santoku 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a989d4dded0a7a81d6621f44ec3bb0c78892fdc
-  data.tar.gz: 1c7f29375f4df5109cbcabeb4492df2d5e9e037d
+  metadata.gz: f2d8bfadb34d6d3a3afdfcc83ab1278c9a39e578
+  data.tar.gz: df7f809fa31474ab1eef2cbb3b75ce2541e0f903
 SHA512:
-  metadata.gz: ba2a6132825146128a3f0ccce31afa5e13fd2cdb368ffeb2dded265e9963e5b5c510d4478b178cdc731ec339ec8a66f914a4a34625a2db3e6cfe5ec8f3d88ce1
-  data.tar.gz: 8f32f409d780d30494197d19ee36a143fd65351640dfc6b74a9c5238820ca6fde07602ebbfd35e29d96c5f1352728dcd853996b591ed385e8cc04e40e2547256
+  metadata.gz: 3bbd5a78c001b6ba734b547c20964020560bf57bb75b5ab99d999946f974e0f8d41e388ad4f3a1430568ec57ad177f730a52d666a2d570888ab05bc63d8ad712
+  data.tar.gz: cb620bb5d996f0286047fd59d71ee456615e0241be082013c10a38e68d9e03b81ed6f917fb68f326c777726aa71ffb604733342e811f648136545ea916fc38d8

data/bin/santoku

@@ -1,6 +1,18 @@
 #!/usr/bin/env ruby
 require 'santoku'
+require "rubygems"
+require 'thor'
 
-command = ARGV[0]
-query = ARGV[1]
-Santoku.run(command, query)
+class SantokuCommand < Thor
+  map '-t' => :test
+
+  desc 'test COMMAND [QUERY]', 'Execute command on nodes, scoped on the given query if query is given. Query syntax should be the same as `knife search` syntax.'
+  option :invert, type: :boolean, desc: "invert matched results (DOESN'T WORK YET)", default: false
+  option :timeout, type: :numeric, desc: 'timeout interval per ssh connection (default: 15)', default: 15
+  option :'print-success', type: :boolean, desc: 'prints output of successful commands', default: false
+  def test(command, query='name:*')
+    Santoku.test(command, query, options[:timeout], options[:'print-success'], options[:'invert'])
+  end
+end
+
+SantokuCommand.start

data/lib/santoku.rb

@@ -1,112 +1,42 @@
-require 'colorize'
-require 'net/ssh'
 require 'peach'
-require 'ridley'
-require 'yaml'
 
-class Santoku
-  def self.run(command='uptime', query)
-    output_stream = Array.new
-    failed_output_stream = Array.new
-    timeout_output_stream = Array.new
+require 'santoku/helpers'
+require 'santoku/printers'
 
-    ridley.search(:node, query).peach(5) do |node|
-      begin
-        timeout 10 do
-          Net::SSH.start(node.chef_id, 'root', paranoid: false, forward_agent: true) do |ssh|
-            output = ssh_exec!(ssh, command)
-            if output[2] != 0
-              failed_output_stream.push "#{node.chef_id} error #{output[2]}: #{output[1]}"
-              print 'F'.red
-            else
-              output_stream.push "#{node.chef_id}: #{output[0]}"
-              print '.'.green
+class Santoku
+  class << self
+    def test(command, query, timeout_interval, verbose_success, invert)
+      @verbose_success = verbose_success
+      @invert = invert
+
+      ridley.search(:node, query).peach(5) do |node|
+        begin
+          timeout timeout_interval do
+            Net::SSH.start(node.chef_id, 'root', paranoid: false, forward_agent: true) do |ssh|
+              output = ssh_exec!(ssh, command)
+              if output[2] == 0 && !invert?
+                succeeded "#{node.chef_id}: #{output[0]}"
+              elsif output[2] != 0 && invert?
+                succeeded "#{node.chef_id} returned #{output[2]}: #{output[1]} #{output[0]}"
+              else
+                failed "#{node.chef_id} returned #{output[2]}: #{output[1]} #{output[0]}"
+              end
             end
           end
+        rescue TimeoutError
+          timed_out "#{node.chef_id}: connection timed out"
+        rescue Errno::ETIMEDOUT
+          timed_out "#{node.chef_id}: Operation timed out - connect(2)"
+        rescue SocketError
+          timed_out "#{node.chef_id}: node does not resolve"
+        rescue Errno::EHOSTUNREACH
+          timed_out "#{node.chef_id}: no route to host"
+        rescue Exception => e
+          timed_out "#{node.chef_id}: #{e.inspect}"
         end
-
-      rescue TimeoutError
-        timeout_output_stream.push "#{node.chef_id}: connection timed out"
-        print '*'.yellow
-      rescue SocketError
-        timeout_output_stream.push "#{node.chef_id}: node does not resolve"
-        print '*'.yellow
-      rescue Errno::EHOSTUNREACH
-        timeout_output_stream.push "#{node.chef_id}: no route to host"
-        print '*'.yellow
-      rescue Exception => e
-        failed_output_stream.push "#{node.chef_id}: #{e.inspect}"
-        print 'F'.red
       end
-    end
-
-    print "\n"
-
-    timeout_output_stream.each do |output|
-      puts output.yellow
-    end
-
-    failed_output_stream.each do |output|
-      puts output.red
-    end
-
-    output_stream.each do |output|
-      puts output.green
-    end
-
-    puts "\n---------------------------------------\n"
-
-    puts "#{'Success'.green}: #{output_stream.count}"
-    puts "#{'Timed out or does not resolve'.yellow}: #{timeout_output_stream.count}"
-    puts "#{'Failed'.red}: #{failed_output_stream.count}"
-  end
 
-private
-  def self.knife_config
-    if ::File.exist?(File.expand_path("../knife.rb", __FILE__))
-      Ridley::Chef::Config.from_file(File.expand_path("../knife.rb", __FILE__))
-    elsif ::File.exist?("#{ENV['HOME']}/.chef/knife.rb")
-      Ridley::Chef::Config.from_file("#{ENV['HOME']}/.chef/knife.rb")
-    else
-      raise 'Could not find knife.rb in current directory or home '
-    end
-  end
-
-  def self.ridley
-    @ridley ||= Ridley.new(
-      server_url: knife_config.chef_server_url,
-      client_name: knife_config.node_name,
-      client_key: knife_config.client_key
-    )
-  end
-end
-
-def ssh_exec!(ssh, command)
-  # I am not awesome enough to have made this method myself
-  # I've just modified it a bit
-  # Originally submitted by 'flitzwald' over here: http://stackoverflow.com/a/3386375
-  stdout_data = ""
-  stderr_data = ""
-  exit_code = nil
-
-  ssh.open_channel do |channel|
-    channel.exec(command) do |ch, success|
-      unless success
-        abort "FAILED: couldn't execute command (ssh.channel.exec)"
-      end
-      channel.on_data do |ch,data|
-        stdout_data+=data
-      end
-
-      channel.on_extended_data do |ch,type,data|
-        stderr_data+=data
-      end
-
-      channel.on_request("exit-status") do |ch,data|
-        exit_code = data.read_long
-      end
+      print_summary
     end
   end
-  ssh.loop
-  [stdout_data, stderr_data, exit_code]
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: santoku
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Steven De Coeyer
+- Mike Morraye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -52,9 +53,23 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A gem to perform command over parrallel ssh connections on multiple chef
+- !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'
+description: A gem to perform command over parallel ssh connections on multiple chef
   serverspec. Output is rspec-like.
-email: steven@banteng.be
+email: tech@openminds.be
 executables:
 - santoku
 extensions: []