rubygems-update 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c20c7c669b32417a83211d35eeff0d0d98713e7d
-  data.tar.gz: bd5443e865df6b0ce628a5965697b774c86d3ac3
+  metadata.gz: c3eb7f711990fd0f87cb87eca6c1627ebb4ff6c7
+  data.tar.gz: c4f84f383343a06eaa173d95a7e67d909f041cb2
 SHA512:
-  metadata.gz: 4613025ac39f89bd6e74699f2f3b6a46de2bdeb5e76617e1623014d339aff631e56e5d2dac5acb908dd7cabfb9e30da1043ce6d45eb85751b4ad26dc2d637cda
-  data.tar.gz: c19dd4c9508c24558e644483d17158266825b9dc8220719be5caa292f2edc9c81b9e0c9c8ac6568c249e1da4163034de2c364ca6023ba203579275845ea41895
+  metadata.gz: 902cedce83b8ec3fab27ec81b8c3e0722c4517b71cfe132b30f366b51aafa01d69195233d0645d3a2e27d750c2ee63902794dcdd9cce682613910ab5f28e1da3
+  data.tar.gz: 3116347b7dcd216652caff56d52ef2c55940f67c7117623d49d75313a8f89dd6f2989327375ea8a9ea9b70aee66d87c8ba11daa72d1aec2ee41806eaacdd9c8c

data/History.txt

@@ -1,5 +1,15 @@
 # coding: UTF-8
 
+=== 2.1.8 / 2013-10-10
+
+Bug fixes:
+
+* Fixed local installation of platform gem files.  Issue #664 by Ryan Melton.
+* Files starting with "." in the root directory are installed again.  Issue
+  #680 by Ivo Wever, Pull Request #681 by Jeremy Evans.
+* The index generator no longer indexes default gems.  Issue #661 by
+  Jeremy Hinegardner.
+
 === 2.1.7 / 2013-10-09
 
 Bug fixes:

data/lib/rubygems.rb

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

data/lib/rubygems/dependency_installer.rb

@@ -403,7 +403,9 @@ class Gem::DependencyInstaller
       request_set.soft_missing = true
     end
 
-    request_set.resolve Gem::DependencyResolver.compose_sets(as, installer_set)
+    composed_set = Gem::DependencyResolver.compose_sets as, installer_set
+
+    request_set.resolve composed_set
 
     request_set
   end

data/lib/rubygems/dependency_resolver/index_set.rb

@@ -30,7 +30,7 @@ class Gem::DependencyResolver::IndexSet
     name = req.dependency.name
 
     @all[name].each do |uri, n|
-      if req.dependency.match? n
+      if req.dependency.match? n then
         res << Gem::DependencyResolver::IndexSpecification.new(
           self, n.name, n.version, uri, n.platform)
       end

data/lib/rubygems/dependency_resolver/index_specification.rb

@@ -14,12 +14,12 @@ class Gem::DependencyResolver::IndexSpecification
 
   attr_reader :version
 
-  def initialize set, name, version, source, plat
+  def initialize set, name, version, source, platform
     @set = set
     @name = name
     @version = version
     @source = source
-    @platform = plat
+    @platform = platform.to_s
 
     @spec = nil
   end

data/lib/rubygems/dependency_resolver/installer_set.rb

@@ -87,7 +87,11 @@ class Gem::DependencyResolver::InstallerSet
   end
 
   def inspect # :nodoc:
-    '#<%s domain: %s specs: %p>' % [ self.class, @domain, @specs.keys ]
+    always_install = @always_install.map { |s| s.full_name }
+
+    '#<%s domain: %s specs: %p always install: %p>' % [
+      self.class, @domain, @specs.keys, always_install,
+    ]
   end
 
   ##
@@ -131,5 +135,20 @@ class Gem::DependencyResolver::InstallerSet
   def prefetch(reqs)
   end
 
+  def pretty_print q # :nodoc:
+    q.group 2, '[InstallerSet', ']' do
+      q.breakable
+      q.text "domain: #{@domain}"
+
+      q.breakable
+      q.text 'specs: '
+      q.pp @specs.keys
+
+      q.breakable
+      q.text 'always install: '
+      q.pp @always_install
+    end
+  end
+
 end
 

data/lib/rubygems/indexer.rb

@@ -126,7 +126,7 @@ class Gem::Indexer
   # Builds Marshal quick index gemspecs.
 
   def build_marshal_gemspecs
-    count = Gem::Specification.count
+    count = Gem::Specification.count { |s| not s.default_gem? }
     progress = ui.progress_reporter count,
                                     "Generating Marshal quick index gemspecs for #{count} gems",
                                     "Complete"
@@ -135,6 +135,7 @@ class Gem::Indexer
 
     Gem.time 'Generated Marshal quick index gemspecs' do
       Gem::Specification.each do |spec|
+        next if spec.default_gem?
         spec_file_name = "#{spec.original_name}.gemspec.rz"
         marshal_name = File.join @quick_marshal_dir, spec_file_name
 
@@ -188,10 +189,13 @@ class Gem::Indexer
   # Builds indicies for RubyGems 1.2 and newer. Handles full, latest, prerelease
 
   def build_modern_indicies
-    prerelease, released = Gem::Specification.partition { |s|
+    specs = Gem::Specification.reject { |s| s.default_gem? }
+
+    prerelease, released = specs.partition { |s|
       s.version.prerelease?
     }
-    latest_specs = Gem::Specification.latest_specs
+    latest_specs =
+      Gem::Specification.latest_specs.reject { |s| s.default_gem? }
 
     build_modern_index(released.sort, @specs_index, 'specs')
     build_modern_index(latest_specs.sort, @latest_specs_index, 'latest specs')

data/lib/rubygems/package.rb

@@ -339,13 +339,9 @@ EOM
   def extract_tar_gz io, destination_dir, pattern = "*" # :nodoc:
     open_tar_gz io do |tar|
       tar.each do |entry|
-        # Some entries start with "./" which fnmatch does not like, see github
-        # issue #644
-        full_name = entry.full_name.sub %r%\A\./%, ''
+        next unless File.fnmatch pattern, entry.full_name, File::FNM_DOTMATCH
 
-        next unless File.fnmatch pattern, full_name
-
-        destination = install_location full_name, destination_dir
+        destination = install_location entry.full_name, destination_dir
 
         FileUtils.rm_rf destination
 

data/lib/rubygems/source/local.rb

@@ -97,7 +97,7 @@ class Gem::Source::Local < Gem::Source
     if data = @specs[name]
       data.last.spec
     else
-      raise Gem::Exception, "Unable to find spec for '#{name}'"
+      raise Gem::Exception, "Unable to find spec for #{name.inspect}"
     end
   end
 

data/test/rubygems/test_gem_dependency_resolver_index_specification.rb

@@ -1,5 +1,6 @@
 require 'rubygems/test_case'
 require 'rubygems/dependency_resolver'
+require 'rubygems/available_set'
 
 class TestGemDependencyResolverIndexSpecification < Gem::TestCase
 
@@ -18,6 +19,17 @@ class TestGemDependencyResolverIndexSpecification < Gem::TestCase
     assert_equal source, spec.source
   end
 
+  def test_initialize_platform
+    set     = Gem::DependencyResolver::IndexSet.new
+    source  = Gem::Source::Local.new
+    version = Gem::Version.new '3.0.3'
+
+    spec = Gem::DependencyResolver::IndexSpecification.new(
+      set, 'rails', version, source, Gem::Platform.local)
+
+    assert_equal Gem::Platform.local.to_s, spec.platform
+  end
+
   def test_spec
     @fetcher = Gem::FakeFetcher.new
     Gem::RemoteFetcher.fetcher = @fetcher
@@ -41,6 +53,21 @@ class TestGemDependencyResolverIndexSpecification < Gem::TestCase
     assert_equal a_2_p.full_name, spec.full_name
   end
 
+  def test_spec_local
+    a_2_p = quick_spec 'a', 2 do |s| s.platform = Gem::Platform.local end
+    Gem::Package.build a_2_p
+
+    source = Gem::Source::Local.new
+    set = Gem::DependencyResolver::InstallerSet.new :local
+    set.always_install << a_2_p
+
+    i_spec = Gem::DependencyResolver::IndexSpecification.new \
+      set, 'a', v(2), source, Gem::Platform.local
+
+    spec = i_spec.spec
+
+    assert_equal a_2_p.full_name, spec.full_name
+  end
 
 end
 

data/test/rubygems/test_gem_indexer.rb

@@ -24,6 +24,9 @@ class TestGemIndexer < Gem::TestCase
     @d2_0_b = quick_spec 'd', '2.0.b'
     util_build_gem @d2_0_b
 
+    @default = new_default_spec 'default', 2
+    install_default_gems @default
+
     @tempdir = File.join(@tempdir, 'indexer')
 
     gems = File.join(@tempdir, 'gems')

data/test/rubygems/test_gem_package.rb

@@ -409,6 +409,19 @@ class TestGemPackage < Gem::Package::TarTestCase
     assert_path_exists extracted
   end
 
+  def test_extract_tar_gz_dot_file
+    package = Gem::Package.new @gem
+
+    tgz_io = util_tar_gz do |tar|
+      tar.add_file '.dot_file.rb', 0644 do |io| io.write 'hi' end
+    end
+
+    package.extract_tar_gz tgz_io, @destination
+
+    extracted = File.join @destination, '.dot_file.rb'
+    assert_path_exists extracted
+  end
+
   def test_install_location
     package = Gem::Package.new @gem
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Jim Weirich
@@ -32,7 +32,7 @@ cert_chain:
   KDyY1VIazVgoC8XvR4h/95/iScPiuglzA+DBG1hip1xScAtw05BrXyUNrc9CEMYU
   wgF94UVoHRp6ywo8I7NP3HcwFQDFNEZPNGXsng==
   -----END CERTIFICATE-----
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -495,7 +495,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rubygems-update
-rubygems_version: 2.1.5
+rubygems_version: 2.1.7
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby