lib/koma/cli.rb in koma-0.9.0 vs lib/koma/cli.rb in koma-0.10.0

@@ -3,74 +3,80 @@
 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|
           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.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)
       if options[:yaml]
         puts YAML.dump(backend.gather)