keep_up 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 139b7cb090fcb84c95e481c0c53916a89bc0a93e
-  data.tar.gz: d6f41235120d1dcb492039497d151bb27ad48771
+  metadata.gz: 8d697f00632839f4e229ca8ce80dee80b7be5f2f
+  data.tar.gz: 592795209fe85c984634f464a5f1a0b90cecebef
 SHA512:
-  metadata.gz: fd5cd0d7f42b6687ea47d5cf227483128f761fd6a2bc6b14062f83e3e7829f4f216a5b2ff5b02e09227cb26705953a04be7b654b417597e426b76837e6e93214
-  data.tar.gz: 38f762f73f2ff74b9dd541704ca40574f17856e81bd9ab954bc278f2c079f26b41063c60589c348cc5f40a783c75f8bdafb1e5f01455e4bad5e5a7fcc3713a3b
+  metadata.gz: 13810077f15f56bae0f06ceb5857be28378df8ff8b2aea00091ecef593f2d4733ebe8f413101407b438c8308aff7a8429d8d9732b4d969e2bf7053471d33809e
+  data.tar.gz: b47bf2945e6ec10338e6c715c9b2f8bfefc71273f57139c00520b22166b5a743ea51189afbf1461e1ba106cd3e15b0cdaf25f4ed62a13d67971c2fef286b1b82

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.0 / 2016-12-16
+
+* Match existing specificity of versions when updating them
+* Stop eating people's homework by doing some sanity checks at the start
+
 ## 0.4.0 / 2016-12-11
 
 * Allow local operation

data/README.md

@@ -4,8 +4,6 @@ Automatically update your dependencies.
 
 ## Installation
 
-THIS GEM IS HIGHLY EXPERIMENTAL AND WILL EAT YOUR HOMEWORK!
-
 KeepUp is not intended to be part of your application's bundle. You should
 install it yourself as:
 
@@ -15,16 +13,16 @@ install it yourself as:
 
 KeepUp only works with git at the moment!
 
-First, make sure your checkout directory is clean. KeepUp will currently not
-check this for you and may throw away your changes!
-
-Next, it's probably nice to start a new branch.
+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:
 
     $ keep_up
 
-KeepUp will do its thing.
+KeepUp will proceed to update your dependencies one by one, committing each
+change if updating the bundle is succesful.
 
 Next, run `bundle install` and run your tests or whatever. Since KeepUp
 generates a separate commit for each succesful update, you can use `git bisect`
@@ -40,7 +38,6 @@ to find any updates that cause problems and remove or fix them.
 
 ## Planned Features
 
-* Check the starting situation (clean checkout, Gemfile.lock up to date)
 * Allow some check for each change. My feeling at the moment is that for local,
   supervised use it's best to test everything at once at the end and then go
   back and fix things. However, for automation it may be helpful to fully check

data/Rakefile

@@ -1,8 +1,10 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 Cucumber::Rake::Task.new(:features)
+RuboCop::RakeTask.new
 
-task default: [:spec, :features]
+task default: [:spec, :features, :rubocop]

data/bin/keep_up

@@ -25,5 +25,6 @@ end.parse!
 begin
   KeepUp::Application.new(options).run
 rescue KeepUp::BailOut => e
-  puts "Failure: #{e.message}"
+  warn e.message
+  exit 1
 end

data/keep_up.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'bundler', '~> 1.13'
 
-  spec.add_development_dependency 'rake', '~> 11.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'aruba', '~> 0.14.2'
-  spec.add_development_dependency 'rubocop', '~> 0.45.0'
+  spec.add_development_dependency 'rubocop', '~> 0.46.0'
   spec.add_development_dependency 'pry'
 end

data/lib/keep_up/application.rb

@@ -23,6 +23,7 @@ module KeepUp
     end
 
     def run
+      sanity_check
       update_all_dependencies
       report_up_to_date
     end
@@ -31,15 +32,26 @@ module KeepUp
 
     attr_reader :skip, :local
 
+    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'"
+    end
+
     def update_all_dependencies
       Updater.new(bundle: bundle,
                   repository: Repository.new(index: index),
-                  version_control: VersionControl.new,
+                  version_control: version_control,
                   filter: filter).run
     end
 
+    def version_control
+      @version_control ||= VersionControl.new
+    end
+
     def bundle
-      Bundle.new(definition_builder: definition_builder)
+      @bundle ||= Bundle.new(definition_builder: definition_builder)
     end
 
     def report_up_to_date
@@ -57,7 +69,6 @@ module KeepUp
                   else
                     NullFilter.new
                   end
-
     end
 
     def index

data/lib/keep_up/bundle.rb

@@ -11,13 +11,7 @@ module KeepUp
     end
 
     def direct_dependencies
-      (gemspec_dependencies + gemfile_dependencies).map do |dep|
-        spec = locked_spec dep
-        next unless spec
-        Dependency.new(name: dep.name,
-                       version: dep.requirements_list.first,
-                       locked_version: spec.version)
-      end.compact
+      gemspec_dependencies + gemfile_dependencies
     end
 
     def apply_updated_dependency(dependency)
@@ -27,18 +21,33 @@ module KeepUp
       update_lockfile(dependency)
     end
 
+    def check?
+      bundler_definition.to_lock == File.read('Gemfile.lock')
+    end
+
     private
 
     attr_reader :definition_builder
 
     def gemfile_dependencies
-      bundler_lockfile.dependencies
+      build_dependencies bundler_lockfile.dependencies
     end
 
     def gemspec_dependencies
-      gemspec_source = bundler_lockfile.sources.find { |it| it.is_a? Bundler::Source::Gemspec }
+      gemspec_source = bundler_lockfile.sources.
+        find { |it| it.is_a? Bundler::Source::Gemspec }
       return [] unless gemspec_source
-      gemspec_source.gemspec.dependencies
+      build_dependencies gemspec_source.gemspec.dependencies
+    end
+
+    def build_dependencies(deps)
+      deps.map { |dep| build_dependency dep }.compact
+    end
+
+    def build_dependency(dep)
+      spec = locked_spec dep
+      return unless spec
+      Dependency.new(dependency: dep, locked_spec: spec)
     end
 
     def locked_spec(dep)
@@ -53,21 +62,27 @@ module KeepUp
       @bundler_definition ||= definition_builder.build(false)
     end
 
-    def update_gemfile_contents(dependency)
-      current_dependency = gemfile_dependencies.find { |it| it.name == dependency.name }
-      return if !current_dependency
-      return if current_dependency.matches_spec?(dependency)
+    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)
+
       contents = File.read 'Gemfile'
-      updated_contents = GemfileFilter.apply(contents, dependency)
+      updated_contents = GemfileFilter.apply(contents, update)
       File.write 'Gemfile', updated_contents
     end
 
-    def update_gemspec_contents(dependency)
-      current_dependency = gemspec_dependencies.find { |it| it.name == dependency.name }
-      return if !current_dependency
-      return if current_dependency.matches_spec?(dependency)
+    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, dependency)
+      updated_contents = GemspecFilter.apply(contents, update)
       File.write gemspec_name, updated_contents
     end
 
@@ -83,9 +98,9 @@ module KeepUp
                         end
     end
 
-    def update_lockfile(dependency)
+    def update_lockfile(update)
       Bundler.clear_gemspec_cache
-      definition_builder.build(gems: [dependency.name]).lock('Gemfile.lock')
+      definition_builder.build(gems: [update.name]).lock('Gemfile.lock')
       true
     rescue Bundler::VersionConflict
       puts 'Update failed'

data/lib/keep_up/bundler_definition_builder.rb

@@ -1,6 +1,7 @@
 require 'bundler'
 
 module KeepUp
+  # Creates Bunder::Definition objects.
   class BundlerDefinitionBuilder
     def initialize(local: false)
       @local = local

data/lib/keep_up/dependency.rb

@@ -1,12 +1,42 @@
 module KeepUp
   # Single dependency with its current locked version.
   class Dependency
-    def initialize(name:, version:, locked_version:)
-      @name = name
-      @version = version
-      @locked_version = locked_version
+    def initialize(dependency:, locked_spec:)
+      @dependency = dependency
+      @locked_spec = locked_spec
     end
 
-    attr_reader :name, :version, :locked_version
+    def name
+      @dependency.name
+    end
+
+    def locked_version
+      @locked_spec.version
+    end
+
+    def matches_spec?(spec)
+      @dependency.matches_spec? spec
+    end
+
+    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('.')
+      Gem::Specification.new(specification.name, version)
+    end
+
+    private
+
+    def requirement
+      @dependency.requirement
+    end
+
+    def segment_count
+      @segment_count ||= begin
+                           _, ver = requirement.requirements.first
+                           ver.segments.count
+                         end
+    end
   end
 end

data/lib/keep_up/gemspec_filter.rb

@@ -2,8 +2,9 @@ module KeepUp
   # Filter to update dependency information in a Gemspec.
   module GemspecFilter
     def self.apply(contents, dependency)
+      matcher = dependency_matcher(dependency)
       contents.each_line.map do |line|
-        if line =~ /^(.*_dependency[ (](?:['"]|%q.)#{dependency.name}.(?:\.freeze)?, \[?['"](?:~>|=)? *)[^'"]*(['"].*)/m
+        if line =~ matcher
           match = Regexp.last_match
           "#{match[1]}#{dependency.version}#{match[2]}"
         else
@@ -11,5 +12,13 @@ module KeepUp
         end
       end.join
     end
+
+    def self.dependency_matcher(dependency)
+      /
+        ^(.*_dependency
+        [\ (](?:['"]|%q.)#{dependency.name}.(?:\.freeze)?,
+        \ \[?['"](?:~>|=)?\ *)[^'"]*(['"].*)
+      /mx
+    end
   end
 end

data/lib/keep_up/updater.rb

@@ -25,7 +25,7 @@ module KeepUp
     def possible_updates
       bundle.direct_dependencies.
         select { |dep| filter.call dep }.
-        map { |dep| repository.updated_dependency_for dep }.compact
+        map { |dep| repository.updated_dependency_for dep }.compact.uniq
     end
   end
 end

data/lib/keep_up/version.rb

@@ -1,3 +1,3 @@
 module KeepUp
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/keep_up/version_control.rb

@@ -8,5 +8,9 @@ module KeepUp
     def revert_changes
       `git reset --hard`
     end
+
+    def clean?
+      `git status -s` == ''
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keep_up
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement