bundler 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1b0f254fde45e5334d616c37efb448b0c3213d5681d141a3652fe6aa59e3f4a
-  data.tar.gz: 3c6f21c091483b75be54095df2449cc31f12dce5800473b57fabe7efa1536368
+  metadata.gz: 843e4286044cdb233de4175677bc39b0e942bf7530dfc102b513f0f813ebe628
+  data.tar.gz: f8c96b7117f2b17f8c6e7286575a972168a4ac0a4f8611d33d2ebe07e8e9a624
 SHA512:
-  metadata.gz: d55cf58680c59ed903fa27d6b90e73d9609b9373ccf51041bbfdd31b56449ee40eb1d927c0ef1278aa977d85a912e06f90accaa958a36376abee465c11ad846b
-  data.tar.gz: 67860aa75e4883107d5c8c3afd76a388bea176a6b39382e1258ceafec35afa993aed49b82d2cce92da64e41739dafbbc65fba01ce9ca80470490d44474fabf7e
+  metadata.gz: 58b2638c69639e4e1ee65cbb9eb803fcf07055fcd2fb51b123c04cff7f756c0900c8147d73bd8f8f3005972dc7d6ade1defa6febcc930e53683d5f8953d6354e
+  data.tar.gz: e8e0bd8f0da1f426f47f8ecb051d92874b2c32a2494c4979d26d2c318cb742b17bc7ce9b7ea8d0303111a9045ede19bcbdb25d3e611d7ec71ab523692af58bf5

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 2.1.2 (December 20, 2019)
+
+Bugfixes:
+
+  - Restore an explicit `require "rubygems"` on top `rubygems_integration.rb` to avoid some missing constant errors under some convoluted setups [#7505](https://github.com/bundler/bundler/pull/7505)
+
+## 2.1.1 (December 17, 2019)
+
+Bugfixes:
+
+  - Fix some cases of shelling out to `rubygems` still being silent [#7493](https://github.com/bundler/bundler/pull/7493)
+  - Restore compatibility with `rubygems-bundler` so that binstubs work under `RVM` [#7498](https://github.com/bundler/bundler/pull/7498)
+
 ## 2.1.0 (December 15, 2019)
 
 Features:

data/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2019-12-15".freeze
-    @git_commit_sha = "683fe9799e".freeze
+    @built_at = "2019-12-20".freeze
+    @git_commit_sha = "4da3289ebd".freeze
     @release = true
     # end ivars
 

data/lib/bundler/cli/exec.rb

@@ -25,12 +25,12 @@ module Bundler
       SharedHelpers.set_bundle_environment
       if bin_path = Bundler.which(cmd)
         if !Bundler.settings[:disable_exec_load] && ruby_shebang?(bin_path)
-          return with_verbose_rubygems { kernel_load(bin_path, *args) }
+          return kernel_load(bin_path, *args)
         end
-        with_verbose_rubygems { kernel_exec(bin_path, *args) }
+        kernel_exec(bin_path, *args)
       else
         # exec using the given command
-        with_verbose_rubygems { kernel_exec(cmd, *args) }
+        kernel_exec(cmd, *args)
       end
     end
 
@@ -89,14 +89,5 @@ module Bundler
       first_line = File.open(file, "rb") {|f| f.read(possibilities.map(&:size).max) }
       possibilities.any? {|shebang| first_line.start_with?(shebang) }
     end
-
-    def with_verbose_rubygems
-      old_ui = Gem::DefaultUserInteraction.ui
-      Gem::DefaultUserInteraction.ui = nil
-
-      yield
-    ensure
-      Gem::DefaultUserInteraction.ui = old_ui
-    end
   end
 end

data/lib/bundler/rubygems_integration.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rubygems"
+
 module Bundler
   class RubygemsIntegration
     if defined?(Gem::Ext::Builder::CHDIR_MONITOR)
@@ -525,6 +527,14 @@ module Bundler
       end
     end
 
+    def plain_specs
+      Gem::Specification._all
+    end
+
+    def plain_specs=(specs)
+      Gem::Specification.all = specs
+    end
+
     def fetch_specs(remote, name)
       path = remote.uri.to_s + "#{name}.#{Gem.marshal_version}.gz"
       fetcher = gem_remote_fetcher

data/lib/bundler/setup.rb

@@ -19,4 +19,9 @@ if Bundler::SharedHelpers.in_bundle?
   else
     Bundler.ui.silence { Bundler.setup }
   end
+
+  # We might be in the middle of shelling out to rubygems
+  # (RUBYOPT=-rbundler/setup), so we need to give rubygems the opportunity of
+  # not being silent.
+  Gem::DefaultUserInteraction.ui = nil
 end

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.1.0".freeze
+  VERSION = "2.1.2".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - André Arko
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-15 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -366,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies