ding 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e05f95e97b10a2fe9ca8391de9e980d289fbb62
-  data.tar.gz: 38600b7149dcb9aa2707af2323a69ad9ccaa8c96
+  metadata.gz: d8a39c932af78aaa0bb31eb6241ea47df2540a0d
+  data.tar.gz: f779635e7018639696730787ae88ca5d3eb23518
 SHA512:
-  metadata.gz: 22dfc9dd2c8c3d45e682b933b7f1dd266fe9c6d4a462907ce8064d13d1e6b3a05a2a8e2575c9041b613b0ae0cf442f2919f7cdd50f2a09433e2b264f8dec62ed
-  data.tar.gz: 4796ecb56b0ad9da839e254abd588478162336c69992202da0308c778d273348d85fefe694c410a29e57815a96801568db45c41397ae211adacd43859643e2c3
+  metadata.gz: 874a0c0ac45b7f02a6b9c08dfeb7e4dd64e9bbab3d5e70b87be43ba0e84f54ce94f3c9b24a5040bd70636efa3c1b7e04835aa9151e82d9459eaf2531c81b92d5
+  data.tar.gz: d4d7f4a3c2276fc4f0f3960320acb11cd96c3c920883159d76acc9ffac11ac44fb054136e6f4c361a0f9ef73188d78e6b82bc0e307ad64060de3d8e42eea7a5e

data/lib/ding/cli.rb

@@ -16,8 +16,12 @@ 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|
-        say "> Synchronising with the remote", :green
         r.checkout develop_branch
+
+        say "> Deleting #{testing_branch}", :green
+        r.delete_branch(testing_branch)
+
+        say "> Synchronising with the remote", :green
         r.update
       end
 
@@ -27,21 +31,15 @@ module Ding
         exit 1
       end
 
-      feature_branches = ask_which_item(branches, 'Which feature branch should I use?', :multiple)
+      feature_branches = ask_which_item(branches, "\nWhich feature branch should I use?", :multiple)
 
       repo.tap do |r|
-        say "\n> Deleting #{testing_branch}", :green
+        say "\n> Deleting any synched #{testing_branch}", :green
         r.delete_branch(testing_branch)
 
-        say "> Checking out #{develop_branch}", :green
-        r.checkout(develop_branch)
-
         say "> Creating #{testing_branch}", :green
         r.create_branch(testing_branch)
 
-        say "> Checking out #{testing_branch}", :green
-        r.checkout(testing_branch)
-
         say "> Merging in selected feature #{feature_branches.count == 1 ? 'branch' : 'branches'}...", :green
         merge_errors = false
         feature_branches.each do |branch|
@@ -66,6 +64,7 @@ module Ding
       show_error e
     else
       say "\n  --> I'm finished: ding ding ding!\n\n", :green
+      exit 0
     end
 
     desc "version", "Display current version of 'ding'"
@@ -88,6 +87,7 @@ module Ding
           if yes?("Do you want me to replace the existing key?", :yellow)
             say "> Removing existing key #{key_name}", :cyan
             s.delete_ssh_key key_name
+
             say "> Creating the replacement ssh key pair", :cyan
             s.create_ssh_key key_name, ENV['USER']
           else
@@ -99,6 +99,7 @@ module Ding
         end
         say "> Adding the private key to the ssh config", :green
         s.update_config options[:host], key_name
+
         say "> Copying the public key to the clipboard", :green
         copy_file_to_clipboard s.ssh_public_key_file(key_name)
       end
@@ -107,6 +108,7 @@ module Ding
       show_error e
     else
       say "\n  --> I'm finished: ding ding ding!\n\n", :green
+      exit 0
     end
 
     desc "key-show", "Copy a public ssh key signature to the system clipboard (use -v to also display the signature)"
@@ -114,7 +116,7 @@ module Ding
       say "\nDing ding ding: let's copy a public key to the clipboard:\n\n", :green
 
       Ding::Ssh.new(options).tap do |s|
-        key_name = ask_which_item(s.list_ssh_keys, 'Which key do you want to copy?')
+        key_name = ask_which_item(s.list_ssh_keys, "\nWhich key do you want to copy?")
         say "\n> Copying the public key to the clipboard", :green
         copy_file_to_clipboard s.ssh_public_key_file(key_name)
       end
@@ -123,6 +125,7 @@ module Ding
       show_error e
     else
       say "\n  --> You can now Command-v to paste that key: ding ding ding!\n\n", :green
+      exit 0
     end
 
     private
@@ -138,7 +141,7 @@ module Ding
     def ask_which_item(items, prompt, mode=:single)
       return Array(items.first) if items.size == 1
       str_format = "\n %#{items.count.to_s.size}s: %s"
-      prompt     = prompt << "\n > Enter multiple selections separated by ',' or 'A' for all" if mode == :multiple
+      prompt     = prompt << "\n > Enter a single selection, multiple selections separated by ',', 'A' for all, 'Q' or nothing to quit" if mode == :multiple
       question   = set_color prompt, :yellow
       answers    = {}
 
@@ -150,21 +153,21 @@ module Ding
 
       say question
       reply = ask(" >", :yellow).to_s
-      begin
-        replies = reply.split(',')
-        if answers[reply]
-          answers.values_at(reply)
-        elsif mode == :multiple && reply == 'A'
-          answers.values
-        elsif mode == :multiple && !replies.empty?
-          selected_items = answers.values_at(*replies)
-          raise "Invalid selection" if selected_items.include?(nil)
-          selected_items
+      replies = reply.split(',')
+      if reply.empty? || reply.upcase == 'Q'
+        say "\n --> OK, nothing for me to do here but ding ding ding!\n\n", :green
+        exit 0
+      elsif answers[reply]
+        answers.values_at(reply)
+      elsif mode == :multiple && reply.upcase == 'A'
+        answers.values
+      elsif mode == :multiple && !replies.empty?
+        selected_items = answers.values_at(*replies)
+        if selected_items.include?(nil)
+          say "\n  --> That's not a valid selection, I'm out of here!\n\n", :red
+          exit 1
         end
-      rescue
-        raise if options[:verbose]
-        say "\n  --> That's not a valid selection, I'm out of here!\n\n", :red
-        exit 1
+        selected_items
       end
     end
 

data/lib/ding/models/git.rb

@@ -19,8 +19,9 @@ module Ding
       raise "Unable to checkout #{branch}" unless run_cmd "git checkout #{branch}"
     end
 
-    def create_branch(branch)
+    def create_branch(branch, checkout=true)
       raise "Unable to create #{branch}" unless run_cmd "git branch --no-track #{branch}"
+      checkout(branch) if checkout
     end
 
     def current_branch

data/lib/ding/version.rb

@@ -1,3 +1,3 @@
 module Ding
-  VERSION = "0.7.4"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ding
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Warren Bain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler