collins_shell 0.2.17 → 0.2.18

data/VERSION

@@ -1 +1 @@
-0.2.17
+0.2.18

data/collins_shell.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "collins_shell"
-  s.version = "0.2.17"
+  s.version = "0.2.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Matheny"]
-  s.date = "2012-12-18"
+  s.date = "2013-03-19"
   s.description = "Provides basic CLI for interacting with Collins API"
   s.email = "bmatheny@tumblr.com"
   s.executables = ["collins-shell"]

data/lib/collins_shell/asset.rb

@@ -49,8 +49,8 @@ module CollinsShell
     method_option :exec, :type => :string, :desc => 'Execute a command using the data from this asset. Use {{hostname}}, {{ipmi.password}}, etc for substitution'
     method_option :header, :type => :boolean, :default => true, :desc => 'Display a tag header. Defaults to true'
     method_option :logs, :type => :boolean, :default => false, :desc => 'Also display asset logs, only used with details (SLOW)'
-    method_option :size, :type => :numeric, :default => 50, :desc => 'Number of results to find. Defaults to 50'
     method_option :tags, :type => :array, :desc => 'Tags to display of form: tag1 tag2 tag3. e.g. --tags=hostname tag backend_ip_address'
+    method_option :threads, :type => :numeric, :default => 1, :desc => 'Number of threads to use for --exec. Defaults to 1.'
     method_option :url, :type => :boolean, :default => true, :desc => 'Display a URL along with tags or the default listing'
     def find
       client = get_collins_client
@@ -69,14 +69,15 @@ module CollinsShell
                                                                   :detailed => !options.exec?
             puts printer
           end
-          asset_exec asset, options.exec, options.confirm
+          asset_exec asset, options.exec, options.confirm, options.threads
         end
       else
         if not options.quiet then
           print_find_results assets, options.tags, :header => options.header, :url => options.url
         end
-        assets.each {|asset| asset_exec(asset, options.exec, options.confirm)}
+        assets.each {|asset| asset_exec(asset, options.exec, options.confirm, options.threads)}
       end
+      finalize_exec
     end
 
     desc 'find_similar TAG', 'get similar unallocated assets for a gven asset'
@@ -136,6 +137,7 @@ module CollinsShell
       batch_selector_operation Hash[
         :remote => options.remote,
         :operation => "set_attribute",
+        :size => options["size"],
         :success_message => proc {|asset| "Set attribute on #{asset.tag}"},
         :error_message => proc{|asset| "Setting attribute on #{asset.tag}"},
         :confirmation_message => proc do |assets|
@@ -172,6 +174,7 @@ module CollinsShell
       batch_selector_operation Hash[
         :remote => options.remote,
         :operation => "set_attributes",
+        :size => options["size"],
         :success_message => proc {|asset| "Set attributes on #{asset.tag}"},
         :error_message => proc{|asset| "Setting attributes on #{asset.tag}"},
         :confirmation_message => proc do |assets|
@@ -190,6 +193,7 @@ module CollinsShell
       batch_selector_operation Hash[
         :remote => options.remote,
         :operation => "delete_attribute",
+        :size => options["size"],
         :success_message => proc {|asset| "Delete attribute on #{asset.tag}"},
         :error_message => proc{|asset| "Delete attribute on #{asset.tag}"},
         :confirmation_message => proc do |assets|
@@ -217,6 +221,7 @@ module CollinsShell
       batch_selector_operation Hash[
         :remote => options.remote,
         :operation => "set_status",
+        :size => options["size"],
         :success_message => proc {|asset| "Set status to #{status} on #{asset.tag}"},
         :error_message => proc{|asset| "Setting status on #{asset.tag}"},
         :confirmation_message => proc do |assets|

data/lib/collins_shell/console/commands/cat.rb

@@ -96,6 +96,7 @@ module CollinsShell; module Console; module Commands
       end
 
       def display_asset tag
+        tag = tag.gsub(/^\//, '')
         if asset_exists? tag then
           asset = get_asset tag
           show_logs = opts.logs?

data/lib/collins_shell/thor.rb

@@ -48,6 +48,7 @@ module CollinsShell
     def use_selector_option required = false
       method_option :selector, :type => :hash, :required => required, :desc => 'Selector to query collins. Takes the form of --selector=key1:val1 key2:val2 etc'
       method_option :remote, :type => :boolean, :default => false, :desc => 'Search all collins instances, including remote ones'
+      method_option :size, :type => :numeric, :default => 50, :desc => 'Number of results to find. Defaults to 50'
     end
 
     def selector_or_tag
@@ -61,9 +62,16 @@ module CollinsShell
     end
 
     def require_yes message, color = nil, should_exit = true
+      def appropriate_answer?(a); na = a.to_s.downcase.strip; na == 'yes' || na == 'no'; end
       highline = HighLine.new
       colored_message = set_color(message, color)
-      answer = ask(colored_message)
+      answer = nil
+      while !appropriate_answer?(answer) do
+        unless answer.nil? then
+          say_status "error", "Please type 'yes' or 'no'.", :red
+        end
+        answer = ask(colored_message)
+      end
       if answer.downcase.strip !~ /^yes$/ then
         if should_exit then
           exit(0)
@@ -84,7 +92,7 @@ module CollinsShell
       require_non_empty(success_message, "success_message not set")
       require_non_empty(error_message, "error_message not set")
       require_non_empty(operation, "operation not set")
-      selector = get_selector selector_or_tag, [], nil, options[:remote]
+      selector = get_selector selector_or_tag, [], options[:size], options[:remote]
       call_collins get_collins_client, operation do |client|
         assets = client.find selector
         if assets.length > 1 then

data/lib/collins_shell/util.rb

@@ -1,5 +1,6 @@
 require 'collins_shell/monkeypatch'
 require 'collins_shell/util/asset_stache'
+require 'open3'
 
 module CollinsShell
   module Util
@@ -50,13 +51,65 @@ module CollinsShell
       selector
     end
 
-    def asset_exec asset, execs, confirm = true
+    def asset_exec asset, execs, confirm = true, threads = 1
       return unless execs
       mustache = CollinsShell::Util::AssetStache.new asset
       rendered = mustache.render "/bin/bash -c '#{execs}'"
       say_status("exec", rendered, :red)
       require_yes("Running on #{asset.tag}. ARE YOU SURE?", :red) if confirm
-      system(rendered)
+      if threads < 2 then
+        system(rendered)
+      else
+        run_command_in_thread(rendered, threads)
+      end
+    end
+
+    # Should be called after asset_exec
+    def finalize_exec
+      thread_mgr.threads.each(&:join)
+    end
+
+    # Wraps open threads and provides a synchronized output buffer for concurrently writing output
+    def thread_mgr
+      @_thread_mgr ||= OpenStruct.new({
+        :threads => [],
+        :lock => Mutex.new
+      })
+    end
+
+    def say_status(status, message, log_status=true)
+      thread_mgr.lock.synchronize {
+        super
+      }
+    end
+
+    # @param [String] syscmd The system command to execute
+    # @param [Fixnum] thread_count The numbers of threads to allow running at one time
+    def run_command_in_thread syscmd, thread_count
+      if thread_mgr.threads.size > thread_count then
+        thread_mgr.threads.each(&:join)
+        thread_mgr.threads.clear
+      else
+        thread_mgr.threads << Thread.new(syscmd) do |cmd|
+          begin
+            stdin, stdout, stderr, thread = Open3.popen3(cmd)
+            stdin.close
+            o, e = [stdout, stderr].map {|p| begin p.read ensure p.close end}
+            unless o.empty? then
+              say_status("stdout: #{cmd}", o, :green)
+            end
+            unless e.empty? then
+              say_status("stderr: #{cmd}", e, :red)
+            end
+            if thread then
+              Process.kill('TERM', thread.pid) rescue nil
+              thread.kill unless nil
+            end
+          rescue Exception => e
+            say_status("exception: #{cmd}", e.to_s, :red)
+          end
+        end
+      end
     end
 
     def asset_get tag, options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collins_shell
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: collins_client
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -728758615218698730
+      hash: -4494318623502944839
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: