bumpit 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68d87f278351ec95fc76870de6df9be813d44aae3a2f0430a938355ab8dc3fc4
-  data.tar.gz: e5cf8fbc1f5d3cbaecd6c2f52804f740b8417b64b58b2546182226185aa1a4f0
+  metadata.gz: be1c0bb76df08a59b1b9fc2eadb1e46428fd4ab44f854a6102f1ca15bf7de133
+  data.tar.gz: 28144e9b887d3530b536bc3cd0cbd858cf0b43e9e5d03faba072c1d76541daf5
 SHA512:
-  metadata.gz: 8c65b840921cbb7ed1e137acefd534d570d64531e5b637d8038742a12ac4827699b673c375a27f8944853136e73ecf9531bf9f65b3fe572353a81cfa70fed059
-  data.tar.gz: ae3e9ad75af3579d537c11c22333e749c347dbf82b3402965fdeb27569f8bf492f9fd77ee63310a0ef6484760cb83ba7c65dfb663aa6b00b1ae87341f992a4bb
+  metadata.gz: 0f185cfd65f511b3bff01fab6dcec7a84ffdac77fcf384d7baaac9e7728f19ae1272c8904be23a67e7bc6e1e27bef701a9cf73437fea440588a16f7b21b4a142
+  data.tar.gz: 8e01b90aabef132c4fb192da53191cf3f08a050619e3a0d877b62c1c8ac6152ccf2090b46a26c7714137b400772665175d8aaea87df854d0ce46f94838822b91

data/lib/bumpit/managers/bundler.rb

@@ -6,10 +6,14 @@ require "pathname"
 class Bumpit
   module Managers
     class Bundler < Base
-      DEPENDENCY_MATCH = /gem "([^"]+)"/
-      FILENAMES        = %w(Gemfile Gemfile.lock).freeze
-      OUTDATED_COMMAND = "bundle outdated --only-explicit --parseable 2>/dev/null"
-      OUTDATED_MATCHER = /\A(.+) \(newest (.+), installed (.+), requested = (.+)\)\z/
+      BUNDLE_VERSION_COMMAND = "bundle info bundler --version"
+      BUNDLER_UPDATE_COMMAND = "bundle update --bundler"
+      DEPENDENCY_MATCHER     = /^\s*gem\s+['"]([^'"]+)['"].*$/
+      FILENAMES              = %w(Gemfile Gemfile.lock).freeze
+      GEM_INFO_COMMAND       = "gem info --exact --remote --no-prerelease --no-verbose bundler"
+      INFO_MATCHER           = /bundler \(([^)]+)\)/
+      OUTDATED_COMMAND       = "bundle outdated --only-explicit --parseable 2>/dev/null"
+      OUTDATED_MATCHER       = /\A(.+) \(newest (.+), installed (.+), requested = (.+)\)\z/
 
       # Determine if the manager is valid.
       #
@@ -25,9 +29,11 @@ class Bumpit
       #
       # @return [void]
       def bump
+        update_bundler
+
         if outdated.any?
           write_contents
-          bundler_update
+          bundle_update
         end
       end
 
@@ -35,8 +41,11 @@ class Bumpit
       #
       # @return [String]
       def message
-        if outdated.any?
-          "Updates #{to_sentence(outdated.keys.sort)} in Ruby."
+        dependencies = outdated.keys
+        dependencies << "bundler" if update_bundler?
+
+        if dependencies.any?
+          "Updates #{to_sentence(dependencies.sort)} in Ruby."
         end
       end
 
@@ -45,7 +54,7 @@ class Bumpit
       # Reset the existing cache and settings and run update for Bundler.
       #
       # @return [void]
-      def bundler_update
+      def bundle_update
         silence_output do
           ::Bundler.clear_gemspec_cache
           ::Bundler.reset!
@@ -67,7 +76,7 @@ class Bumpit
       # @return [Array]
       def modified_contents
         contents.split("\n").map do |line|
-          _, name = line.match(DEPENDENCY_MATCH).to_a
+          _, name = line.match(DEPENDENCY_MATCHER).to_a
           dependency = outdated[name]
 
           if dependency
@@ -91,6 +100,27 @@ class Bumpit
         end
       end
 
+      # Update Bundler in the lock file.
+      #
+      # @return [void]
+      def update_bundler
+        if update_bundler?
+          `#{BUNDLER_UPDATE_COMMAND}`
+        end
+      end
+
+      # Determine if Bundler should be updated in the lock file.
+      #
+      # @return [Boolean]
+      def update_bundler?
+        @update_bundler ||= begin
+          _, latest = INFO_MATCHER.match(`#{GEM_INFO_COMMAND}`).to_a
+          current   = `#{BUNDLE_VERSION_COMMAND}`
+
+          Gem::Version.new(latest.to_s) > Gem::Version.new(current.to_s)
+        end
+      end
+
       # Write the file with the bumped dependencies.
       #
       # @return [void]

data/lib/bumpit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Bumpit
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumpit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tristan Dunn
@@ -57,6 +57,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/tristandunn/bumpit/issues
   changelog_uri: https://github.com/tristandunn/bumpit/blob/main/CHANGELOG.md
+  github_repo: https://github.com/tristandunn/bumpit
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -72,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Automatically bump dependencies in multiple package managers.
 test_files: []