rubygems-update 2.5.0 → 2.5.1

data/lib/rubygems/util/licenses.rb

@@ -4,7 +4,8 @@ class Gem::Licenses
   # Software Package Data Exchange (SPDX) standard open-source software
   # license identifiers
   IDENTIFIERS = %w(
-    AAL
+      0BSD
+      AAL
       ADSL
       AFL-1.1
       AFL-1.2
@@ -89,6 +90,7 @@ class Gem::Licenses
       CECILL-1.0
       CECILL-1.1
       CECILL-2.0
+      CECILL-2.1
       CECILL-B
       CECILL-C
       CNRI-Jython
@@ -102,6 +104,7 @@ class Gem::Licenses
       ClArtistic
       Condor-1.1
       Crossword
+      CrystalStacker
       Cube
       D-FSL-1.0
       DOC
@@ -146,6 +149,7 @@ class Gem::Licenses
       Imlib2
       Intel
       Intel-ACPI
+      Interbase-1.0
       JSON
       JasPer-2.0
       LGPL-2.0
@@ -254,6 +258,7 @@ class Gem::Licenses
       SPL-1.0
       SWL
       Saxpath
+      Sendmail
       SimPL-2.0
       Sleepycat
       Spencer-86
@@ -306,4 +311,19 @@ class Gem::Licenses
       xpp
       zlib-acknowledgement
   ).freeze
+
+  REGEXP = %r{
+    \A
+    (
+      #{Regexp.union(IDENTIFIERS)}
+      \+?
+      (\s WITH \s .+)?
+      | #{NONSTANDARD}
+    )
+    \Z
+  }ox.freeze
+
+  def self.match?(license)
+    !REGEXP.match(license).nil?
+  end
 end

data/lib/rubygems/version.rb

@@ -107,7 +107,7 @@
 # Client A needs a stack with basic push/pop capability.  They write to the
 # original interface (no <tt>top</tt>), so their version constraint looks like:
 #
-#   gem 'stack', '~> 0.0'
+#   gem 'stack', '>= 0.0'
 #
 # Essentially, any version is OK with Client A.  An incompatible change to
 # the library will cause them grief, but they are willing to take the chance

data/test/rubygems/test_bundled_ca.rb

@@ -52,8 +52,8 @@ class TestBundledCA < Gem::TestCase
     assert_https('d2chzxaqi4y7f8.cloudfront.net')
   end
 
-  def test_accessing_s3
-    assert_https('s3.amazonaws.com')
+  def test_accessing_fastly
+    assert_https('rubygems.global.ssl.fastly.net')
   end
 
 end if ENV['TRAVIS']

data/test/rubygems/test_gem_resolver.rb

@@ -516,7 +516,7 @@ class TestGemResolver < Gem::TestCase
 
     dependency = e.conflict.dependency
 
-    assert_equal 'a', dependency.name
+    assert_includes %w(a b), dependency.name
     assert_equal req('>= 0'), dependency.requirement
 
     activated = e.conflict.activated

data/test/rubygems/test_gem_specification.rb

@@ -2128,6 +2128,27 @@ dependencies: []
     assert_nil @ext.to_fullpath("notexist")
   end
 
+  def test_fullpath_return_rb_extension_file_when_exist_the_same_name_file
+    ext_spec
+
+    @ext.require_paths = 'lib'
+
+    dir = File.join(@gemhome, 'gems', @ext.original_name, 'lib')
+    expected_rb = File.join(dir, 'code.rb')
+    FileUtils.mkdir_p dir
+    FileUtils.touch expected_rb
+
+    dir = @ext.extension_dir
+    ext = RbConfig::CONFIG["DLEXT"]
+    expected_so = File.join(dir, "code.#{ext}")
+    FileUtils.mkdir_p dir
+    FileUtils.touch expected_so
+
+    @ext.activate
+
+    assert_equal expected_rb, @ext.to_fullpath("code")
+  end
+
   def test_require_already_activated
     save_loaded_features do
       a1 = new_spec "a", "1", nil, "lib/d.rb"
@@ -2657,6 +2678,21 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use:
     end
   end
 
+  def test_validate_prerelease_dependencies_with_prerelease_version
+    util_setup_validate
+
+    Dir.chdir @tempdir do
+      @a1.version = '1.0.0.beta.1'
+      @a1.add_runtime_dependency 'b', '~> 1.2.0.beta.1'
+
+      use_ui @ui do
+        @a1.validate
+      end
+
+      assert_equal '', @ui.error, 'warning'
+    end
+  end
+
   def test_validate_description
     util_setup_validate
 
@@ -2874,6 +2910,46 @@ http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
     warning
   end
 
+  def test_validate_license_values_plus
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.licenses = ['GPL-2.0+']
+      @a1.validate
+    end
+
+    assert_empty @ui.error
+  end
+
+  def test_validate_license_values_with
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.licenses = ['GPL-2.0+ WITH Autoconf-exception-2.0']
+      @a1.validate
+    end
+
+    assert_empty @ui.error
+  end
+
+  def test_validate_license_with_nonsense_suffix
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.licenses = ['GPL-2.0+ FOO', 'GPL-2.0 FOO']
+      @a1.validate
+    end
+
+    assert_match <<-warning, @ui.error
+WARNING: license value 'GPL-2.0+ FOO' is invalid.  Use a license identifier from
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+    warning
+    assert_match <<-warning, @ui.error
+WARNING: license value 'GPL-2.0 FOO' is invalid.  Use a license identifier from
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+    warning
+  end
+
   def test_validate_name
     util_setup_validate
 

data/test/rubygems/test_gem_stub_specification.rb

@@ -3,13 +3,15 @@ require "rubygems/stub_specification"
 
 class TestStubSpecification < Gem::TestCase
   SPECIFICATIONS = File.expand_path(File.join("..", "specifications"), __FILE__)
-  FOO = File.join SPECIFICATIONS, "foo-0.0.1.gemspec"
+  FOO = File.join SPECIFICATIONS, "foo-0.0.1-x86-mswin32.gemspec"
   BAR = File.join SPECIFICATIONS, "bar-0.0.2.gemspec"
 
   def setup
     super
 
-    @foo = Gem::StubSpecification.gemspec_stub FOO
+    @base_dir = File.dirname(SPECIFICATIONS)
+    @gems_dir = File.join File.dirname(SPECIFICATIONS), 'gem'
+    @foo = Gem::StubSpecification.gemspec_stub FOO, @base_dir, @gems_dir
   end
 
   def test_initialize
@@ -31,7 +33,7 @@ class TestStubSpecification < Gem::TestCase
   end
 
   def test_initialize_missing_stubline
-    stub = Gem::StubSpecification.gemspec_stub(BAR)
+    stub = Gem::StubSpecification.gemspec_stub(BAR, @base_dir, @gems_dir)
     assert_equal "bar", stub.name
     assert_equal Gem::Version.new("0.0.2"), stub.version
     assert_equal Gem::Platform.new("ruby"), stub.platform
@@ -118,7 +120,7 @@ class TestStubSpecification < Gem::TestCase
       io.write spec.to_ruby_for_cache
     end
 
-    default_spec = Gem::StubSpecification.gemspec_stub spec.loaded_from
+    default_spec = Gem::StubSpecification.gemspec_stub spec.loaded_from, spec.base_dir, spec.gems_dir
 
     refute default_spec.missing_extensions?
   end
@@ -140,7 +142,7 @@ class TestStubSpecification < Gem::TestCase
   def test_to_spec_with_other_specs_loaded_does_not_warn
     real_foo = util_spec @foo.name, @foo.version
     real_foo.activate
-    bar = Gem::StubSpecification.gemspec_stub BAR
+    bar = Gem::StubSpecification.gemspec_stub BAR, real_foo.base_dir, real_foo.gems_dir
     refute_predicate Gem.loaded_specs, :empty?
     assert bar.to_spec
   end
@@ -148,7 +150,7 @@ class TestStubSpecification < Gem::TestCase
   def test_to_spec_activated
     assert @foo.to_spec.is_a?(Gem::Specification)
     assert_equal "foo", @foo.to_spec.name
-    refute @foo.to_spec.instance_variable_defined? :@ignored
+    refute @foo.to_spec.instance_variable_get :@ignored
   end
 
   def test_to_spec_missing_extensions
@@ -179,7 +181,7 @@ end
 
       io.flush
 
-      stub = Gem::StubSpecification.gemspec_stub io.path
+      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, 'gems')
 
       yield stub if block_given?
 
@@ -202,7 +204,7 @@ end
 
       io.flush
 
-      stub = Gem::StubSpecification.gemspec_stub io.path
+      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, 'gems')
 
       yield stub if block_given?
 

data/test/rubygems/test_require.rb

@@ -277,6 +277,21 @@ class TestGemRequire < Gem::TestCase
     assert_equal %w(a-1.0 b-2.0), loaded_spec_names
   end
 
+  def test_require_doesnt_traverse_development_dependencies
+    a = new_spec("a", "1", nil, "lib/a.rb")
+    z = new_spec("z", "1", "w" => "> 0")
+    w1 = new_spec("w", "1") { |s| s.add_development_dependency "non-existent" }
+    w2 = new_spec("w", "2") { |s| s.add_development_dependency "non-existent" }
+
+    install_specs a, w1, w2, z
+
+    assert gem("z")
+    assert_equal %w(z-1), loaded_spec_names
+    assert_equal ["w (> 0)"], unresolved_names
+
+    assert require("a")
+  end
+
   def test_default_gem_only
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")

data/util/generate_spdx_license_list.rb

@@ -7,15 +7,30 @@ licenses = JSON.parse(json)['licenses'].map do |licenseObject|
 end
 
 open 'lib/rubygems/util/licenses.rb', 'w' do |io|
-  io.write <<-HERE
+  io.write <<-RUBY
 class Gem::Licenses
   NONSTANDARD = 'Nonstandard'.freeze
 
   # Software Package Data Exchange (SPDX) standard open-source software
   # license identifiers
   IDENTIFIERS = %w(
-    #{licenses.sort.join "\n      "}
+      #{licenses.sort.join "\n      "}
   ).freeze
+
+  REGEXP = %r{
+    \\A
+    (
+      \#{Regexp.union(IDENTIFIERS)}
+      \\+?
+      (\\s WITH \\s .+)?
+      | \#{NONSTANDARD}
+    )
+    \\Z
+  }ox.freeze
+
+  def self.match?(license)
+    !REGEXP.match(license).nil?
+  end
 end
-  HERE
+  RUBY
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Jim Weirich
@@ -31,7 +31,7 @@ cert_chain:
   +paXWY9JmO3d13yH2/nhDPAo/y7KwmEETFvtUoBmX4o44n/ELqSgb9NrL+613z9j
   n8mbTOXmLGlTBA==
   -----END CERTIFICATE-----
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -411,7 +411,7 @@ files:
 - test/rubygems/sff/discover.rb
 - test/rubygems/simple_gem.rb
 - test/rubygems/specifications/bar-0.0.2.gemspec
-- test/rubygems/specifications/foo-0.0.1.gemspec
+- test/rubygems/specifications/foo-0.0.1-x86-mswin32.gemspec
 - test/rubygems/ssl_cert.pem
 - test/rubygems/ssl_key.pem
 - test/rubygems/test_bundled_ca.rb
@@ -547,7 +547,7 @@ files:
 - util/create_encrypted_key.rb
 - util/generate_spdx_license_list.rb
 - util/update_bundled_ca_certificates.rb
-homepage: http://rubygems.org
+homepage: https://rubygems.org
 licenses:
 - Ruby
 - MIT
@@ -571,7 +571,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby