koma 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33a965754d80b189a101cea02a9e879803b774ab
-  data.tar.gz: 1808ccb3e7afa6090c289d35735c245b2040a391
+  metadata.gz: db1380979186368ebfa605559dab0218e3a89263
+  data.tar.gz: e117f8bdb660c5ce0e55c15413e7e123339bdfbd
 SHA512:
-  metadata.gz: 6281c8a5b558259025f43ca058ca32fa7a473cc6c32498871da4ffea6ac9dcd2b36cd95cb0cfeca2be0bcaba174dbf575895ac4844550be14bed361e0e4a9eaf
-  data.tar.gz: d4bc1790b1ba8c7ea700053299e1650f6bc35373d5ce89cf1c0973f913d1a093dd5e131765c34426323e8eb0ef762b68bbd86d75c43adb3bbd6ccd7ea46e6a98
+  metadata.gz: eb850c346b24037bb842395391f1ed7449707f62eff0788a72f83d00eecd120a4797ccefa9317299a401757c7763ea85a0110a5ae666f6c8208248ac12507fbe
+  data.tar.gz: 573f446930f97f3edcf13b0915561f1e94efc1c21588cef06b52881d8bf2a24289b12ce8db1d0c03090e84a9ce80e7691d6ad8f7e17e6b064efa51c81cec1ec9

data/README.md

@@ -63,17 +63,22 @@ Host example_jp
   IdentityFile /path/to/more/example_jp_rsa
 EOF
 
-$ cat ssh_config_tmp | koma ssh
+$ cat ssh_config_tmp | koma ssh --key platform,platform_version
 ```
 
+Use [sconb](https://github.com/k1LoW/sconb).
+
 ```sh
-$ vagrant ssh-config | koma ssh --key cpu,kernel
+$ sconb dump example_* | sconb restore | koma ssh --key platform,platform_version
 ```
 
+Gather vagrant box host inventory.
+
 ```sh
-$ sconb dump example.com | sconb restore | koma ssh --key platform,platform_version
+$ vagrant ssh-config | koma ssh --key cpu,kernel
 ```
 
+
 ## Host inventory keys
 
 ```sh

data/lib/koma/backend/ssh.rb

@@ -20,7 +20,39 @@ module Koma
         result
       end
 
+      def run_command(command)
+        if host.include?(',')
+          list = host.split(',').uniq
+          results = Parallel.map(list) do |h|
+            run_command_via_ssh(h, options, command)
+          end
+          arr = [list, results].transpose
+          result = Hash[*arr.flatten]
+        else
+          result = run_command_via_ssh(host, options, command)
+        end
+        result
+      end
+
       def gather_via_ssh(host, options)
+        set :ssh_options, build_ssh_options(host, options)
+        out(options[:key])
+      end
+
+      def run_command_via_ssh(host, options, command)
+        set :ssh_options, build_ssh_options(host, options)
+        result = Specinfra.backend.run_command(command)
+        {
+          exit_signal: result.exit_signal,
+          exit_status: result.exit_status,
+          stderr: result.stderr,
+          stdout: result.stdout
+        }
+      end
+
+      private
+
+      def build_ssh_options(host, options)
         user, host = host.split('@') if host.include?('@')
         set :backend, :ssh
         set :host, host
@@ -34,9 +66,7 @@ module Koma
           ssh_options[:keys] = [options[:identity_file]] if options[:identity_file]
           ssh_options[:port] = options[:port] if options[:port]
         end
-
-        set :ssh_options, ssh_options
-        out(options[:key])
+        ssh_options
       end
     end
   end

data/lib/koma/cli.rb

@@ -5,40 +5,54 @@ require 'yaml'
 module Koma
   class CLI < Thor
     desc 'ssh <host1,host2,..>', 'stdout remote host inventory'
-    option :key,
-           type: :string,
-           banner: '<key1,key2,..>',
-           desc: 'inventory keys',
-           aliases: :k
-    option :yaml,
-           type: :boolean,
-           desc: 'stdout YAML',
-           aliases: :y
-    option :identity_file,
-           type: :string,
-           banner: '<identity_file>',
-           desc: 'identity file',
-           aliases: :i
-    option :port,
-           type: :numeric,
-           banner: '<port>',
-           desc: 'port',
-           aliases: :p
+    option :key, type: :string, banner: '<key1,key2,..>', desc: 'inventory keys', aliases: :k
+    option :yaml, type: :boolean, desc: 'stdout YAML', aliases: :Y
+    option :identity_file, type: :string, banner: '<identity_file>', desc: 'identity file', aliases: :i
+    option :port, type: :numeric, banner: '<port>', desc: 'port', aliases: :p
     Koma::HostInventory.disabled_keys.each do |key|
-      option "with-#{key}",
-             type: :boolean,
-             desc: "enable #{key}"
+      option "with-#{key}", type: :boolean, desc: "enable #{key}"
     end
     def ssh(host = nil)
       if host.nil?
         begin
-          stdin = timeout(5) do
-            $stdin.read
-          end
+          stdin = timeout(1) { $stdin.read }
+        rescue Timeout::Error
+        end
+        ret = stdin.split("\n").select { |line| line =~ /^Host ([^\s\*]+)/ }.map do |line|
+          line =~ /^Host ([^\s]+)/
+          Regexp.last_match[1]
+        end
+        host = ret.join(',')
+      end
+      backend = Koma::Backend::Ssh.new(host, options)
+      backend.stdin = stdin if stdin
+      gathered = backend.gather
+      if options[:yaml]
+        puts YAML.dump(gathered)
+      else
+        puts JSON.pretty_generate(gathered)
+      end
+    end
 
+    desc 'run-command <host1,host2,..> <command>', 'run command on a remote machine'
+    option :yaml, type: :boolean, desc: 'stdout YAML', aliases: :Y
+    option :identity_file, type: :string, banner: '<identity_file>', desc: 'identity file', aliases: :i
+    option :port, type: :numeric, banner: '<port>', desc: 'port', aliases: :p
+    def run_command(host = nil, command = nil)
+      if stdin.nil?
+        STDERR.puts 'ERROR: "koma run-command" was called with no arguments'
+        STDERR.puts 'Usage: "koma run-command <host1,host2,..> <command>"'
+        return
+      end
+      if command.nil?
+        command = host
+        begin
+          stdin = timeout(1) { $stdin.read }
         rescue Timeout::Error
-          STDERR.puts 'ERROR: "koma ssh" was called with no arguments'
-          STDERR.puts 'Usage: "koma ssh <host1,host2,..>"'
+        end
+        if stdin.nil?
+          STDERR.puts 'ERROR: "koma run-command" was called with no arguments'
+          STDERR.puts 'Usage: "koma run-command <host1,host2,..> <command>"'
           return
         end
         ret = stdin.split("\n").select { |line| line =~ /^Host ([^\s\*]+)/ }.map do |line|
@@ -49,27 +63,19 @@ module Koma
       end
       backend = Koma::Backend::Ssh.new(host, options)
       backend.stdin = stdin if stdin
+      gathered = backend.run_command(command)
       if options[:yaml]
-        puts YAML.dump(backend.gather)
+        puts YAML.dump(gathered)
       else
-        puts JSON.pretty_generate(backend.gather)
+        puts JSON.pretty_generate(gathered)
       end
     end
 
     desc 'exec', 'stdout local host inventory'
-    option :key,
-           type: :string,
-           banner: '<key1,key2,..>',
-           desc: 'inventory keys',
-           aliases: :k
-    option :yaml,
-           type: :boolean,
-           desc: 'stdout YAML',
-           aliases: :y
+    option :key, type: :string, banner: '<key1,key2,..>', desc: 'inventory keys', aliases: :k
+    option :yaml, type: :boolean, desc: 'stdout YAML', aliases: :Y
     Koma::HostInventory.disabled_keys.each do |key|
-      option "with-#{key}",
-             type: :boolean,
-             desc: "enable #{key}"
+      option "with-#{key}", type: :boolean, desc: "enable #{key}"
     end
     def exec
       backend = Koma::Backend::Exec.new(nil, options)

data/lib/koma/version.rb

@@ -1,3 +1,3 @@
 module Koma
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koma
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor