drg 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9abe1205b4fdd0cf60c4a18a0e0820ecffd553be
-  data.tar.gz: ea1df095df062541a1f4dbb617b855f08e838125
+  metadata.gz: 64ab93e66f0e85ab52aad6415ff9742dc974eff3
+  data.tar.gz: cd44e409518042394da5dd01f18833cb51b37c2b
 SHA512:
-  metadata.gz: f4bd3bf791edcc37126ceed1e832e4ebe6377c35db197fce3e13591923861183a4894c3ce3c8836789a46b53948e123d272c207ed77575f3fdba709aa04c7b98
-  data.tar.gz: be7a521bdacf28560799780803083ac5f019e29aeac50903fda4290110668d08fe183424030f17f635800c656e94d2c22112e8511936942f59e426ba36fa63d8
+  metadata.gz: 34adbd98f8df9b92863b0b4349895e9241853070c24f99c333f309cbea81a3fd130b49712f73c513073aa521ac59c9f1cca02e4ae60a14bf37cafe215498bf27
+  data.tar.gz: bd191ee0cba818a2be8e1074bac1e512bed7a42b266542953f66d83e9b5f88aeab9b1d7b5681a9e649fe5574d7ef35cb761c59b8b58ef48f51bb0729339aa526

data/README.md

@@ -10,12 +10,30 @@ Add this line to your application's Gemfile:
 gem 'drg'
 ```
 
-## Usage
+## Tasks
 
-### Pinning Gems
+```bash
+rake drg:update
+rake drg:pin
+rake drg:pin:minor
+rake drg:pin:major
+rake drg:unpin
+```
+
+### drg:update
+
+DRG can update your outdated gems, one-by-one, to the latest version. It'll update the gem and then run your tests.
+If your tests pass, then the new version will be written to your Gemfile (similar to Gemnasium).
+
+```bash
+rake drg:update
+```
+
+### pin
 
 DRG really wants to help you manage your project's gems. But DRG doesn't want to replace Bundler. Instead we want to build on
-it. You can "pin" all your versions to the current version listed in the Gemfile.lock:
+it. Pinning ignores gems that are fetched from somewhere other than rubygems. For example, gems listed with `:git`, `:github`,
+or `:path` will be ignored. You can "pin" all your versions to the current version listed in the Gemfile.lock:
 
 ```bash
 rake drg:pin
@@ -27,8 +45,6 @@ Which will change gems list in your Gemfile to their full version. So if you hav
 gem 'rails'
 gem 'byebug', require: false
 gem 'therubyracer', '~> 0.12', platforms: :ruby
-
-# gotta include ourselves
 gem 'drg'
 ```
 
@@ -38,18 +54,18 @@ it'll get changed to
 gem 'rails', '4.2.3'
 gem 'byebug', '5.0.0', require: false
 gem 'therubyracer', '0.12.2', platforms: :ruby
-
-# gotta include ourselves
 gem 'drg', '0.4.1'
 ```
 
+### pin:minor
+
 Although, you may want to pin gems with their _minor_ version (which allows updating patches). Run:
 
 ```bash
 rake drg:pin:minor
 ```
 
-This will change a gem listed like
+Which will update your Gemfile from
 
 ```ruby
 gem 'rails', '4.2.3'
@@ -61,20 +77,22 @@ to
 gem 'rails', '~> 4.2'
 ```
 
-Pinning ignores gems that are fetched from somewhere other than rubygems. For example, gems listed with `:git`, `:github`, 
-or `:path` will be ignored.
+This can be combined with `bundle update` to quickly update all gems to the latest patch or minor level.
 
-There is also a `rake drg:pin:major` which does what you think.
+### pin:major
 
-This can be combined with `bundle update` to quickly update all gems to the latest patch or minor level.
+There is also a
 
-### Updating Gems
+ ```bash
+ rake drg:pin:major
+ ```
 
-DRG can also try to update all outdated gems to the most recent version. It'll update the gem and run your tests. If your
-tests pass, then it'll update your gemfile with the current version. Similar to what Gemnasium offers (experience may vary).
+### drg:unpin
+
+Remove the versions from your Gemfile. Start fresh!
 
 ```bash
-rake drg:update
+rake drg:unpin
 ```
 
 ## Development

data/drg.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency 'ruby_parser', '>= 3.7.0', '< 4.0.0'
   # spec.add_dependency 'ruby2ruby', '>= 2.2.0', '< 3.0.0'
   spec.add_dependency 'bundler', '~> 1.10'
-  # spec.add_dependency 'duck_puncher', '1.0.0'
+  spec.add_dependency 'duck_puncher', '1.0.0'
 
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '>= 3.2', '< 4'

data/lib/drg/tasks/gemfile.rb

@@ -17,6 +17,7 @@ module DRG
       end
 
       def remove_version(gem)
+        saved_lines << lines.clone!
         lines[gem] = gem.remove_version
         write
       end
@@ -38,6 +39,16 @@ module DRG
         end
       end
 
+      def rollback
+        return if saved_lines.empty?
+        lines.replace saved_lines.pop
+        write
+      end
+
+      def saved_lines
+        @saved_lines ||= []
+      end
+
       def lines
         @lines ||= File.readlines file
       end

data/lib/drg/tasks/updater.rb

@@ -16,41 +16,48 @@ module DRG
       # @todo Cleanup old gems when finished
       # @note `bundle outdated` returns lines that look like 'slop (newest 4.2.0, installed 3.6.0) in group "default"'
       def perform
-        `bundle outdated`.scan(/\s\*\s(.+)\s/).flatten.each do |item|
-          name = item[/([\-\w0-9]+)\s/, 1]
-          gem = gemfile.find_by_name(name)
-          next unless gem
-          latest_version = item[/newest\s([\d.\w]+)/, 1]
-          current_version = item[/installed\s([\d.\w]+)/, 1]
-          log(%Q[Trying to update gem "#{gem.name}" from #{current_version} to #{latest_version}])
-          try_update(gem, latest_version)
-        end
-        if $?.to_i.nonzero?
-          fail Bundler::GemNotFound, "Failed to load the environment. Maybe do `bundle` and try again"
+        log 'Searching for outdated gems ....'
+        outdated = `bundle outdated`.scan(/\s\*\s(.+)\s/).flatten
+        gems = outdated.map do |item|
+          gem = OpenStruct.new
+          gem.name = item[/([\-\w0-9]+)\s/, 1]
+          gem.entry = gemfile.find_by_name(gem.name)
+          next unless gem.entry
+          gem.latest_version = item[/newest\s([\d.\w]+)/, 1]
+          gem.current_version = item[/installed\s([\d.\w]+)/, 1]
+          gem
+        end.compact
+        if gems.any?
+          gems.each &method(:try_update)
+        else
+          log 'All gems up to date!'
         end
       end
 
-      # @param [GemfileLine] gem
-      def try_update(gem, latest_version)
-        gemfile.remove_version gem
+      # @param [OpenStruct] gem
+      def try_update(gem)
+        log(%Q[Updating "#{gem.name}" from #{gem.current_version} to #{gem.latest_version}])
+        gemfile.remove_version gem.entry
         bundler.update(gem.name)
         if $0.to_i.zero?
-          log(%Q[Succeeded in installing "#{gem.name}" (#{latest_version})])
+          log(%Q[Succeeded in installing "#{gem.name}" (#{gem.latest_version})])
           if system('rake')
-            log(%Q[Tests passed! Updating Gemfile with ... "#{gem.name}" (#{latest_version})])
-            gemfile.update(gem, latest_version)
+            log(%Q[Tests passed! Updating Gemfile entry for "#{gem.name}" to #{gem.latest_version}])
+            gemfile.update(gem.entry, gem.latest_version)
           else
             failures << gem.name
           end
         else
           fail StandardError, %Q[Failed to update "#{gem.name}"]
         end
-      rescue Bundler::GemNotFound, Bundler::InstallError
-        log %Q[Failed to find "#{gem.name}" (#{latest_version})]
-      rescue Bundler::VersionConflict
-        # @todo retry it later
+      rescue Bundler::GemNotFound, Bundler::InstallError, Bundler::VersionConflict => e
+        log %Q[Failed to find a compatible of "#{gem.name}" (#{gem.latest_version}): #{e.class} #{e.message}]
+        gemfile.rollback
         failures << gem.name
-        log %Q(Failed to find a compatible version of "#{gem.name}")
+          # @todo retry it later
+      rescue => e
+        puts "#{e.class}: #{e.message} #{e.backtrace}"
+        gemfile.rollback
       end
 
       # @note not used

data/lib/drg/version.rb

@@ -1,3 +1,3 @@
 module DRG
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/lib/drg.rb

@@ -3,9 +3,10 @@ require 'set'
 require 'bundler'
 require 'bundler/cli'
 require 'drg/version'
+require 'duck_puncher'
 
 # defines #clone!
-# DuckPuncher.load! :Object
+DuckPuncher.load! :Object
 
 module DRG
   autoload :FileReader, 'drg/file_reader'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drg
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ryan Buckley
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: duck_puncher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement