@@ -1,12 +1,3 @@ -2009-07-23 Chad Woolley <thewoolleyman@gmail.com> - - * lib/rubygems/commands/install_command.rb, - lib/rubygems/command/update_command.rb, - lib/rubygems/dependency_installer.rb, - lib/rubygems/install_update_options.rb: Make --format-executables - the default for all commands including setup and system update. - Addresses issue #1728 in Ruby core. - 2009-07-21 Eric Hodel <drbrain@segment7.net> * lib/rubygems/package.rb: Remove dangling digest require. Reported ChangeLog @@ -21,7 +21,7 @@ class Gem::Commands::InstallCommand < Gem::Command defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({ :generate_rdoc => true, :generate_ri => true, - :format_executable => true, + :format_executable => false, :test => false, :version => Gem::Requirement.default, }) @@ -39,7 +39,7 @@ class Gem::Commands::InstallCommand < Gem::Command end def defaults_str # :nodoc: - "--both --version '#{Gem::Requirement.default}' --format-executable --rdoc --ri --no-force\n" \ + "--both --version '#{Gem::Requirement.default}' --rdoc --ri --no-force\n" \ "--no-test --install-dir #{Gem.dir}" end lib/rubygems/commands/install_command.rb @@ -37,7 +37,7 @@ class Gem::Commands::UpdateCommand < Gem::Command end def defaults_str # :nodoc: - "--format-executable --rdoc --ri --no-force --no-test --install-dir #{Gem.dir}" + "--rdoc --ri --no-force --no-test --install-dir #{Gem.dir}" end def usage # :nodoc: @@ -139,7 +139,7 @@ class Gem::Commands::UpdateCommand < Gem::Command args.push '--prefix', Gem.prefix unless Gem.prefix.nil? args << '--no-rdoc' unless options[:generate_rdoc] args << '--no-ri' unless options[:generate_ri] - args << '--no-format-executable' unless options[:format_executable] + args << '--no-format-executable' if options[:no_format_executable] update_dir = File.join Gem.dir, 'gems', "rubygems-update-#{version}" lib/rubygems/commands/update_command.rb @@ -18,7 +18,7 @@ class Gem::DependencyInstaller :env_shebang => false, :domain => :both, # HACK dup :force => false, - :format_executable => true, # HACK dup + :format_executable => false, # HACK dup :ignore_dependencies => false, :prerelease => false, :security_policy => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low? lib/rubygems/dependency_installer.rb @@ -117,7 +117,7 @@ module Gem::InstallUpdateOptions # Default options for the gem install command. def install_update_defaults_str - '--format-executable --rdoc --no-force --no-test --wrappers' + '--rdoc --no-force --no-test --wrappers' end end lib/rubygems/install_update_options.rb 4cf260369268dffe36590cd96978e1cdb3232c98 thewoolleyman thewoolleyman@3d4018f9-ac1a-0410-99e9-8a154d859a19 http://github.com/wycats/rubygems/commit/6a812fa67ff9ce3a01bac9f7ac009e845e59471f 6a812fa67ff9ce3a01bac9f7ac009e845e59471f 2009-07-25T15:23:53-07:00 2009-07-25T15:23:53-07:00 revert change to make --format-executable the default. Needs more discussion for Jruby, etc. Patch and ticket are here: http://rubyforge.org/tracker/index.php?func=detail&aid=26754&group_id=126&atid=577 git-svn-id: http://rubygems.rubyforge.org/svn/trunk@2281 3d4018f9-ac1a-0410-99e9-8a154d859a19 5450f3151aa0d8b5cdecbb36a8f4a193908a8735 thewoolleyman thewoolleyman@3d4018f9-ac1a-0410-99e9-8a154d859a19