rubygems-update 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb17f443c52c3e9d111c851bc1586c5a95ed1a11
-  data.tar.gz: 8aaf7b4e989d1a519adee5c7abe0f47aedd60680
+  metadata.gz: c20c7c669b32417a83211d35eeff0d0d98713e7d
+  data.tar.gz: bd5443e865df6b0ce628a5965697b774c86d3ac3
 SHA512:
-  metadata.gz: 424cbda40e4f296d31ed0c257a9b4ede1b138658523afc34ef9886bbc258a02e96fbceb75b322c186522b6024d1239313c7a8028f3262aa8ee2c7778186d6d9e
-  data.tar.gz: 1db97669760cc8a82a966bca59108cdf3cd9b6290bc807b8ee5038ae8a44f9c7f037a94b2a505529c4eecb8705bd260202dcd00f56d0f948765cdcca635d96f6
+  metadata.gz: 4613025ac39f89bd6e74699f2f3b6a46de2bdeb5e76617e1623014d339aff631e56e5d2dac5acb908dd7cabfb9e30da1043ce6d45eb85751b4ad26dc2d637cda
+  data.tar.gz: c19dd4c9508c24558e644483d17158266825b9dc8220719be5caa292f2edc9c81b9e0c9c8ac6568c249e1da4163034de2c364ca6023ba203579275845ea41895

data/History.txt

@@ -1,5 +1,20 @@
 # coding: UTF-8
 
+=== 2.1.7 / 2013-10-09
+
+Bug fixes:
+
+* `gem sources --list` now displays a list of sources.  Pull request #672 by
+  Nathan Marley.
+* RubyGems no longer alters Gem::Specification.dirs when installing.  Pull
+  Request #670 by Vít Ondruch
+* Use RFC 2616-compatible time in HTTP headers.  Pull request #655 by Larry
+  Marburger.
+* RubyGems now gives a more descriptive message for missing licenses on
+  validation.  Issue #656 by Markus Heiler.
+* Expand unpack destination directory.  This fixes problems when File.realpath
+  is missing and $GEM_HOME contains "..".  Issue #679 by Charles Nutter.
+
 === 2.1.6 / 2013-10-08
 
 Bug fixes:
@@ -155,6 +170,23 @@ Bug fixes:
 * Fixed credential creation for `gem push` when `--host` is not given.  Pull
   request #622 by Arthur Nogueira Neves
 
+=== 2.0.11 / 2013-10-08
+
+Bug fixes:
+
+* Added certificates to follow the s3.amazonaws.com certificate change.  Fixes
+  #665 by emeyekayee.  Fixes #671 by jonforums.
+* Remove redundant built-in certificates not needed for https://rubygems.org
+  Fixes #654 by Vít Ondruch.
+* Added test for missing certificates for https://s3.amazonaws.com or
+  https://rubygems.org.  Pull request #673 by Hannes Georg.
+* RubyGems now allows a Pathname for Kernel#require like the built-in
+  Kernel#require.  Pull request #663 by Aaron Patterson.
+* Required rbconfig in Gem::ConfigFile for Ruby 1.9.1 compatibility.  (Ruby
+  1.9.1 is no longer receiving security fixes, so please update to a newer
+  version.)  Issue #676 by Michal Papis.  Issue wayneeseguin/rvm#2262 by
+  Thomas Sänger.
+
 === 2.0.10 / 2013-09-24
 
 Security fixes:
@@ -650,6 +682,18 @@ $SAFE=1.  There is no functional difference compared to Ruby 2.0.0.preview2
   * URI scheme matching is no longer case-sensitive.  Fixes #322
   * ext/builder now checks $MAKE as well as $make (okkez)
 
+=== 1.8.28 / 2013-10-08
+
+Bug fixes:
+
+* Added the Verisign Class 3 Public Primary Certification Authority G5
+  certificate and its intermediary to follow the s3.amazonaws.com certificate
+  change.  Fixes #665 by emeyekayee.  Fixes #671 by jonforums.
+* Remove redundant built-in certificates not needed for https://rubygems.org
+  Fixes #654 by Vít Ondruch.
+* Added test for missing certificates for https://s3.amazonaws.com or
+  https://rubygems.org.  Pull request #673 by Hannes Georg.
+
 === 1.8.27 / 2013-09-24
 
 Security fixes:

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.1.6'
+  VERSION = '2.1.7'
 end
 
 # Must be first since it unloads the prelude from 1.9.2

data/lib/rubygems/commands/sources_command.rb

@@ -154,8 +154,7 @@ To remove a source use the --remove argument:
   end
 
   def list? # :nodoc:
-    !(options[:list] ||
-      options[:add] ||
+    !(options[:add] ||
       options[:clear_all] ||
       options[:remove] ||
       options[:update])

data/lib/rubygems/dependency_installer.rb

@@ -74,12 +74,6 @@ class Gem::DependencyInstaller
     @only_install_dir = !!options[:install_dir]
     @install_dir = options[:install_dir] || Gem.dir
 
-    if options[:install_dir] then
-      # HACK shouldn't change the global settings, needed for -i behavior
-      # maybe move to the install command?  See also github #442
-      Gem::Specification.dirs = @install_dir
-    end
-
     options = DEFAULT_OPTIONS.merge options
 
     @bin_dir             = options[:bin_dir]

data/lib/rubygems/package.rb

@@ -386,6 +386,7 @@ EOM
 
     destination_dir = File.realpath destination_dir if
       File.respond_to? :realpath
+    destination_dir = File.expand_path destination_dir
 
     destination = File.join destination_dir, filename
     destination = File.expand_path destination

data/lib/rubygems/request.rb

@@ -114,8 +114,7 @@ class Gem::Request
     request.add_field 'Keep-Alive', '30'
 
     if @last_modified then
-      @last_modified = @last_modified.utc
-      request.add_field 'If-Modified-Since', @last_modified.rfc2822
+      request.add_field 'If-Modified-Since', @last_modified.httpdate
     end
 
     yield request if block_given?

data/lib/rubygems/specification.rb

@@ -510,6 +510,9 @@ class Gem::Specification < Gem::BasicSpecification
   # This should just be the name of your license. The full
   # text of the license should be inside of the gem when you build it.
   #
+  # See http://opensource.org/licenses/alphabetical for a list of licenses and
+  # their abbreviations (or short names).
+  #
   # You can set multiple licenses with #licenses=
   #
   # Usage:
@@ -527,6 +530,8 @@ class Gem::Specification < Gem::BasicSpecification
   # This should just be the name of your license. The full
   # text of the license should be inside of the gem when you build it.
   #
+  # See #license= for more discussion
+  #
   # Usage:
   #   spec.licenses = ['MIT', 'GPL-2']
 
@@ -1835,6 +1840,8 @@ class Gem::Specification < Gem::BasicSpecification
 
   ##
   # Plural accessor for setting licenses
+  #
+  # See #license= for details
 
   def licenses
     @licenses ||= []
@@ -2450,7 +2457,10 @@ class Gem::Specification < Gem::BasicSpecification
       end
     }
 
-    alert_warning 'licenses is empty' if licenses.empty?
+    alert_warning <<-warning if licenses.empty?
+licenses is empty.  Use a license abbreviation from:
+  http://opensource.org/licenses/alphabetical
+    warning
 
     validate_permissions
 

data/test/rubygems/test_gem_commands_build_command.rb

@@ -79,7 +79,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     assert_equal [], output
 
     if check_licenses
-      assert_equal "WARNING:  licenses is empty\n", @ui.error
+      assert_match "WARNING:  licenses is empty", @ui.error
     end
 
     gem_file = File.join @tempdir, File.basename(gem.cache_file)

data/test/rubygems/test_gem_commands_sources_command.rb

@@ -198,6 +198,23 @@ beta-gems.example.com is not a URI
     refute File.exist?(dir), 'cache dir removed'
   end
 
+  def test_execute_list
+    @cmd.handle_options %w[--list]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+*** CURRENT SOURCES ***
+
+#{@gem_repo}
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+  end
+
   def test_execute_remove
     @cmd.handle_options %W[--remove #{@gem_repo}]
 

data/test/rubygems/test_gem_package.rb

@@ -432,6 +432,22 @@ class TestGemPackage < Gem::Package::TarTestCase
                  "#{@destination} is not allowed", e.message)
   end
 
+  def test_install_location_dots
+    package = Gem::Package.new @gem
+
+    file = 'file.rb'
+
+    destination = File.join @destination, 'foo', '..', 'bar'
+
+    FileUtils.mkdir_p File.join @destination, 'foo'
+    FileUtils.mkdir_p File.expand_path destination
+
+    destination = package.install_location file, destination
+
+    # this test only fails on ruby missing File.realpath
+    assert_equal File.join(@destination, 'bar', 'file.rb'), destination
+  end
+
   def test_install_location_extra_slash
     skip 'no File.realpath on 1.8' if RUBY_VERSION < '1.9'
     package = Gem::Package.new @gem

data/test/rubygems/test_gem_request.rb

@@ -99,7 +99,7 @@ class TestGemRequest < Gem::TestCase
 
   def test_fetch_unmodified
     uri = URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}"
-    t = Time.now
+    t = Time.utc(2013, 1, 2, 3, 4, 5)
     @request = Gem::Request.new(uri, Net::HTTP::Get, t, nil)
     conn = util_stub_connection_for :body => '', :code => 304
 
@@ -108,7 +108,9 @@ class TestGemRequest < Gem::TestCase
     assert_equal 304, response.code
     assert_equal '', response.body
 
-    assert_equal t.rfc2822, conn.payload['if-modified-since']
+    modified_header = conn.payload['if-modified-since']
+
+    assert_equal 'Wed, 02 Jan 2013 03:04:05 GMT', modified_header
   end
 
   def test_user_agent

data/test/rubygems/test_gem_specification.rb

@@ -2021,6 +2021,20 @@ end
     end
   end
 
+  def test_validate_license
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.licenses.clear
+      @a1.validate
+    end
+
+    assert_equal <<-warning, @ui.error
+WARNING:  licenses is empty.  Use a license abbreviation from:
+  http://opensource.org/licenses/alphabetical
+    warning
+  end
+
   def test_validate_name
     util_setup_validate
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Jim Weirich
@@ -32,7 +32,7 @@ cert_chain:
   KDyY1VIazVgoC8XvR4h/95/iScPiuglzA+DBG1hip1xScAtw05BrXyUNrc9CEMYU
   wgF94UVoHRp6ywo8I7NP3HcwFQDFNEZPNGXsng==
   -----END CERTIFICATE-----
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest