mortar 0.4.3 → 0.4.4

data/lib/mortar/git.rb

@@ -35,9 +35,9 @@ module Mortar
         if has_git
           git_version = git_version_output.split(" ")[2]
           versions = git_version.split(".")
-          is_ok_version = versions[0].to_i >= 1 &&
-                          versions[1].to_i >= 7 &&
-                          versions[2].to_i >= 7
+          is_ok_version = versions[0].to_i >= 2 ||
+                          ( versions[0].to_i == 1 && versions[1].to_i >= 8 ) ||
+                          ( versions[0].to_i == 1 && versions[1].to_i == 7 && versions[2].to_i >= 7)
         end
         has_git && is_ok_version
       end
@@ -248,4 +248,4 @@ module Mortar
       end
     end
   end
-end
+end

data/lib/mortar/version.rb

@@ -16,5 +16,5 @@
 
 module Mortar
   # see http://semver.org/
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/mortar/git_spec.rb

@@ -26,15 +26,25 @@ module Mortar
     
     context "has_git?" do
       it "returns false with no git installed" do
-        mock(@git).run_cmd("git --version").returns("-bash: git: command not found")
+        mock(@git).run_cmd("git --version").returns(["-bash: git: command not found",-1])
         @git.has_git?.should be_false
       end
 
       it "returns false with unsupported git version" do
-        mock(@git).run_cmd("git --version").returns("git version 1.7.6")
+        mock(@git).run_cmd("git --version").returns(["git version 1.7.6",0])
         @git.has_git?.should be_false
       end
 
+      it "returns true with supported git version 2.0.0" do
+        mock(@git).run_cmd("git --version").returns(["git version 2.0.0", 0])
+        @git.has_git?.should be_true
+      end
+
+      it "returns true with supported git version 1.8.0" do
+        mock(@git).run_cmd("git --version").returns(["git version 1.8.0", 0])
+        @git.has_git?.should be_true 
+      end
+
       it "returns false with unsupported git version" do
         @git.has_git?.should be_true
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mortar
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Mortar Data
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-27 00:00:00 Z
+date: 2012-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mortar-api-ruby