drg 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc8458eead2110fb89a28e5594fce74bd3cecaa2
-  data.tar.gz: b08d8bbc72aaf3fa8de3b20f5b07a1ffa08deec9
+  metadata.gz: 5d977148d147d5723ae15052033d4dcb47c8b61f
+  data.tar.gz: e2cab2591d53736ebd56955b776f1d93ed473c36
 SHA512:
-  metadata.gz: 45cba115c9a853f42d363f8810f83ee3edb455e0898692a3bd9fb431a3a010e39c771b2b88d2a2d7ed23fb4e96bcf331cbb392b85cbe2e8fd45704d921eb219f
-  data.tar.gz: a49c11efdf04d9d13909c6c4f3b4fb75e52300c29d1b68bddb380e8673c74247b032b2743b3727ba3a0d2cc51e05ef83e9f7b74c414b1165b26f7dceaead1cf9
+  metadata.gz: 7b4aabe2fb664f1c7a7c32c15685c5337da7384a3f1b26cf9c77e487378f47733dee129e03c3ee2840a2f07c668a150583afa88cfeb15c1a505c1bf194fb6f2f
+  data.tar.gz: a16ef93951806031a4ddebb84c34741657e5f38cf05c907ac5457d159c1cbf392128f381c0580b1ff25834d87ff50b75a2517f0f57bd5db49da7b9bf325e3df9

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.5
+  - 2.2.0
   - 2.2.1
   - 2.2.2
   - 2.2.3

data/lib/drg/tasks/active_pinner.rb

@@ -107,8 +107,18 @@ module DRG
       # @param [Array] list of a gem version's segments
       # @param [Array] other_list of another gem version's segments
       def higher?(list, other_list)
-        gem_version_segments = (0..2).to_a
-        gem_version_segments.any? { |i| list[i].to_i > other_list[i].to_i }
+        higher = false
+        equal = false
+        sem_ver_size = [list.size, other_list.size].max
+        sem_ver_size.times do |i|
+          if list[i].to_i >= other_list[i].to_i
+            higher = true
+            equal = list[i].to_i == other_list[i].to_i
+          else
+            break
+          end
+        end
+        higher && !equal
       end
     end
   end

data/lib/drg/tasks/gemfile_line.rb

@@ -11,7 +11,7 @@ module DRG
       # @param [String] version is the new value for the gem (add/replace)
       # @return [String] line
       def update(new_version)
-        swap_version(", '#{new_version.to_s}'")
+        swap_version("'#{new_version.to_s}'")
       end
 
       # @return [String] line
@@ -19,27 +19,48 @@ module DRG
         swap_version('')
       end
 
+      # @description Replaces the gem version with the given one
+      # @example
+      #
+      #   line = "gem 'duck_puncher', '> 1', '< 2', require: false   # dude"
+      #   swap_version('1.5.5')
+      #   line # => "gem 'duck_puncher', '1.5.5', require: false   # dude"
+      #
+      # @destructive Modifies @line in place
+      # @param [String] full_version is the quoted version to update or remove from the gem line
       # @return [String] line
       def swap_version(full_version)
-        comment = line =~ /#/ ? " #{line.slice!(/#.*/).strip}" : ''
-        if line =~ /,.+\n?/
-          if line =~ /,.*[\d.]+.*,.*require.+/
-            line.sub! /,\s*['"].+['"]\s*,\s*/, "#{full_version}, "
-          elsif line =~ /,\s*['"].+['"]/
-            line[/,\s*['"].+['"]/] = full_version
+        code, *comments = line.split(/#/)
+        parts = code.split(',')
+        if parts.size == 1
+          parts[0].chomp!
+          parts << " #{full_version}" unless full_version.empty?
+        else
+          # ignore the first part, which is the gem name
+          parts_without_gem = parts.drop(1)
+          # reject options hash
+          version_parts = parts_without_gem.reject { |x| x.include?(':') }
+          # remove all but the first version part from the original parts array
+          version_parts.drop(1).each { |version_part| parts.delete(version_part) }
+          # find the index of it
+          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
-            line[/,\s*/] = "#{full_version}, "
-            line[/\n/] = "#{comment}\n"
+            parts.insert 1, " #{full_version}"
           end
-        elsif line.end_with?("\n")
-          line.sub!("\n", "#{full_version}#{comment}\n")
-        else
-          line << full_version  << comment << "\n"
+          parts.reject!(&:empty?)
         end
+        line.replace parts.join(',')
+        line << "#" << comments.join if comments.any?
+        line << "\n" unless line.end_with?("\n")
         line
       end
 
       # @note not used
+      # @deprecated
       def version
         line[/, (.+)\n?/, 1]
       end

data/lib/drg/version.rb

@@ -1,3 +1,3 @@
 module DRG
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler