keep_up 0.6.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c6e9711c520dce8201a771fec4b0b972817ab8b9
-  data.tar.gz: 2cbdba7b2d01263a405bc8baee64fb587dc28fd7
+SHA256:
+  metadata.gz: d9a8cf50656d55403aaae2319218ce2801bcd9dffdea0151d86fc90f7051de27
+  data.tar.gz: ea53a52e56e04b9dba8134bdf86c99713847ef2158181a557f93165e326177b9
 SHA512:
-  metadata.gz: 994a91e4ed5c541a0c594cc41868b19be18d5d50dd1c62ca011e947116c64377f24e1ce641b770fb4836db68f5f5bca0aa158f737476a88a79a63dfe166397d4
-  data.tar.gz: bc4867a1518651a0715ab59c9c418c1ea1a1d822d89235c665232e6c4db1e6c4ca86f741a0472ab4881446631be87dbdc58cd28c1363f409fbade67e8f5cd551
+  metadata.gz: 251e0b63416c6b937831aac2b65cccd5b6e3b38432af375d4210f52071e63edd4688767754c4d94ef8d540176d8fd8ee895ee51ae81926613c39fdc81e1c87cf
+  data.tar.gz: 0eab09bcbfc0c8472a511e9d10cf8132529a3801d5aadc68a138d7d26d6d34c636d8d6e0246ee255c72e2853ed5344019f2ec486fac0b370a4fdf4e31f75f534

data/.hound.yml

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

data/.rubocop.yml

@@ -1,21 +1,41 @@
+inherit_from: .rubocop_todo.yml
+
+require:
+  - rubocop-performance
+  - rubocop-rspec
+
 AllCops:
   Exclude:
     - 'tmp/**/*'
+  NewCops: enable
+  TargetRubyVersion: 2.5
 
-# Dot at end of line makes it clearer that the line is not done
-Layout/DotPosition:
-  EnforcedStyle: trailing
+# Be lenient with line length
+Layout/LineLength:
+  Max: 92
 
-# Multi-line assignment should be simply indented. Aligning them makes it even
-# harder to keep a sane line length.
-Layout/MultilineOperationIndentation:
-  EnforcedStyle: indented
+# 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
+
+# Assume the programmer knows how bracketed block syntax works
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
 # Allow if (foo = get_foo) style
 Lint/AssignmentInCondition:
   AllowSafeAssignment: true
@@ -25,9 +45,8 @@ Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
 
-# Require lines to fit in pull requests.
-Metrics/LineLength:
-  Max: 92
+Performance/StartWith:
+  AutoCorrect: true
 
 # Allow and/or for control flow only
 Style/AndOr:
@@ -37,18 +56,32 @@ Style/AndOr:
 Style/GuardClause:
   MinBodyLength: 2
 
-# Don't use if or unless as modifier if the line gets too long
-Style/IfUnlessModifier:
-  MaxLineLength: 60
+# Sometimes an if statement just looks better than next with a guard clause
+Style/Next:
+  Enabled: false
 
 # Explicite numbers are often clearer, and more robust.
 Style/NumericPredicate:
   Enabled: false
 
+# Use older RuboCop default
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%W': ()
+    '%w': ()
+
 # Allow explicit return with multiple return values
 Style/RedundantReturn:
   AllowMultipleReturnValues: true
 
-# I prefer to have symbols look like symbols
+# Do not commit to use of interpolation
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+# Prefer symbols to look like symbols
 Style/SymbolArray:
   EnforcedStyle: brackets
+
+# Accessors are only trivial if they match the ivar name
+Style/TrivialAccessors:
+  ExactNameMatch: true

data/.rubocop_todo.yml

@@ -0,0 +1,22 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-08-28 11:02:57 UTC using RuboCop version 0.89.1.
+# 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: 2
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 15
+
+# Offense count: 8
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 10
+
+# Offense count: 1
+Security/Eval:
+  Exclude:
+    - 'lib/keep_up/bundle.rb'

data/.simplecov

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+SimpleCov.start do
+  add_group "Main", "lib"
+  add_group "Specs", "spec"
+  enable_coverage :branch
+end
+
+SimpleCov.at_exit do
+  SimpleCov.result.format!
+end

data/.travis.yml

@@ -1,18 +1,24 @@
-sudo: false
 language: ruby
-rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
 
-before_install:
-  - rvm use @global
-  - gem uninstall bundler -x
-  - gem install bundler --version=1.13.7
-  - bundler --version
+dist: xenial
+
+before_script:
   - git config --global user.email "you@example.com"
   - git config --global user.name "Your Name"
 
+cache:
+  bundler: true
+
+rvm:
+  - 2.5
+  - 2.6
+  - 2.7
+  - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
 branches:
   only:
     - master

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## 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
+
+## 0.8.0 / 2019-10-16
+
+* Drop support for Ruby 2.3
+* Handle use of `require_relative` in gemspec files
+
+## 0.7.1 / 2019-01-16
+
+* Support Ruby 2.6
+* Support Bundler 2.x
+
+## 0.7.0 / 2018-12-10
+
+* Interface with Bundler via its CLI
+* Perform a real `bundle update` for each update dependency. This means gems
+  will actually be installed in each step.
+* Drop support for Bundler versions below 1.15.
+* Delegate finding available update candidates to Bundler.
+* Gracefully handle git dependencies when collecting update candidates
+* Do not attempt to update requirements with more than one element
+* Restore effect of the `--local` flag.
+
 ## 0.6.3 / 2017-10-27
 
 * Filter out pre-releases when searching for dependencies to support

data/Gemfile

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

data/README.md

@@ -17,7 +17,7 @@ Before running KeepUp, it's probably nice to start a new branch. Also, KeepUp
 will refuse to run if your checkout directory is not clean, or if your
 Gemfile.lock is not up-to-date.
 
-Run keep_up in your project directory:
+Run `keep_up` in your project directory:
 
     $ keep_up
 
@@ -64,8 +64,9 @@ git commits and tags, and push the `.gem` file to
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at
-https://github.com/mvz/keep_up. This project is intended to be a safe,
+Bug reports and pull requests are welcome at
+[`keep_up`'s repository](https://github.com/mvz/keep_up) on GitHub.
+This project is intended to be a safe,
 welcoming space for collaboration, and contributors are expected to adhere to
 the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 

data/Rakefile

@@ -1,8 +1,13 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
+# 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 = ["-rbundler/setup -rsimplecov -w"]
+end
 
-RSpec::Core::RakeTask.new(:spec)
 Cucumber::Rake::Task.new(:features)
 
 task default: [:spec, :features]

data/bin/keep_up

@@ -1,29 +1,39 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require 'optparse'
-require_relative '../lib/keep_up'
+require "optparse"
+require_relative "../lib/keep_up"
 
 options = {
   local: false,
-  test_command: 'bundle exec rake',
+  test_command: "bundle exec rake",
   skip: []
 }
-OptionParser.new do |parser|
-  parser.on('--[no-]local') do |local|
+
+opt_parser = OptionParser.new do |parser|
+  parser.on("--[no-]local", "Only consider locally installed gems") do |local|
     options[:local] = local
   end
-
-  parser.on('--test-command=COMMAND') do |command|
+  parser.on("--test-command=COMMAND", "Run COMMAND to test each update") do |command|
     options[:test_command] = command
   end
-
-  parser.on('--skip=SKIPPED_GEM') do |gemname|
+  parser.on("--skip=SKIPPED_GEM", "Do not consider SKIPPED_GEM for updating") do |gemname|
     options[:skip] << gemname
   end
-end.parse!
+  parser.on_tail("-h", "--help", "Show this message") do
+    puts parser
+    exit
+  end
+  parser.on_tail("-v", "--version", "Show version") do
+    puts "#{parser.program_name} #{KeepUp::VERSION}\n"
+    exit
+  end
+end
+
+opt_parser.parse!
 
 begin
-  KeepUp::Application.new(options).run
+  KeepUp::Application.new(**options).run
 rescue KeepUp::BailOut => e
   warn e.message
   exit 1

data/keep_up.gemspec

@@ -1,31 +1,36 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'keep_up/version'
+require "keep_up/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'keep_up'
+  spec.name          = "keep_up"
   spec.version       = KeepUp::VERSION
-  spec.authors       = ['Matijs van Zuijlen']
-  spec.email         = ['matijs@matijs.net']
+  spec.authors       = ["Matijs van Zuijlen"]
+  spec.email         = ["matijs@matijs.net"]
 
-  spec.summary       = 'Automatically update your dependencies'
+  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'
+    "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.files = `git ls-files -z`.split("\x0")
+    .reject { |f| f.match(%r{^(test|script|spec|features)/}) }
 
-  spec.bindir        = 'bin'
+  spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_runtime_dependency 'bundler', '~> 1.13'
+  spec.add_runtime_dependency "bundler", [">= 1.15", "< 3.0"]
 
-  spec.add_development_dependency 'aruba', '~> 0.14.2'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency "aruba", "~> 1.0"
+  spec.add_development_dependency "cucumber", "~> 5.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov", "~> 0.19.0"
 end

data/lib/keep_up.rb

@@ -1,5 +1,7 @@
-require_relative 'keep_up/version'
-require_relative 'keep_up/application'
+# frozen_string_literal: true
+
+require_relative "keep_up/version"
+require_relative "keep_up/application"
 
 # Main KeepUp namespace
 module KeepUp

data/lib/keep_up/application.rb

@@ -1,13 +1,11 @@
-require 'bundler'
-require 'open3'
-require_relative 'bundle'
-require_relative 'bundler_definition_builder'
-require_relative 'gem_index'
-require_relative 'null_filter'
-require_relative 'repository'
-require_relative 'skip_filter'
-require_relative 'updater'
-require_relative 'version_control'
+# frozen_string_literal: true
+
+require_relative "runner"
+require_relative "bundle"
+require_relative "null_filter"
+require_relative "skip_filter"
+require_relative "updater"
+require_relative "version_control"
 
 module KeepUp
   # Error thrown when we can't go any further.
@@ -16,50 +14,53 @@ module KeepUp
 
   # Main application
   class Application
-    def initialize(local:, test_command:, skip:)
+    def initialize(local:, test_command:, skip:, runner: Runner)
       @test_command = test_command
       @local = local
       @skip = skip
+      @runner = runner
     end
 
     def run
-      sanity_check
+      check_version_control_clean
+      check_bundle_lockfile
       update_all_dependencies
       report_done
     end
 
     private
 
-    attr_reader :skip, :local
+    attr_reader :skip, :local, :runner
+
+    def check_version_control_clean
+      return if version_control.clean?
+
+      raise BailOut, "Commit or stash your work before running 'keep_up'"
+    end
+
+    def check_bundle_lockfile
+      return if bundle.check? && version_control.clean?
 
-    def sanity_check
-      version_control.clean? or
-        raise BailOut, "Commit or stash your work before running 'keep_up'"
-      bundle.check? or
-        raise BailOut, "Make sure your Gemfile.lock is up-to-date before running 'keep_up'"
+      version_control.revert_changes
+      raise BailOut, "Make sure your Gemfile.lock is up-to-date before running 'keep_up'"
     end
 
     def update_all_dependencies
       Updater.new(bundle: bundle,
-                  repository: Repository.new(index: index),
                   version_control: version_control,
                   filter: filter).run
     end
 
     def version_control
-      @version_control ||= VersionControl.new
+      @version_control ||= VersionControl.new(runner: runner)
     end
 
     def bundle
-      @bundle ||= Bundle.new(definition_builder: definition_builder)
+      @bundle ||= Bundle.new(runner: runner, local: local)
     end
 
     def report_done
-      puts 'All done!'
-    end
-
-    def definition_builder
-      @definition_builder ||= BundlerDefinitionBuilder.new(local: local)
+      puts "All done!"
     end
 
     def filter
@@ -69,9 +70,5 @@ module KeepUp
                     NullFilter.new
                   end
     end
-
-    def index
-      GemIndex.new(definition_builder: definition_builder)
-    end
   end
 end

data/lib/keep_up/bundle.rb

@@ -1,132 +1,124 @@
-require 'bundler'
-require_relative 'gemfile_filter'
-require_relative 'gemspec_filter'
-require_relative 'dependency'
-require_relative 'one'
+# frozen_string_literal: true
+
+require_relative "gemfile_filter"
+require_relative "gemspec_filter"
+require_relative "dependency"
 
 module KeepUp
   # A Gemfile with its current set of locked dependencies.
   class Bundle
-    def initialize(definition_builder:)
-      @definition_builder = definition_builder
-    end
+    OUTDATED_MATCHER =
+      /([^ ]*) \(newest ([^,]*), installed ([^,]*)(?:, requested (.*))?\)/.freeze
+    UPDATE_MATCHER =
+      /(?:Using|Installing|Fetching) ([^ ]*) ([^ ]*)(?: \(was (.*))?\)/.freeze
 
-    def dependencies
-      gemspec_dependencies + gemfile_dependencies + transitive_dependencies
+    def initialize(runner:, local:)
+      @runner = runner
+      @local = local
     end
 
-    def apply_updated_dependency(dependency)
-      report_intent dependency
-      update_gemfile_contents(dependency)
-      update_gemspec_contents(dependency)
-      result = update_lockfile(dependency)
-      report_result dependency, result
-      result
+    def dependencies
+      @dependencies ||=
+        begin
+          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)
+          end
+        end
     end
 
     def check?
-      bundler_definition.to_lock == File.read('Gemfile.lock')
+      _, status = @runner.run2 "bundle check"
+      status == 0
     end
 
-    private
-
-    attr_reader :definition_builder
+    def update_gemfile_contents(update)
+      update = find_specification_update(dependencies, update)
+      return unless update
 
-    def report_intent(dependency)
-      print "Updating #{dependency.name}"
+      update_specification_contents(update, "Gemfile", GemfileFilter)
     end
 
-    def report_result(dependency, result)
-      if result
-        puts " to #{result.version}"
-      else
-        puts " to #{dependency.version}"
-        puts 'Update failed'
-      end
-    end
+    def update_gemspec_contents(update)
+      return unless gemspec_name
 
-    def gemfile_dependencies
-      raw = if Bundler::VERSION >= '1.15.'
-              bundler_lockfile.dependencies.values
-            else
-              bundler_lockfile.dependencies
-            end
-      build_dependencies raw
-    end
+      update = find_specification_update(dependencies, update)
+      return unless update
 
-    def gemspec_dependencies
-      gemspec_source = bundler_lockfile.sources.
-        find { |it| it.is_a? Bundler::Source::Gemspec }
-      return [] unless gemspec_source
-      build_dependencies gemspec_source.gemspec.dependencies
+      update_specification_contents(update, gemspec_name, GemspecFilter)
     end
 
-    def transitive_dependencies
-      build_dependencies bundler_lockfile.specs.flat_map(&:dependencies).uniq
+    # 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}"
+      lines = run_filtered command, UPDATE_MATCHER
+      lines.each do |name, version, old_version|
+        next unless name == update_name && old_version
+
+        current = Gem::Specification.new(name, old_version)
+        result = Gem::Specification.new(name, version)
+        return result if result.version > current.version
+      end
+      nil
     end
 
-    def build_dependencies(deps)
-      deps.map { |dep| build_dependency dep }.compact
-    end
+    private
 
-    def build_dependency(dep)
-      spec = locked_spec dep
-      return unless spec
-      Dependency.new(name: dep.name,
-                     requirement_list: dep.requirement.as_list,
-                     locked_version: spec.version)
+    def gemspec
+      @gemspec ||= if gemspec_name
+                     gemspec_path = File.expand_path(gemspec_name)
+                     eval File.read(gemspec_name), nil, gemspec_path
+                   end
     end
 
-    def locked_spec(dep)
-      bundler_lockfile.specs.find { |it| it.name == dep.name }
+    def gemspec_dependencies
+      @gemspec_dependencies ||= if gemspec
+                                  gemspec.dependencies
+                                else
+                                  []
+                                end
     end
 
-    def bundler_lockfile
-      @bundler_lockfile ||= bundler_definition.locked_gems
-    end
+    def fetch_gemspec_dependency_requirements(name)
+      dep = gemspec_dependencies.find { |it| it.name == name }
+      return unless dep
 
-    def bundler_definition
-      @bundler_definition ||= definition_builder.build(false)
+      dep.requirements_list
     end
 
-    def update_gemfile_contents(update)
-      current_dependency = gemfile_dependencies.find { |it| it.name == update.name }
-      return unless current_dependency
-      return if current_dependency.matches_spec?(update)
-
-      update = current_dependency.generalize_specification(update)
+    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)
 
-      contents = File.read 'Gemfile'
-      updated_contents = GemfileFilter.apply(contents, update)
-      File.write 'Gemfile', updated_contents
+      current_dependency.generalize_specification(update)
     end
 
-    def update_gemspec_contents(update)
-      current_dependency = gemspec_dependencies.find { |it| it.name == update.name }
-      return unless current_dependency
-      return if current_dependency.matches_spec?(update)
-
-      update = current_dependency.generalize_specification(update)
-
-      contents = File.read gemspec_name
-      updated_contents = GemspecFilter.apply(contents, update)
-      File.write gemspec_name, updated_contents
+    def update_specification_contents(update, file, filter)
+      File.write file, filter.apply(File.read(file), update)
     end
 
     def gemspec_name
-      @gemspec_name ||= One.fetch(Dir.glob('*.gemspec'))
+      @gemspec_name ||= Dir.glob("*.gemspec").first
     end
 
-    # Update lockfile and return resulting spec, or false in case of failure
-    def update_lockfile(update)
-      Bundler.clear_gemspec_cache
-      definition = definition_builder.build(gems: [update.name])
-      definition.lock('Gemfile.lock')
-      current = locked_spec(update)
-      result = definition.specs.find { |it| it.name == update.name }
-      result if result.version > current.version
-    rescue Bundler::VersionConflict
-      false
+    def run_filtered(command, regexp)
+      result = @runner.run command
+      lines = result.split("\n").reject(&:empty?)
+      lines.map do |line|
+        matchdata = regexp.match line
+        next unless matchdata
+
+        matchdata.to_a[1..-1]
+      end.compact
     end
   end
 end

data/lib/keep_up/dependency.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 module KeepUp
   # Single dependency with its current locked version.
   class Dependency
-    def initialize(name:, requirement_list:, locked_version:)
+    def initialize(name:, requirement_list:, locked_version:, newest_version:)
       @name = name
       @requirement_list = requirement_list
       @locked_version = Gem::Version.new locked_version
+      @newest_version = Gem::Version.new newest_version
     end
 
-    attr_reader :name, :locked_version
+    attr_reader :name, :locked_version, :newest_version
 
     def requirement
       @requirement ||= Gem::Requirement.new @requirement_list
@@ -19,15 +22,18 @@ module KeepUp
 
     def generalize_specification(specification)
       return specification if requirement.exact?
+
       segments = specification.version.segments
       return specification if segments.count <= segment_count
-      version = segments.take(segment_count).join('.')
+
+      version = segments.take(segment_count).join(".")
       Gem::Specification.new(specification.name, version)
     end
 
     def ==(other)
       other.name == name &&
         other.locked_version == locked_version &&
+        other.newest_version == newest_version &&
         other.requirement == requirement
     end
 

data/lib/keep_up/gemfile_filter.rb

@@ -1,15 +1,28 @@
+# frozen_string_literal: true
+
 module KeepUp
   # Filter to update dependency information in a Gemfile.
   module GemfileFilter
     def self.apply(contents, dependency)
+      matcher = dependency_matcher(dependency)
       contents.each_line.map do |line|
-        if line =~ /^(\s*gem\s+['"]#{dependency.name}['"],\s+['"](~> *)?)[^'"]*(['"].*)/m
+        if line =~ matcher
           match = Regexp.last_match
-          "#{match[1]}#{dependency.version}#{match[3]}"
+          "#{match[1]}#{dependency.version}#{match[2]}"
         else
           line
         end
       end.join
     end
+
+    def self.dependency_matcher(dependency)
+      /
+        ^(\s*gem\s+['"]#{dependency.name}['"],
+        \s+\[?['"](?:~>|=)?\ *)
+        [^'"]*
+        (['"]\]?[^\]]*)
+        $
+      /mx
+    end
   end
 end

data/lib/keep_up/gemspec_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KeepUp
   # Filter to update dependency information in a Gemspec.
   module GemspecFilter
@@ -18,7 +20,9 @@ module KeepUp
         ^(.*_dependency
         \s*(?:\(\s*)?
         (?:['"]|%q.)#{dependency.name}.(?:\.freeze)?,
-        \s+\[?['"](?:~>|=)?\ *)[^'"]*(['"].*)
+        \s+\[?['"](?:~>|=)?\ *)
+        [^'"]*
+        (['"]\]?[^'"]*)$
       /mx
     end
   end

data/lib/keep_up/null_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KeepUp
   # Simple filter that acccepts everything.
   class NullFilter

data/lib/keep_up/runner.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "open3"
+
+module KeepUp
+  # Encapsulate knowledge of running external commands
+  module Runner
+    module_function
+
+    def run(command)
+      stdout, = run2 command
+      stdout
+    end
+
+    def run2(command)
+      Open3.capture2 command
+    end
+  end
+end

data/lib/keep_up/skip_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KeepUp
   # Filter that skips dependencies if their name is on the list of things to be skipped.
   class SkipFilter

data/lib/keep_up/updater.rb

@@ -1,20 +1,23 @@
-require_relative 'null_filter'
+# frozen_string_literal: true
+
+require_relative "null_filter"
 
 module KeepUp
   # Apply potential updates to a Gemfile.
   class Updater
-    attr_reader :bundle, :repository, :version_control, :filter
+    attr_reader :bundle, :version_control, :filter
 
-    def initialize(bundle:, repository:, version_control:, filter: NullFilter.new)
+    def initialize(bundle:, version_control:,
+                   filter: NullFilter.new, out: $stdout)
       @bundle = bundle
-      @repository = repository
       @version_control = version_control
       @filter = filter
+      @out = out
     end
 
     def run
       possible_updates.each do |update|
-        result = bundle.apply_updated_dependency update
+        result = apply_updated_dependency update
         if result
           version_control.commit_changes result
         else
@@ -24,9 +27,41 @@ module KeepUp
     end
 
     def possible_updates
-      bundle.dependencies.
-        select { |dep| filter.call dep }.
-        map { |dep| repository.updated_dependency_for dep }.compact.uniq
+      bundle.dependencies
+        .select { |dep| filter.call dep }
+        .map { |dep| updated_dependency_for dep }.compact.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
+    end
+
+    def report_intent(dependency)
+      @out.print "Updating #{dependency.name}"
+    end
+
+    def report_result(dependency, result)
+      if result
+        @out.puts " to #{result.version}"
+      else
+        @out.puts " to #{dependency.version}"
+        @out.puts "Update failed"
+      end
+    end
+
+    def updated_dependency_for(dependency)
+      locked_version = dependency.locked_version
+      newest_version = dependency.newest_version
+      return unless newest_version > locked_version
+
+      Gem::Specification.new(dependency.name, newest_version)
     end
   end
 end

data/lib/keep_up/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KeepUp
-  VERSION = '0.6.3'.freeze
+  VERSION = "0.9.0"
 end

data/lib/keep_up/version_control.rb

@@ -1,16 +1,22 @@
+# frozen_string_literal: true
+
 module KeepUp
   # Interface to the version control system (only Git is supported).
   class VersionControl
+    def initialize(runner:)
+      @runner = runner
+    end
+
     def commit_changes(dependency)
-      `git commit -am "Auto-update #{dependency.name} to #{dependency.version}"`
+      @runner.run "git commit -am 'Update #{dependency.name} to version #{dependency.version}'"
     end
 
     def revert_changes
-      `git reset --hard`
+      @runner.run "git reset --hard"
     end
 
     def clean?
-      `git status -s` == ''
+      @runner.run("git status -s") == ""
     end
   end
 end

metadata

@@ -1,71 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: keep_up
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.15'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.0
 description: Automatically update the dependencies listed in your Gemfile, Gemfile.lock,
   and gemspec.
 email:
@@ -91,8 +111,11 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".simplecov"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -106,14 +129,11 @@ files:
 - lib/keep_up.rb
 - lib/keep_up/application.rb
 - lib/keep_up/bundle.rb
-- lib/keep_up/bundler_definition_builder.rb
 - lib/keep_up/dependency.rb
-- lib/keep_up/gem_index.rb
 - lib/keep_up/gemfile_filter.rb
 - lib/keep_up/gemspec_filter.rb
 - lib/keep_up/null_filter.rb
-- lib/keep_up/one.rb
-- lib/keep_up/repository.rb
+- lib/keep_up/runner.rb
 - lib/keep_up/skip_filter.rb
 - lib/keep_up/updater.rb
 - lib/keep_up/version.rb
@@ -130,15 +150,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Automatically update your dependencies

data/lib/keep_up/bundler_definition_builder.rb

@@ -1,26 +0,0 @@
-require 'bundler'
-
-module KeepUp
-  # Creates Bunder::Definition objects.
-  class BundlerDefinitionBuilder
-    def initialize(local: false)
-      @local = local
-    end
-
-    def build(lock)
-      definition = Bundler::Definition.build('Gemfile', 'Gemfile.lock', lock)
-      if lock
-        if local
-          definition.resolve_with_cache!
-        else
-          definition.resolve_remotely!
-        end
-      end
-      definition
-    end
-
-    private
-
-    attr_reader :local
-  end
-end

data/lib/keep_up/gem_index.rb

@@ -1,24 +0,0 @@
-module KeepUp
-  # Searches possibly remote gem index to find potential dependency updates.
-  class GemIndex
-    def initialize(definition_builder:)
-      @definition_builder = definition_builder
-    end
-
-    def search(dependency)
-      index.search(Bundler::Dependency.new(dependency.name, nil))
-    end
-
-    private
-
-    attr_reader :definition_builder
-
-    def definition
-      @definition ||= definition_builder.build(true)
-    end
-
-    def index
-      @index ||= definition.index
-    end
-  end
-end

data/lib/keep_up/one.rb

@@ -1,13 +0,0 @@
-module KeepUp
-  # Fetch value from an array with exactly one element
-  module One
-    def self.fetch(arr)
-      case arr.count
-      when 1
-        arr.first
-      else
-        raise 'Expected exactly one element'
-      end
-    end
-  end
-end

data/lib/keep_up/repository.rb

@@ -1,16 +0,0 @@
-module KeepUp
-  # Picks updated versions for dependencies.
-  class Repository
-    attr_reader :index
-
-    def initialize(index:)
-      @index = index
-    end
-
-    def updated_dependency_for(dependency)
-      candidates = index.search(dependency).reject { |it| it.version.prerelease? }
-      latest = candidates.sort_by(&:version).last
-      latest unless latest.version <= dependency.locked_version
-    end
-  end
-end