drg 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ddf75e8d9ec68fcf629d3bee1e94873ccf539f
-  data.tar.gz: b65f8d6a1ef6d3ade552f130173eb1b75a4c17cc
+  metadata.gz: 9abe1205b4fdd0cf60c4a18a0e0820ecffd553be
+  data.tar.gz: ea1df095df062541a1f4dbb617b855f08e838125
 SHA512:
-  metadata.gz: e72440e44018c17ce53ef2ac829a6cbfc078be2571116bc0ea1375fb1003e73527b3ab4b3b5b46d597a222960c03f2284f3d77a675e2e803a9b0da43c2171adb
-  data.tar.gz: ebe2053f8c02d35a5d54e6eb704545cb890a27ed99c648a1b5da2f9b4873259d6406715aa9b0a99c7c87fc9a99997525a6c781adbb14020d90589babfbf01dbf
+  metadata.gz: f4bd3bf791edcc37126ceed1e832e4ebe6377c35db197fce3e13591923861183a4894c3ce3c8836789a46b53948e123d272c207ed77575f3fdba709aa04c7b98
+  data.tar.gz: be7a521bdacf28560799780803083ac5f019e29aeac50903fda4290110668d08fe183424030f17f635800c656e94d2c22112e8511936942f59e426ba36fa63d8

data/drg.gemspec

@@ -5,7 +5,7 @@ require 'drg/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "drg"
-  spec.version       = Drg::VERSION
+  spec.version       = DRG::VERSION
   spec.authors       = ["Ryan Buckley"]
   spec.email         = ["arebuckley@gmail.com"]
   spec.summary       = %q{DRG automation}
@@ -19,6 +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_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '>= 3.2', '< 4'

data/lib/drg/tasks/gemfile.rb

@@ -3,8 +3,8 @@ module DRG
     class Gemfile
       attr_accessor :file
 
-      def initialize
-        @file = ::Bundler.default_gemfile
+      def initialize(file = ::Bundler.default_gemfile)
+        @file = file
       end
 
       # Saves a copy of @lines before changing it (note that #dup and #clone weren't working)
@@ -12,8 +12,13 @@ module DRG
       # @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
+        write
+      end
+
+      def remove_version(gem)
+        lines[gem] = gem.remove_version
+        write
       end
 
       def find_by_name(name)
@@ -25,14 +30,6 @@ module DRG
         nil
       end
 
-      def lines
-        @lines ||= File.readlines file
-      end
-
-      def saved_lines
-        @saved_lines ||= lines
-      end
-
       def write
         File.open file, 'wb' do |f|
           lines.each do |line|
@@ -41,9 +38,8 @@ module DRG
         end
       end
 
-      def rollback
-        @lines = saved_lines
-        write
+      def lines
+        @lines ||= File.readlines file
       end
     end
   end

data/lib/drg/tasks/gemfile_line.rb

@@ -9,17 +9,30 @@ module DRG
       end
 
       # @param [String] version is the new value for the gem (add/replace)
+      # @return [String] line
       def update(version)
+        swap_version(", '#{version.to_s}'")
+      end
+
+      # @return [String] line
+      def remove_version
+        swap_version('')
+      end
+
+      # @return [String] line
+      def swap_version(full_version)
+        comment = line =~ /#/ ? " #{line.slice!(/#.*/).strip}" : ''
         if line =~ /,.+\n?/
           if line =~ /,\s*['"].+['"]/
-            line[/,\s*['"].+['"]/] = ", '#{version.to_s}'"
+            line[/,\s*['"].+['"]/] = full_version
           else
-            line[/,\s*/] = ", '#{version.to_s}', "
+            line[/,\s*/] = "#{full_version}, "
+            line[/\n/] = "#{comment}\n"
           end
         elsif line.end_with?("\n")
-          line.sub!("\n", ", '#{version.to_s}'\n")
+          line.sub!("\n", "#{full_version}#{comment}\n")
         else
-          line << ", '#{version.to_s}'\n"
+          line << full_version  << comment << "\n"
         end
         line
       end

data/lib/drg/tasks/pinner.rb

@@ -9,13 +9,21 @@ module DRG
       end
 
       def perform
-        log %Q(Pinning Gemfile "#{gemfile}")
+        log %Q(Pinning Gemfile "#{gemfile.file}")
         ::Bundler.locked_gems.specs.each do |spec|
           gem = gemfile.find_by_name spec.name
           next unless gem
           gemfile.update gem, public_send(type, spec.version.to_s)
         end
-        gemfile.write
+        log %Q(Done)
+      end
+
+      def unpin
+        log %Q(Unpinning Gemfile "#{gemfile.file}")
+        ::Bundler.locked_gems.specs.each do |spec|
+          gem = gemfile.find_by_name spec.name
+          gemfile.remove_version gem if gem
+        end
         log %Q(Done)
       end
 

data/lib/drg/tasks/updater.rb

@@ -25,27 +25,32 @@ module DRG
           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"
+        end
       end
 
       # @param [GemfileLine] gem
       def try_update(gem, latest_version)
-        gemfile.update(gem, latest_version)
-        gemfile.write
+        gemfile.remove_version gem
         bundler.update(gem.name)
+        if $0.to_i.zero?
+          log(%Q[Succeeded in installing "#{gem.name}" (#{latest_version})])
+          if system('rake')
+            log(%Q[Tests passed! Updating Gemfile with ... "#{gem.name}" (#{latest_version})])
+            gemfile.update(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})]
-        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
 
       # @note not used

data/lib/drg/version.rb

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

data/lib/drg.rb

@@ -4,6 +4,9 @@ require 'bundler'
 require 'bundler/cli'
 require 'drg/version'
 
+# defines #clone!
+# DuckPuncher.load! :Object
+
 module DRG
   autoload :FileReader, 'drg/file_reader'
   autoload :Scanner, 'drg/scanner'

data/lib/tasks/drg.rake

@@ -1,16 +1,23 @@
 require 'rake'
 
 namespace :drg do
-  desc 'Pins your gems in the Gemfile to the current version (using Gemfile.lock)'
+  desc "Pins the gems in your Gemfile to the current version in the Gemfile.lock"
   task :pin do
     DRG::Tasks::Pinner.new.perform
   end
 
+  desc 'Unpins the gems in your the Gemfile'
+  task :unpin do
+    DRG::Tasks::Pinner.new.unpin
+  end
+
   namespace :pin do
+    desc 'Adds the fuzzy match operator to the minor version of your gems (e.g. rails, "~> 4.2")'
     task :minor do
       DRG::Tasks::Pinner.new(:minor).perform
     end
 
+    desc 'Adds the fuzzy match operator to the major version of your gems (e.g. rails, "~> 4")'
     task :major do
       DRG::Tasks::Pinner.new(:major).perform
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler