rubygems-update 3.0.9 → 3.1.0.pre1

data/lib/rubygems/command_manager.rb

@@ -169,12 +169,6 @@ class Gem::CommandManager
     when '-v', '--version' then
       say Gem::VERSION
       terminate_interaction 0
-    when '--no-ri', '--no-rdoc' then
-      # This was added to compensate for a deprecation warning not being shown
-      # in Rubygems 2.x.x.
-      # TODO: Remove when Rubygems 3.1 is released.
-      alert_error "Invalid option: #{args.first}. Use --no-document instead."
-      terminate_interaction 1
     when /^-/ then
       alert_error clean_text("Invalid option: #{args.first}. See 'gem --help'.")
       terminate_interaction 1

data/lib/rubygems/commands/build_command.rb

@@ -57,18 +57,32 @@ Gems can be saved to a specified filename with the output option:
   end
 
   def execute
-    gemspec = get_one_gem_name
+    gem_name = get_one_optional_argument || find_gemspec
+    build_gem(gem_name)
+  end
+
+  private
 
-    unless File.exist? gemspec
-      gemspec += '.gemspec' if File.exist? gemspec + '.gemspec'
+  def find_gemspec
+    gemspecs = Dir.glob("*.gemspec").sort
+
+    if gemspecs.size > 1
+      alert_error "Multiple gemspecs found: #{gemspecs}, please specify one"
+      terminate_interaction(1)
     end
 
-    if File.exist? gemspec
+    gemspecs.first
+  end
+
+  def build_gem(gem_name)
+    gemspec = File.exist?(gem_name) ? gem_name : "#{gem_name}.gemspec"
+
+    if File.exist?(gemspec)
       spec = Gem::Specification.load(gemspec)
 
       if options[:build_path]
         Dir.chdir(File.dirname(gemspec)) do
-          spec = Gem::Specification.load File.basename(gemspec)
+          spec = Gem::Specification.load(File.basename(gemspec))
           build_package(spec)
         end
       else
@@ -77,12 +91,10 @@ Gems can be saved to a specified filename with the output option:
 
     else
       alert_error "Gemspec file not found: #{gemspec}"
-      terminate_interaction 1
+      terminate_interaction(1)
     end
   end
 
