thorium 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0be3adba8cd2cbb26b1afeea7fd9c2ee1d0232c
-  data.tar.gz: c5f5b2c231ff20c98cb109722bee1eb39e483162
+  metadata.gz: 1915fb23dbce02dc16d56d322810e1424eedcdae
+  data.tar.gz: 187107add74947748aa10894cc641c15e7472f01
 SHA512:
-  metadata.gz: b266ff24f8d12859f3090733b31df86627778c53fddd78931cbac3208ad29487dedaf1070b71abb40f0bd11da7b5623d6b108afc826d5982291d4eee4bdf9a5a
-  data.tar.gz: 136274242cfbe0e4778c47e16721b1f2a98abb90656b1481c1b231e013b5eb8030313282447908eb9904bb18f3b1f2098f91808d016423e27e4dfe2b46292308
+  metadata.gz: 8ee9a2f61e2599e10ee02b050d33323ceba8151cfcc18ad459fb72a1a9c4ca7df530cf1e7c8deb0585778d9df31ff1691c290b434a4c1fcc71a2331bc181ee6c
+  data.tar.gz: 8125cc0c92d8c352da5e773411d85fc46c5e444b6cb81c07f0e5cbb6c93f484a6d782d51efc7ff05177aab9f5945196389858223a8974b1e52c7bd8b029bd8f5

data/bin/thorium

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-
 require 'thorium'
 
-ThoriumCLI::Thorium.start(ARGV)
+ThoriumCLI::Thorium.start(ARGV)

data/lib/thorium.rb

@@ -1 +1 @@
-require_relative 'thorium/base'
+require_relative 'thorium/base'

data/lib/thorium/base.rb

@@ -8,43 +8,63 @@ require_relative 'tasks/apache'
 require_relative 'tasks/git'
 
 module ThoriumCLI
+  # Top level tasks for thorium
+  # Includes routines that do not require packaging of subcomands
   class Thorium < Thor
     package_name 'Thorium'
+    SKIP = ''
+    ALIAS = 'th'
+    OS = ENV['_system_type']
 
     include Thor::Actions
     include ApacheCLI
     include GitCLI
 
-    class_option :verbose, :type => :boolean, :default => false
-    @@os = ENV['_system_type']
-    @@skip = ""
+    class_option :verbose, type: :boolean, default: false, aliases: :v
 
-    desc "pubkeys", "Simple public keys manipulation tool"
+    desc 'pubkeys', 'Simple public keys manipulation'
     def pubkeys
-      public_keys = Dir.glob(File.expand_path("~/.ssh") + "/*.pub")
+      public_keys = Dir.glob(File.expand_path('~/.ssh') + '/*.pub')
       if public_keys.any?
-        puts "\nPublic keys found:"
-        puts "------------------"
-        public_keys.each_with_index do |f, i|
-          say "[#{i+1}] #{f}", :blue
-          run "cat #{f}", verbose: false
-        end
-        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]
+        puts '', 'Public keys found:'
+        puts '------------------'
+        print_keys public_keys
+        ask_options = { limited_to: ('1'..public_keys.size.to_s).to_a, skip: SKIP }
+        index = ask('Which key do you want in your clipboard?', :green, ask_options)
+        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
+        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
       end
     end
 
     # Apache subcommand
-    desc "apache [SUBCOMMAND] [ARGS]", "Control Apache with ease!"
-    subcommand "apache", Apache
+    desc 'apache [SUBCOMMAND] [ARGS]', 'Control Apache with ease!'
+    subcommand 'apache', Apache
 
     # Git subcommand
-    desc "git [SUBCOMMAND] [ARGS]", "Git wrapper"
-    subcommand "git", Git
+    desc 'git [SUBCOMMAND] [ARGS]', 'Git wrapper'
+    subcommand 'git', Git
+
+    no_commands do
+
+      private
+      # Prints public keys with indexes
+      def print_keys(public_keys)
+        public_keys.each_with_index do |f, i|
+          say "[#{i + 1}] #{f}", :blue
+          run "cat #{f}", verbose: false
+        end
+      end
+
+      def copy_to_clipboard(content)
+        if run 'which pbcopy > /dev/null', verbose: false
+          run "pbcopy < #{content}"
+        else
+          say 'pbcopy is not installed, cannot copy to clipboard', :red
+        end
+      end
+    end
   end
-end
+end

data/lib/thorium/core/bootstrap.rb

@@ -1,25 +1,36 @@
-require "thor"
+require 'thor'
 
 class Thor
   module Shell
+    # Top level commit
     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)"
+        if options.key? :skip
+          statement += if options[:skip].strip.empty?
+            ' (Enter to skip)'
+          else
+            " (#{options[:skip]} to skip)"
+          end
         end
-        until correct_answer
-          answers = answer_set.join(", ")
+        correct_answer answer_set, options, color, statement
+      end
+
+      def correct_answer(answer_set, options, color, statement)
+        result = nil
+
+        until result
+          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
+          skipped = (options.key?(:skip) && (answer == options[:skip].chomp))
+          result = answer_set.include?(answer) || skipped ? answer : nil
+          unless result
+            say("Your response must be one of: [#{answers}]. Please try again.")
+          end
         end
-        correct_answer
-      end
 
+        result
+      end
     end
   end
-end
+end

data/lib/thorium/tasks/apache.rb

@@ -1,14 +1,15 @@
 module ApacheCLI
+  # Top level comment for apache
   class Apache < Thor
     package_name 'Thorium | Apache'
 
     include Thor::Actions
 
-    class_option :verbose, :type => :boolean, :default => true
-    class_option :sudo, :type => :boolean, :default => true
-    class_option :ctl_method, :enum => ['apachectl', 'apache2ctl', 'service'], :default => 'apachectl'
+    class_option :verbose, type: :boolean, default: true
+    class_option :sudo, type: :boolean, default: true
+    class_option :ctl_method, enum: %w(apachectl apache2ctl service), default: 'apachectl'
 
-    desc "ctl [ARGS]", "Apache controller wrapper"
+    desc 'ctl [ARGS]', 'Apache controller wrapper'
     long_desc <<-LONGDESC
       `start`     - Starts apache
       `stop`      - Stops apache
@@ -20,11 +21,9 @@ module ApacheCLI
     def ctl(*args)
       command = "#{options[:ctl_method]} #{args * ' '}"
       command = 'sudo ' + command if options[:sudo]
-      run(command, {:verbose => options[:verbose], :capture => false})
+      run command, verbose: options[:verbose], capture: false
     end
 
-    no_commands {
-
-    }
+    no_commands {}
   end
-end
+end

data/lib/thorium/tasks/common.rb

@@ -0,0 +1 @@
+# Common tasks TBA

data/lib/thorium/tasks/git.rb

@@ -1,45 +1,53 @@
 module GitCLI
+  # Git tasks package
+  # Listing and cloning of repositories (Github support included)
   class Git < Thor
     package_name 'Thorium | Git'
+    GH_API_URL = 'https://api.github.com'
 
     include Thor::Actions
 
-    class_option :verbose, :type => :boolean, :default => 1
-    @@gh_api_url = "https://api.github.com"
+    class_option :verbose, type: :boolean, default: 1
 
-    desc "list", "Lists Github repositories"
+    desc 'list', 'Lists Github repositories'
     def list
       require 'json'
-      gh_uname = ask("Enter Github username: ", :green)
+      gh_uname = ask('Enter Github username: ', :green)
       abort if gh_uname.empty?
       puts "\nFetching Github repositories (#{gh_uname})..."
-      puts "------------------------------------------"
+      puts '------------------------------------------'
       @repos = get_gh_repos(gh_uname).each_with_index.map do |e, i|
-        e.values_at("name", "ssh_url", "clone_url").unshift("[#{i+1}]")
+        e.values_at('name', 'ssh_url', 'clone_url').unshift("[#{i + 1}]")
       end
       print_table @repos
     end
 
-    desc "clone", "Clones a repository from the list"
+    desc 'clone', 'Clones a repository from the list'
     def clone
       list
       # 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)
+      ask_options = { limited_to: ('1'..@repos.size.to_s).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[answer.to_i-1][2] : @repos[answer-1][3]
+      protocol = ask('Select a protocol (ssh or https)?', :green, limited_to: %w(s h))
+      url = if protocol == 's'
+        @repos[answer.to_i - 1][2]
+      else
+        @repos[answer - 1][3]
+      end
       run "git clone #{url}"
     end
 
-    no_commands {
+    no_commands do
+
+      private
       # Fetches Github repositories for a given user
       def get_gh_repos(uname)
-        url = "#{@@gh_api_url}/users/#{uname}/repos"
+        url = "#{GH_API_URL}/users/#{uname}/repos"
         gh_repos_filepath = ENV['HOME'] + "/.thorium/gh_repos_#{uname}.json"
-        get url, gh_repos_filepath, :verbose => false
+        get url, gh_repos_filepath, verbose: false
         JSON.parse File.read(gh_repos_filepath)
       end
-    }
+    end
   end
-end
+end

data/lib/thorium/version.rb

@@ -1,3 +1,4 @@
+# Top level comment for thorium
 module Thorium
-  VERSION = "0.3.3"
-end
+  VERSION = '0.3.4'
+end

metadata

@@ -1,27 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: thorium
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Daniel Stankevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple workflow automation toolkit.
@@ -49,12 +77,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []