keep_up 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70911a9102c02fe33b82355f5bbf25cd631ae7a9
-  data.tar.gz: 1f7fcd97b471795d3278484384b92c2f6efff2f3
+  metadata.gz: 139b7cb090fcb84c95e481c0c53916a89bc0a93e
+  data.tar.gz: d6f41235120d1dcb492039497d151bb27ad48771
 SHA512:
-  metadata.gz: ee2f377e57c84a9e47d0c58c6585bc86d07c11f1142aa2970ecbec3f015aee0a49904756927cee700f40a4aaacecbaaa1ba95e4d17ea5d3d0edcc472da884a49
-  data.tar.gz: 7a20e839edd119df4f823823a36fef22e05d3a4275122190a05a49bef930bdfa14b1e68e8aa7a4a1d93c9262c481b8dbf96b9eebc927fe3c12ef6c53d4646a70
+  metadata.gz: fd5cd0d7f42b6687ea47d5cf227483128f761fd6a2bc6b14062f83e3e7829f4f216a5b2ff5b02e09227cb26705953a04be7b654b417597e426b76837e6e93214
+  data.tar.gz: 38f762f73f2ff74b9dd541704ca40574f17856e81bd9ab954bc278f2c079f26b41063c60589c348cc5f40a783c75f8bdafb1e5f01455e4bad5e5a7fcc3713a3b

data/CHANGELOG.md

@@ -1,8 +1,13 @@
 # Changelog
 
+## 0.4.0 / 2016-12-11
+
+* Allow local operation
+* Handle explicitely frozen strings in gemspecs
+
 ## 0.3.0 / 2016-11-30
 
-* Allow specifying gems to skip and not to attempt updates for.
+* Allow specifying gems to skip and not to attempt updates for
 
 ## 0.2.0 / 2016-11-24
 

data/README.md

@@ -11,7 +11,7 @@ install it yourself as:
 
     $ gem install keep_up
 
-## Usage
+## Basic Usage
 
 KeepUp only works with git at the moment!
 
@@ -30,6 +30,14 @@ 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`
 to find any updates that cause problems and remove or fix them.
 
+## Options
+
+* You can pass `--skip <GEMNAME>` to make KeepUp not consider the named gem for
+  upgrades. This is helpful if you know a given upgrade is problematic. This
+  option can be passed multiple times.
+* You can pass `--local` to make KeepUp not try to fetch remote gem version
+  information.
+
 ## Planned Features
 
 * Check the starting situation (clean checkout, Gemfile.lock up to date)

data/lib/keep_up/application.rb

@@ -1,11 +1,13 @@
 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'
-require_relative 'null_filter'
-require_relative 'skip_filter'
 
 module KeepUp
   # Error thrown when we can't go any further.
@@ -14,8 +16,6 @@ module KeepUp
 
   # Main application
   class Application
-    attr_reader :skip
-
     def initialize(local:, test_command:, skip:)
       @test_command = test_command
       @local = local
@@ -29,18 +29,28 @@ module KeepUp
 
     private
 
+    attr_reader :skip, :local
+
     def update_all_dependencies
-      Updater.new(bundle: Bundle.new,
-                  repository: Repository.new,
+      Updater.new(bundle: bundle,
+                  repository: Repository.new(index: index),
                   version_control: VersionControl.new,
                   filter: filter).run
     end
 
+    def bundle
+      Bundle.new(definition_builder: definition_builder)
+    end
+
     def report_up_to_date
       puts 'Bundle up to date!'
       puts 'All done!'
     end
 
+    def definition_builder
+      @definition_builder ||= BundlerDefinitionBuilder.new(local: local)
+    end
+
     def filter
       @filter ||= if skip.any?
                     SkipFilter.new(skip)
@@ -49,5 +59,9 @@ module KeepUp
                   end
 
     end
+
+    def index
+      GemIndex.new(definition_builder: definition_builder)
+    end
   end
 end

data/lib/keep_up/bundle.rb

@@ -6,6 +6,10 @@ 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
+
     def direct_dependencies
       (gemspec_dependencies + gemfile_dependencies).map do |dep|
         spec = locked_spec dep
@@ -25,6 +29,8 @@ module KeepUp
 
     private
 
+    attr_reader :definition_builder
+
     def gemfile_dependencies
       bundler_lockfile.dependencies
     end
@@ -44,7 +50,7 @@ module KeepUp
     end
 
     def bundler_definition
-      @bundler_definition ||= Bundler::Definition.build('Gemfile', 'Gemfile.lock', false)
+      @bundler_definition ||= definition_builder.build(false)
     end
 
     def update_gemfile_contents(dependency)
@@ -79,9 +85,7 @@ module KeepUp
 
     def update_lockfile(dependency)
       Bundler.clear_gemspec_cache
-      Bundler::Definition.build('Gemfile', 'Gemfile.lock', gems: [dependency.name]).
-        tap(&:resolve_remotely!).
-        lock('Gemfile.lock')
+      definition_builder.build(gems: [dependency.name]).lock('Gemfile.lock')
       true
     rescue Bundler::VersionConflict
       puts 'Update failed'

data/lib/keep_up/bundler_definition_builder.rb

@@ -0,0 +1,25 @@
+require 'bundler'
+
+module KeepUp
+  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

@@ -0,0 +1,24 @@
+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/gemspec_filter.rb

@@ -3,7 +3,7 @@ module KeepUp
   module GemspecFilter
     def self.apply(contents, dependency)
       contents.each_line.map do |line|
-        if line =~ /^(.*_dependency[ (](?:['"]|%q.)#{dependency.name}., \[?['"](?:~>|=)? *)[^'"]*(['"].*)/m
+        if line =~ /^(.*_dependency[ (](?:['"]|%q.)#{dependency.name}.(?:\.freeze)?, \[?['"](?:~>|=)? *)[^'"]*(['"].*)/m
           match = Regexp.last_match
           "#{match[1]}#{dependency.version}#{match[2]}"
         else

data/lib/keep_up/repository.rb

@@ -1,16 +1,14 @@
-require_relative 'remote_index'
-
 module KeepUp
   # Picks updated versions for dependencies.
   class Repository
-    attr_reader :remote_index
+    attr_reader :index
 
-    def initialize(remote_index: RemoteIndex.new)
-      @remote_index = remote_index
+    def initialize(index:)
+      @index = index
     end
 
     def updated_dependency_for(dependency)
-      candidates = remote_index.search(dependency)
+      candidates = index.search(dependency)
       latest = candidates.sort_by(&:version).last
       latest unless latest.version <= dependency.locked_version
     end

data/lib/keep_up/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keep_up
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,11 +118,12 @@ 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/remote_index.rb
 - lib/keep_up/repository.rb
 - lib/keep_up/skip_filter.rb
 - lib/keep_up/updater.rb
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Automatically update your dependencies

data/lib/keep_up/remote_index.rb

@@ -1,17 +0,0 @@
-module KeepUp
-  # Searches possibly remote gem index o find potential dependency updates.
-  class RemoteIndex
-    def search(dependency)
-      remote_index.search(Bundler::Dependency.new(dependency.name, nil))
-    end
-
-    def remote_definition
-      @remote_definition ||=
-        Bundler::Definition.build('Gemfile', 'Gemfile.lock', true).tap(&:resolve_remotely!)
-    end
-
-    def remote_index
-      @remote_index ||= remote_definition.index
-    end
-  end
-end