-  private
-
   def build_package(spec)
     if spec
       Gem::Package.build(
@@ -96,4 +108,5 @@ Gems can be saved to a specified filename with the output option:
       terminate_interaction 1
     end
   end
+
 end

data/lib/rubygems/commands/cert_command.rb

@@ -319,5 +319,4 @@ For further reading on signing gems see `ri Gem::Security`.
     email =~ /\A.+@.+\z/
   end
 
-
 end if defined?(OpenSSL::SSL)

data/lib/rubygems/commands/cleanup_command.rb

@@ -99,7 +99,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
     @full = Gem::DependencyList.from_specs
 
     deplist = Gem::DependencyList.new
-    @gems_to_cleanup.each do |spec| deplist.add spec end
+    @gems_to_cleanup.each { |spec| deplist.add spec }
 
     deps = deplist.strongly_connected_components.flatten
 
@@ -121,19 +121,19 @@ If no gems are named all gems in GEM_HOME are cleaned.
   end
 
   def get_gems_to_cleanup
-    gems_to_cleanup = @candidate_gems.select { |spec|
+    gems_to_cleanup = @candidate_gems.select do |spec|
       @primary_gems[spec.name].version != spec.version
-    }
+    end
 
-    default_gems, gems_to_cleanup = gems_to_cleanup.partition { |spec|
+    default_gems, gems_to_cleanup = gems_to_cleanup.partition do |spec|
       spec.default_gem?
-    }
+    end
 
     uninstall_from = options[:user_install] ? Gem.user_dir : @original_home
 
-    gems_to_cleanup = gems_to_cleanup.select { |spec|
+    gems_to_cleanup = gems_to_cleanup.select do |spec|
       spec.base_dir == uninstall_from
-    }
+    end
 
     @default_gems += default_gems
     @default_gems.uniq!

data/lib/rubygems/commands/contents_command.rb

@@ -14,7 +14,7 @@ class Gem::Commands::ContentsCommand < Gem::Command
 
     add_version_option
 
-    add_option(      '--all',
+    add_option('--all',
                "Contents for all gems") do |all, options|
       options[:all] = all
     end
@@ -29,12 +29,12 @@ class Gem::Commands::ContentsCommand < Gem::Command
       options[:lib_only] = lib_only
     end
 
-    add_option(      '--[no-]prefix',
+    add_option('--[no-]prefix',
                "Don't include installed path prefix") do |prefix, options|
       options[:prefix] = prefix
     end
 
-    add_option(      '--[no-]show-install-dir',
+    add_option('--[no-]show-install-dir',
                'Show only the gem install dir') do |show, options|
       options[:show_install_dir] = show
     end

data/lib/rubygems/commands/dependency_command.rb

@@ -80,9 +80,9 @@ use with other commands.
   end
 
   def gem_dependency(pattern, version, prerelease) # :nodoc:
-    dependency = Gem::Deprecate.skip_during {
+    dependency = Gem::Deprecate.skip_during do
       Gem::Dependency.new pattern, version
-    }
+    end
 
     dependency.prerelease = prerelease
 
@@ -208,11 +208,12 @@ use with other commands.
   def name_pattern(args)
     args << '' if args.empty?
 
-    if args.length == 1 and args.first =~ /\A\/(.*)\/(i)?\z/m
+    if args.length == 1 and args.first =~ /\A(.*)(i)?\z/m
       flags = $2 ? Regexp::IGNORECASE : nil
       Regexp.new $1, flags
     else
       /\A#{Regexp.union(*args)}/
     end
   end
+
 end

data/lib/rubygems/commands/environment_command.rb

@@ -9,7 +9,6 @@ class Gem::Commands::EnvironmentCommand < Gem::Command
 
   def arguments # :nodoc:
     args = <<-EOF
-          packageversion  display the package version
           gemdir          display the path where gems are installed
           gempath         display path used to search for gems
           version         display the gem format version
@@ -76,8 +75,6 @@ lib/rubygems/defaults/operating_system.rb
     arg = options[:args][0]
     out <<
       case arg
-      when /^packageversion/ then
-        Gem::RubyGemsPackageVersion
       when /^version/ then
         Gem::VERSION
       when /^gemdir/, /^gemhome/, /^home/, /^GEM_HOME/ then

data/lib/rubygems/commands/info_command.rb

@@ -4,6 +4,7 @@ require 'rubygems/command'
 require 'rubygems/commands/query_command'
 
 class Gem::Commands::InfoCommand < Gem::Commands::QueryCommand
+
   def initialize
     super "info", "Show information for the given gem"
 
@@ -30,4 +31,5 @@ class Gem::Commands::InfoCommand < Gem::Commands::QueryCommand
   def defaults_str
     "--local"
   end
+
 end

data/lib/rubygems/commands/install_command.rb

@@ -194,62 +194,21 @@ You can use `i` command instead of `install`.
 
     req = Gem::Requirement.create(version)
 
-    if options[:ignore_dependencies]
-      install_gem_without_dependencies name, req
-    else
-      inst = Gem::DependencyInstaller.new options
-      request_set = inst.resolve_dependencies name, req
-
-      if options[:explain]
-        puts "Gems to install:"
-
-        request_set.sorted_requests.each do |s|
-          puts "  #{s.full_name}"
-        end
-
-        return
-      else
-        @installed_specs.concat request_set.install options
-      end
+    dinst = Gem::DependencyInstaller.new options
 
-      show_install_errors inst.errors
-    end
-  end
+    request_set = dinst.resolve_dependencies name, req
 
-  def install_gem_without_dependencies(name, req) # :nodoc:
-    gem = nil
+    if options[:explain]
+      say "Gems to install:"
 
-    if local?
-      if name =~ /\.gem$/ and File.file? name
-        source = Gem::Source::SpecificFile.new name
-        spec = source.spec
-      else
-        source = Gem::Source::Local.new
-        spec = source.find_gem name, req
+      request_set.sorted_requests.each do |activation_request|
+        say "  #{activation_request.full_name}"
       end
-      gem = source.download spec if spec
-    end
-
-    if remote? and not gem
-      dependency = Gem::Dependency.new name, req
-      dependency.prerelease = options[:prerelease]
-
-      fetcher = Gem::RemoteFetcher.fetcher
-      gem = fetcher.download_to_cache dependency
+    else
+      @installed_specs.concat request_set.install options
     end
 
-    inst = Gem::Installer.at gem, options
-    inst.install
-
-    require 'rubygems/dependency_installer'
-    dinst = Gem::DependencyInstaller.new options
-    dinst.installed_gems.replace [inst.spec]
-
-    Gem.done_installing_hooks.each do |hook|
-      hook.call dinst, [inst.spec]
-    end unless Gem.done_installing_hooks.empty?
-
-    @installed_specs.push(inst.spec)
+    show_install_errors dinst.errors
   end
 
   def install_gems # :nodoc:
@@ -259,6 +218,7 @@ You can use `i` command instead of `install`.
       gem_version ||= options[:version]
       domain = options[:domain]
       domain = :local unless options[:suggest_alternate]
+      supress_suggestions = (domain == :local)
 
       begin
         install_gem gem_name, gem_version
@@ -266,11 +226,11 @@ You can use `i` command instead of `install`.
         alert_error "Error installing #{gem_name}:\n\t#{e.message}"
         exit_code |= 1
       rescue Gem::GemNotFoundException => e
-        show_lookup_failure e.name, e.version, e.errors, domain
+        show_lookup_failure e.name, e.version, e.errors, supress_suggestions
 
         exit_code |= 2
       rescue Gem::UnsatisfiableDependencyError => e
-        show_lookup_failure e.name, e.version, e.errors, domain,
+        show_lookup_failure e.name, e.version, e.errors, supress_suggestions,
                             "'#{gem_name}' (#{gem_version})"
 
         exit_code |= 2

data/lib/rubygems/commands/lock_command.rb

@@ -100,9 +100,9 @@ lock it down to the exact version.
   end
 
   def spec_path(gem_full_name)
-    gemspecs = Gem.path.map { |path|
+    gemspecs = Gem.path.map do |path|
       File.join path, "specifications", "#{gem_full_name}.gemspec"
-    }
+    end
 
     gemspecs.find { |path| File.exist? path }
   end

data/lib/rubygems/commands/mirror_command.rb

@@ -3,6 +3,7 @@ require 'rubygems/command'
 
 unless defined? Gem::Commands::MirrorCommand
   class Gem::Commands::MirrorCommand < Gem::Command
+
     def initialize
       super('mirror', 'Mirror all gem files (requires rubygems-mirror)')
       begin

data/lib/rubygems/commands/open_command.rb

@@ -17,7 +17,7 @@ class Gem::Commands::OpenCommand < Gem::Command
     end
     add_option('-v', '--version VERSION', String,
                "Opens specific gem version") do |version|
-      options[:version]  = version
+      options[:version] = version
     end
   end
 
@@ -84,4 +84,5 @@ class Gem::Commands::OpenCommand < Gem::Command
 
     say "Unable to find gem '#{name}'"
   end
+
 end

data/lib/rubygems/commands/outdated_command.rb

@@ -30,4 +30,5 @@ update the gems with the update or install commands.
       say "#{spec.name} (#{spec.version} < #{remote_version})"
     end
   end
+
 end

data/lib/rubygems/commands/owner_command.rb

@@ -91,11 +91,6 @@ permission to.
     owners.each do |owner|
       begin
         response = send_owner_request(method, name, owner)
-
-        if need_otp? response
-          response = send_owner_request(method, name, owner, true)
-        end
-
         action = method == :delete ? "Removing" : "Adding"
 
         with_response response, "#{action} #{owner}"
@@ -107,11 +102,11 @@ permission to.
 
   private
 
-  def send_owner_request(method, name, owner, use_otp = false)
+  def send_owner_request(method, name, owner)
     rubygems_api_request method, "api/v1/gems/#{name}/owners" do |request|
       request.set_form_data 'email' => owner
       request.add_field "Authorization", api_key
-      request.add_field "OTP", options[:otp] if use_otp
+      request.add_field "OTP", options[:otp] if options[:otp]
     end
   end
 

data/lib/rubygems/commands/pristine_command.rb

@@ -104,6 +104,8 @@ extensions will be restored.
               end.flatten
             end
 
+    specs = specs.select{|spec| RUBY_ENGINE == spec.platform || Gem::Platform.local === spec.platform || spec.platform == Gem::Platform::RUBY }
+
     if specs.to_a.empty?
       raise Gem::Exception,
             "Failed to find gems #{options[:args]} #{options[:version]}"
@@ -183,4 +185,5 @@ extensions will be restored.
       say "Restored #{spec.full_name}"
     end
   end
+
 end

data/lib/rubygems/commands/push_command.rb

@@ -5,6 +5,7 @@ require 'rubygems/gemcutter_utilities'
 require 'rubygems/package'
 
 class Gem::Commands::PushCommand < Gem::Command
+
   include Gem::LocalRemoteOptions
   include Gem::GemcutterUtilities
 
@@ -118,22 +119,18 @@ You can upgrade or downgrade to the latest release version with:
 
     response = send_push_request(name, args)
 
-    if need_otp? response
-      response = send_push_request(name, args, true)
-    end
-
     with_response response
   end
 
   private
 
-  def send_push_request(name, args, use_otp = false)
+  def send_push_request(name, args)
     rubygems_api_request(*args) do |request|
       request.body = Gem.read_binary name
       request.add_field "Content-Length", request.body.size
       request.add_field "Content-Type",   "application/octet-stream"
       request.add_field "Authorization",  api_key
-      request.add_field "OTP", options[:otp] if use_otp
+      request.add_field "OTP", options[:otp] if options[:otp]
     end
   end
 
@@ -145,4 +142,5 @@ You can upgrade or downgrade to the latest release version with:
       gem_metadata["allowed_push_host"]
     ]
   end
+
 end

data/lib/rubygems/commands/query_command.rb

@@ -39,7 +39,7 @@ class Gem::Commands::QueryCommand < Gem::Command
       options[:details] = value
     end
 
-    add_option(      '--[no-]versions',
+    add_option('--[no-]versions',
                'Display only gem names') do |value, options|
       options[:versions] = value
       options[:details] = false unless value
@@ -56,7 +56,7 @@ class Gem::Commands::QueryCommand < Gem::Command
       options[:exact] = value
     end
 
-    add_option(      '--[no-]prerelease',
+    add_option('--[no-]prerelease',
                'Display prerelease versions') do |value, options|
       options[:prerelease] = value
     end
@@ -78,46 +78,58 @@ is too hard to use.
   end
 
   def execute
+    gem_names = Array(options[:name])
+
+    if !args.empty?
+      gem_names = options[:exact] ? args.map{|arg| /\A#{Regexp.escape(arg)}\Z/ } : args.map{|arg| /#{arg}/i }
+    end
+
+    terminate_interaction(check_installed_gems(gem_names)) if check_installed_gems?
+
+    gem_names.each { |n| show_gems(n) }
+  end
+
+  private
+
+  def check_installed_gems(gem_names)
     exit_code = 0
-    if options[:args].to_a.empty? and options[:name].source.empty?
-      name = options[:name]
-      no_name = true
-    elsif !options[:name].source.empty?
-      name = Array(options[:name])
+
+    if args.empty? && !gem_name?
+      alert_error "You must specify a gem name"
+      exit_code = 4
+    elsif gem_names.count > 1
+      alert_error "You must specify only ONE gem!"
+      exit_code = 4
     else
-      args = options[:args].to_a
-      name = options[:exact] ? args.map{|arg| /\A#{Regexp.escape(arg)}\Z/ } : args.map{|arg| /#{arg}/i }
+      installed = installed?(gem_names.first, options[:version])
+      installed = !installed unless options[:installed]
+
+      say(installed)
+      exit_code = 1 if !installed
     end
 
-    prerelease = options[:prerelease]
+    exit_code
+  end
 
-    unless options[:installed].nil?
-      if no_name
-        alert_error "You must specify a gem name"
-        exit_code |= 4
-      elsif name.count > 1
-        alert_error "You must specify only ONE gem!"
-        exit_code |= 4
-      else
-        installed = installed? name.first, options[:version]
-        installed = !installed unless options[:installed]
+  def check_installed_gems?
+    !options[:installed].nil?
+  end
 
-        if installed
-          say "true"
-        else
-          say "false"
-          exit_code |= 1
-        end
-      end
+  def gem_name?
+    !options[:name].source.empty?
+  end
 
-      terminate_interaction exit_code
-    end
+  def prerelease
+    options[:prerelease]
+  end
 
-    names = Array(name)
-    names.each { |n| show_gems n, prerelease }
+  def show_prereleases?
+    prerelease.nil? || prerelease
   end
 
-  private
+  def args
+    options[:args].to_a
+  end
 
   def display_header(type)
     if (ui.outs.tty? and Gem.configuration.verbose) or both?
@@ -128,56 +140,57 @@ is too hard to use.
   end
 
   #Guts of original execute
-  def show_gems(name, prerelease)
-    req = Gem::Requirement.default
-    # TODO: deprecate for real
+  def show_gems(name)
+    show_local_gems(name)  if local?
+    show_remote_gems(name) if remote?
+  end
+
+  def show_local_gems(name, req = Gem::Requirement.default)
+    display_header("LOCAL")
+
+    specs = Gem::Specification.find_all do |s|
+      s.name =~ name and req =~ s.version
+    end
+
     dep = Gem::Deprecate.skip_during { Gem::Dependency.new name, req }
-    dep.prerelease = prerelease
+    specs.select! do |s|
+      dep.match?(s.name, s.version, show_prereleases?)
+    end
 
-    if local?
-      if prerelease and not both?
-        alert_warning "prereleases are always shown locally"
-      end
+    spec_tuples = specs.map do |spec|
+      [spec.name_tuple, spec]
+    end
 
-      display_header 'LOCAL'
+    output_query_results(spec_tuples)
+  end
 
-      specs = Gem::Specification.find_all { |s|
-        s.name =~ name and req =~ s.version
-      }
+  def show_remote_gems(name)
+    display_header("REMOTE")
 
-      spec_tuples = specs.map do |spec|
-        [spec.name_tuple, spec]
-      end
+    fetcher = Gem::SpecFetcher.fetcher
 
-      output_query_results spec_tuples
-    end
+    spec_tuples = if name.respond_to?(:source) && name.source.empty?
+                    fetcher.detect(specs_type) { true }
+                  else
+                    fetcher.detect(specs_type) do |name_tuple|
+                      name === name_tuple.name
+                    end
+                  end
 
-    if remote?
-      display_header 'REMOTE'
-
-      fetcher = Gem::SpecFetcher.fetcher
-
-      type = if options[:all]
-               if options[:prerelease]
-                 :complete
-               else
-                 :released
-               end
-             elsif options[:prerelease]
-               :prerelease
-             else
-               :latest
-             end
-
-      if name.respond_to?(:source) && name.source.empty?
-        spec_tuples = fetcher.detect(type) { true }
+    output_query_results(spec_tuples)
+  end
+
+  def specs_type
+    if options[:all]
+      if options[:prerelease]
+        :complete
       else
-        spec_tuples = fetcher.detect(type) do |name_tuple|
-          name === name_tuple.name
-        end
+        :released
       end
-
-      output_query_results spec_tuples
+    elsif options[:prerelease]
+      :prerelease
+    else
+      :latest
     end
   end
 
@@ -235,7 +248,7 @@ is too hard to use.
 
     name_tuple, spec = detail_tuple
 
-    spec = spec.fetch_spec name_tuple if spec.respond_to? :fetch_spec
+    spec = spec.fetch_spec(name_tuple)if spec.respond_to?(:fetch_spec)
 
     entry << "\n"
 
@@ -285,8 +298,8 @@ is too hard to use.
 
     entry = [name_tuples.first.name]
 
-    entry_versions entry, name_tuples, platforms, specs
-    entry_details  entry, detail_tuple, specs, platforms
+    entry_versions(entry, name_tuples, platforms, specs)
+    entry_details(entry, detail_tuple, specs, platforms)
 
     entry.join
   end
@@ -337,12 +350,13 @@ is too hard to use.
 
     if platforms.length == 1
       title = platforms.values.length == 1 ? 'Platform' : 'Platforms'
-      entry << "    #{title}: #{platforms.values.sort.join ', '}\n"
+      entry << "    #{title}: #{platforms.values.sort.join(', ')}\n"
     else
       entry << "    Platforms:\n"
-      platforms.sort_by do |version,|
-        version
-      end.each do |version, pls|
+
+      sorted_platforms = platforms.sort_by { |version,| version }
+
+      sorted_platforms.each do |version, pls|
         label = "        #{version}: "
         data = format_text pls.sort.join(', '), 68, label.length
         data[0, label.length] = label