schacon-git 1.2.0 → 1.2.1

data/lib/git.rb

@@ -26,13 +26,9 @@ require 'git/author'
 require 'git/stashes'
 require 'git/stash'
 
-minimum_version = [1, 6, 0, 0]
-current_version = Git::Lib.new(nil, nil).command_version
-if current_version[0] < minimum_version[0] || 
-   current_version[1] < minimum_version[1] ||
-   current_version[2] < minimum_version[2] ||
-   current_version[3] < minimum_version[3]
-  $stderr.puts "The git gem requires git #{minimum_version.join('.')} or later, but only found #{current_version.join('.')}. You should probably upgrad.e"
+lib = Git::Lib.new(nil, nil)
+unless lib.meets_required_version?
+  $stderr.puts "[WARNING] The git gem requires git #{lib.required_command_version.join('.')} or later, but only found #{lib.current_command_version.join('.')}. You should probably upgrade."
 end
 
 # Git/Ruby Library

data/lib/git/lib.rb

@@ -645,12 +645,26 @@ module Git
     end
 
     # returns the current version of git, as an Array of Fixnums.
-    def command_version
+    def current_command_version
       output = command('version', [], false)
       version = output[/(\d+)\.(\d+)\.(\d+)\.(\d+)/]
       version.split('.').collect {|i| i.to_i}
     end
 
+    def required_command_version
+      [1, 6, 0, 0]
+    end
+
+    def meets_required_version?
+      current_version  = self.current_command_version
+      required_version = self.required_command_version
+      return current_version[0] >= required_version[0] && 
+             current_version[1] >= required_version[1] &&
+             current_version[2] >= required_version[2] &&
+             current_version[3] >= required_version[3]
+    end
+
+
     private
     
     def command_lines(cmd, opts = [], chdir = true, redirect = '')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: schacon-git
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Scott Chacon