rubygems-update 2.2.0.rc.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16286e9749232be3a36bc8fe9bacd580538c2604
-  data.tar.gz: 9d162a488ba83c7ee731f916701915e872dd2eb6
+  metadata.gz: b5fa16de744ce2ed895d0e7df7961e93c05bb2a5
+  data.tar.gz: 62d47904fc5dc3ac7109b09f7cde08bd4ca88ac4
 SHA512:
-  metadata.gz: 327d139d886f5df53c61cfe5f718d0b12d7fc6442dfdc6d91b0580bcdc5f0460aee4a2b39a97a6814787cd7ba3a5f254ea3eee4eae95cb21b5d0849b7f74c7d8
-  data.tar.gz: 2e2267811edd5a657cba4103d020a8def8dc0fd137f5153466710d933dbf00588bbd86eb76796b39731c91de7c002d9e8712092bba6948ac39b11a1bb20d5ba4
+  metadata.gz: bee054acc56218d99769f2d18b692ad696587896c6f260b102dc864e7ce52a3b3f7a522411f740882a4e45e2ae42ae71ed88677d5efedeeb2cf526e6cf03f5cf
+  data.tar.gz: 75c31cee8fe53b38c222abb3cd9036865f1c0fecd820459aaf996a8f1d6f1439c4663eaa5ac58c02f5296c88424a1c9f75b969163c16da43bde966a2c2f1531b

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-<Re�@�~��
-�VD���{��Ql������7��]S���s�{�V
,��2Hn.3�)���
+����`e��|C8���,Z�t�5
+���O�viN��I�@�,�����q��ޥ��A�ޑֳ�
�$�D٢���6:U�S�=���8���Z���=:��i�i�����8mv?XI!��I.$y1Rg�i�����g����{2�&f#����p7r��{�
���]t��ꃊ�s1pg]y�)�[`d/�hu����l���S>Bޛf�eIV�b�G
+N��a�L1�L�>� ��BNxVi�����Y�Ќ)�e}��z$Q"�U�A인/

data/History.txt

@@ -1,6 +1,9 @@
 # coding: UTF-8
 
-=== 2.2.0.rc.1 / 2013-12-20
+=== 2.2.0 / 2013-12-26
+
+Special thanks to Vít Ondruch and Michal Papis for testing and finding bugs in
+RubyGems as it was prepared for the 2.2.0 release.
 
 Major enhancements:
 

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.2.0.rc.1'
+  VERSION = '2.2.0'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -568,11 +568,8 @@ module Gem
   end
 
   ##
-  # The index to insert activated gem paths into the $LOAD_PATH.
-  #
-  # Defaults to the site lib directory unless gem_prelude.rb has loaded paths,
-  # then it inserts the activated gem's paths before the gem_prelude.rb paths
-  # so you can override the gem_prelude.rb default $LOAD_PATH paths.
+  # The index to insert activated gem paths into the $LOAD_PATH. The activated
+  # gem's paths are inserted before site lib directory by default.
 
   def self.load_path_insert_index
     index = $LOAD_PATH.index ConfigMap[:sitelibdir]

data/lib/rubygems/commands/install_command.rb

@@ -69,7 +69,7 @@ class Gem::Commands::InstallCommand < Gem::Command
       o[:explain] = v
     end
 
-    @installed_specs = nil
+    @installed_specs = []
   end
 
   def arguments # :nodoc:
@@ -200,10 +200,8 @@ to write the specification by hand.  For example:
 
     req = Gem::Requirement.create(version)
 
-    if options[:ignore_dependencies]
-      inst = Gem::Installer.new name, options
-      inst.install
-      @installed_specs.push(inst.spec)
+    if options[:ignore_dependencies] then
+      install_gem_without_dependencies name, req
     else
       inst = Gem::DependencyInstaller.new options
 
@@ -227,6 +225,30 @@ to write the specification by hand.  For example:
     end
   end
 
+  def install_gem_without_dependencies name, req # :nodoc:
+    gem = nil
+
+    if remote? then
+      dependency = Gem::Dependency.new name, req
+      dependency.prerelease = options[:prerelease]
+
+      fetcher = Gem::RemoteFetcher.fetcher
+      gem = fetcher.download_to_cache dependency
+    end
+
+    if local? and not gem then
+      source = Gem::Source::Local.new
+      spec = source.find_gem name, req
+
+      gem = source.download spec
+    end
+
+    inst = Gem::Installer.new gem, options
+    inst.install
+
+    @installed_specs.push(inst.spec)
+  end
+
   def install_gems # :nodoc:
     exit_code = 0
 

data/test/rubygems/test_gem_commands_install_command.rb

@@ -533,6 +533,32 @@ ERROR:  Possible alternatives: non_existent_with_hint
     assert_match "1 gem installed", @ui.output
   end
 
+  def test_install_gem_ignore_dependencies_both
+    spec = quick_spec 'a', 2
+
+    util_build_gem spec
+
+    FileUtils.mv spec.cache_file, @tempdir
+
+    @cmd.options[:ignore_dependencies] = true
+
+    @cmd.install_gem 'a', '>= 0'
+
+    assert_equal %w[a-2], @cmd.installed_specs.map { |s| s.full_name }
+  end
+
+  def test_install_gem_ignore_dependencies_remote
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
+
+    @cmd.options[:ignore_dependencies] = true
+
+    @cmd.install_gem 'a', '>= 0'
+
+    assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
+  end
+
   def test_parses_requirement_from_gemname
     spec_fetcher do |fetcher|
       fetcher.gem 'a', 2

data/test/rubygems/test_gem_ext_builder.rb

@@ -228,7 +228,7 @@ install:
 
     assert_match %r%#{Regexp.escape Gem.ruby} extconf\.rb%,
                  File.read(gem_make_out)
-    assert_match /: No such file/,
+    assert_match %r%: No such file%,
                  File.read(gem_make_out)
 
     refute_path_exists @spec.gem_build_complete_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.2.0.rc.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Jim Weirich
@@ -32,7 +32,7 @@ cert_chain:
   KDyY1VIazVgoC8XvR4h/95/iScPiuglzA+DBG1hip1xScAtw05BrXyUNrc9CEMYU
   wgF94UVoHRp6ywo8I7NP3HcwFQDFNEZPNGXsng==
   -----END CERTIFICATE-----
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest