omg_pull_request 0.5.1 → 0.5.2

data/lib/omg_pull_request/git_client.rb

@@ -17,13 +17,21 @@ module OmgPullRequest
     end
 
     def merge!(sha)
-      merge_response = `cd #{local_repo} && git merge #{sha} 2>&1`
+      merge_response, exit_code = execute_command "cd #{local_repo} && git merge #{sha} 2>&1"
       self.logger.log merge_response
-      merge_response.match(/CONFLICT/) ? :conflict : :success
+      return :success if exit_code.zero?
+      return :conflict if merge_response.match(/CONFLICT/)
+      
+      raise "Boom goes the dynamite!  Failure to do the merge in a non-predicatable way."
     end
 
     private
 
+    def execute_command(command)
+      resp = `#{command}`
+      [resp, $?.to_i]
+    end
+
     def execute_verify_success(command)
       result = `#{command}`
       logger.log(command) 

data/lib/omg_pull_request/version.rb

@@ -1,3 +1,3 @@
 module OmgPullRequest
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/test/units/omg_pull_request/git_client_test.rb

@@ -14,10 +14,18 @@ module OmgPullRequest
       git_client.unstub(:log)
     end
 
+    def test_execute_merge_no_conflict_but_not_success
+      git_client.expects(:execute_command).returns(["yolo", 100])
+      assert_raises RuntimeError do
+        git_client.merge!("swag")
+      end
+    end
+
     private
 
     def git_client
-      @git_client ||= GitClient.new(:logger => TestLogger.new)
+      @git_client ||= GitClient.new(:logger => TestLogger.new, 
+        :configuration => MOCK_CONFIGURATION)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omg_pull_request
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &70347177204760 !ruby/object:Gem::Requirement
+  requirement: &70179237751220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70347177204760
+  version_requirements: *70179237751220
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70347177204020 !ruby/object:Gem::Requirement
+  requirement: &70179237744860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70347177204020
+  version_requirements: *70179237744860
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &70347177203380 !ruby/object:Gem::Requirement
+  requirement: &70179237740540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70347177203380
+  version_requirements: *70179237740540
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70347177202860 !ruby/object:Gem::Requirement
+  requirement: &70179237730080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70347177202860
+  version_requirements: *70179237730080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70347177202260 !ruby/object:Gem::Requirement
+  requirement: &70179237705560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70347177202260
+  version_requirements: *70179237705560
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70347177201600 !ruby/object:Gem::Requirement
+  requirement: &70179237668200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70347177201600
+  version_requirements: *70179237668200
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70347177200920 !ruby/object:Gem::Requirement
+  requirement: &70179237655480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,7 +90,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70347177200920
+  version_requirements: *70179237655480
 description: Have tests run automatically for your Github Pull Request
 email:
 - kenmazaika@gmail.com
@@ -199,3 +199,4 @@ test_files:
 - test/units/omg_pull_request/storage/aws_test.rb
 - test/units/omg_pull_request/storage/gist_test.rb
 - test/units/omg_pull_request/test_runner/base_test.rb
+has_rdoc: