drg 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fefdf1d9cd212f2ee36433f9c2d259612dd53d03
-  data.tar.gz: 9b53797151e4207130e5c5bbadebd06f086c6025
+  metadata.gz: 64ddf75e8d9ec68fcf629d3bee1e94873ccf539f
+  data.tar.gz: b65f8d6a1ef6d3ade552f130173eb1b75a4c17cc
 SHA512:
-  metadata.gz: 68179fa7f8061ff784872e30e0c77a46bdb4546cda7749f7cafed1da4bbcb56da35cc491789e1ee3f235b69ff79e81e9a0d3c6d3e95e2fc6ee82f11b7265da69
-  data.tar.gz: 174250acc39178991ba52476660d5fbabafbc44f156070e138a0763fd8d05fd9a67b5bb84fc6bf80927b2c3feee3be91099e039f5e7ce8f5bffb3be2abe5210e
+  metadata.gz: e72440e44018c17ce53ef2ac829a6cbfc078be2571116bc0ea1375fb1003e73527b3ab4b3b5b46d597a222960c03f2284f3d77a675e2e803a9b0da43c2171adb
+  data.tar.gz: ebe2053f8c02d35a5d54e6eb704545cb890a27ed99c648a1b5da2f9b4873259d6406715aa9b0a99c7c87fc9a99997525a6c781adbb14020d90589babfbf01dbf

data/README.md

@@ -10,14 +10,6 @@ Add this line to your application's Gemfile:
 gem 'drg'
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install drg
-
 ## Usage
 
 ### Pinning Gems
@@ -40,7 +32,7 @@ gem 'therubyracer', '~> 0.12', platforms: :ruby
 gem 'drg'
 ```
 
-to
+it'll get changed to
 
 ```ruby
 gem 'rails', '4.2.3'
@@ -48,10 +40,10 @@ gem 'byebug', '5.0.0', require: false
 gem 'therubyracer', '0.12.2', platforms: :ruby
 
 # gotta include ourselves
-gem 'drg', '0.3.1'
+gem 'drg', '0.4.1'
 ```
 
-Although, you may want to pin gems with their _minor_ version (which allows updating patches). To do this, just run:
+Although, you may want to pin gems with their _minor_ version (which allows updating patches). Run:
 
 ```bash
 rake drg:pin:minor
@@ -72,9 +64,9 @@ 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.
 
-There is also a `rake drg:pin:major` that does what you think.
+There is also a `rake drg:pin:major` which does what you think.
 
-This can be combined with `bundle update` to quickly update all gems to the latest patch level.
+This can be combined with `bundle update` to quickly update all gems to the latest patch or minor level.
 
 ### Updating Gems
 
@@ -87,9 +79,8 @@ rake drg:update
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake false` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake` to run the tests. 
+You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 ## Contributing
 

data/bin/console

@@ -3,8 +3,8 @@
 require 'bundler/setup'
 require 'pp'
 
-require 'ruby2ruby'
-require 'ruby_parser'
+# require 'ruby2ruby'
+# require 'ruby_parser'
 
 require 'rspec'
 require 'object_tracker'

data/lib/drg/tasks/gemfile.rb

@@ -7,9 +7,12 @@ module DRG
         @file = ::Bundler.default_gemfile
       end
 
+      # Saves a copy of @lines before changing it (note that #dup and #clone weren't working)
+      #
       # @param [GemfileLine] gem
       # @param [String] version to update the gem line with
       def update(gem, version)
+        @saved_lines = Marshal.load Marshal.dump(lines)
         lines[gem] = gem.update version
       end
 
@@ -17,7 +20,7 @@ module DRG
         lines.each_with_index.each do |line, index|
           next if line =~ /:?path:?\s*(=>)?\s*/
           next if line =~ /:?git(hub)?:?\s*(=>)?\s*/
-          return GemfileLine.new line, index if line =~ /gem\s*['"]#{name}["']/
+          return GemfileLine.new line, index, name if line =~ /gem\s*['"]#{name}["']/
         end
         nil
       end
@@ -26,6 +29,10 @@ module DRG
         @lines ||= File.readlines file
       end
 
+      def saved_lines
+        @saved_lines ||= lines
+      end
+
       def write
         File.open file, 'wb' do |f|
           lines.each do |line|
@@ -34,6 +41,10 @@ module DRG
         end
       end
 
+      def rollback
+        @lines = saved_lines
+        write
+      end
     end
   end
 end

data/lib/drg/tasks/gemfile_line.rb

@@ -1,6 +1,6 @@
 module DRG
   module Tasks
-    class GemfileLine < Struct.new(:line, :index)
+    class GemfileLine < Struct.new(:line, :index, :name)
       alias to_s line
       alias to_int index
 

data/lib/drg/tasks/updater.rb

@@ -1,39 +1,50 @@
 module DRG
   module Tasks
     class Updater
-      attr_reader :gemfile
+      attr_reader :gemfile, :failures, :bundler
 
       def initialize
         @gemfile = Gemfile.new
-        @versions = {}
         @failures = Set.new
+        @bundler = Bundler::CLI.new [], debug: true, current_command: OpenStruct.new
+        @versions = {}
       end
 
-      def perform(tries = 2)
-        `bundle outdated`.scan(/\s\*\s(.+)\s/).flatten.each &method(:try_update)
-        perform(tries -= 1) if @failures.any? && tries > 1
-        gemfile.write
-        `bundle` # Install all new dependencies for updated gems
+      # Updates the projects outdated gems listed in the Gemfile
+      #
+      # @todo Incrementally update the gem using +versions+
+      # @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
       end
 
-      # @param [Item] item from the `bundle outdated` command (e.g. 'slop (newest 4.2.0, installed 3.6.0) in group "default"')
-      def try_update(item)
-        name = item[/([\-\w0-9]+)\s/, 1]
-        gem = gemfile.find_by_name(name)
-        return unless gem
-        `bundle` # make sure current list is up-to-date
-        latest_version = item[/newest\s([\d.]+)/, 1]
-        log(%Q(Trying to update gem "#{name}" to #{latest_version}))
-        if system("bundle update #{name}")
-          log(%Q[Succeeded in installing "#{name}" (#{latest_version})])
-          if system('rake')
-            log(%Q(Tests passed after updating "#{name}" to version #{latest_version}))
-            gemfile.update(gem, latest_version)
-          else
-            @failures << name
-          end
-        else
-          @failures << name
+      # @param [GemfileLine] gem
+      def try_update(gem, latest_version)
+        gemfile.update(gem, latest_version)
+        gemfile.write
+        bundler.update(gem.name)
+      rescue Bundler::GemNotFound, Bundler::InstallError
+        log %Q[Failed to find "#{gem.name}" (#{latest_version})]
+        gemfile.rollback
+      rescue Bundler::VersionConflict
+        # @todo retry it later
+        failures << gem.name
+        gemfile.rollback
+        log %Q(Failed to find a compatible version of "#{gem.name}")
+      else
+        log(%Q[Succeeded in installing "#{gem.name}" (#{latest_version})])
+        unless system('rake')
+          failures << gem.name
+          gemfile.rollback
         end
       end
 

data/lib/drg/version.rb

@@ -1,3 +1,3 @@
 module Drg
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/lib/drg.rb

@@ -1,6 +1,7 @@
 require 'ostruct'
 require 'set'
 require 'bundler'
+require 'bundler/cli'
 require 'drg/version'
 
 module DRG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drg
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ryan Buckley