rubygems-update 1.3.2 → 1.3.3

data/lib/rubygems/version.rb

@@ -20,9 +20,15 @@ require 'rubygems'
 # parts are sorted alphabetically using the normal Ruby string sorting
 # rules.
 #
+# Prereleases sort between real releases (newest to oldest):
+#
+# 1. 1.0
+# 2. 1.0.b
+# 3. 1.0.a
+# 4. 0.9
 
 class Gem::Version
-  
+
   class Part
     include Comparable
 
@@ -39,7 +45,7 @@ class Gem::Version
     def inspect
       @value
     end
-    
+
     def alpha?
       String === value
     end
@@ -110,12 +116,16 @@ class Gem::Version
     "#<#{self.class} #{@version.inspect}>"
   end
 
+  ##
   # Dump only the raw version string, not the complete object
+
   def marshal_dump
     [@version]
   end
 
+  ##
   # Load custom marshal format
+
   def marshal_load(array)
     self.version = array[0]
   end
@@ -138,9 +148,7 @@ class Gem::Version
 
   ##
   # Returns the text representation of the version
-  #
-  # return:: [String] version as string
-  #
+
   def to_s
     @version
   end
@@ -156,10 +164,20 @@ class Gem::Version
 
   ##
   # A version is considered a prerelease if any part contains a letter.
-  
+
   def prerelease?
     parts.any? { |part| part.alpha? }
   end
+  
+  ##
+  # The release for this version (e.g. 1.2.0.a -> 1.2.0)
+  # Non-prerelease versions return themselves
+  def release
+    return self unless prerelease?
+    rel_parts = parts.dup
+    rel_parts.pop while rel_parts.any? { |part| part.alpha? }
+    self.class.new(rel_parts.join('.'))
+  end
 
   def yaml_initialize(tag, values)
     self.version = values['version']
@@ -194,9 +212,12 @@ class Gem::Version
     @version.hash
   end
 
-  # Return a new version object where the next to the last revision
-  # number is one greater. (e.g.  5.3.1 => 5.4)
+  ##
+  # Return a new version object where the next to the last revision number is
+  # one greater. (e.g.  5.3.1 => 5.4)
+  #
   # Pre-release (alpha) parts are ignored. (e.g 5.3.1.b2 => 5.4)
+
   def bump
     parts = parse_parts_from_version_string
     parts.pop while parts.any? { |part| part.alpha? }
@@ -217,6 +238,7 @@ class Gem::Version
 
   require 'rubygems/requirement'
 
+  ##
   # Gem::Requirement's original definition is nested in Version.
   # Although an inappropriate place, current gems specs reference the nested
   # class name explicitly.  To remain compatible with old software loading

data/test/test_gem.rb

@@ -77,6 +77,14 @@ class TestGem < RubyGemTestCase
     end
   end
 
+  def test_self_bin_path_with_spaces
+    quick_gem 'sp ace', '3' do |s|
+      s.executables = ['exec']
+    end
+    path = Gem.bin_path('sp ace', 'exec')
+    assert_equal %w(" "), [path[0,1], path[-1,1]], "Path should be escaped"
+  end
+
   def test_self_bin_path_not_found
     assert_raises(Gem::GemNotFoundException) do
       Gem.bin_path('non-existent')

data/test/test_gem_commands_server_command.rb

@@ -22,5 +22,31 @@ class TestGemCommandsServerCommand < RubyGemTestCase
     assert_equal File.expand_path('/nonexistent'), @cmd.options[:gemdir]
     assert_equal 9999, @cmd.options[:port]
   end
+
+  def test_handle_options_port
+    @cmd.send :handle_options, %w[-p 0]
+    assert_equal 0, @cmd.options[:port]
+
+    @cmd.send :handle_options, %w[-p 65535]
+    assert_equal 65535, @cmd.options[:port]
+
+    @cmd.send :handle_options, %w[-p http]
+    assert_equal 80, @cmd.options[:port]
+
+    e = assert_raises OptionParser::InvalidArgument do
+      @cmd.send :handle_options, %w[-p nonexistent]
+    end
+
+    assert_equal 'invalid argument: -p nonexistent: no such named service',
+                 e.message
+
+    e = assert_raises OptionParser::InvalidArgument do
+      @cmd.send :handle_options, %w[-p 65536]
+    end
+
+    assert_equal 'invalid argument: -p 65536: not a port number',
+                 e.message
+  end
+
 end
 

data/test/test_gem_commands_specification_command.rb

@@ -70,6 +70,19 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
     assert_equal '', @ui.error
   end
 
+  def test_execute_field
+    foo = quick_gem 'foo'
+    Gem.source_index.add_spec foo
+
+    @cmd.options[:args] = %w[foo name]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_equal "--- foo\n\n", @ui.output
+  end
+
   def test_execute_marshal
     foo = quick_gem 'foo'
     Gem.source_index.add_spec foo

data/test/test_gem_server.rb

@@ -222,6 +222,16 @@ class TestGemServer < RubyGemTestCase
     assert_equal Gem::Platform.local, spec.platform
   end
 
+  def test_rdoc
+    data = StringIO.new "GET /rdoc?q=a HTTP/1.0\r\n\r\n"
+    @req.parse data
+
+    @server.rdoc @req, @res
+
+    assert_equal 200, @res.status, @res.body
+    assert_match %r|No documentation found|, @res.body
+    assert_equal 'text/html', @res['content-type']
+  end
 
   def test_root
     data = StringIO.new "GET / HTTP/1.0\r\n\r\n"

data/test/test_gem_specification.rb

@@ -197,8 +197,8 @@ end
     assert_equal [], spec.requirements
     assert_equal [], spec.dependencies
     assert_equal 'bin', spec.bindir
-    assert_equal false, spec.has_rdoc
-    assert_equal false, spec.has_rdoc?
+    assert_equal true, spec.has_rdoc
+    assert_equal true, spec.has_rdoc?
     assert_equal '>= 0', spec.required_ruby_version.to_s
     assert_equal '>= 0', spec.required_rubygems_version.to_s
   end
@@ -281,7 +281,7 @@ end
     assert_equal 'bin', spec.bindir
     assert_same spec.bindir, new_spec.bindir
 
-    assert_equal false, spec.has_rdoc
+    assert_equal true, spec.has_rdoc
     assert_same spec.has_rdoc, new_spec.has_rdoc
 
     assert_equal '>= 0', spec.required_ruby_version.to_s
@@ -431,7 +431,7 @@ end
       s.homepage = %q{http://www.spice-of-life.net/download/cgikit/}
       s.autorequire = %q{cgikit}
       s.bindir = nil
-      s.has_rdoc = nil
+      s.has_rdoc = true
       s.required_ruby_version = nil
       s.platform = nil
       s.files = ["lib/cgikit", "lib/cgikit.rb", "lib/cgikit/components", "..."]
@@ -578,12 +578,35 @@ end
     assert @a1.has_rdoc?
   end
 
+  def test_has_rdoc_equals
+
+    use_ui @ui do
+      @a1.has_rdoc = false
+    end
+
+    assert_equal '', @ui.output
+
+    assert_equal true, @a1.has_rdoc
+  end
+
   def test_hash
     assert_equal @a1.hash, @a1.hash
     assert_equal @a1.hash, @a1.dup.hash
     refute_equal @a1.hash, @a2.hash
   end
 
+  def test_installation_path
+    assert_equal @gemhome, @a1.installation_path
+
+    @a1.send :remove_instance_variable, :@loaded_from
+
+    e = assert_raises Gem::Exception do
+      @a1.installation_path
+    end
+
+    assert_equal 'spec a-1 is not from an installed gem', e.message
+  end
+
   def test_lib_files
     @a1.files = %w[lib/foo.rb Rakefile]
 
@@ -736,7 +759,6 @@ Gem::Specification.new do |s|
   s.description = %q{This is a test description}
   s.email = %q{example@example.com}
   s.files = [\"lib/code.rb\"]
-  s.has_rdoc = true
   s.homepage = %q{http://example.com}
   s.require_paths = [\"lib\"]
   s.rubygems_version = %q{#{Gem::RubyGemsVersion}}
@@ -788,7 +810,6 @@ Gem::Specification.new do |s|
   s.executables = [\"exec\"]
   s.extensions = [\"ext/a/extconf.rb\"]
   s.files = [\"lib/code.rb\", \"test/suite.rb\", \"bin/exec\", \"ext/a/extconf.rb\"]
-  s.has_rdoc = %q{true}
   s.homepage = %q{http://example.com}
   s.licenses = [\"MIT\"]
   s.require_paths = [\"lib\"]
@@ -1034,6 +1055,7 @@ end
 
     FileUtils.mkdir_p File.join(@tempdir, 'bin')
     File.open File.join(@tempdir, 'bin', 'exec'), 'w' do end
+    FileUtils.mkdir_p File.join(@tempdir, 'exec')
 
     use_ui @ui do
       Dir.chdir @tempdir do
@@ -1041,19 +1063,26 @@ end
       end
     end
 
+    assert_equal %w[exec], @a1.executables
+
     assert_equal '', @ui.output, 'output'
     assert_equal "WARNING:  bin/exec is missing #! line\n", @ui.error, 'error'
   end
 
   def test_validate_empty_require_paths
-    util_setup_validate
+    if win_platform? then
+      skip 'test_validate_empty_require_paths skipped on MS Windows (symlink)'
+    else
+      util_setup_validate
 
-    @a1.require_paths = []
-    e = assert_raises Gem::InvalidSpecificationException do
-      @a1.validate
-    end
+      @a1.require_paths = []
+      e = assert_raises Gem::InvalidSpecificationException do
+        @a1.validate
+      end
 
-    assert_equal 'specification must have at least one require_path', e.message
+      assert_equal 'specification must have at least one require_path',
+                   e.message
+    end
   end
 
   def test_validate_files
@@ -1079,7 +1108,7 @@ end
     util_setup_validate
 
     Dir.chdir @tempdir do
-      @a1.homepage = ''
+      @a1.homepage = nil
 
       use_ui @ui do
         @a1.validate
@@ -1087,28 +1116,23 @@ end
 
       assert_equal "WARNING:  no homepage specified\n", @ui.error, 'error'
 
-      @a1.homepage = 'over at my cool site'
+      @ui = MockGemUi.new
 
-      e = assert_raises Gem::InvalidSpecificationException do
+      @a1.homepage = ''
+
+      use_ui @ui do
         @a1.validate
       end
 
-      assert_equal '"over at my cool site" is not a URI', e.message
-    end
-  end
-
-  def test_validate_has_rdoc
-    util_setup_validate
+      assert_equal "WARNING:  no homepage specified\n", @ui.error, 'error'
 
-    Dir.chdir @tempdir do
-      @a1.has_rdoc = false
+      @a1.homepage = 'over at my cool site'
 
-      use_ui @ui do
+      e = assert_raises Gem::InvalidSpecificationException do
         @a1.validate
       end
 
-      assert_equal "WARNING:  RDoc will not be generated (has_rdoc == false)\n",
-                   @ui.error, 'error'
+      assert_equal '"over at my cool site" is not a URI', e.message
     end
   end
 

data/test/test_gem_uninstaller.rb

@@ -10,6 +10,23 @@ class TestGemUninstaller < GemInstallerTestCase
     ui = MockGemUi.new
     util_setup_gem ui
 
+    @user_spec.executables = ["my_exec"]
+
+    # HACK util_make_exec
+    user_bin_dir = File.join Gem.user_dir, 'gems', @user_spec.full_name, 'bin'
+    FileUtils.mkdir_p user_bin_dir
+    exec_path = File.join user_bin_dir, "my_exec"
+    File.open exec_path, 'w' do |f|
+      f.puts "#!/usr/bin/ruby"
+    end
+
+    user_bin_dir = File.join Gem.user_dir, 'bin'
+    FileUtils.mkdir_p user_bin_dir
+    exec_path = File.join user_bin_dir, "my_exec"
+    File.open exec_path, 'w' do |f|
+      f.puts "#!/usr/bin/ruby"
+    end
+
     build_rake_in do
       use_ui ui do
         @installer.install
@@ -49,6 +66,19 @@ class TestGemUninstaller < GemInstallerTestCase
     assert_equal false, File.exist?(File.join(@gemhome, 'bin', 'executable'))
   end
 
+  def test_remove_executables_user
+    uninstaller = Gem::Uninstaller.new nil, :executables => true
+
+    use_ui @ui do
+      uninstaller.remove_executables @user_spec
+    end
+
+    exec_path = File.join Gem.user_dir, 'bin', 'my_exec'
+    assert_equal false, File.exist?(exec_path), 'removed exec from bin dir'
+
+    assert_equal "Removing my_exec\n", @ui.output
+  end
+
   def test_path_ok_eh
     uninstaller = Gem::Uninstaller.new nil
 

data/test/test_gem_version.rb

@@ -199,6 +199,13 @@ class TestGemVersion < RubyGemTestCase
     refute Gem::Version.new('2.9').prerelease?
     refute Gem::Version.new('22.1.50.0').prerelease?
   end
+  
+  def test_release
+    assert_equal Gem::Version.new('1.2.0'), Gem::Version.new('1.2.0.a').release
+    assert_equal Gem::Version.new('1.1'),   Gem::Version.new('1.1.rc10').release
+    assert_equal Gem::Version.new('1.9.3'), Gem::Version.new('1.9.3.alpha.5').release
+    assert_equal Gem::Version.new('1.9.3'), Gem::Version.new('1.9.3').release
+  end
 
   def test_satisfied_by_eh_boxed
     assert_inadequate("1.3", "~> 1.4")
@@ -212,6 +219,11 @@ class TestGemVersion < RubyGemTestCase
     assert_adequate(  "1.4.5", "~> 1.4.4")
     assert_inadequate("1.5",   "~> 1.4.4")
     assert_inadequate("2.0",   "~> 1.4.4")
+    
+    assert_inadequate("1.1.pre", "~> 1.0.0")
+    assert_adequate(  "1.1.pre", "~> 1.1")
+    assert_inadequate("2.0.a",   "~> 1.0")
+    assert_adequate(  "2.0.a",   "~> 2.0")
   end
 
   def test_satisfied_by_eh_multiple

data/test/test_kernel.rb

@@ -46,12 +46,14 @@ class TestKernel < RubyGemTestCase
   def test_gem_conflicting
     assert gem('a', '= 1'), "Should load"
 
-    ex = assert_raises Gem::Exception do
+    ex = assert_raises Gem::LoadError do
       gem 'a', '= 2'
     end
 
     assert_match(/activate a \(= 2, runtime\)/, ex.message)
     assert_match(/activated a-1/, ex.message)
+    assert_equal 'a', ex.name
+    assert_equal Gem::Requirement.new('= 2'), ex.version_requirement
 
     assert $:.any? { |p| %r{a-1/lib} =~ p }
     assert $:.any? { |p| %r{a-1/bin} =~ p }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - Jim Weirich
@@ -32,7 +32,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2009-04-15 00:00:00 -07:00
+date: 2009-05-04 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -89,6 +89,7 @@ files:
 - doc/release_notes/rel_1_3_0.rdoc
 - doc/release_notes/rel_1_3_1.rdoc
 - doc/release_notes/rel_1_3_2.rdoc
+- doc/release_notes/rel_1_3_3.rdoc
 - lib/gauntlet_rubygems.rb
 - lib/rbconfig/datadir.rb
 - lib/rubygems.rb
@@ -288,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.3.1.2162
+rubygems_version: 1.3.2.2179
 signing_key: 
 specification_version: 3
 summary: RubyGems update gem