thorium 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06cc86ecfb89a29ea8c2f507b923a8f88f9b2d3d
-  data.tar.gz: ad50508ad6c1696bee2416dc96383830ab815b73
+  metadata.gz: 5db9df4d8edcf8c12684ed088c24929bcd5dc537
+  data.tar.gz: 48def82486f09746dc14a2bfda7aaff01afc7e45
 SHA512:
-  metadata.gz: 250b1a68de0e25c7acaa77302cb0198745102a2d53c9b7135338978e87c8ea285478f16962376117278c7061f8eadadc9457719918757854f5b80b6c08bbbaad
-  data.tar.gz: 0b6bd5d5ef3d4542a92eed92f516b605ea741bf3d720b27f327839e7202cae238e4834283cbb662961d26dd8dd3c81712c39b8f91c0d12d15726ef7b46ecf002
+  metadata.gz: deff5ddad3edc2e0b240e295aef17bf43153f2fadb81742db8318a02b00414018830757b1ca229042b9a96d4018fdad48d0ef68a8a6e58652541761d183728f2
+  data.tar.gz: a0df9c51bfb792a54daf2742f9ad301f1e30492cdd0510f327f34009459eb2198d324d8444f3fef49476eef9f6d39162c1ddab82f113048cf84e36fa868c5c24

data/lib/thorium/base.rb

@@ -22,9 +22,17 @@ module ThoriumCLI
 
     class_option :verbose, type: :boolean, default: false, aliases: :v
 
-    desc 'pubkey', 'Get id_rsa.pub (default) in your clipboard'
+    desc 'pubkey', 'Copy `id_rsa.pub` (default) in your clipboard'
     def pubkey
-      copy_to_clipboard Dir.glob(File.expand_path('~/.ssh/id_rsa.pub')).first
+      path = '~/.ssh/id_rsa.pub'
+      file = Dir.glob(File.expand_path(path)).first
+      if file
+        say "Use `thorium pubkeys` if you want to select a specific key.", :yellow
+        copy_to_clipboard file
+      else
+        say "File `#{path}` has not been found.", :red
+        generate_pubkey?
+      end
     end
 
     desc 'pubkeys', 'Simple public keys manipulation'
@@ -39,13 +47,12 @@ module ThoriumCLI
         copy_to_clipboard public_keys[index.to_i - 1] if index != ask_options[:skip]
       else
         say 'No public keys have been found.', :red
-        generate_new = yes?('Do you want to generate a new one?', :green)
-        run 'ssh-keygen' if generate_new
+        generate_pubkey?
       end
     end
 
     # Apache subcommand
-    desc 'apache [SUBCOMMAND] [ARGS]', 'Control Apache with ease!'
+    desc 'apache [SUBCOMMAND] [ARGS]', 'Apache controller'
     subcommand 'apache', Apache
 
     # Git subcommand
@@ -55,6 +62,13 @@ module ThoriumCLI
     no_commands do
 
       private
+
+      # Prompts to run `ssh-keygen`
+      def generate_pubkey?
+        answered_yes = yes?('Do you want to generate a new public pubkey?', :green)
+        run 'ssh-keygen', verbose: false if answered_yes
+      end
+
       # Prints public keys with indexes
       def print_keys(public_keys)
         public_keys.each_with_index do |f, i|
@@ -64,9 +78,10 @@ module ThoriumCLI
       end
 
       def copy_to_clipboard(content)
-        if run 'which pbcopy > /dev/null', verbose: false
+        say "(!) No content provided.", :red unless content
+        if (run 'which pbcopy > /dev/null', verbose: false)
           run "pbcopy < #{content}", verbose: false
-          say "---> `#{content}` copied to your clipboard.", :blue
+          say "--> `#{content}` copied to your clipboard.", :blue
         else
           say 'pbcopy is not installed, cannot copy to clipboard', :red
         end

data/lib/thorium/tasks/git.rb

@@ -10,7 +10,7 @@ module GitCLI
 
     class_option :verbose, type: :boolean, default: 1
 
-    desc 'list', 'Lists Github repositories'
+    desc 'list', 'Lists repositories (Github)'
     def list
       gh_uname = ask('Enter Github username: ', :green)
       abort if gh_uname.empty?
@@ -22,7 +22,7 @@ module GitCLI
       print_table @repos
     end
 
-    desc 'clone', 'Clones a repository from the list'
+    desc 'clone', 'Clones a repository from the list (Github)'
     def clone
       list
       # Do not do anything if list is empty

data/lib/thorium/version.rb

@@ -1,4 +1,4 @@
 # Top level comment for thorium
 module Thorium
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thorium
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Daniel Stankevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor