diff options
Diffstat (limited to 'lib/rubygems')
| -rw-r--r-- | lib/rubygems/commands/help_command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/commands/install_command.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/commands/pristine_command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/installer.rb | 14 | ||||
| -rw-r--r-- | lib/rubygems/package.rb | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/lib/rubygems/commands/help_command.rb b/lib/rubygems/commands/help_command.rb index 9f0ebc087f..4cbb8dadee 100644 --- a/lib/rubygems/commands/help_command.rb +++ b/lib/rubygems/commands/help_command.rb @@ -46,7 +46,7 @@ Some examples of 'gem' usage. * Update all gems on your system: gem update - + * Update your local version of RubyGems gem update --system diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb index ac78764af5..5e2ffcdff3 100644 --- a/lib/rubygems/commands/install_command.rb +++ b/lib/rubygems/commands/install_command.rb @@ -37,7 +37,7 @@ class Gem::Commands::InstallCommand < Gem::Command 'install the listed gems') do |v,o| o[:gemdeps] = v end - + add_option(:"Install/Update", '--default', 'Add the gem\'s full specification to', 'specifications/default and extract only its bin') do |v,o| @@ -157,7 +157,7 @@ to write the specification by hand. For example: alert_error "Can't use --version w/ multiple gems. Use name:ver instead." terminate_interaction 1 end - + # load post-install hooks appropriate to options if options[:install_as_default] require 'rubygems/install_default_message' diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb index 0a7f315a0a..257e6df1cc 100644 --- a/lib/rubygems/commands/pristine_command.rb +++ b/lib/rubygems/commands/pristine_command.rb @@ -110,7 +110,7 @@ with extensions. Gem::RemoteFetcher.fetcher.download_to_cache dep end - env_shebang = + env_shebang = if options.include? :env_shebang then options[:env_shebang] else diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index c6fad3c492..47995f4cb7 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -212,17 +212,17 @@ class Gem::Installer FileUtils.rm_rf gem_dir FileUtils.mkdir_p gem_dir - + if @options[:install_as_default] extract_bin write_default_spec else extract_files - + build_extensions write_build_info_file run_post_build_hooks - + generate_bin write_spec write_cache_file @@ -349,11 +349,11 @@ class Gem::Installer file.fsync rescue nil # for filesystems without fsync(2) end end - + ## # Writes the full .gemspec specification (in Ruby) to the gem home's # specifications/default directory. - + def write_default_spec File.open(default_spec_file, "w") do |file| file.puts spec.to_ruby @@ -738,12 +738,12 @@ EOF def extract_files @package.extract_files gem_dir end - + ## # Extracts only the bin/ files from the gem into the gem directory. # This is used by default gems to allow a gem-aware stub to function # without the full gem installed. - + def extract_bin @package.extract_files gem_dir, "bin/*" end diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index 76f45a99d8..511062e7ee 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -340,7 +340,7 @@ EOM open_tar_gz io do |tar| tar.each do |entry| next unless File.fnmatch pattern, entry.full_name - + destination = install_location entry.full_name, destination_dir FileUtils.rm_rf destination |