rubygems-update 1.8.30 → 2.0.0.preview2

data/lib/rubygems/commands/dependency_command.rb

@@ -71,14 +71,9 @@ class Gem::Commands::DependencyCommand < Gem::Command
     if remote? and not options[:reverse_dependencies] then
       fetcher = Gem::SpecFetcher.fetcher
 
-      # REFACTOR: fetcher.find_specs_matching => specs
-      specs_and_sources = fetcher.find_matching(dependency,
-                                                dependency.specific?, true,
-                                                dependency.prerelease?)
-
-      specs.concat specs_and_sources.map { |spec_tuple, source_uri|
-        fetcher.fetch_spec spec_tuple, URI.parse(source_uri)
-      }
+      ss, _ = fetcher.spec_for_dependency dependency
+
+      ss.each { |s,o| specs << s }
     end
 
     if specs.empty? then

data/lib/rubygems/commands/environment_command.rb

@@ -24,33 +24,38 @@ class Gem::Commands::EnvironmentCommand < Gem::Command
 The RubyGems environment can be controlled through command line arguments,
 gemrc files, environment variables and built-in defaults.
 
-Command line argument defaults and some RubyGems defaults can be set in
-~/.gemrc file for individual users and a /etc/gemrc for all users.  A gemrc
-is a YAML file with the following YAML keys:
+Command line argument defaults and some RubyGems defaults can be set in a
+~/.gemrc file for individual users and a /etc/gemrc for all users. These
+files are YAML files with the following YAML keys:
 
   :sources: A YAML array of remote gem repositories to install gems from
-  :verbose: Verbosity of the gem command.  false, true, and :really are the
+  :verbose: Verbosity of the gem command. false, true, and :really are the
             levels
   :update_sources: Enable/disable automatic updating of repository metadata
   :backtrace: Print backtrace when RubyGems encounters an error
   :gempath: The paths in which to look for gems
-  gem_command: A string containing arguments for the specified gem command
+  :disable_default_gem_server: Force specification of gem server host on push
+  <gem_command>: A string containing arguments for the specified gem command
 
 Example:
 
   :verbose: false
   install: --no-wrappers
   update: --no-wrappers
+  :disable_default_gem_server: true
 
 RubyGems' default local repository can be overridden with the GEM_PATH and
-GEM_HOME environment variables.  GEM_HOME sets the default repository to
-install into.  GEM_PATH allows multiple local repositories to be searched for
+GEM_HOME environment variables. GEM_HOME sets the default repository to
+install into. GEM_PATH allows multiple local repositories to be searched for
 gems.
 
 If you are behind a proxy server, RubyGems uses the HTTP_PROXY,
 HTTP_PROXY_USER and HTTP_PROXY_PASS environment variables to discover the
 proxy server.
 
+If you would like to push gems to a private gem server the RUBYGEMS_HOST
+environment variable can be set to the URI for that server.
+
 If you are packaging RubyGems all of RubyGems' defaults are in
 lib/rubygems/defaults.rb.  You may override these in
 lib/rubygems/defaults/operating_system.rb
@@ -74,7 +79,7 @@ lib/rubygems/defaults/operating_system.rb
     when /^gempath/, /^path/, /^GEM_PATH/ then
       out << Gem.path.join(File::PATH_SEPARATOR)
     when /^remotesources/ then
-      out << Gem.sources.join("\n")
+      out << Gem.sources.to_a.join("\n")
     when /^platform/ then
       out << Gem.platforms.join(File::PATH_SEPARATOR)
     when nil then

data/lib/rubygems/commands/fetch_command.rb

@@ -34,7 +34,6 @@ class Gem::Commands::FetchCommand < Gem::Command
 
   def execute
     version = options[:version] || Gem::Requirement.default
-    all = Gem::Requirement.default != version
 
     platform  = Gem.platforms.last
     gem_names = get_all_gem_names
@@ -43,32 +42,20 @@ class Gem::Commands::FetchCommand < Gem::Command
       dep = Gem::Dependency.new gem_name, version
       dep.prerelease = options[:prerelease]
 
