Merge pull request #6 from github/rescue_empty_commit

Rescue CommandError so we don't push empty commits, but don't fail ei…

Author: DanHoerst

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    entitlements-gitrepo-auditor-plugin (0.2.0)
+    entitlements-gitrepo-auditor-plugin (0.2.1)
       contracts (= 0.17)
       entitlements (= 0.2.0)
 

VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

lib/entitlements/util/gitrepo.rb

@@ -79,7 +79,11 @@ def clone(dir)
       Contract String, String => nil
       def commit(dir, commit_message)
         validate_git_repository!(dir)
-        git(dir, ["commit", "-m", commit_message])
+        begin
+          git(dir, ["commit", "-m", commit_message])
+        rescue Entitlements::Util::GitRepo::CommandError
+          logger.info "No changes to git repository"
+        end
         nil
       end
 

spec/unit/entitlements/util/gitrepo_spec.rb

@@ -39,6 +39,13 @@
       expect(subject).to receive(:git).with(directory, ["commit", "-m", "My commit message"])
       expect(subject.commit(directory, "My commit message")).to be nil
     end
+
+    it "skips the commit if it receives a command error" do
+      allow(subject).to receive(:validate_git_repository!)
+      expect(subject).to receive(:git).with(directory, ["commit", "-m", "My commit message"]).and_raise(Entitlements::Util::GitRepo::CommandError)
+      expect(logger).to receive(:info).with("No changes to git repository")
+      expect(subject.commit(directory, "My commit message")).to be nil
+    end
   end
 
   describe "#configure" do