rubygems-update 1.8.0 → 1.8.1

data/History.txt

@@ -1,4 +1,17 @@
-=== 1.8.0 / 2011-04-34
+=== 1.8.1 / 2011-05-05
+
+* 1 minor enhancement:
+
+  * Added Gem::Requirement#specific? and Gem::Dependency#specific?
+
+* 4 bug fixes:
+
+  * Typo on Indexer rendered it useless on Windows
+  * gem dep can fetch remote dependencies for non-latest gems again.
+  * gem uninstall with multiple versions no longer crashes with ArgumentError
+  * Always use binary mode for File.open to keep Windows happy
+
+=== 1.8.0 / 2011-04-34
 
 This release focused on properly encapsulating functionality.  Most of this
 work focused on moving functionality out of Gem::SourceIndex and

data/lib/rubygems.rb

@@ -120,7 +120,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.0'
+  VERSION = '1.8.1'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -855,7 +855,7 @@ module Gem
   def self.required_location(gemname, libfile, *requirements)
     requirements = Gem::Requirement.default if requirements.empty?
 
-    matches = Gem.source_index.find_name gemname, requirements
+    matches = Gem::Specification.find_all_by_name gemname, *requirements
 
     return nil if matches.empty?
 

data/lib/rubygems/commands/dependency_command.rb

@@ -43,6 +43,11 @@ class Gem::Commands::DependencyCommand < Gem::Command
   end
 
   def execute
+    if options[:reverse_dependencies] and remote? and not local? then
+      alert_error 'Only reverse dependencies for local gems are supported.'
+      terminate_interaction 1
+    end
+
     options[:args] << '' if options[:args].empty?
 
     pattern = if options[:args].length == 1 and
@@ -59,11 +64,6 @@ class Gem::Commands::DependencyCommand < Gem::Command
     }
     dependency.prerelease = options[:prerelease]
 
-    if options[:reverse_dependencies] and remote? and not local? then
-      alert_error 'Only reverse dependencies for local gems are supported.'
-      terminate_interaction 1
-    end
-
     specs = []
 
     specs.concat dependency.matching_specs if local?
@@ -72,7 +72,8 @@ class Gem::Commands::DependencyCommand < Gem::Command
       fetcher = Gem::SpecFetcher.fetcher
 
       # REFACTOR: fetcher.find_specs_matching => specs
-      specs_and_sources = fetcher.find_matching(dependency, false, true,
+      specs_and_sources = fetcher.find_matching(dependency,
+                                                dependency.specific?, true,
                                                 dependency.prerelease?)
 
       specs.concat specs_and_sources.map { |spec_tuple, source_uri|

data/lib/rubygems/dependency.rb

@@ -227,6 +227,13 @@ class Gem::Dependency
     matches = matches.sort_by { |s| s.sort_obj } # HACK: shouldn't be needed
   end
 
+  ##
+  # True if the dependency will not always match the latest version.
+
+  def specific?
+    @requirement.specific?
+  end
+
   def to_specs
     matches = matching_specs true
 

data/lib/rubygems/indexer.rb

@@ -80,7 +80,7 @@ class Gem::Indexer
     @master_index = File.join @directory, 'yaml'
     @marshal_index = File.join @directory, marshal_name
 
-    @quick_dir = File.join, @directory, 'quick'
+    @quick_dir = File.join @directory, 'quick'
     @quick_marshal_dir = File.join @quick_dir, marshal_name
     @quick_marshal_dir_base = File.join "quick", marshal_name # FIX: UGH
 

data/lib/rubygems/package.rb

@@ -31,6 +31,8 @@ module Gem::Package
 
   class TarInvalidError < Error; end
 
+  # FIX: zenspider said: does it really take an IO?
+  # passed to a method called open?!? that seems stupid.
   def self.open(io, mode = "r", signer = nil, &block)
     tar_type = case mode
                when 'r' then TarInput

data/lib/rubygems/requirement.rb

@@ -138,6 +138,15 @@ class Gem::Requirement
   alias :=== :satisfied_by?
   alias :=~ :satisfied_by?
 
+  ##
+  # True if the requirement will not always match the latest version.
+
+  def specific?
+    return true if @requirements.length > 1 # GIGO, > 1, > 2 is silly
+
+    not %w[> >=].include? @requirements.first.first # grab the operator
+  end
+
   def to_s # :nodoc:
     as_list.join ", "
   end

data/lib/rubygems/uninstaller.rb

@@ -73,7 +73,7 @@ class Gem::Uninstaller
       raise Gem::InstallError, "cannot uninstall, check `gem list -d #{@gem}`"
 
     elsif list.size > 1 and @force_all then
-      remove_all list.dup
+      remove_all list
 
     elsif list.size > 1 then
       gem_names = list.collect {|gem| gem.full_name} + ["All versions"]
@@ -82,9 +82,9 @@ class Gem::Uninstaller
       _, index = choose_from_list "Select gem to uninstall:", gem_names
 
       if index == list.size then
-        remove_all list.dup
+        remove_all list
       elsif index >= 0 && index < list.size then
-        uninstall_gem list[index], list.dup
+        uninstall_gem list[index]
       else
         say "Error: must enter a number [1-#{list.size+1}]"
       end
@@ -171,7 +171,7 @@ class Gem::Uninstaller
   # NOTE: removes uninstalled gems from +list+.
 
   def remove_all(list)
-    list.dup.each { |spec| uninstall_gem spec, list }
+    list.each { |spec| uninstall_gem spec }
   end
 
   ##

data/test/rubygems/test_gem_builder.rb

@@ -38,7 +38,7 @@ class TestGemBuilder < Gem::TestCase
     spec = Dir.chdir @tempdir do
       FileUtils.mkdir 'lib'
       File.open('lib/code.rb', 'w') { |f| f << "something" }
-      Gem::Package.open(File.open(builder.build)) { |x| x.metadata }
+      Gem::Package.open(File.open(builder.build, 'rb')) { |x| x.metadata }
     end
   end
 end

data/test/rubygems/test_gem_commands_dependency_command.rb

@@ -185,6 +185,24 @@ ERROR:  Only reverse dependencies for local gems are supported.
     assert_equal '', @ui.error
   end
 
+  def test_execute_remote_version
+    @fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @fetcher
+
+    util_setup_spec_fetcher @a1, @a2
+
+    @cmd.options[:args] = %w[a]
+    @cmd.options[:domain] = :remote
+    @cmd.options[:version] = req '= 1'
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_equal "Gem a-1\n\n", @ui.output
+    assert_equal '', @ui.error
+  end
+
   def test_execute_prerelease
     @fetcher = Gem::FakeFetcher.new
     Gem::RemoteFetcher.fetcher = @fetcher

data/test/rubygems/test_gem_dependency.rb

@@ -166,5 +166,12 @@ class TestGemDependency < Gem::TestCase
 
     assert d.prerelease?
   end
+
+  def test_specific
+    refute dep('a', '> 1').specific?
+
+    assert dep('a', '= 1').specific?
+  end
+
 end
 

data/test/rubygems/test_gem_requirement.rb

@@ -250,6 +250,19 @@ class TestGemRequirement < Gem::TestCase
     refute_satisfied_by "2.0",   "~> 1.4.4"
   end
 
+  def test_specific
+    refute req('> 1') .specific?
+    refute req('>= 1').specific?
+
+    assert req('!= 1').specific?
+    assert req('< 1') .specific?
+    assert req('<= 1').specific?
+    assert req('= 1') .specific?
+    assert req('~> 1').specific?
+
+    assert req('> 1', '> 2').specific? # GIGO
+  end
+
   def test_bad
     refute_satisfied_by "",            "> 0.1"
     refute_satisfied_by "1.2.3",       "!= 1.2.3"

data/test/rubygems/test_gem_uninstaller.rb

@@ -27,6 +27,18 @@ class TestGemUninstaller < Gem::InstallerTestCase
     assert_match %r|/foo/bar$|, uninstaller.instance_variable_get(:@gem_home)
   end
 
+  def test_remove_all
+    uninstaller = Gem::Uninstaller.new nil
+
+    ui = Gem::MockGemUi.new "y\n"
+
+    use_ui ui do
+      uninstaller.remove_all [@spec]
+    end
+
+    refute_path_exists @spec.gem_dir
+  end
+
   def test_remove_executables_force_keep
     uninstaller = Gem::Uninstaller.new nil, :executables => false
 
@@ -195,4 +207,19 @@ class TestGemUninstaller < Gem::InstallerTestCase
     assert_same uninstaller, @pre_uninstall_hook_arg
     assert_same uninstaller, @post_uninstall_hook_arg
   end
+
+  def test_uninstall_selection_greater_than_one
+    util_make_gems
+    
+    list = Gem::Specification.find_all_by_name('a')
+
+    uninstaller = Gem::Uninstaller.new('a')
+
+    use_ui Gem::MockGemUi.new("2\n") do
+      uninstaller.uninstall
+    end
+
+    updated_list = Gem::Specification.find_all_by_name('a')
+    assert_equal list.length - 1, updated_list.length
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 1
   - 8
-  - 0
-  version: 1.8.0
+  - 1
+  version: 1.8.1
 platform: ruby
 authors: 
 - Jim Weirich
@@ -38,7 +38,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-05-04 00:00:00 Z
+date: 2011-05-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -406,7 +406,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.0 Documentation
+- --title=RubyGems 1.8.1 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -432,7 +432,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.7.2
+rubygems_version: 1.8.0
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby