ding 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe5e1d69894d7cc671a8548c30b5fc80a0c3b8cb
-  data.tar.gz: 335f9ad291ea78cd4b0970886053692717132ff8
+  metadata.gz: 852f8d7b2c81e1f9add37fc53fa7c1451507beb8
+  data.tar.gz: bea5f5455250cd77a750981d0095bc96ba93bce8
 SHA512:
-  metadata.gz: e8a1100a6bc0217b6507be4f1fe28ca983231745260099be0732a613216b8332abaeaf8a327e16f10792916a8ab408df9cb20d82e7c30adf5f9ac33dbd4bd3c6
-  data.tar.gz: 5a173fe81594030dbc9f192f97fb583f3d108566c156b31c3e254cf6a17dbeb9b4e6d66accab9aaa59d374fcbccd4c8f5954839de08aed793afc1a9d3c7adf89
+  metadata.gz: 89077adae81bba83de931a1ab9dd14a821e33b9c4f573e51a73dca48a9285959dde0fe981b91c7779bbc3df08d5936ea406baf561dee279bdc39b6fd3ac3d7e4
+  data.tar.gz: bd458bcc277ddb7d01e6bd6e977503859972ab12127c3c924c92edaab63ce20299488e5dd8e1ed95ca7b568196e275bd1275da35bb96daf209b7557387b7b532

data/lib/ding/cli.rb

@@ -39,9 +39,10 @@ module Ding
         say "\n --> No feature branches available to test, I'm out of here!\n\n", :red
         exit 1
       end
-
       feature_branches = ask_which_item(branches, "\nWhich feature branch should I use?", :multiple)
 
+      commit_parents = repo.commit_parents(testing_branch)
+
       repo.tap do |r|
         say "\n> Deleting any synched #{testing_branch}", :green
         r.delete_branch(testing_branch)
@@ -67,6 +68,11 @@ module Ding
           say "\n  --> There were merge errors, ding dang it!\n\n", :red
           exit 1
         end
+
+        if repo.commit_parents(testing_branch).sort == commit_parents.sort
+          result = options[:verbose] ? ": #{commit_parents}" : ''
+          say "\n  --> That did not alter the testing branch commit parents#{result}!\n", :yellow
+        end
       end
 
     rescue => e
@@ -164,7 +170,7 @@ module Ding
 
       say question
       reply = ask(" >", :yellow).to_s
-      replies = reply.split(',')
+      replies = reply.split(',').map(&:strip)
       if reply.empty? || reply.upcase == 'Q'
         say "\n --> OK, nothing for me to do here but ding ding ding!\n\n", :green
         exit 0

data/lib/ding/models/git.rb

@@ -40,6 +40,10 @@ module Ding
       %x(git rev-parse --abbrev-ref HEAD)
     end
 
+    def commit_parents(branch)
+      %x(git rev-list --parents -n 1 #{remote_version(branch)}).split.drop(1)
+    end
+
     def delete_branch(branch)
       local_branch  = local_version(branch)
       remote_branch = remote_version(branch)

data/lib/ding/version.rb

@@ -1,3 +1,3 @@
 module Ding
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ding
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Warren Bain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler