bundler 1.7.9 → 1.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c6635aa6f9381865c09e22712c65eb6ce6df71
-  data.tar.gz: f7e85da257a62822115cb5450a4a77a538499bae
+  metadata.gz: a55dd2e2969802758ae392f5be881b51dca84355
+  data.tar.gz: 77b178808d29ac2895509f4bd43aa0eb01844176
 SHA512:
-  metadata.gz: 6effd53e12307044062ea6905c96f7435c8cb986d657483707e6c44daff0360f0cee0d3083d8b5939dec53b79e91282adbca66abe3484ebd20d87676c4d8a6da
-  data.tar.gz: 3e46d038f7c07fbc627766dd87e2e120d79bbd303c0168de029c73f3b90cb91596ec9eb9249c34903aa5ad93a3a8a4862365ffec82f4031430c205dacb581a62
+  metadata.gz: 19680456643187a2e4f5ae83e380403bf4ea42f7e71649542febc5e0583a97c70a04f055287304ca4380aa832fa0040c066ac4069c18309e714e3ebcfbdb374f
+  data.tar.gz: 1c7b78aff2f46af2a16813d388f0bdaae7fb0925eda42db989f51f6a530ea5691218faae53d3bec46d306e43cbd9e37d60677940bfda19a61cc8fe3cf4f18457

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.7.10 (2014-12-29)
+
+Bugfixes:
+
+  - Fix source blocks sometimes causing deployment mode to fail wrongly (#3298, @TimMoore)
+
+Features(?):
+
+  - Support `platform :mri_22` and related version bits (#3309, @thomasfedb)
+
 ## 1.7.9 (2014-12-09)
 
 Bugfixes:
@@ -10,7 +20,7 @@ Bugfixes:
 
 Bugfixes:
 
-  - Hide credentials while warning about gems with ambiguous sources (#3256, @tmoore)
+  - Hide credentials while warning about gems with ambiguous sources (#3256, @TimMoore)
 
 ## 1.7.7 (2014-11-19)
 
@@ -30,14 +40,14 @@ Bugfixes:
 
 Bugfixes:
 
-  - Fix --deployment with source blocks and non-alphabetical gems (#3224, @tmoore)
+  - Fix --deployment with source blocks and non-alphabetical gems (#3224, @TimMoore)
   - Vendor CA chain to validate new rubygems.org HTTPS certificate (@indirect)
 
 ## 1.7.4 (2014-10-19)
 
 Bugfixes:
 
-  - Allow --deployment after `pack` while using source blocks (#3167, @tmoore)
+  - Allow --deployment after `pack` while using source blocks (#3167, @TimMoore)
   - Use dependency API even when HTTP credentials are in ENV (#3191, @fvaleur)
   - Silence warnings (including root warning) in --quiet mode (#3186, @indirect)
   - Stop asking gem servers for gems already found locally (#2909, @dubek)
@@ -60,23 +70,23 @@ Bugfixes:
 Bugfixes:
 
   - Install gems from one source needed by gems in another source (@indirect)
-  - Install the same gem versions even after some are installed (@tmoore)
+  - Install the same gem versions even after some are installed (@TimMoore)
   - Download specs only when installing from servers (@indirect)
 
 ## 1.7.0 (2014-08-13)
 
 Security:
 
-  - Fix for CVE-2013-0334, installing gems from an unexpected source (@tmoore)
+  - Fix for CVE-2013-0334, installing gems from an unexpected source (@TimMoore)
 
 Features:
 
-  - Gemfile `source` calls now take a block containing gems from that source (@tmoore)
-  - Added the `:source` option to `gem` to specify a source (@tmoore)
+  - Gemfile `source` calls now take a block containing gems from that source (@TimMoore)
+  - Added the `:source` option to `gem` to specify a source (@TimMoore)
 
 Bugfixes:
 
-  - Warn on ambiguous gems available from more than one source (@tmoore)
+  - Warn on ambiguous gems available from more than one source (@TimMoore)
 
 ## 1.6.5 (2014-07-23)
 

data/lib/bundler/current_ruby.rb

@@ -23,6 +23,10 @@ module Bundler
       RUBY_VERSION =~ /^2\.1/
     end
 
+    def on_22?
+      RUBY_VERSION =~ /^2\.2/
+    end
+
     def ruby?
       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev")
     end
@@ -43,6 +47,10 @@ module Bundler
       ruby? && on_21?
     end
 
+    def ruby_22?
+      ruby? && on_22?
+    end
+
     def mri?
       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
     end
@@ -63,6 +71,10 @@ module Bundler
       mri? && on_21?
     end
 
+    def mri_22?
+      mri? && on_22?
+    end
+
     def rbx?
       ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
     end
@@ -87,6 +99,46 @@ module Bundler
       Bundler::WINDOWS
     end
 
+    def mswin_18?
+      mswin? && on_18?
+    end
+
+    def mswin_19?
+      mswin? && on_19?
+    end
+
+    def mswin_20?
+      mswin? && on_20?
+    end
+
+    def mswin_21?
+      mswin? && on_21?
+    end
+
+    def mswin_22?
+      mswin? && on_22?
+    end
+
+    def mswin64?
+      Bundler::WINDOWS && Gem::Platform.local.os == "mswin64" && Gem::Platform.local.cpu == 'x64'
+    end
+
+    def mswin64_19?
+      mswin64? && on_19?
+    end
+
+    def mswin64_20?
+      mswin64? && on_20?
+    end
+
+    def mswin64_21?
+      mswin64? && on_21?
+    end
+
+    def mswin64_22?
+      mswin64? && on_22?
+    end
+
     def mingw?
       Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu != 'x64'
     end
@@ -107,6 +159,10 @@ module Bundler
       mingw? && on_21?
     end
 
+    def mingw_22?
+      mingw? && on_22?
+    end
+
     def x64_mingw?
       Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu == 'x64'
     end
@@ -119,5 +175,9 @@ module Bundler
       x64_mingw? && on_21?
     end
 
+    def x64_mingw_22?
+      x64_mingw? && on_22?
+    end
+
   end
 end

data/lib/bundler/dependency.rb

@@ -14,6 +14,7 @@ module Bundler
       :ruby_19  => Gem::Platform::RUBY,
       :ruby_20  => Gem::Platform::RUBY,
       :ruby_21  => Gem::Platform::RUBY,
+      :ruby_22  => Gem::Platform::RUBY,
       :mri      => Gem::Platform::RUBY,
       :mri_18   => Gem::Platform::RUBY,
       :mri_19   => Gem::Platform::RUBY,

data/lib/bundler/source_list.rb

@@ -59,10 +59,10 @@ module Bundler
 
       replacement_rubygems =
         replacement_sources.detect { |s| s.is_a?(Source::Rubygems) }
-      @rubygems_aggregate = replacement_rubygems
+      @rubygems_aggregate = replacement_rubygems if replacement_rubygems
 
       # Return true if there were changes
-      all_sources.to_set != replacement_sources.to_set ||
+      lock_sources.to_set != replacement_sources.to_set ||
         rubygems_remotes.to_set != replacement_rubygems.remotes.to_set
     end
 

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.7.9" unless defined?(::Bundler::VERSION)
+  VERSION = "1.7.10" unless defined?(::Bundler::VERSION)
 end

data/man/gemfile.5.ronn

@@ -181,6 +181,8 @@ There are a number of `Gemfile` platforms:
     _ruby_ `AND` version 2.0
   * `ruby_21`:
     _ruby_ `AND` version 2.1
+  * `ruby_22`:
+    _ruby_ `AND` version 2.2
   * `mri`:
     Same as _ruby_, but not Rubinius
   * `mri_18`:

data/spec/cache/platform_spec.rb

@@ -5,7 +5,7 @@ describe "bundle cache with multiple platforms" do
     gemfile <<-G
       source "file://#{gem_repo1}"
 
-      platforms :ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21 do
+      platforms :ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22 do
         gem "rack", "1.0.0"
       end
 
@@ -13,7 +13,7 @@ describe "bundle cache with multiple platforms" do
         gem "activesupport", "2.3.5"
       end
 
-      platforms :mri, :mri_18, :mri_19, :mri_20, :mri_21 do
+      platforms :mri, :mri_18, :mri_19, :mri_20, :mri_21, :mri_22 do
         gem "activerecord", "2.3.2"
       end
     G

data/spec/install/gems/sources_spec.rb

@@ -239,6 +239,38 @@ describe "bundle install with gems on multiple sources" do
         expect(out).to include("Could not find gem 'not_in_repo1 (>= 0) ruby'")
       end
     end
+
+    context "with an existing lockfile" do
+      before do
+        system_gems "rack-0.9.1", "rack-1.0.0"
+
+        lockfile <<-L
+          GEM
+            remote: file:#{gem_repo1}
+            remote: file:#{gem_repo3}
+            specs:
+              rack (0.9.1)
+
+          PLATFORMS
+            ruby
+
+          DEPENDENCIES
+            rack!
+        L
+
+        gemfile <<-G
+          source "file://#{gem_repo1}"
+          source "file://#{gem_repo3}" do
+            gem 'rack'
+          end
+        G
+      end
+
+      # Reproduction of https://github.com/bundler/bundler/issues/3298
+      it "does not unlock the installed gem on exec" do
+        should_be_installed("rack 0.9.1")
+      end
+    end
   end
 
   context "when an older version of the same gem also ships with Ruby" do

data/spec/realworld/edgecases_spec.rb

@@ -27,7 +27,7 @@ describe "real world edgecases", :realworld => true do
     install_gemfile <<-G
       source :rubygems
 
-      gem 'i18n', '~> 0.4'
+      gem 'i18n', '~> 0.6.0'
       gem 'activesupport', '~> 3.0'
       gem 'activerecord', '~> 3.0'
       gem 'builder', '~> 2.1.2'
@@ -61,7 +61,7 @@ describe "real world edgecases", :realworld => true do
     install_gemfile <<-G
     source "https://rubygems.org"
 
-    gem "i18n", "~> 0.4"
+    gem "i18n", "~> 0.6.0"
     gem "activesupport", "~> 3.0"
     gem "activerecord", "~> 3.0"
     gem "builder", "~> 2.1.2"

data/spec/realworld/parallel_spec.rb

@@ -6,6 +6,7 @@ describe "parallel", :realworld => true do
       source "https://rubygems.org"
       gem 'activesupport', '~> 3.2.13'
       gem 'faker', '~> 1.1.2'
+      gem 'i18n', '~> 0.6.0' # Because 1.7+ requires Ruby 1.9.3+
     G
 
     bundle :install, :jobs => 4, :env => {"DEBUG" => "1"}
@@ -52,6 +53,7 @@ describe "parallel", :realworld => true do
       source "https://rubygems.org"
       gem 'activesupport', '~> 3.2.12'
       gem 'faker', '~> 1.1.2'
+      gem 'i18n', '~> 0.6.0' # Because 1.7+ requires Ruby 1.9.3+
     G
 
     bundle :update, :jobs => 4, :env => {"DEBUG" => "1"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.7.10
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache