keep_up 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97d3f75d5a76fc8ce0a3d1c0c9d93df3d7d1f7790108b7166012c12e83eb824a
-  data.tar.gz: 850cd7426571713d51c058b068a31c9abd72de6713bdbdd721baf596d9363d6c
+  metadata.gz: f982817574ba0a2dc2a74ea68776912ceb896a30a88461c7f5b89bd11d77dae7
+  data.tar.gz: 8f4b736dd3f0389915b501c2c0de2f97d28719c9a9a5783b838604eb403e3a70
 SHA512:
-  metadata.gz: '049e14f64bd4dd799dcabac41e0141fb682f81b6a933817f182d1b07c9365f38da42fa0c2dd4a79a1e19512420cb29fa81325030e4d149538198b9c447dcb344'
-  data.tar.gz: 41bd81924f216a3957bdaf627ebe4cf3f878e7668b953af977b6467cc272ff5ff8203b9f60748febb4cda97ef42cc4613d47a584ead02d899bd30d36bbd59bbc
+  metadata.gz: b84d4c38eb78a3c2be0924d1e2ea2359b21748885e19f024bee5e8451454218b5e1023e54da6a28f7c096bf47ecc7e3aa2a51b96c7df3d90e04d8c1bf4ae3204
+  data.tar.gz: '050589501a228b59a809b50f2a9d36e3df7aa479ef4411ce606cba6c119697d8f1c02d828a3535ab98e13adfb60efc3fd146dd8195486c157461a4cf2eb9ea14'

data/CHANGELOG.md

@@ -1,12 +1,25 @@
 # Changelog
 
+## 0.11.0 / 2023-09-22
+
+* Drop support for Ruby 2.6 ([#102] by [mvz])
+* Add support for Ruby 3.2 ([#103] by [mvz])
+
+[mvz]: https://github.com/mvz
+[#102]: https://github.com/mvz/keep_up/pull/102
+[#103]: https://github.com/mvz/keep_up/pull/103
+
+## 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 if 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 if 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,24 +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)
-      contents = File.read(file)
-      updated_contents = filter.apply(contents, update)
-      if contents == updated_contents
-        false
-      else
-        File.write file, updated_contents
-        true
-      end
-    end
-
     def gemspec_name
       @gemspec_name ||= Dir.glob("*.gemspec").first
     end
@@ -128,12 +115,12 @@ module KeepUp
     def run_filtered(command, regexp)
       result = @runner.run command
       lines = result.split("\n").reject(&:empty?)
-      lines.map do |line|
+      lines.filter_map do |line|
         matchdata = regexp.match line
         next unless matchdata
 
         matchdata.to_a[1..]
-      end.compact
+      end
     end
   end
 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,21 @@ 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
-      update = bundle.update_gemspec_contents(dependency)
-      update2 = bundle.update_gemfile_contents(dependency)
+
+      specification = updated_specification_for(dependency)
+
+      update = bundle.update_gemspec_contents(specification)
+      update2 = bundle.update_gemfile_contents(specification)
       update ||= update2
-      result = bundle.update_lockfile(dependency)
-      report_result dependency, result
+      result = bundle.update_lockfile(specification, dependency.locked_version)
+      report_result specification, result
       update || result if result
     end
 
@@ -55,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.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keep_up
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2023-09-22 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: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,56 +106,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.52'
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.22'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 description: Automatically update the dependencies listed in your Gemfile, Gemfile.lock,
   and gemspec.
 email:
@@ -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
@@ -196,14 +212,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Automatically update your dependencies