keep_up 0.8.1 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 801a2183bb26562d1312f2aab9533084b9858c15102f247026ce2bab5ae441e3
-  data.tar.gz: c98dc0df6a89fbecb06b49dc428027a0b4406f4107d252be5cb325795b288be0
+  metadata.gz: 97d3f75d5a76fc8ce0a3d1c0c9d93df3d7d1f7790108b7166012c12e83eb824a
+  data.tar.gz: 850cd7426571713d51c058b068a31c9abd72de6713bdbdd721baf596d9363d6c
 SHA512:
-  metadata.gz: bc24c9ea45e40f4d3a7289ea1189f95154a641ceb3d4dfdf9dd3148ccadfcea450b38c0a358e042d3dac23816affd707a4f9c573e74bba18b000273b9f14afe7
-  data.tar.gz: c0b4cedf1a784b6efbd3964278ec76211031fc8bbacd3323c7ccbcf4ad58e2367d7b37616c76a31bfe8a7c296dfd6774746a9136203ec857438d781d67d680b3
+  metadata.gz: '049e14f64bd4dd799dcabac41e0141fb682f81b6a933817f182d1b07c9365f38da42fa0c2dd4a79a1e19512420cb29fa81325030e4d149538198b9c447dcb344'
+  data.tar.gz: 41bd81924f216a3957bdaf627ebe4cf3f878e7668b953af977b6467cc272ff5ff8203b9f60748febb4cda97ef42cc4613d47a584ead02d899bd30d36bbd59bbc

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 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
+* Add support for Ruby 3.0 and 3.1
+* Avoid interrupting half-printed lines when bundle update fails
+
+## 0.9.0 / 2020-09-18
+
+* Drop support for Ruby 2.4
+* Improve wording for commit messages
+
 ## 0.8.1 / 2019-12-30
 
 * Silence keyword arguments deprecation on Ruby 2.7

data/lib/keep_up/application.rb

@@ -46,9 +46,11 @@ module KeepUp
     end
 
     def update_all_dependencies
-      Updater.new(bundle: bundle,
-                  version_control: version_control,
-                  filter: filter).run
+      Updater.new(
+        bundle: bundle,
+        version_control: version_control,
+        filter: filter
+      ).run
     end
 
     def version_control
@@ -64,11 +66,12 @@ module KeepUp
     end
 
     def filter
-      @filter ||= if skip.any?
-                    SkipFilter.new(skip)
-                  else
-                    NullFilter.new
-                  end
+      @filter ||=
+        if skip.any?
+          SkipFilter.new(skip)
+        else
+          NullFilter.new
+        end
     end
   end
 end

data/lib/keep_up/bundle.rb

@@ -20,17 +20,10 @@ module KeepUp
     def dependencies
       @dependencies ||=
         begin
-          command = "bundle outdated --parseable#{' --local' if @local}"
+          command = "bundle outdated --parseable#{" --local" if @local}"
           lines = run_filtered command, OUTDATED_MATCHER
           lines.map do |name, newest, version, requirement|
-            requirement_list = requirement&.split(/,\s*/)
-            requirement_list ||= fetch_gemspec_dependency_requirements(name)
-            version = version.split(" ").first
-            newest = newest.split(" ").first
-            Dependency.new(name: name,
-                           locked_version: version,
-                           newest_version: newest,
-                           requirement_list: requirement_list)
+            build_dependency(name, newest, version, requirement)
           end
         end
     end
@@ -44,7 +37,7 @@ module KeepUp
       update = find_specification_update(dependencies, update)
       return unless update
 
-      update_specification_contents(update, "Gemfile", GemfileFilter)
+      update if update_specification_contents(update, "Gemfile", GemfileFilter)
     end
 
     def update_gemspec_contents(update)
@@ -53,13 +46,13 @@ module KeepUp
       update = find_specification_update(dependencies, update)
       return unless update
 
-      update_specification_contents(update, gemspec_name, GemspecFilter)
+      update if update_specification_contents(update, gemspec_name, GemspecFilter)
     end
 
     # Update lockfile and return resulting spec, or false in case of failure
     def update_lockfile(update)
       update_name = update.name
-      command = "bundle update#{' --local' if @local} --conservative #{update_name}"
+      command = "bundle update#{" --local" if @local} --conservative #{update_name}"
       lines = run_filtered command, UPDATE_MATCHER
       lines.each do |name, version, old_version|
         next unless name == update_name && old_version
@@ -74,18 +67,33 @@ module KeepUp
     private
 
     def gemspec
