rubygems-update 1.8.17 → 1.8.18

data/History.txt

@@ -1,5 +1,15 @@
 # coding: UTF-8
 
+=== 1.8.18 / 2012-03-11
+
+* 4 bug fixes:
+
+  * Use Psych API to emit more compatible YAML
+  * Download and write inside `gem fetch` directly. Fixes #289
+  * Honor sysconfdir on 1.8. Fixes #291
+  * Search everywhere for a spec for `gem spec`. Fixes #288
+  * Fix Gem.all_load_path. Fixes #171
+
 === 1.8.17 / 2012-02-17
 
 * 2 minor enhancements:

data/Manifest.txt

@@ -86,6 +86,7 @@ lib/rubygems/package/tar_writer.rb
 lib/rubygems/package_task.rb
 lib/rubygems/path_support.rb
 lib/rubygems/platform.rb
+lib/rubygems/psych_tree.rb
 lib/rubygems/remote_fetcher.rb
 lib/rubygems/require_paths_builder.rb
 lib/rubygems/requirement.rb

data/Rakefile

@@ -18,7 +18,7 @@ Hoe::RUBY_FLAGS << " --disable-gems" if RUBY_VERSION > "1.9"
 
 Hoe.plugin :minitest
 Hoe.plugin :git
-Hoe.plugin :isolate
+# Hoe.plugin :isolate
 
 hoe = Hoe.spec 'rubygems-update' do
   self.rubyforge_name = 'rubygems'
@@ -93,6 +93,7 @@ task :package do
   end
 end
 
+desc "Upload release to rubyforge"
 task :upload_to_rubyforge do
   v = hoe.version
   sh "rubyforge add_release rubygems rubygems #{v} pkg/rubygems-update-#{v}.gem"
@@ -100,6 +101,15 @@ task :upload_to_rubyforge do
   sh "rubyforge add_file rubygems rubygems #{v} pkg/rubygems-#{v}.tgz"
 end
 
+desc "Upload release to gemcutter S3"
+task :upload_to_gemcutter do
+  v = hoe.version
+  sh "s3cmd put -P pkg/rubygems-update-#{v}.gem pkg/rubygems-#{v}.zip pkg/rubygems-#{v}.tgz s3://production.s3.rubygems.org/rubygems/"
+end
+
+desc "Upload release to rubyforge and gemcutter"
+task :upload => [:upload_to_rubyforge, :upload_to_gemcutter]
+
 # Misc Tasks ---------------------------------------------------------
 
 # These tasks expect to have the following directory structure:

data/lib/rubygems.rb

@@ -9,7 +9,7 @@ module Gem
   QUICKLOADER_SUCKAGE = RUBY_VERSION =~ /^1\.9\.1/
 
   # Only MRI 1.9.2 has the custom prelude.
-  GEM_PRELUDE_SUCKAGE = RUBY_VERSION =~ /^1\.9\.2/ and RUBY_ENGINE == "ruby"
+  GEM_PRELUDE_SUCKAGE = RUBY_VERSION =~ /^1\.9\.2/ && RUBY_ENGINE == "ruby"
 end
 
 if Gem::GEM_PRELUDE_SUCKAGE and defined?(Gem::QuickLoader) then
@@ -120,7 +120,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.17'
+  VERSION = '1.8.18'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -258,7 +258,7 @@ module Gem
 
     Gem.path.each do |gemdir|
       each_load_path all_partials(gemdir) do |load_path|
-        result << gemdir.add(load_path).expand_path
+        result << load_path
       end
     end
 
@@ -664,6 +664,8 @@ module Gem
       require 'yaml'
     end
 
+    require 'rubygems/psych_tree'
+
     # Now that we're sure some kind of yaml library is loaded, pull
     # in our hack to deal with Syck's DefaultKey ugliness.
     require 'rubygems/syck_hack'

data/lib/rubygems/commands/fetch_command.rb

@@ -58,8 +58,16 @@ class Gem::Commands::FetchCommand < Gem::Command
         next
       end
 
-      path = Gem::RemoteFetcher.fetcher.download spec, source_uri
-      FileUtils.mv path, File.basename(spec.cache_file)
+      file = "#{spec.full_name}.gem"
+      remote_path = source_uri + "gems/#{file}"
+
+      f = Gem::RemoteFetcher.fetcher
+
+      gem = f.fetch_path remote_path
+
+      File.open file, "wb" do |f|
+        f.write gem
+      end
 
       say "Downloaded #{spec.full_name}"
     end

data/lib/rubygems/commands/specification_command.rb

@@ -62,7 +62,25 @@ FIELD         name of gemspec field to show
             "Please specify a gem name or file on the command line"
     end
 
-    dep = Gem::Dependency.new gem, options[:version]
+    case options[:version]
+    when String
+      req = Gem::Requirement.parse options[:version]
+    when Gem::Requirement
+      req = options[:version]
+    else
+      raise Gem::CommandLineError, "Unsupported version type: #{options[:version]}"
+    end
+
+    if !req.none? and options[:all]
+      alert_error "Specify --all or -v, not both"
+      terminate_interaction 1
+    end
+
+    if options[:all]
+      dep = Gem::Dependency.new gem
+    else
+      dep = Gem::Dependency.new gem, options[:version]
+    end
 
     field = get_one_optional_argument
 
@@ -80,7 +98,11 @@ FIELD         name of gemspec field to show
     end
 
     if remote? then
-      found = Gem::SpecFetcher.fetcher.fetch dep
+      found = Gem::SpecFetcher.fetcher.fetch dep, true
+
+      if dep.prerelease? or options[:prerelease]
+        found += Gem::SpecFetcher.fetcher.fetch dep, false, true, true
+      end
 
       specs.push(*found.map { |spec,| spec })
     end

data/lib/rubygems/config_file.rb

@@ -68,7 +68,7 @@ class Gem::ConfigFile
 
         path.strip
       rescue LoadError
-        "/etc"
+        RbConfig::CONFIG["sysconfdir"] || "/etc"
       end
     end
 

data/lib/rubygems/psych_tree.rb

@@ -0,0 +1,16 @@
+module Gem
+  if defined? ::Psych
+    class NoAliasYAMLTree < Psych::Visitors::YAMLTree
+      def visit_String(str)
+        return super unless str == '=' # or whatever you want
+
+        quote = Psych::Nodes::Scalar::SINGLE_QUOTED
+        @emitter.scalar str, nil, nil, false, true, quote
+      end
+
+      # Noop this out so there are no anchors
+      def register(target, obj)
+      end
+    end
+  end
+end

data/lib/rubygems/specification.rb

@@ -1923,7 +1923,15 @@ class Gem::Specification
 
   def to_yaml(opts = {}) # :nodoc:
     if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck? then
-      super.gsub(/ !!null \n/, " \n")
+      builder = Gem::NoAliasYAMLTree.new({})
+      builder << self
+      ast = builder.tree
+
+      io = StringIO.new
+
+      Psych::Visitors::Emitter.new(io).accept(ast)
+
+      io.string.gsub(/ !!null \n/, " \n")
     else
       YAML.quick_emit object_id, opts do |out|
         out.map taguri, to_yaml_style do |map|

data/test/rubygems/test_gem_commands_install_command.rb

@@ -3,6 +3,7 @@ require 'rubygems/commands/install_command'
 
 begin
   gem "rdoc"
+  gem "json"
 rescue Gem::LoadError
   # ignore
 end

data/test/rubygems/test_gem_commands_specification_command.rb

@@ -43,6 +43,24 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
     assert_equal '', @ui.error
   end
 
+  def test_execute_all_conflicts_with_version
+    quick_spec 'foo', '0.0.1'
+    quick_spec 'foo', '0.0.2'
+
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:all] = true
+    @cmd.options[:version] = "1"
+
+    assert_raises Gem::MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    assert_equal '', @ui.output
+    assert_equal "ERROR:  Specify --all or -v, not both\n", @ui.error
+  end
+
   def test_execute_bad_name
     @cmd.options[:args] = %w[foo]
 
@@ -122,6 +140,86 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
     assert_match %r|name: foo|, @ui.output
   end
 
