keep_up 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f7cf0d8f661622facd6330ca2b0185be3b4e307750f498a8d7a5fe5e426b2d4
-  data.tar.gz: d4b93a7ecde478f08fe746582af8aafcae56edb2c32932f37a5e324ee39fc811
+  metadata.gz: a77e5f8cb4c411d576d9f5fc4953649bcbfff6a5660ed80d3ee6479381009706
+  data.tar.gz: 1d7b27d5487b6fce85a4b5e675ef426909bf79651963e543c958f48bd1256e71
 SHA512:
-  metadata.gz: 2636dc31ad91af4460b38804925e078161cce26c86041683022a8a11f6932d615ec61bcded0db14e25d9b0d255481a7bc1ede9a1de0bb5f6fb7067d93fc2471a
-  data.tar.gz: 559e8a41d53d847156b468e8cf28ae49183ac839ead216fc0440d4c28c4a3a7fc42d753dd1fdf52733fae7fd1749388449bf843943cc1193b461ee6f18f9dc9e
+  metadata.gz: ca2d2e5f203e28dc17dfb55eea2f4a528415facf18b347e6cf6eeed5555ff926644927b30d05fed1fccc2e79c5392bb2a1cb8111d745d1b830be94bf3f4504cb
+  data.tar.gz: 380256f06a826011bff4f36ed62341687b5e36082a5b652c1f0e955d3c01bc2354c6e64c554a3bc5c495201f4f7e9545980ae6f1266a8a1e477b2b79b50ea42f

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Changelog
 
+## 0.10.2 / 2022-09-23
+
+* Detect version update even if `bundle update` does not print old version
+
+## 0.10.1 / 2022-05-20
+
+* Adjust commit message to match update specificity
+
 ## 0.10.0 / 2022-01-23
 
-* Drop support for Ruby 2.5 and 2.6
+* Drop support for Ruby 2.5
 * Add support for Ruby 3.0 and 3.1
 * Avoid interrupting half-printed lines when bundle update fails
 