-      @gemspec ||= if gemspec_name
-                     gemspec_path = File.expand_path(gemspec_name)
-                     eval File.read(gemspec_name), nil, gemspec_path
-                   end
+      @gemspec ||=
+        if gemspec_name
+          gemspec_path = File.expand_path(gemspec_name)
+          eval File.read(gemspec_name), nil, gemspec_path
+        end
     end
 
     def gemspec_dependencies
-      @gemspec_dependencies ||= if gemspec
-                                  gemspec.dependencies
-                                else
-                                  []
-                                end
+      @gemspec_dependencies ||=
+        if gemspec
+          gemspec.dependencies
+        else
+          []
+        end
+    end
+
+    def build_dependency(name, newest, version, requirement)
+      requirement_list = requirement&.split(/,\s*/)
+      requirement_list ||= fetch_gemspec_dependency_requirements(name)
+      version = version.split.first
+      newest = newest.split.first
+      Dependency.new(
+        name: name,
+        locked_version: version,
+        newest_version: newest,
+        requirement_list: requirement_list
+      )
     end
 
     def fetch_gemspec_dependency_requirements(name)
@@ -103,7 +111,14 @@ module KeepUp
     end
 
     def update_specification_contents(update, file, filter)
-      File.write file, filter.apply(File.read(file), update)
+      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
@@ -117,7 +132,7 @@ module KeepUp
         matchdata = regexp.match line
         next unless matchdata
 
-        matchdata.to_a[1..-1]
+        matchdata.to_a[1..]
       end.compact
     end
   end

data/lib/keep_up/dependency.rb

@@ -44,10 +44,11 @@ module KeepUp
     end
 
     def segment_count
-      @segment_count ||= begin
-                           _, ver = requirement.requirements.first
-                           ver.segments.count
-                         end
+      @segment_count ||=
+        begin
+          _, ver = requirement.requirements.first
+          ver.segments.count
+        end
     end
   end
 end

data/lib/keep_up/updater.rb

@@ -7,8 +7,7 @@ module KeepUp
   class Updater
     attr_reader :bundle, :version_control, :filter
 
-    def initialize(bundle:, version_control:,
-                   filter: NullFilter.new, out: STDOUT)
+    def initialize(bundle:, version_control:, filter: NullFilter.new, out: $stdout)
       @bundle = bundle
       @version_control = version_control
       @filter = filter
@@ -36,23 +35,23 @@ module KeepUp
 
     def apply_updated_dependency(dependency)
       report_intent dependency
-      bundle.update_gemfile_contents(dependency)
-      bundle.update_gemspec_contents(dependency)
+      update = bundle.update_gemspec_contents(dependency)
+      update2 = bundle.update_gemfile_contents(dependency)
+      update ||= update2
       result = bundle.update_lockfile(dependency)
       report_result dependency, result
-      result
+      update || result if result
     end
 
     def report_intent(dependency)
-      @out.print "Updating #{dependency.name}"
+      @out.puts "Updating #{dependency.name}"
     end
 
     def report_result(dependency, result)
       if result
-        @out.puts " to #{result.version}"
+        @out.puts "Updated #{dependency.name} to #{result.version}"
       else
-        @out.puts " to #{dependency.version}"
-        @out.puts "Update failed"
+        @out.puts "Failed updating #{dependency.name} to #{dependency.version}"
       end
     end
 

data/lib/keep_up/version.rb

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

data/lib/keep_up/version_control.rb

@@ -8,7 +8,8 @@ module KeepUp
     end
 
     def commit_changes(dependency)
-      @runner.run "git commit -am 'Auto-update #{dependency.name} to #{dependency.version}'"
+      message = "Update #{dependency.name} to version #{dependency.version}"
+      @runner.run "git commit -am '#{message}'"
     end
 
     def revert_changes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keep_up
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.10.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -36,28 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rake-manifest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +100,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.21.0
 description: Automatically update the dependencies listed in your Gemfile, Gemfile.lock,
   and gemspec.
 email:
@@ -109,23 +165,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".dockerignore"
-- ".gitignore"
-- ".hound.yml"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".simplecov"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Dockerfile
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - bin/keep_up
-- keep_up.gemspec
 - lib/keep_up.rb
 - lib/keep_up/application.rb
 - lib/keep_up/bundle.rb
@@ -141,8 +185,10 @@ files:
 homepage: https://github.com/mvz/keep_up
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/mvz/keep_up
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,15 +196,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Automatically update your dependencies
 test_files: []

data/.dockerignore

@@ -1,3 +0,0 @@
-tmp/
-Dockerfile
-.dockerignore

data/.gitignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/.hound.yml

@@ -1,2 +0,0 @@
-rubocop:
-  config_file: .rubocop.yml

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.rubocop.yml

@@ -1,75 +0,0 @@
-inherit_from: .rubocop_todo.yml
-
-require:
-  - rubocop-rspec
-  - rubocop-performance
-
-AllCops:
-  Exclude:
-    - 'tmp/**/*'
-  TargetRubyVersion: 2.4
-
-# Require lines to fit in pull requests.
-Layout/LineLength:
-  Max: 92
-
-# Don't force lonely closing parentheses
-Layout/MultilineMethodCallBraceLayout:
-  EnforcedStyle: same_line
-
-# Multi-line method calls should be simply indented. Aligning them makes it
-# even harder to keep a sane line length.
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-# Multi-line assignment should be simply indented. Aligning them makes it even
-# harder to keep a sane line length.
-Layout/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
-# Force consistent spacing independent of block contents
-Layout/SpaceBeforeBlockBraces:
-  EnforcedStyleForEmptyBraces: space
-
-# This cop gives bad advice
-Lint/AmbiguousBlockAssociation:
-  Enabled: false
-
-# Allow if (foo = get_foo) style
-Lint/AssignmentInCondition:
-  AllowSafeAssignment: true
-
-# Spec describe blocks can be any size
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*'
-
-# Allow and/or for control flow only
-Style/AndOr:
-  EnforcedStyle: conditionals
-
-# Require at least two dependent lines before suggesting a guard clause
-Style/GuardClause:
-  MinBodyLength: 2
-
-# Explicite numbers are often clearer, and more robust.
-Style/NumericPredicate:
-  Enabled: false
-
-# Allow explicit return with multiple return values
-Style/RedundantReturn:
-  AllowMultipleReturnValues: true
-
-# Do not commit to use of interpolation
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-# Prefer symbols to look like symbols
-Style/SymbolArray:
-  EnforcedStyle: brackets
-
-# Project-specific configuration goes here.
-
-# Allow deeper nesting for spec organization
-RSpec/NestedGroups:
-  Max: 4

data/.rubocop_todo.yml

@@ -1,17 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2019-12-22 13:07:39 +0100 using RuboCop version 0.78.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 15
-
-# Offense count: 1
-Security/Eval:
-  Exclude:
-    - 'lib/keep_up/bundle.rb'

data/.simplecov

@@ -1,9 +0,0 @@
-SimpleCov.start do
-  track_files 'lib/**/*.rb'
-  add_filter 'spec/'
-  coverage_dir 'tmp/coverage'
-end
-
-SimpleCov.at_exit do
-  SimpleCov.result.format!
-end

data/.travis.yml

@@ -1,25 +0,0 @@
-language: ruby
-
-dist: xenial
-
-before_script:
-  - git config --global user.email "you@example.com"
-  - git config --global user.name "Your Name"
-
-cache:
-  bundler: true
-
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-
-branches:
-  only:
-    - master

data/Dockerfile

@@ -1,21 +0,0 @@
-FROM ruby:2.4.0
-
-RUN mkdir /keep_up
-WORKDIR /keep_up
-
-# Set up minimum files to run bundler
-ADD Gemfile /keep_up
-ADD keep_up.gemspec /keep_up
-RUN mkdir -p /keep_up/lib/keep_up
-ADD lib/keep_up/version.rb /keep_up/lib/keep_up
-ADD .git /keep_up
-
-RUN bundle install
-
-RUN gem uninstall bunder -xa
-RUN gem install bundler --version=1.13.7
-RUN git config --global user.email "you@example.com"
-RUN git config --global user.name "Your Name"
-
-ADD . /keep_up
-RUN bundle exec rake

data/Gemfile

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in keep_up.gemspec
-gemspec

data/Rakefile

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "cucumber/rake/task"
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.ruby_opts = ["-w"]
-end
-
-Cucumber::Rake::Task.new(:features)
-
-task default: [:spec, :features]

data/keep_up.gemspec

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "keep_up/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "keep_up"
-  spec.version       = KeepUp::VERSION
-  spec.authors       = ["Matijs van Zuijlen"]
-  spec.email         = ["matijs@matijs.net"]
-
-  spec.summary       = "Automatically update your dependencies"
-  spec.description =
-    "Automatically update the dependencies listed in your Gemfile," \
-    " Gemfile.lock, and gemspec."
-  spec.homepage      = "https://github.com/mvz/keep_up"
-  spec.license       = "MIT"
-
-  spec.files = `git ls-files -z`.split("\x0")
-    .reject { |f| f.match(%r{^(test|script|spec|features)/}) }
-
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = ">= 2.4.0"
-
-  spec.add_runtime_dependency "bundler", [">= 1.15", "< 3.0"]
-
-  spec.add_development_dependency "aruba", "~> 0.14.2"
-  spec.add_development_dependency "cucumber", "~> 3.1"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "simplecov", "~> 0.17.0"
-end