+  def test_execute_remote_with_version
+    foo1 = quick_gem 'foo', "1"
+    foo2 = quick_gem 'foo', "2"
+
+    @fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @fetcher
+
+    util_setup_spec_fetcher foo1, foo2
+
+    FileUtils.rm File.join(@gemhome, 'specifications', foo1.spec_name)
+    FileUtils.rm File.join(@gemhome, 'specifications', foo2.spec_name)
+
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:version] = "1"
+    @cmd.options[:domain] = :remote
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    spec = Gem::Specification.from_yaml @ui.output
+
+    assert_equal Gem::Version.new("1"), spec.version
+  end
+
+  def test_execute_remote_without_prerelease
+    foo = new_spec 'foo', '2.0.0'
+    foo_pre = new_spec 'foo', '2.0.1.pre'
+
+    install_specs foo, foo_pre
+
+    @fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @fetcher
+
+    util_setup_spec_fetcher foo
+    util_setup_spec_fetcher foo_pre
+
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:domain] = :remote
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_match %r|\A--- !ruby/object:Gem::Specification|, @ui.output
+    assert_match %r|name: foo|, @ui.output
+
+    spec = YAML.load @ui.output
+
+    assert_equal Gem::Version.new("2.0.0"), spec.version
+  end
+
+  def test_execute_remote_with_prerelease
+    foo = new_spec 'foo', '2.0.0'
+    foo_pre = new_spec 'foo', '2.0.1.pre'
+
+    install_specs foo, foo_pre
+
+    @fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @fetcher
+
+    util_setup_spec_fetcher foo
+    util_setup_spec_fetcher foo_pre
+
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:domain] = :remote
+    @cmd.options[:prerelease] = true
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_match %r|\A--- !ruby/object:Gem::Specification|, @ui.output
+    assert_match %r|name: foo|, @ui.output
+
+    spec = YAML.load @ui.output
+
+    assert_equal Gem::Version.new("2.0.1.pre"), spec.version
+  end
+
   def test_execute_ruby
     foo = quick_spec 'foo'
 

data/test/rubygems/test_gem_specification.rb

@@ -1136,6 +1136,18 @@ end
     assert_match %r|^platform: ruby$|, @a1.to_yaml
   end
 
+  def test_to_yaml_emits_syck_compat_yaml
+    if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?
+      @a1.add_dependency "gx", "1.0.0"
+
+      y = @a1.to_yaml
+
+      refute_match %r!^\s*- - =!, y
+    else
+      skip "Only validates psych yaml"
+    end
+  end
+
   def test_validate
     util_setup_validate
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 8
-  - 17
-  version: 1.8.17
+  - 18
+  version: 1.8.18
 platform: ruby
 authors: 
 - Jim Weirich
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-17 00:00:00 Z
+date: 2012-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -25,14 +25,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 21
         segments: 
         - 2
-        - 1
-        - 0
-        version: 2.1.0
+        - 11
+        version: "2.11"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -126,36 +125,21 @@ dependencies:
         version: "4.5"
   type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
-  type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 31
         segments: 
         - 2
-        - 12
-        version: "2.12"
+        - 14
+        version: "2.14"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 description: |-
   RubyGems is a package management framework for Ruby.
   
@@ -192,9 +176,9 @@ extra_rdoc_files:
 - LICENSE.txt
 - MIT.txt
 - Manifest.txt
-- hide_lib_for_update/note.txt
 - README.rdoc
 - UPGRADING.rdoc
+- hide_lib_for_update/note.txt
 files: 
 - .autotest
 - .document
@@ -284,6 +268,7 @@ files:
 - lib/rubygems/package_task.rb
 - lib/rubygems/path_support.rb
 - lib/rubygems/platform.rb
+- lib/rubygems/psych_tree.rb
 - lib/rubygems/remote_fetcher.rb
 - lib/rubygems/require_paths_builder.rb
 - lib/rubygems/requirement.rb
@@ -399,7 +384,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.17 Documentation
+- --title=RubyGems 1.8.18 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -425,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.8.16
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby