summaryrefslogtreecommitdiffstats
path: root/install.rb
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-07-09 18:05:08 -0700
committerMarkus Roberts <Markus@reality.com>2010-07-09 18:05:08 -0700
commiteefccf252527dc5b69af5959b0b0e2ddb5c91b74 (patch)
treea37e13c9cd4aab7e8671004cf4f83000b52c96a8 /install.rb
parent184132e07fc1461555cb4da842df15f32842a843 (diff)
downloadpuppet-eefccf252527dc5b69af5959b0b0e2ddb5c91b74.tar.gz
puppet-eefccf252527dc5b69af5959b0b0e2ddb5c91b74.tar.xz
puppet-eefccf252527dc5b69af5959b0b0e2ddb5c91b74.zip
Code smell: English names for special globals rather than line-noise
* Replaced 36 occurances of [$][?] with $CHILD_STATUS 3 Examples: The code: print "%s finished with exit code %s\n" % [host, $?.exitstatus] becomes: print "%s finished with exit code %s\n" % [host, $CHILD_STATUS.exitstatus] The code: $stderr.puts "Could not find host for PID %s with status %s" % [pid, $?.exitstatus] becomes: $stderr.puts "Could not find host for PID %s with status %s" % [pid, $CHILD_STATUS.exitstatus] The code: unless $? == 0 becomes: unless $CHILD_STATUS == 0 * Replaced 3 occurances of [$][$] with $PID 3 Examples: The code: Process.kill(:HUP, $$) if restart_requested? becomes: Process.kill(:HUP, $PID) if restart_requested? The code: if pid == $$ becomes: if pid == $PID The code: host[:name] = "!invalid.hostname.$$$" becomes: host[:name] = "!invalid.hostname.$PID$" * Replaced 7 occurances of [$]& with $MATCH 3 Examples: The code: work.slice!(0, $&.length) becomes: work.slice!(0, $MATCH.length) The code: if $& becomes: if $MATCH The code: if $& becomes: if $MATCH * Replaced 28 occurances of [$]:(?!:) with $LOAD_PATH 3 Examples: The code: sitelibdir = $:.find { |x| x =~ /site_ruby/ } becomes: sitelibdir = $LOAD_PATH.find { |x| x =~ /site_ruby/ } The code: $:.unshift "lib" becomes: $LOAD_PATH.unshift "lib" The code: $:.shift becomes: $LOAD_PATH.shift * Replaced 3 occurances of [$]! with $ERROR_INFO 3 Examples: The code: $LOG.fatal("Problem reading #{filepath}: #{$!}") becomes: $LOG.fatal("Problem reading #{filepath}: #{$ERROR_INFO}") The code: $stderr.puts "Couldn't build man pages: " + $! becomes: $stderr.puts "Couldn't build man pages: " + $ERROR_INFO The code: $stderr.puts $!.message becomes: $stderr.puts $ERROR_INFO.message * Replaced 3 occurances of ^(.*)[$]" with \1$LOADED_FEATURES 3 Examples: The code: unless $".index 'racc/parser.rb' becomes: unless $LOADED_FEATURES.index 'racc/parser.rb' The code: $".push 'racc/parser.rb' becomes: $LOADED_FEATURES.push 'racc/parser.rb' The code: $".should be_include("tmp/myfile.rb") becomes: $LOADED_FEATURES.should be_include("tmp/myfile.rb")
Diffstat (limited to 'install.rb')
-rwxr-xr-xinstall.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/install.rb b/install.rb
index 18da2bebb..a95ef7616 100755
--- a/install.rb
+++ b/install.rb
@@ -270,7 +270,7 @@ def prepare_installation
else
sitelibdir = Config::CONFIG["sitelibdir"]
if sitelibdir.nil?
- sitelibdir = $:.find { |x| x =~ /site_ruby/ }
+ sitelibdir = $LOAD_PATH.find { |x| x =~ /site_ruby/ }
if sitelibdir.nil?
sitelibdir = File.join(libdir, "site_ruby")
elsif sitelibdir !~ Regexp.quote(version)
@@ -369,7 +369,7 @@ def build_man(bins, sbins)
end
rescue SystemCallError
- $stderr.puts "Couldn't build man pages: " + $!
+ $stderr.puts "Couldn't build man pages: " + $ERROR_INFO
$stderr.puts "Continuing with install..."
end
end
@@ -377,7 +377,7 @@ end
def run_tests(test_list)
begin
require 'test/unit/ui/console/testrunner'
- $:.unshift "lib"
+ $LOAD_PATH.unshift "lib"
test_list.each do |test|
next if File.directory?(test)
require test
@@ -389,7 +389,7 @@ def run_tests(test_list)
tests.delete_if { |o| o == Test::Unit::TestCase }
tests.each { |test| Test::Unit::UI::Console::TestRunner.run(test) }
- $:.shift
+ $LOAD_PATH.shift
rescue LoadError
puts "Missing testrunner library; skipping tests"
end