ding 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6a044bdc079222fb78841ee173ce3f0b875ba13
-  data.tar.gz: 60ad64ebb2840b4a89186966a0d64ff425e222c0
+  metadata.gz: df0176335d68e86af6ccf4969523bb0ac5da0bd8
+  data.tar.gz: 23dc3b2259afcb665653fdf36b376731d7837612
 SHA512:
-  metadata.gz: 25449623b612bddf336e2d7d5655487c7105fcffc98a0a6128f8e48b5bf842f26e47308abcb58d62e92577ba440d44823b1a42fc49d841f048a3eba0e9311758
-  data.tar.gz: ece7668c1d1853340daa84096ef67718bb2dc34b3fd8cc3f23b0f66d614fbfff7aa68052bca302e1c59d48b8a62d2ac6531de2b924dd390ea0f1515db9bcfd01
+  metadata.gz: 019b33111a0df3822be106570f9c8242633b017b0b7836ccb3c29aaadd5bec1d43bc1fe878caa0369cd706c46673d7572f0a8fa94f78e70cd9e21e7c00735738
+  data.tar.gz: c10de9c6c22f53863a2b7f2785dfde6165d748b356667a569af0c04209458ce3f84bad20275b0e04210df4ccf6328075649dfdd348a13f33c6d0c14a200f1417

data/lib/ding/cli.rb

@@ -18,6 +18,11 @@ module Ding
       say "\nDing ding ding: let's merge one or more feature branches to #{testing_branch}:\n\n", :green
 
       repo = Ding::Git.new(options).tap do |r|
+        if r.is_dirty?
+          say "> Local repo is dirty, resetting state", :yellow
+          r.reset_local_state
+        end
+
         r.checkout develop_branch
 
         say "> Deleting #{testing_branch}", :green

data/lib/ding/models/git.rb

@@ -65,6 +65,16 @@ module Ding
       raise "Error synchronising with the remote" unless run_cmd "git up"
     end
 
+    def reset_local_state
+      run_cmd 'git rebase --abort'
+      run_cmd 'git merge --abort'
+      run_cmd 'git reset --hard'
+    end
+
+    def is_dirty?
+      ! %x(git status -s).empty?
+    end
+
     private
 
     def git_repo?

data/lib/ding/version.rb

@@ -1,3 +1,3 @@
 module Ding
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ding
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Warren Bain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler