santoku 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf7295813d610a5e5f36bc497af900d690b98c1
-  data.tar.gz: 95089cdb8cfe09bb57ad35c1fd2ce7a3894ec763
+  metadata.gz: fb52db36d32657b634327f65e244f02cb9994390
+  data.tar.gz: 132f2d8bb28bb26773bbec2a4c19bbcec0c6639f
 SHA512:
-  metadata.gz: 68f756ff452d1f66604752a69107445e30728b7e8478284de23fbb5ae106626d778213bd6bc1a78dd7ceb7bdc2a1501d7bb1bacfc6ec769fd81b4041be8e0466
-  data.tar.gz: 84c3d165ba29d80644a1319468814be213461219fe12b89884d348f78d9ef6f6bfe7654e4a2cc170e994fc199fe2653a5c2e162aa011bcaf84f139e028428c84
+  metadata.gz: ee647aa900f3d34521211f176c34a0ee9f717bc722974e811f04a7de15c08060cb7d2320b2885cbfdfa3cdf2462d3e668d95215ba4f0ff3c14313133b95b2507
+  data.tar.gz: 55a051ddb3cb0379f983bef058bdd6d41e7637f8e39a783ae853d0d658c3681f73bf9f5093519a892f9ff1d2e6813bec9326760f5621a07a26b13bf187a6f339

data/.gitignore

@@ -0,0 +1,2 @@
+*.gem
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Openminds BVBA
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,11 @@
+santoku
+=======
+
+Parrallel ssh commands over chef servers with rspec-like output
+
+install
+=======
+
+This is just a proof of concept for now. Install with:
+
+    gem install santoku

data/Rakefile

@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/bin/santoku

@@ -1,17 +1,17 @@
 #!/usr/bin/env ruby
 require 'santoku'
-require "rubygems"
+require 'rubygems'
 require 'thor'
 
 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 :invert, type: :boolean, desc: 'invert matched results', 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'])
+    Santoku.test(command, query, options[:timeout], options[:'print-success'], options[:invert])
   end
 end
 

data/lib/santoku.rb

@@ -1,39 +1,22 @@
 require 'peach'
 
+require 'santoku/chef'
 require 'santoku/helpers'
 require 'santoku/printers'
+require 'santoku/santoku'
+require 'santoku/ssh'
 
 class Santoku
   class << self
-    def test(command, query, timeout_interval, verbose_success, invert)
+    def test command, query, timeout_interval, verbose_success, invert
+      @command = command
+      @query = query
+      @timeout_interval = timeout_interval
       @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
+      knife_search(@query).peach(5) do |fqdn|
+        execute_query fqdn
       end
 
       print_summary

data/lib/santoku/chef.rb

@@ -0,0 +1,16 @@
+require 'chef/knife'
+
+class Santoku
+  class << self
+    def knife_search query
+      # Monkey patch Chef::Knife::UI to hide stdout
+      Chef::Knife::UI.class_eval do
+        def stdout
+          @stdout_hack ||= ::File.new('/dev/null', 'w')
+        end
+      end
+
+      Chef::Knife.run(['search', 'node', query]).map { |node| node[:fqdn] }
+    end
+  end
+end

data/lib/santoku/helpers.rb

@@ -1,5 +1,3 @@
-require 'ridley'
-require 'net/ssh'
 require 'santoku/printers'
 
 class Santoku
@@ -38,53 +36,5 @@ class Santoku
     def invert?
       @invert
     end
-
-  private
-    def 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 ridley
-      @ridley ||= Ridley.new(
-        server_url: knife_config.chef_server_url,
-        client_name: knife_config.node_name,
-        client_key: knife_config.client_key
-      )
-    end
-
-    def ssh_exec!(ssh, command)
-      # I am not awesome enough to have made this method myself
-      # 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
-        end
-      end
-      ssh.loop
-      [stdout_data, stderr_data, exit_code]
-    end
   end
 end

data/lib/santoku/santoku.rb

@@ -0,0 +1,30 @@
+require 'net/ssh'
+
+class Santoku
+  class << self
+    def execute_query fqdn
+      begin
+        timeout @timeout_interval do
+          Net::SSH.start(fqdn, 'root', paranoid: false, forward_agent: true) do |ssh|
+            output = ssh_exec!(ssh, @command)
+            parse_output output, fqdn
+          end
+        end
+      rescue TimeoutError, Errno::ETIMEDOUT, SocketError, Errno::EHOSTUNREACH => e
+        timed_out "#{fqdn}: #{e.message}"
+      rescue Exception => e
+        timed_out "#{fqdn}: #{e.inspect}"
+      end
+    end
+
+    def parse_output output, fqdn
+      if output[2] == 0 && !invert?
+        succeeded "#{fqdn}: #{output[0]}"
+      elsif output[2] != 0 && invert?
+        succeeded "#{fqdn} returned #{output[2]}: #{output[1]} #{output[0]}"
+      else
+        failed "#{fqdn} returned #{output[2]}: #{output[1]} #{output[0]}"
+      end
+    end
+  end
+end

data/lib/santoku/ssh.rb

@@ -0,0 +1,32 @@
+class Santoku
+  class << self
+    def ssh_exec!(ssh, command)
+      # I am not awesome enough to have made this method myself
+      # 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
+        end
+      end
+      ssh.loop
+      [stdout_data, stderr_data, exit_code]
+    end
+  end
+end

data/santoku.gemspec

@@ -0,0 +1,19 @@
+Gem::Specification.new do |spec|
+  spec.name = 'santoku'
+  spec.version = '0.0.6'
+  spec.executables << 'santoku'
+  spec.date = '2013-11-17'
+  spec.summary = 'Parrallel ssh commands over chef servers with rspec-like output'
+  spec.description = 'A gem to perform command over parallel ssh connections on multiple chef serverspec. Output is rspec-like.'
+  spec.authors = ['Steven De Coeyer', 'Jeroen Jacobs']
+  spec.email = 'tech@openminds.be'
+  spec.files = `git ls-files`.split($\)
+  spec.homepage = 'https://github.com/openminds/santoku'
+  spec.license = 'MIT'
+
+  spec.add_dependency 'chef', '~> 11.0'
+  spec.add_dependency 'colorize'
+  spec.add_dependency 'net-ssh'
+  spec.add_dependency 'peach'
+  spec.add_dependency 'thor'
+end

metadata

@@ -1,15 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: santoku
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Steven De Coeyer
+- Jeroen Jacobs
 autorequire: 
 bindir: bin
 cert_chain: []
 date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -25,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: peach
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ridley
+  name: peach
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -74,11 +89,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- bin/santoku
 - lib/santoku.rb
+- lib/santoku/chef.rb
 - lib/santoku/helpers.rb
 - lib/santoku/printers.rb
-- bin/santoku
-homepage: https://github.com/zhann/santoku
+- lib/santoku/santoku.rb
+- lib/santoku/ssh.rb
+- santoku.gemspec
+homepage: https://github.com/openminds/santoku
 licenses:
 - MIT
 metadata: {}