drg 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c57160d7560cae2722f61cdb40bb0805eb929c7
-  data.tar.gz: 519e48995c57bbfd268d9d8012995738b8b6b329
+  metadata.gz: fe5612bbc6b87eaeaf65277c348340bd231deaff
+  data.tar.gz: 4f0d9cf837920d0744514599b193722457ef190c
 SHA512:
-  metadata.gz: 85bf6b7c9189c415ec71a291dc4a915334c1919f3931aba8dd3c09760f0ad83347095dd9a740aff3dafc112c275e7a39dc093dfc960287f94e1c4030cbb19c05
-  data.tar.gz: 0f6ab838160fade27659c7ec91fc1c1083cf6be47e3bafcfd387eba77591f03aa6d652bf8b5ed03b550a55fbb6ee600e944d3c87817c392063d979b42fffcea8
+  metadata.gz: 0f8b66f4f06e010c7c509d6c96e0d2fdfc15e46d00ff12bc81d2a81a59962fde398cf460dae28e57f620734ec16115e843f51e6420a74afb441e01a2643c52ff
+  data.tar.gz: 1001cf194ff92cd3469314d96b1abd3e1d043a788dd97a129f2f1a9a99bcfb1dcd7bda05562a1c41ae08c5c39eeba5185b78a6b69255085679a414b969742f42

data/lib/drg/tasks/gemfile.rb

@@ -26,7 +26,7 @@ module DRG
         lines.each_with_index.each do |line, index|
           next if line =~ /^\s*#/
           next if line =~ /:?path:?\s*(=>)?\s*/
-          next if line =~ /:?git(hub)?:?\s*(=>)?\s*/
+          next if line =~ /(:git(hub)?)|(git(hub)?:)\s*(=>)?\s*/
           next if line =~ /@drg\s+(frozen|ignore|skip)/
           return GemfileLine.new line, index, name if line =~ /gem\s*['"]#{name}["']/
         end

data/lib/drg/tasks/gemfile_line.rb

@@ -18,7 +18,7 @@ module DRG
       def remove_version
         swap_version('')
       end
-
+      require 'byebug'
       # @description Replaces the gem version with the given one
       # @example
       #
@@ -32,6 +32,7 @@ module DRG
       def swap_version(full_version)
         code, *comments = line.split(/#/)
         parts = code.split(',')
+        end_of_line = code.rstrip.end_with?(',') ? ",#{parts.last}" : ''
         if parts.size == 1
           parts[0].chomp!
           parts << " #{full_version}" unless full_version.empty?
@@ -46,15 +47,17 @@ module DRG
           if index = parts.index(version_parts.first)
             # replace the current gem version (inside quotes)
             parts[index].sub! /['"].+['"]/, full_version
-            # remove white spaces from this item if we're removing the version
-            parts[index].strip! if full_version.empty?
           else
             parts.insert 1, " #{full_version}"
           end
-          parts.reject!(&:empty?)
+          parts.reject! { |x| x.strip.empty? }
         end
+        space_after_gem = parts.first[/\s+$/].to_s
+        space_after_gem = space_after_gem[0, (space_after_gem.size - full_version.size) - 2] if space_after_gem.size > full_version.size
+        parts.first.rstrip!
         line.replace parts.join(',')
-        line << "#" << comments.join if comments.any?
+        line << end_of_line
+        line << space_after_gem << "#" << comments.join if comments.any?
         line << "\n" unless line.end_with?("\n")
         line
       end

data/lib/drg/version.rb

@@ -1,3 +1,3 @@
 module DRG
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler