bundler 2.2.28 → 2.2.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35773b207a2a4289d58aa6ddd95848ac7a5ad74d1d252c82c55375cc2faa34c3
-  data.tar.gz: 5221811c1f5564852c18e319872f63edfb435612406ce99f5bad97357e1483d2
+  metadata.gz: 7069421e0020f0587932b3789c8f14b8aadb042d325355fc4072d56c083743c0
+  data.tar.gz: 5bd5f85c8a0c755f41e8a4be840f1b534700636390e5b6c64123693c3096c365
 SHA512:
-  metadata.gz: fba8a4dfd5a819525341a772361466517157b7c49ab29e36e0a4d24d80939f6ed3ab412fe5709c0dd5d70a57737fca1d4b595c3636b9949d18951d5bf6a77138
-  data.tar.gz: e8c90fead6ac38c7cc693cf2d56269dbcce9f6b99704784a46ff433cd5b402574e878d314ea7728066d60c87afc82d22b381957cf81af3ca4b9c0d483afd4e96
+  metadata.gz: b35d34e74e52b7522a6cfe1734b741b707685c7fb8811d82de51c2829024f4c14c4695e26def71f3f5aaa2473bc4f7301cd601d490a9d60e38f63b68936638a9
+  data.tar.gz: 319d8e58acf68df04ac61973b808df92bacf8793cd2bf0a301ddcd446c62c1bf5e1519de730c206fe8a9dbb447dbc48389d0900cdda16475135d93dcbe9d769d

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.2.29 (October 8, 2021)
+
+## Enhancements:
+
+  - Require at least Ruby 2.6.0 for gems created with recent rubies [#4920](https://github.com/rubygems/rubygems/pull/4920)
+  - Include glob information in string representation of git sources to make generated lockfiles deterministic [#4947](https://github.com/rubygems/rubygems/pull/4947)
+  - Add missing `rubygem_push` prerequisite [#4930](https://github.com/rubygems/rubygems/pull/4930)
+
 # 2.2.28 (September 23, 2021)
 
 ## Enhancements:

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 = "2021-09-23".freeze
-    @git_commit_sha = "99b72cbd55".freeze
+    @built_at = "2021-10-08".freeze
+    @git_commit_sha = "4440b035ef".freeze
     @release = true
     # end ivars
 

data/lib/bundler/cli/gem.rb

@@ -68,7 +68,7 @@ module Bundler
         :bundler_version  => bundler_dependency_version,
         :git              => use_git,
         :github_username  => github_username.empty? ? "[USERNAME]" : github_username,
-        :required_ruby_version => Gem.ruby_version < Gem::Version.new("2.4.a") ? "2.3.0" : "2.4.0",
+        :required_ruby_version => required_ruby_version,
       }
       ensure_safe_gem_name(name, constant_array)
 
@@ -169,7 +169,7 @@ module Bundler
         "For more information, see the RuboCop docs (https://docs.rubocop.org/en/stable/) " \
         "and the Ruby Style Guides (https://github.com/rubocop-hq/ruby-style-guide).")
         config[:rubocop] = true
-        config[:rubocop_version] = Gem.ruby_version < Gem::Version.new("2.4.a") ? "0.81.0" : "1.7"
+        config[:rubocop_version] = rubocop_version
         Bundler.ui.info "RuboCop enabled in config"
         templates.merge!("rubocop.yml.tt" => ".rubocop.yml")
       end
@@ -350,5 +350,22 @@ module Bundler
     def open_editor(editor, file)
       thor.run(%(#{editor} "#{file}"))
     end
+
+    def required_ruby_version
+      if Gem.ruby_version < Gem::Version.new("2.4.a") then "2.3.0"
+      elsif Gem.ruby_version < Gem::Version.new("2.5.a") then "2.4.0"
+      elsif Gem.ruby_version < Gem::Version.new("2.6.a") then "2.5.0"
+      else
+        "2.6.0"
+      end
+    end
+
+    def rubocop_version
+      if Gem.ruby_version < Gem::Version.new("2.4.a") then "0.81.0"
+      elsif Gem.ruby_version < Gem::Version.new("2.5.a") then "1.12"
+      else
+        "1.21"
+      end
+    end
   end
 end

data/lib/bundler/gem_helper.rb

@@ -76,7 +76,7 @@ module Bundler
         tag_version { git_push(args[:remote]) } unless already_tagged?
       end
 
-      task "release:rubygem_push" do
+      task "release:rubygem_push" => "build" do
         rubygem_push(built_gem_path) if gem_push?
       end
 

data/lib/bundler/source/git.rb

@@ -42,7 +42,7 @@ module Bundler
         %w[ref branch tag submodules].each do |opt|
           out << "  #{opt}: #{options[opt]}\n" if options[opt]
         end
-        out << "  glob: #{@glob}\n" unless @glob == DEFAULT_GLOB
+        out << "  glob: #{@glob}\n" unless default_glob?
         out << "  specs:\n"
       end
 
@@ -75,12 +75,20 @@ module Bundler
             git_proxy.branch
           end
 
-          rev = " (at #{at}@#{shortref_for_display(revision)})"
+          rev = "at #{at}@#{shortref_for_display(revision)}"
         rescue GitError
           ""
         end
 
-        "#{@safe_uri}#{rev}"
+        specifiers = [rev, glob_for_display].compact
+        suffix =
+          if specifiers.any?
+            " (#{specifiers.join(", ")})"
+          else
+            ""
+          end
+
+        "#{@safe_uri}#{suffix}"
       end
 
       def name
@@ -282,6 +290,14 @@ module Bundler
         ref[0..11]
       end
 
+      def glob_for_display
+        default_glob? ? nil : "glob: #{@glob}"
+      end
+
+      def default_glob?
+        @glob == DEFAULT_GLOB
+      end
+
       def uri_hash
         if uri =~ %r{^\w+://(\w+@)?}
           # Downcase the domain component of the URI

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.2.28".freeze
+  VERSION = "2.2.29".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.2.28
+  version: 2.2.29
 platform: ruby
 authors:
 - André Arko
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -354,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.2.29
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies