git-up 0.5.3 → 0.5.4

data/lib/git-up.rb

@@ -233,14 +233,14 @@ EOS
     required_version = "1.6.6"
     config_value = config("fetch.prune")
 
-    if git_version < required_version
+    if git_version_at_least?(required_version)
+      config_value != 'false'
+    else
       if config_value == 'true'
         puts "Warning: fetch.prune is set to 'true' but your git version doesn't seem to support it (#{git_version} < #{required_version}). Defaulting to 'false'.".yellow
       end
 
       false
-    else
-      config_value != 'false'
     end
   end
 
@@ -248,6 +248,14 @@ EOS
     repo.config["git-up.#{key}"]
   end
 
+  def git_version_at_least?(required_version)
+    (version_array(git_version) <=> version_array(required_version)) >= 0
+  end
+
+  def version_array(version_string)
+    version_string.split('.').map { |s| s.to_i }
+  end
+
   def git_version
     `git --version`[/\d+(\.\d+)+/]
   end

data/lib/git-up/version.rb

@@ -1,3 +1,3 @@
 class GitUp
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-up
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: &70276083994300 !ruby/object:Gem::Requirement
+  requirement: &70134838021440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276083994300
+  version_requirements: *70134838021440
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70276083993620 !ruby/object:Gem::Requirement
+  requirement: &70134838020640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70276083993620
+  version_requirements: *70134838020640
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70276083992540 !ruby/object:Gem::Requirement
+  requirement: &70134838019620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,7 +46,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70276083992540
+  version_requirements: *70134838019620
 description: 
 email:
 - aanand.prasad@gmail.com