keep_up 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f44b77de355b205d8faca6c69c1d218b346e92f
-  data.tar.gz: 23edfb04bfa78e2dba4c3f8667cbe5829bb87af0
+  metadata.gz: bdd0e57a8da8920532f77628e540e1cd7bb49487
+  data.tar.gz: 71996aa853b7fd964acd0526e675f50d6dd16c3d
 SHA512:
-  metadata.gz: aeeef20c2bde11fce4c977b05fa5729e81040219a2670593ab7a5da163da6a0e24549a00478c9784e141c2bb90b57c85f39424f60d323494a03359194b8dc18e
-  data.tar.gz: 84adbe6b59334e1dc447a2a99b78a0bc84f9dafb4bfeb404209c852f069b62160cef476a9234312cc1387107c5ad784359dce866ad57d9b25b5ab02118491748
+  metadata.gz: 56c60b68a732b8a7c1735ba745e59ab2b9a3652affd68ab80c4e803424b13958e1f30a5305b0223e27dd165ab6c3effd7e1565270f5c62d6a2a7e2cec4486677
+  data.tar.gz: bf9091e21a08aab213bf091d789196a3375f6aa796f461073798df6c84350f45f260715d9198719baac6a5f06c8067965f4b9ec2a8738c7b0dcd67bfe0b5e551

data/.dockerignore

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

data/.rubocop.yml

@@ -6,6 +6,10 @@ AllCops:
 Lint/AssignmentInCondition:
   AllowSafeAssignment: true
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
 # Require lines to fit in pull requests.
 Metrics/LineLength:
   Max: 92

data/.travis.yml

@@ -1,5 +1,18 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.12.5
+  - 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
+  - git config --global user.email "you@example.com"
+  - git config --global user.name "Your Name"
+
+branches:
+  only:
+    - master

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.6.0 / 2017-02-04
+
+* Show actual resulting new version for each update
+* Fail if only dependencies were updated
+* Fail if Bundler downgrades the selected dependency
+* Replace use of custom 'ci' git alias with 'commit'
+
 ## 0.5.1 / 2016-12-17
 
 * Handle extra and unusual whitespace when updating Gemfile and gemspec

data/Dockerfile

@@ -0,0 +1,21 @@
+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/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Matijs van Zuijlen
+Copyright (c) 2016-2017 Matijs van Zuijlen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -69,7 +69,6 @@ https://github.com/mvz/keep_up. 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.
 
-
 ## License
 
 The gem is available as open source under the terms of the

data/keep_up.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   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.46.0'
+  spec.add_development_dependency 'rubocop', '~> 0.47.1'
   spec.add_development_dependency 'pry'
 end

data/lib/keep_up/application.rb

@@ -25,7 +25,7 @@ module KeepUp
     def run
       sanity_check
       update_all_dependencies
-      report_up_to_date
+      report_done
     end
 
     private
@@ -54,8 +54,7 @@ module KeepUp
       @bundle ||= Bundle.new(definition_builder: definition_builder)
     end
 
-    def report_up_to_date
-      puts 'Bundle up to date!'
+    def report_done
       puts 'All done!'
     end
 

data/lib/keep_up/bundle.rb

@@ -15,10 +15,12 @@ module KeepUp
     end
 
     def apply_updated_dependency(dependency)
-      puts "Updating #{dependency.name} to #{dependency.version}"
+      report_intent dependency
       update_gemfile_contents(dependency)
       update_gemspec_contents(dependency)
-      update_lockfile(dependency)
+      result = update_lockfile(dependency)
+      report_result dependency, result
+      result
     end
 
     def check?
@@ -29,6 +31,19 @@ module KeepUp
 
     attr_reader :definition_builder
 
+    def report_intent(dependency)
+      print "Updating #{dependency.name}"
+    end
+
+    def report_result(dependency, result)
+      if result
+        puts " to #{result.version}"
+      else
+        puts " to #{dependency.version}"
+        puts 'Update failed'
+      end
+    end
+
     def gemfile_dependencies
       build_dependencies bundler_lockfile.dependencies
     end
@@ -98,12 +113,15 @@ module KeepUp
                         end
     end
 
+    # Update lockfile and return resulting spec, or false in case of failure
     def update_lockfile(update)
       Bundler.clear_gemspec_cache
-      definition_builder.build(gems: [update.name]).lock('Gemfile.lock')
-      true
+      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
-      puts 'Update failed'
       false
     end
   end

data/lib/keep_up/updater.rb

@@ -14,8 +14,9 @@ module KeepUp
 
     def run
       possible_updates.each do |update|
-        if bundle.apply_updated_dependency update
-          version_control.commit_changes update
+        result = bundle.apply_updated_dependency update
+        if result
+          version_control.commit_changes result
         else
           version_control.revert_changes
         end

data/lib/keep_up/version.rb

@@ -1,3 +1,3 @@
 module KeepUp
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/lib/keep_up/version_control.rb

@@ -2,7 +2,7 @@ module KeepUp
   # Interface to the version control system (only Git is supported).
   class VersionControl
     def commit_changes(dependency)
-      `git ci -am "Update #{dependency.name} to #{dependency.version}"`
+      `git commit -am "Auto-update #{dependency.name} to #{dependency.version}"`
     end
 
     def revert_changes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keep_up
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.47.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.47.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -103,12 +103,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md