thorium 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d3aa3492009a3196b4b9e1fb4536b3d67c528d9
-  data.tar.gz: 7f2cfad46f9e1c95036d39a72e35dbfde90fe677
+  metadata.gz: d0be3adba8cd2cbb26b1afeea7fd9c2ee1d0232c
+  data.tar.gz: c5f5b2c231ff20c98cb109722bee1eb39e483162
 SHA512:
-  metadata.gz: f7f0e101967546c9c28b32cbfa49d8142222575e63b3e2756861b9dda8484e1fcfe106414aef885a909be9ab543c05c975f8a51154400236defcd13a380c9343
-  data.tar.gz: ae5600f280de12b28aee26c9caba27850ac2ef9656d453e92e5aba9602001c19acf810db177af3a5a32c1474a905970d8732161d1f864b695237a8809c157fbe
+  metadata.gz: b266ff24f8d12859f3090733b31df86627778c53fddd78931cbac3208ad29487dedaf1070b71abb40f0bd11da7b5623d6b108afc826d5982291d4eee4bdf9a5a
+  data.tar.gz: 136274242cfbe0e4778c47e16721b1f2a98abb90656b1481c1b231e013b5eb8030313282447908eb9904bb18f3b1f2098f91808d016423e27e4dfe2b46292308

data/lib/thorium/base.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'thor/group'
 
+require_relative 'core/bootstrap.rb'
 require_relative 'version'
 require_relative 'tasks/common'
 require_relative 'tasks/apache'
@@ -16,20 +17,21 @@ module ThoriumCLI
 
     class_option :verbose, :type => :boolean, :default => false
     @@os = ENV['_system_type']
+    @@skip = ""
 
     desc "pubkeys", "Simple public keys manipulation tool"
     def pubkeys
       public_keys = Dir.glob(File.expand_path("~/.ssh") + "/*.pub")
       if public_keys.any?
-        say "\nPublic keys found:"
-        say "------------------"
+        puts "\nPublic keys found:"
+        puts "------------------"
         public_keys.each_with_index do |f, i|
           say "[#{i+1}] #{f}", :blue
           run "cat #{f}", verbose: false
         end
-        answers = ["n"] + ("1".."#{public_keys.size}").to_a
-        index = ask("Which key do you want in your clipboard (n for none)?", :green, :limited_to => answers)
-        run "pbcopy < #{public_keys[index.to_i - 1]}" unless index == "n"
+        ask_options = {:limited_to => ("1".."#{public_keys.size}").to_a, skip: @@skip}
+        index = ask("Which key do you want in your clipboard?", :green, ask_options)
+        run "pbcopy < #{public_keys[index.to_i-1]}" unless 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)

data/lib/thorium/core/bootstrap.rb

@@ -0,0 +1,25 @@
+require "thor"
+
+class Thor
+  module Shell
+    class Basic
+
+      def ask_filtered(statement, color, options)
+        answer_set = options[:limited_to]
+        correct_answer = nil
+        if options.has_key? :skip
+          statement += options[:skip].strip.empty? ? " (Enter to skip)" : " (#{options[:skip]} to skip)"
+        end
+        until correct_answer
+          answers = answer_set.join(", ")
+          answer = ask_simply("#{statement} [#{answers}]", color, options)
+          skipped = (options.has_key?(:skip) && (answer == options[:skip].chomp))
+          correct_answer = answer_set.include?(answer) || skipped ? answer : nil
+          say("Your response must be one of: [#{answers}]. Please try again.") unless correct_answer
+        end
+        correct_answer
+      end
+
+    end
+  end
+end

data/lib/thorium/tasks/apache.rb

@@ -4,8 +4,8 @@ module ApacheCLI
 
     include Thor::Actions
 
-    class_option :verbose, :type => :boolean, :default => 1
-    class_option :sudo, :type => :boolean, :default => 1
+    class_option :verbose, :type => :boolean, :default => true
+    class_option :sudo, :type => :boolean, :default => true
     class_option :ctl_method, :enum => ['apachectl', 'apache2ctl', 'service'], :default => 'apachectl'
 
     desc "ctl [ARGS]", "Apache controller wrapper"
@@ -19,7 +19,7 @@ module ApacheCLI
     LONGDESC
     def ctl(*args)
       command = "#{options[:ctl_method]} #{args * ' '}"
-      command = 'sudo ' + command if options[:root] == 1
+      command = 'sudo ' + command if options[:sudo]
       run(command, {:verbose => options[:verbose], :capture => false})
     end
 

data/lib/thorium/tasks/git.rb

@@ -10,8 +10,8 @@ module GitCLI
     desc "list", "Lists Github repositories"
     def list
       require 'json'
-      require 'pp'
       gh_uname = ask("Enter Github username: ", :green)
+      abort if gh_uname.empty?
       puts "\nFetching Github repositories (#{gh_uname})..."
       puts "------------------------------------------"
       @repos = get_gh_repos(gh_uname).each_with_index.map do |e, i|
@@ -23,10 +23,13 @@ module GitCLI
     desc "clone", "Clones a repository from the list"
     def clone
       list
-      index = ask("Which repository would you like to clone?", :green, :limited_to => ("1".."#{@repos.size}").to_a).to_i
+      # Do not do anything if list is empty
+      ask_options = {limited_to: ("1".."#{@repos.size}").to_a, skip: ""}
+      answer = ask("Which repository would you like to clone?", :green, ask_options)
+      abort if answer == ask_options[:skip]
       protocol = ask("Select a protocol (ssh or https)?", :green, :limited_to => ["s", "h"])
-      url = protocol == "s" ? @repos[index-1][2] : @repos[index-1][3]
-      run("git clone #{url}")
+      url = protocol == "s" ? @repos[answer.to_i-1][2] : @repos[answer-1][3]
+      run "git clone #{url}"
     end
 
     no_commands {

data/lib/thorium/version.rb

@@ -1,3 +1,3 @@
 module Thorium
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thorium
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Daniel Stankevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -34,6 +34,7 @@ files:
 - bin/thorium
 - lib/thorium.rb
 - lib/thorium/base.rb
+- lib/thorium/core/bootstrap.rb
 - lib/thorium/tasks/apache.rb
 - lib/thorium/tasks/common.rb
 - lib/thorium/tasks/git.rb