ding 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8a39c932af78aaa0bb31eb6241ea47df2540a0d
-  data.tar.gz: f779635e7018639696730787ae88ca5d3eb23518
+  metadata.gz: a1be9dc233de1e9fa9ef54dc9598581bf831bc05
+  data.tar.gz: 6ca2841edd020de0c0a6da25e027370497ae7423
 SHA512:
-  metadata.gz: 874a0c0ac45b7f02a6b9c08dfeb7e4dd64e9bbab3d5e70b87be43ba0e84f54ce94f3c9b24a5040bd70636efa3c1b7e04835aa9151e82d9459eaf2531c81b92d5
-  data.tar.gz: d4d7f4a3c2276fc4f0f3960320acb11cd96c3c920883159d76acc9ffac11ac44fb054136e6f4c361a0f9ef73188d78e6b82bc0e307ad64060de3d8e42eea7a5e
+  metadata.gz: 214c096bdc4cff13250bc1f0af923f331a5f29aa89ec59213f90355798c58e167faabd1e5d317ade850f8177a31e3a1c446860970ece0e26d3f9c6758aed1cda
+  data.tar.gz: 3274c3a8d55abdaaba7f1392dd9afcafc0977c53ccca7ecc9f21bd197516e0487b700d2f2f9b7c29f0cc3f10c13428516b49576ad46398c838c2333e89128a59

data/lib/ding/cli.rb

@@ -116,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, "\nWhich key do you want to copy?")
+        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
         copy_file_to_clipboard s.ssh_public_key_file(key_name)
       end
@@ -141,7 +141,9 @@ 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 a single selection, multiple selections separated by ',', 'A' for all, 'Q' or nothing to quit" if mode == :multiple
+      prompt << "\n > Enter a single selection, "
+      prompt << "multiple selections separated by ',', 'A' for all, " if mode == :multiple
+      prompt << "'Q' or nothing to quit"
       question   = set_color prompt, :yellow
       answers    = {}
 
@@ -159,6 +161,9 @@ module Ding
         exit 0
       elsif answers[reply]
         answers.values_at(reply)
+      elsif mode == :single
+          say "\n  --> That's not a valid selection, I'm out of here!\n\n", :red
+          exit 1
       elsif mode == :multiple && reply.upcase == 'A'
         answers.values
       elsif mode == :multiple && !replies.empty?
@@ -172,12 +177,8 @@ module Ding
     end
 
     def copy_file_to_clipboard(file)
-      cmd = "cat #{file} | "
-      if options[:verbose]
-        cmd << 'tee >(pbcopy)'
-      else
-        cmd << 'pbcopy'
-      end
+      cmd = "cat #{file}"
+      cmd << (options[:verbose] ? '|tee >(pbcopy)' : '|pbcopy')
       bash cmd
     end
 

data/lib/ding/helpers.rb

@@ -0,0 +1,10 @@
+module Ding
+  module Helpers
+    # NOTE: only for commands where we are interested in the effect
+    # as unless verbose is turned on, stdout and stderr are suppressed
+    def run_cmd(cmd)
+      cmd << ' &>/dev/null ' unless options[:verbose]
+      system cmd
+    end
+  end
+end

data/lib/ding/models/git.rb

@@ -1,5 +1,8 @@
 module Ding
   class Git
+    include Ding::Helpers
+
+    attr_reader :options
 
     def initialize(options={})
       raise "#{repo} is NOT a git repository" unless git_repo?
@@ -99,16 +102,5 @@ module Ding
     def remote_prefix
       "#{remote_name}/"
     end
-
-    # NOTE: only for commands where we are interested in the effect
-    # as unless verbose is turned on, stdout and stderr are suppressed
-    def run_cmd(cmd)
-      cmd << ' &>/dev/null ' unless options[:verbose]
-      system cmd
-    end
-
-    def options
-      @options || {}
-    end
   end
 end

data/lib/ding/models/ssh.rb

@@ -2,6 +2,9 @@ require 'fileutils'
 
 module Ding
   class Ssh
+    include Ding::Helpers
+
+    attr_reader :options
 
     def initialize(options={})
       @options = options
@@ -17,7 +20,8 @@ module Ding
     end
 
     def delete_ssh_key(name)
-      File.delete ssh_public_key_file(name), ssh_private_key_file(name) if ssh_key_exists? name
+      raise "ssh key #{name} does not exist!" if ssh_key_exists? name
+      File.delete ssh_public_key_file(name), ssh_private_key_file(name)
     end
 
     def update_config(host, name)
@@ -61,16 +65,5 @@ module Ding
     def ssh_config_file
       @ssh_config_file || options[:ssh_config_file] || File.join(ssh_config_path, 'config')
     end
-
-    # NOTE: only for commands where we are interested in the effect
-    # as unless verbose is turned on, stdout and stderr are suppressed
-    def run_cmd(cmd)
-      cmd << ' &>/dev/null ' unless options[:verbose]
-      system cmd
-    end
-
-    def options
-      @options || {}
-    end
   end
 end

data/lib/ding/version.rb

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

data/lib/ding.rb

@@ -1,12 +1,13 @@
 require 'ding/version'
 require 'ding/cli'
+require 'ding/helpers'
 require 'ding/models/git'
 require 'ding/models/ssh'
 
 module Ding
-  MASTER_BRANCH   = ENV['DING_MASTER_BRANCH'] || 'master'
-  DEVELOP_BRANCH   = ENV['DING_DEVELOP_BRANCH'] || 'develop'
-  TESTING_BRANCH  = ENV['DING_TESTING_BRANCH'] || 'testing'
+  MASTER_BRANCH       = ENV['DING_MASTER_BRANCH'] || 'master'
+  DEVELOP_BRANCH      = ENV['DING_DEVELOP_BRANCH'] || 'develop'
+  TESTING_BRANCH      = ENV['DING_TESTING_BRANCH'] || 'testing'
   SACROSANCT_BRANCHES = (ENV['DING_SACROSANCT_BRANCHES'] || "#{MASTER_BRANCH} #{DEVELOP_BRANCH}").split
 
   # because we lurve the command line... ding!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ding
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Warren Bain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - ding.png
 - lib/ding.rb
 - lib/ding/cli.rb
+- lib/ding/helpers.rb
 - lib/ding/models/git.rb
 - lib/ding/models/ssh.rb
 - lib/ding/version.rb