ding 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed7f2cfb83b4814f611f1a4774449656a8181b7
-  data.tar.gz: 0fa2db1d194d584ab917dfeaf389ec42dde1549a
+  metadata.gz: 2e05f95e97b10a2fe9ca8391de9e980d289fbb62
+  data.tar.gz: 38600b7149dcb9aa2707af2323a69ad9ccaa8c96
 SHA512:
-  metadata.gz: 6dfd6a4666b3732cd31fdc0c262717b130eb6037b85af56ce2533fe76674a8ac6b98de8078a485d6df3aec80fff39e470342cf9ca05a522545fb56a878b16e57
-  data.tar.gz: bd5695f229bbef1d5e82f11bc32d72afd0c224cf751fcde614c72f129148718d419308788cd4b608b1968b93ba2652ee2caa2ea95f7f368b706cba0cbc78c9c2
+  metadata.gz: 22dfc9dd2c8c3d45e682b933b7f1dd266fe9c6d4a462907ce8064d13d1e6b3a05a2a8e2575c9041b613b0ae0cf442f2919f7cdd50f2a09433e2b264f8dec62ed
+  data.tar.gz: 4796ecb56b0ad9da839e254abd588478162336c69992202da0308c778d273348d85fefe694c410a29e57815a96801568db45c41397ae211adacd43859643e2c3

data/lib/ding/cli.rb

@@ -13,10 +13,10 @@ module Ding
     option :pattern, type: 'string',   aliases: '-p', default: 'origin/XAP*', desc: 'specify a pattern for listing branches'
     def test
       develop_branch, testing_branch = Ding::DEVELOP_BRANCH.dup, Ding::TESTING_BRANCH.dup
-      say "\nDing ding ding: let's merge one or more feature branches to #{testing_branch}...\n\n", :green
+      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
+        say "> Synchronising with the remote", :green
         r.checkout develop_branch
         r.update
       end
@@ -30,16 +30,16 @@ module Ding
       feature_branches = ask_which_item(branches, 'Which feature branch should I use?', :multiple)
 
       repo.tap do |r|
-        say "\n> Deleting #{testing_branch}...", :green
+        say "\n> Deleting #{testing_branch}", :green
         r.delete_branch(testing_branch)
 
-        say "> Checking out #{develop_branch}...", :green
+        say "> Checking out #{develop_branch}", :green
         r.checkout(develop_branch)
 
-        say "> Creating #{testing_branch}...", :green
+        say "> Creating #{testing_branch}", :green
         r.create_branch(testing_branch)
 
-        say "> Checking out #{testing_branch}...", :green
+        say "> Checking out #{testing_branch}", :green
         r.checkout(testing_branch)
 
         say "> Merging in selected feature #{feature_branches.count == 1 ? 'branch' : 'branches'}...", :green
@@ -54,7 +54,7 @@ module Ding
         end
 
         unless merge_errors
-          say "> Pushing #{testing_branch} to the remote...", :green
+          say "> Pushing #{testing_branch} to the remote", :green
           r.push(testing_branch)
         else
           say "\n  --> There were merge errors, ding dang it!\n\n", :red
@@ -68,6 +68,11 @@ module Ding
       say "\n  --> I'm finished: ding ding ding!\n\n", :green
     end
 
+    desc "version", "Display current version of 'ding'"
+    def version
+      say "ding #{Ding::VERSION}\n"
+    end
+
     desc "key-gen", "Create a new private/public key pair and associated ssh config"
     option :host,       type: 'string',  aliases: '-h', default: 'bitbucket.org', desc: 'specify repository host for ssh config'
     option :name,       type: 'string',  aliases: '-n', default: nil,             desc: 'name for key, defaults to host name'
@@ -76,25 +81,25 @@ module Ding
     option :type,       type: 'string',  aliases: '-t', default: 'rsa',           desc: 'type of key to create per -t option on ssh-keygen'
     def key_gen
       key_name = options[:name] || "#{options[:host]}_#{options[:type]}"
-      say "\nDing ding ding: let's create and configure a new ssh key #{key_name}...\n\n", :green
+      say "\nDing ding ding: let's create and configure a new ssh key #{key_name}:\n\n", :green
 
       Ding::Ssh.new(options).tap do |s|
         if s.ssh_key_exists?(key_name)
           if yes?("Do you want me to replace the existing key?", :yellow)
-            say "> Removing existing key #{key_name}...", :cyan
+            say "> Removing existing key #{key_name}", :cyan
             s.delete_ssh_key key_name
-            say "> Creating the replacement ssh key pair...", :cyan
+            say "> Creating the replacement ssh key pair", :cyan
             s.create_ssh_key key_name, ENV['USER']
           else
-            say "> Using existing key #{key_name}...", :cyan
+            say "> Using existing key #{key_name}", :cyan
           end
         else
-          say "> Creating the new ssh key pair...", :green
+          say "> Creating the new ssh key pair", :green
           s.create_ssh_key key_name, ENV['USER']
         end
-        say "> Adding the private key to the ssh config...", :green
+        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
+        say "> Copying the public key to the clipboard", :green
         copy_file_to_clipboard s.ssh_public_key_file(key_name)
       end
 
@@ -106,11 +111,11 @@ module Ding
 
     desc "key-show", "Copy a public ssh key signature to the system clipboard (use -v to also display the signature)"
     def key_show
-      say "\nDing ding ding: let's copy a public key to the clipboard...\n\n", :green
+      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?')
-        say "\n> Copying the public key to the clipboard...", :green
+        say "\n> Copying the public key to the clipboard", :green
         copy_file_to_clipboard s.ssh_public_key_file(key_name)
       end
 
@@ -168,7 +173,7 @@ module Ding
       if options[:verbose]
         cmd << 'tee >(pbcopy)'
       else
-        cmd << ' pbcopy'
+        cmd << 'pbcopy'
       end
       bash cmd
     end

data/lib/ding/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ding
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Warren Bain