bumpit 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7f4e75f04e4442e4be186b4c5722e5fcf4a93ad23e041042fa64d81abaab5e5
-  data.tar.gz: 5de688f9d7f53c154298a85b6e9e3d8f66ce30dcb40b9333320de3b991fb78fd
+  metadata.gz: 61dc3fe86a1ce8d55b8cd34773cfff73c8beb459bc4964d7beb2dd008506745b
+  data.tar.gz: 8f12b7cf3e4128b9ec0f7a5776779d89bf31b3fd31c450f552d814f75b7fb67d
 SHA512:
-  metadata.gz: b87e8506d7a0e66fd458925952adc13cb98265b7238198bab90a1900875a75576303178db9c44edf429e4679f07db8ec276e3df88e1fbffa09966287b6ef15dc
-  data.tar.gz: 295de8364062b94a5bdbf822e37f3a696704ecc9d7707340b5170bf476ec9d89646fb23ca5ef777856e9bc2fd60b87107b200ca392d24050aa8e749cd90fe729
+  metadata.gz: 0a8bbfd7d4cf366219f71f0de32ea6b3e08fa029326095e45cf8b30281fdb304429fe2f2fe30e9ddc65001f1063b925e044bfe048707eea7372028aeb60b1409
+  data.tar.gz: d4ae18ad6a77baa29373022fe79ec62b0627428a0742533fd5439d0fc77de15c03eae97a623c3b6421036ac43f9f1ec1b999b677b9224cba8196b14076d421a1

data/lib/bumpit/managers/base.rb

@@ -2,7 +2,7 @@
 
 require "bundler"
 
-# :nocov:
+# simplecov:disable
 class Bumpit
   module Managers
     class Base
@@ -50,4 +50,4 @@ class Bumpit
     end
   end
 end
-# :nocov:
+# simplecov:enable

data/lib/bumpit/managers/bundler.rb

@@ -6,14 +6,16 @@ require "pathname"
 class Bumpit
   module Managers
     class Bundler < Base
-      BUNDLE_VERSION_COMMAND = "bundle info bundler --version"
-      BUNDLER_UPDATE_COMMAND = "bundle update --bundler"
+      BUNDLED_WITH_MATCHER   = /^BUNDLED WITH\n\s+(.+)$/
+      BUNDLER_UPDATE_COMMAND = "bundle update --bundler=%s"
       DEPENDENCY_MATCHER     = /^\s*gem\s+['"]([^'"]+)['"].*$/
-      FILENAMES              = %w(Gemfile Gemfile.lock).freeze
+      GEMFILE                = "Gemfile"
+      GEMFILE_LOCK           = "Gemfile.lock"
+      FILENAMES              = [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/
+      OUTDATED_MATCHER       = /\A(\S+) \(newest ([^,)]+), installed ([^,)]+), requested = ([^,)]+)/
 
       # Determine if the manager is valid.
       #
@@ -29,12 +31,12 @@ class Bumpit
       #
       # @return [void]
       def bump
-        update_bundler
-
-        if outdated.any?
+        if outdated?
           write_contents
           bundle_update
         end
+
+        update_bundler
       end
 
       # Return a message for which dependencies were bumped.
@@ -68,7 +70,7 @@ class Bumpit
       #
       # @return [String] The contents of the Gemfile.
       def contents
-        @contents ||= File.read("Gemfile")
+        @contents ||= File.read(GEMFILE)
       end
 
       # Return the modified contents of the Gemfile.
@@ -87,6 +89,13 @@ class Bumpit
         end
       end
 
+      # Return the latest released version of Bundler.
+      #
+      # @return [String]
+      def latest_bundler_version
+        @latest_bundler_version ||= INFO_MATCHER.match(`#{GEM_INFO_COMMAND}`).to_a.last.to_s
+      end
+
       # Return the outdated dependencies.
       #
       # @return [Hash]
@@ -100,12 +109,22 @@ class Bumpit
         end
       end
 
+      # Determine if there are outdated dependencies, including Bundler.
+      #
+      # Checks update_bundler? first to cache the result before bundle_update
+      # modifies the lock file.
+      #
+      # @return [Boolean]
+      def outdated?
+        update_bundler? || outdated.any?
+      end
+
       # Update Bundler in the lock file.
       #
       # @return [void]
       def update_bundler
         if update_bundler?
-          `#{BUNDLER_UPDATE_COMMAND}`
+          `#{format(BUNDLER_UPDATE_COMMAND, latest_bundler_version)}`
         end
       end
 
@@ -113,11 +132,12 @@ class Bumpit
       #
       # @return [Boolean]
       def update_bundler?
-        @update_bundler ||= begin
-          _, latest = INFO_MATCHER.match(`#{GEM_INFO_COMMAND}`).to_a
-          current   = `#{BUNDLE_VERSION_COMMAND}`
+        return @update_bundler if defined?(@update_bundler)
+
+        @update_bundler = begin
+          _, current = BUNDLED_WITH_MATCHER.match(File.read(GEMFILE_LOCK)).to_a
 
-          Gem::Version.new(latest.to_s) > Gem::Version.new(current.to_s)
+          Gem::Version.new(latest_bundler_version) > Gem::Version.new(current.to_s)
         end
       end
 
@@ -125,7 +145,7 @@ class Bumpit
       #
       # @return [void]
       def write_contents
-        File.write("Gemfile", "#{modified_contents.join("\n")}\n")
+        File.write(GEMFILE, "#{modified_contents.join("\n")}\n")
       end
     end
   end

data/lib/bumpit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumpit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Tristan Dunn
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.23
 specification_version: 4
 summary: Automatically bump dependencies in multiple package managers.
 test_files: []