-      specs_and_sources, errors =
-        Gem::SpecFetcher.fetcher.fetch_with_errors(dep, all, true,
-                                                   dep.prerelease?)
-
+      specs_and_sources, errors = Gem::SpecFetcher.fetcher.spec_for_dependency dep
       if platform then
         filtered = specs_and_sources.select { |s,| s.platform == platform }
         specs_and_sources = filtered unless filtered.empty?
       end
 
-      spec, source_uri = specs_and_sources.sort_by { |s,| s.version }.last
+      spec, source = specs_and_sources.sort_by { |s,| s.version }.first
 
       if spec.nil? then
         show_lookup_failure gem_name, version, errors, options[:domain]
         next
       end
 
-      file = "#{spec.full_name}.gem"
-      remote_path = URI.parse(source_uri) + "gems/#{file}"
-
-      fetch = Gem::RemoteFetcher.fetcher
-
-      gem = fetch.fetch_path remote_path.to_s
-
-      File.open file, "wb" do |f|
-        f.write gem
-      end
+      source.download spec
 
       say "Downloaded #{spec.full_name}"
     end

data/lib/rubygems/commands/generate_index_command.rb

@@ -11,29 +11,16 @@ class Gem::Commands::GenerateIndexCommand < Gem::Command
   def initialize
     super 'generate_index',
           'Generates the index files for a gem server directory',
-          :directory => '.', :build_legacy => true, :build_modern => true
+          :directory => '.', :build_modern => true
 
     add_option '-d', '--directory=DIRNAME',
                'repository base dir containing gems subdir' do |dir, options|
       options[:directory] = File.expand_path dir
     end
 
-    add_option '--[no-]legacy',
-               'Generate Marshal.4.8' do |value, options|
-      unless options[:build_modern] or value then
-        raise OptionParser::InvalidOption, 'no indicies will be built'
-      end
-
-      options[:build_legacy] = value
-    end
-
     add_option '--[no-]modern',
-               'Generate indexes for RubyGems newer',
-               'than 1.2.0' do |value, options|
-      unless options[:build_legacy] or value then
-        raise OptionParser::InvalidOption, 'no indicies will be built'
-      end
-
+               'Generate indexes for RubyGems',
+               '(always true)' do |value, options|
       options[:build_modern] = value
     end
 
@@ -42,27 +29,10 @@ class Gem::Commands::GenerateIndexCommand < Gem::Command
                'since the last update' do |value, options|
       options[:update] = value
     end
-
-    add_option :RSS, '--rss-gems-host=GEM_HOST',
-               'Host name where gems are served from,',
-               'used for GUID and enclosure values' do |value, options|
-      options[:rss_gems_host] = value
-    end
-
-    add_option :RSS, '--rss-host=HOST',
-               'Host name for more gems information,',
-               'used for RSS feed link' do |value, options|
-      options[:rss_host] = value
-    end
-
-    add_option :RSS, '--rss-title=TITLE',
-               'Set title for RSS feed' do |value, options|
-      options[:rss_title] = value
-    end
   end
 
   def defaults_str # :nodoc:
-    "--directory . --legacy --modern"
+    "--directory . --modern"
   end
 
   def description # :nodoc:
@@ -85,25 +55,15 @@ When done, it will generate a set of files like this:
   prerelease_specs.<version>.gz                # prerelease specs index
   quick/Marshal.<version>/<gemname>.gemspec.rz # Marshal quick index file
 
-  # these files support legacy RubyGems
-  Marshal.<version>
-  Marshal.<version>.Z                          # Marshal full index
-
-The .Z and .rz extension files are compressed with the inflate algorithm.
+The .rz extension files are compressed with the inflate algorithm.
 The Marshal version number comes from ruby's Marshal::MAJOR_VERSION and
 Marshal::MINOR_VERSION constants.  It is used to ensure compatibility.
-
-If --rss-host and --rss-gem-host are given an RSS feed will be generated at
-index.rss containing gems released in the last two days.
     EOF
   end
 
   def execute
-    if options[:update] and
-       (options[:rss_host] or options[:rss_gems_host]) then
-      alert_error '--update not compatible with RSS generation'
-      terminate_interaction 1
-    end
+    # This is always true becasue it's the only way now.
+    options[:build_modern] = true
 
     if not File.exist?(options[:directory]) or
        not File.directory?(options[:directory]) then

data/lib/rubygems/commands/help_command.rb

@@ -37,7 +37,7 @@ Some examples of 'gem' usage.
 
 * Create a gem:
 
-    See http://rubygems.rubyforge.org/wiki/wiki.pl?CreateAGemInTenMinutes
+    See http://guides.rubygems.org/make-your-own-gem/
 
 * See information about RubyGems:
 

data/lib/rubygems/commands/install_command.rb

@@ -1,10 +1,11 @@
 require 'rubygems/command'
-require 'rubygems/doc_manager'
 require 'rubygems/install_update_options'
 require 'rubygems/dependency_installer'
 require 'rubygems/local_remote_options'
 require 'rubygems/validator'
 require 'rubygems/version_option'
+require 'rubygems/install_message' # must come before rdoc for messaging
+require 'rubygems/rdoc'
 
 ##
 # Gem installer command line tool
@@ -13,14 +14,14 @@ require 'rubygems/version_option'
 
 class Gem::Commands::InstallCommand < Gem::Command
 
+  attr_reader :installed_specs # :nodoc:
+
   include Gem::VersionOption
   include Gem::LocalRemoteOptions
   include Gem::InstallUpdateOptions
 
   def initialize
     defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({
-      :generate_rdoc     => true,
-      :generate_ri       => true,
       :format_executable => false,
       :version           => Gem::Requirement.default,
     })
@@ -32,6 +33,14 @@ class Gem::Commands::InstallCommand < Gem::Command
     add_platform_option
     add_version_option
     add_prerelease_option "to be installed. (Only for listed gems)"
+
+    add_option(:"Install/Update", '-g', '--file FILE',
+               'Read from a gem dependencies API file and',
+               'install the listed gems') do |v,o|
+      o[:gemdeps] = v
+    end
+
+    @installed_specs = nil
   end
 
   def arguments # :nodoc:
@@ -39,7 +48,7 @@ class Gem::Commands::InstallCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--both --version '#{Gem::Requirement.default}' --rdoc --ri --no-force\n" \
+    "--both --version '#{Gem::Requirement.default}' --document --no-force\n" \
     "--install-dir #{Gem.dir}"
   end
 
@@ -100,31 +109,73 @@ to write the specification by hand.  For example:
     "#{program_name} GEMNAME [GEMNAME ...] [options] -- --build-flags"
   end
 
+  def install_from_gemdeps(gf)
+    require 'rubygems/request_set'
+    rs = Gem::RequestSet.new
+    rs.load_gemdeps gf
+
+    rs.resolve
+
+    specs = rs.install options do |req, inst|
+      s = req.full_spec
+
+      if inst
+        say "Installing #{s.name} (#{s.version})"
+      else
+        say "Using #{s.name} (#{s.version})"
+      end
+    end
+
+    @installed_specs = specs
+
+    raise Gem::SystemExitException, 0
+  end
+
   def execute
-    if options[:include_dependencies] then
-      alert "`gem install -y` is now default and will be removed"
-      alert "use --ignore-dependencies to install only the gems you list"
+    if gf = options[:gemdeps] then
+      install_from_gemdeps gf
+      return
     end
 
-    installed_gems = []
+    @installed_specs = []
 
     ENV.delete 'GEM_PATH' if options[:install_dir].nil? and RUBY_VERSION > '1.9'
 
+    if options[:install_dir] and options[:user_install]
+      alert_error "Use --install-dir or --user-install but not both"
+      terminate_interaction 1
+    end
+
     exit_code = 0
 
-    get_all_gem_names.each do |gem_name|
+    if options[:version] != Gem::Requirement.default &&
+        get_all_gem_names.size > 1 then
+      alert_error "Can't use --version w/ multiple gems. Use name:ver instead."
+      terminate_interaction 1
+    end
+
+
+    get_all_gem_names_and_versions.each do |gem_name, gem_version|
+      gem_version ||= options[:version]
+
       begin
         next if options[:conservative] and
-          not Gem::Dependency.new(gem_name, options[:version]).matching_specs.empty?
+          not Gem::Dependency.new(gem_name, gem_version).matching_specs.empty?
 
         inst = Gem::DependencyInstaller.new options
-        inst.install gem_name, options[:version]
+        inst.install gem_name, Gem::Requirement.create(gem_version)
 
-        inst.installed_gems.each do |spec|
-          say "Successfully installed #{spec.full_name}"
-        end
+        @installed_specs.push(*inst.installed_gems)
 
-        installed_gems.push(*inst.installed_gems)
+        next unless errs = inst.errors
+
+        errs.each do |x|
+          next unless Gem::SourceFetchProblem === x
+
+          msg = "Unable to pull data from '#{x.source.uri}': #{x.error.message}"
+
+          alert_warning msg
+        end
       rescue Gem::InstallError => e
         alert_error "Error installing #{gem_name}:\n\t#{e.message}"
         exit_code |= 1
@@ -135,27 +186,9 @@ to write the specification by hand.  For example:
       end
     end
 
-    unless installed_gems.empty? then
-      gems = installed_gems.length == 1 ? 'gem' : 'gems'
-      say "#{installed_gems.length} #{gems} installed"
-
-      # NOTE: *All* of the RI documents must be generated first.  For some
-      # reason, RI docs cannot be generated after any RDoc documents are
-      # generated.
-
-      if options[:generate_ri] then
-        installed_gems.each do |gem|
-          Gem::DocManager.new(gem, options[:rdoc_args]).generate_ri
-        end
-
-        Gem::DocManager.update_ri_cache
-      end
-
-      if options[:generate_rdoc] then
-        installed_gems.each do |gem|
-          Gem::DocManager.new(gem, options[:rdoc_args]).generate_rdoc
-        end
-      end
+    unless @installed_specs.empty? then
+      gems = @installed_specs.length == 1 ? 'gem' : 'gems'
+      say "#{@installed_specs.length} #{gems} installed"
     end
 
     raise Gem::SystemExitException, exit_code

data/lib/rubygems/commands/list_command.rb

@@ -7,8 +7,9 @@ require 'rubygems/commands/query_command'
 
 class Gem::Commands::ListCommand < Gem::Commands::QueryCommand
 
-  def initialize
-    super 'list', 'Display gems whose name starts with STRING'
+  def initialize(name = 'list',
+                 summary = 'Display gems whose name starts with STRING')
+    super name, summary
 
     remove_option('--name-matches')
   end
@@ -26,8 +27,9 @@ class Gem::Commands::ListCommand < Gem::Commands::QueryCommand
   end
 
   def execute
-    string = get_one_optional_argument || ''
-    options[:name] = /^#{string}/i
+    name = get_one_optional_argument || ''
+    options[:name] = /^#{name}/i
+
     super
   end
 

data/lib/rubygems/commands/lock_command.rb

@@ -30,7 +30,7 @@ generated.
 
 Example:
 
-  gemlock rails-1.0.0 > lockdown.rb
+  gem lock rails-1.0.0 > lockdown.rb
 
 will produce in lockdown.rb:
 

data/lib/rubygems/commands/mirror_command.rb

@@ -0,0 +1,17 @@
+require 'rubygems/command'
+
+class Gem::Commands::MirrorCommand < Gem::Command
+  def initialize
+    super('mirror', 'Mirror all gem files (requires rubygems-mirror)')
+    begin
+      Gem::Specification.find_by_name('rubygems-mirror').activate
+    rescue Gem::LoadError
+      # no-op
+    end
+  end
+
+  def execute
+    alert_error "Install the rubygems-mirror gem for the mirror command"
+  end
+
+end

data/lib/rubygems/commands/outdated_command.rb

@@ -19,12 +19,15 @@ class Gem::Commands::OutdatedCommand < Gem::Command
     Gem::Specification.outdated.sort.each do |name|
       local   = Gem::Specification.find_all_by_name(name).max
       dep     = Gem::Dependency.new local.name, ">= #{local.version}"
-      remotes = Gem::SpecFetcher.fetcher.fetch dep
+      remotes, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dep
 
       next if remotes.empty?
 
-      remote = remotes.last.first
-      say "#{local.name} (#{local.version} < #{remote.version})"
+      remotes.sort! { |a,b| a[0].version <=> b[0].version }
+
+      highest = remotes.last.first
+
+      say "#{local.name} (#{local.version} < #{highest.version})"
     end
   end
 end