bundler 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cf30bcd207cba359961fa2c3f40503e76b184a1
-  data.tar.gz: e45c83872eeb29bd016d22b09440f4f323eb0505
+  metadata.gz: 94dcf8415141822172726fafaafc71de5639e1b7
+  data.tar.gz: 2c99b2539d93bd15af0a51c6167bf1825d5f7fd5
 SHA512:
-  metadata.gz: afd262fe1efecca74d592abfa7d4c2c8488e4b17048202eaf45b8c276530d9698e4b999eed995dbebb23ebcc4a1608d5226f9879ffa2ee6d2101ed8eba69b2a6
-  data.tar.gz: d2c2c10768e70e684774d81fd019cf40a6f5af0ef180693c6f45f5a8249d490fcfbbb9848f9bebad6bede3821ee2f3166736a1f7aaf1cf3d9afb353d547038d5
+  metadata.gz: 767a8471e930fd16d98b2bad05bf8719cf86996a9ed592a619c12d8ef1728450cfc52f0c7897acf7cfe3557e2720d26ad091da21a5d0af6f0107d4836f54ae2a
+  data.tar.gz: 368ac2c806d1e2e90c998fb5e9df1c0b41ace6db7f8a40aed9a9f4c665cb2f3254a88b0a45a67bd10b13d57a045d71dd7e5cc7f9eb663cde0791450271423c68

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.8.4 (2015-03-05)
+
+Bugfixes:
+
+  - document --all-platforms option (#3449, @moeffju)
+  - find gems from all sources on exec after install (#3450, @TimMoore)
+
 ## 1.8.3 (2015-02-24)
 
 Bugfixes:

data/lib/bundler/lockfile_parser.rb

@@ -29,7 +29,7 @@ module Bundler
       @state        = :source
       @specs        = {}
 
-      @rubygems_aggregate = Source::LocalRubygems.new
+      @rubygems_aggregate = Source::Rubygems.new
 
       if lockfile.match(/<<<<<<<|=======|>>>>>>>|\|\|\|\|\|\|\|/)
         raise LockfileError, "Your Gemfile.lock contains merge conflicts.\n" \

data/lib/bundler/source.rb

@@ -1,9 +1,8 @@
 module Bundler
   class Source
-    autoload :Rubygems,      'bundler/source/rubygems'
-    autoload :LocalRubygems, 'bundler/source/local_rubygems'
-    autoload :Path,          'bundler/source/path'
-    autoload :Git,           'bundler/source/git'
+    autoload :Rubygems, 'bundler/source/rubygems'
+    autoload :Path,     'bundler/source/path'
+    autoload :Git,      'bundler/source/git'
 
     def self.mirror_for(uri)
       uri = URI(uri.to_s) unless uri.is_a?(URI)

data/lib/bundler/source/rubygems.rb

@@ -68,10 +68,15 @@ module Bundler
       alias_method :name, :to_s
 
       def specs
-        # remote_specs usually generates a way larger Index than the other
-        # sources, and large_idx.use small_idx is way faster than
-        # small_idx.use large_idx.
-        @specs ||= @allow_remote ? remote_specs.dup : Index.new
+        @specs ||= begin
+          # remote_specs usually generates a way larger Index than the other
+          # sources, and large_idx.use small_idx is way faster than
+          # small_idx.use large_idx.
+          idx = @allow_remote ? remote_specs.dup : Index.new
+          idx.use(cached_specs, :override_dupes) if @allow_cached || @allow_remote
+          idx.use(installed_specs, :override_dupes)
+          idx
+        end
       end
 
       def install(spec)

data/lib/bundler/source_list.rb

@@ -6,7 +6,7 @@ module Bundler
     def initialize
       @path_sources       = []
       @git_sources        = []
-      @rubygems_aggregate = Source::LocalRubygems.new
+      @rubygems_aggregate = Source::Rubygems.new
       @rubygems_sources   = []
     end
 
@@ -57,7 +57,8 @@ module Bundler
         end
       end
 
-      replacement_rubygems = replacement_sources.detect { |s| s.is_a?(Source::LocalRubygems) }
+      replacement_rubygems =
+        replacement_sources.detect { |s| s.is_a?(Source::Rubygems) }
       @rubygems_aggregate = replacement_rubygems if replacement_rubygems
 
       # Return true if there were changes

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.8.3" unless defined?(::Bundler::VERSION)
+  VERSION = "1.8.4" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-package.ronn

@@ -17,6 +17,13 @@ Since Bundler 1.2, the `bundle package` command can also package `:git` and
 `:path` dependencies besides .gem files. This needs to be explicitly enabled
 via the `--all` option. Once used, the `--all` option will be remembered.
 
+## SUPPORT FOR MULTIPLE PLATFORMS
+
+When using gems that have different packages for different platforms, Bundler
+1.8 and newer support caching of gems for other platforms in `vendor/cache`.
+This needs to be enabled via the `--all-platforms` option. This setting will be
+remembered in your local bundler configuration.
+
 ## REMOTE FETCHING
 
 By default, if you simply run [bundle install(1)][bundle-install] after running

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -175,7 +175,6 @@ files:
 - lib/bundler/source.rb
 - lib/bundler/source/git.rb
 - lib/bundler/source/git/git_proxy.rb
-- lib/bundler/source/local_rubygems.rb
 - lib/bundler/source/path.rb
 - lib/bundler/source/path/installer.rb
 - lib/bundler/source/rubygems.rb

data/lib/bundler/source/local_rubygems.rb

@@ -1,16 +0,0 @@
-module Bundler
-  class Source
-    class LocalRubygems < Rubygems
-
-      def specs
-        @specs ||= begin
-          idx = super
-          idx.use(cached_specs, :override_dupes) if @allow_cached || @allow_remote
-          idx.use(installed_specs, :override_dupes)
-          idx
-        end
-      end
-
-    end
-  end
-end