data/bin/keep_up

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require "optparse"
-require_relative "../lib/keep_up"
+require "keep_up"
 
 options = {
   local: false,

data/lib/keep_up/bundle.rb

@@ -3,6 +3,7 @@
 require_relative "gemfile_filter"
 require_relative "gemspec_filter"
 require_relative "dependency"
+require_relative "dependency_set"
 
 module KeepUp
   # A Gemfile with its current set of locked dependencies.
@@ -10,7 +11,7 @@ module KeepUp
     OUTDATED_MATCHER =
       /([^ ]*) \(newest ([^,]*), installed ([^,]*)(?:, requested (.*))?\)/.freeze
     UPDATE_MATCHER =
-      /(?:Using|Installing|Fetching) ([^ ]*) ([^ ]*)(?: \(was (.*))?\)/.freeze
+      /(?:Using|Installing|Fetching) ([^ ]*) ([^ ]*)(?: \(was (.*)\))?/.freeze
 
     def initialize(runner:, local:)
       @runner = runner
@@ -28,33 +29,37 @@ module KeepUp
         end
     end
 
+    def dependency_set
+      @dependency_set ||= DependencySet.new(dependencies)
+    end
+
     def check?
       _, status = @runner.run2 "bundle check"
       status == 0
     end
 
     def update_gemfile_contents(update)
-      update = find_specification_update(dependencies, update)
+      update = dependency_set.find_specification_update(update)
       return unless update
 
-      update_specification_contents(update, "Gemfile", GemfileFilter)
+      update if GemfileFilter.apply_to_file("Gemfile", update)
     end
 
     def update_gemspec_contents(update)
       return unless gemspec_name
 
-      update = find_specification_update(dependencies, update)
+      update = dependency_set.find_specification_update(update)
       return unless update
 
-      update_specification_contents(update, gemspec_name, GemspecFilter)
+      update if GemspecFilter.apply_to_file(gemspec_name, update)
     end
 
     # Update lockfile and return resulting spec, or false in case of failure
-    def update_lockfile(update)
+    def update_lockfile(update, old_version)
       update_name = update.name
       command = "bundle update#{" --local" if @local} --conservative #{update_name}"
       lines = run_filtered command, UPDATE_MATCHER
-      lines.each do |name, version, old_version|
+      lines.each do |name, version, _old_version|
         next unless name == update_name && old_version
 
         current = Gem::Specification.new(name, old_version)
@@ -103,17 +108,6 @@ module KeepUp
       dep.requirements_list
     end
 
-    def find_specification_update(current_dependencies, update)
-      current_dependency = current_dependencies.find { |it| it.name == update.name }
-      return if !current_dependency || current_dependency.matches_spec?(update)
-
-      current_dependency.generalize_specification(update)
-    end
-
-    def update_specification_contents(update, file, filter)
-      File.write file, filter.apply(File.read(file), update)
-    end
-
     def gemspec_name
       @gemspec_name ||= Dir.glob("*.gemspec").first
     end

data/lib/keep_up/dependency_set.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module KeepUp
+  # Set of dependencies with their current locked versions.
+  class DependencySet
+    attr_reader :dependencies
+
+    def initialize(dependencies)
+      @dependencies = dependencies
+    end
+
+    def find_specification_update(update)
+      current_dependency = dependencies.find { |it| it.name == update.name }
+      return if !current_dependency || current_dependency.matches_spec?(update)
+
+      current_dependency.generalize_specification(update)
+    end
+  end
+end

data/lib/keep_up/file_filter.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module KeepUp
+  # Base class for file filters
+  class FileFilter
+    def self.apply_to_file(file, dependency)
+      contents = File.read(file)
+      updated_contents = apply(contents, dependency)
+      if contents == updated_contents
+        false
+      else
+        File.write file, updated_contents
+        true
+      end
+    end
+  end
+end

data/lib/keep_up/gemfile_filter.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require_relative "file_filter"
+
 module KeepUp
   # Filter to update dependency information in a Gemfile.
-  module GemfileFilter
+  class GemfileFilter < FileFilter
     def self.apply(contents, dependency)
       matcher = dependency_matcher(dependency)
       contents.each_line.map do |line|

data/lib/keep_up/gemspec_filter.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require_relative "file_filter"
+
 module KeepUp
   # Filter to update dependency information in a Gemspec.
-  module GemspecFilter
+  class GemspecFilter < FileFilter
     def self.apply(contents, dependency)
       matcher = dependency_matcher(dependency)
       contents.each_line.map do |line|

data/lib/keep_up/null_filter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module KeepUp
-  # Simple filter that acccepts everything.
+  # Simple dependency filter that acccepts everything.
   class NullFilter
     def call(_dep)
       true

data/lib/keep_up/skip_filter.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module KeepUp
-  # Filter that skips dependencies if their name is on the list of things to be skipped.
+  # Dependency filter that skips dependencies if their name is on the list of
+  # things to be skipped.
   class SkipFilter
     def initialize(skip_list)
       @skip_list = skip_list

data/lib/keep_up/updater.rb

@@ -28,18 +28,22 @@ module KeepUp
     def possible_updates
       bundle.dependencies
         .select { |dep| filter.call dep }
-        .map { |dep| updated_dependency_for dep }.compact.uniq
+        .select { |dep| updateable_dependency? dep }.uniq
     end
 
     private
 
     def apply_updated_dependency(dependency)
       report_intent dependency
-      bundle.update_gemfile_contents(dependency)
-      bundle.update_gemspec_contents(dependency)
-      result = bundle.update_lockfile(dependency)
-      report_result dependency, result
-      result
+
+      specification = updated_specification_for(dependency)
+
+      update = bundle.update_gemspec_contents(specification)
+      update2 = bundle.update_gemfile_contents(specification)
+      update ||= update2
+      result = bundle.update_lockfile(specification, dependency.locked_version)
+      report_result specification, result
+      update || result if result
     end
 
     def report_intent(dependency)
@@ -54,12 +58,14 @@ module KeepUp
       end
     end
 
-    def updated_dependency_for(dependency)
+    def updateable_dependency?(dependency)
       locked_version = dependency.locked_version
       newest_version = dependency.newest_version
-      return unless newest_version > locked_version
+      newest_version > locked_version
+    end
 
-      Gem::Specification.new(dependency.name, newest_version)
+    def updated_specification_for(dependency)
+      Gem::Specification.new(dependency.name, dependency.newest_version)
     end
   end
 end

data/lib/keep_up/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KeepUp
-  VERSION = "0.10.0"
+  VERSION = "0.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keep_up
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +106,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.32'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.32'
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +188,8 @@ files:
 - lib/keep_up/application.rb
 - lib/keep_up/bundle.rb
 - lib/keep_up/dependency.rb
+- lib/keep_up/dependency_set.rb
+- lib/keep_up/file_filter.rb
 - lib/keep_up/gemfile_filter.rb
 - lib/keep_up/gemspec_filter.rb
 - lib/keep_up/null_filter.rb
@@ -203,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Automatically update your dependencies