koma 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe87e3f628aaf7717c0ae51b76a7e56ec23d085f
-  data.tar.gz: ddf155543824ca36b212cb5e462e433e85f01b68
+  metadata.gz: 3eee13c68f078a3f02b2d19e063eff87acd4e0fb
+  data.tar.gz: 3f0b322b862a2059da3ee03eb62fdbb8b555b47e
 SHA512:
-  metadata.gz: b14e688817e30ab9598c476f386267e712ff19037b05eb04f3cab5752d9445e0bf4e65d31445713bd780f35785f46d9587adad9a6e32037886ea792a1964ac43
-  data.tar.gz: 646816c3d97bfe9ec25f7baecd3cde9fdce11c86d8073e0f12ff4a66af0ea51f9fbcdced2acd3d810eb3f14b3e39483ced2f4b5d13d91835bbd4b8b444e3acfb
+  metadata.gz: 3349038bfe0a67bc48dc05eb1568efd4d5c1b6b8a84fa02eb27ffda0c723f78a395a9a2ae90064c1c52acb7d6bf966dae359c17ff1a3cc9c3cef10af9d5071cc
+  data.tar.gz: 5115f5fbd67158edb19ab6ea258fca8447ac14f32d1714b8a179c98512ed10f977dd50271b13e3dc69c94b3fd82b752396f1bf2855d265c20c785bbf1be1cb70

data/README.md

@@ -32,6 +32,20 @@ $ koma ssh example.com
 
 And get stdout like [this](stdout_sample.json).
 
+### Multi host gathering
+
+```sh
+$ koma ssh example.com,example.jp
+{
+  "example.com" : {
+    ...
+  },
+  "example.jp" : {
+    ...
+  }
+}
+```
+
 ## Host inventory keys
 
 ```sh

data/koma.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'highline'
   spec.add_runtime_dependency 'specinfra', '~> 2.48'
+  spec.add_runtime_dependency 'parallel'
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'

data/lib/koma/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'json'
+require 'parallel'
 
 include Specinfra::Helper::Set
 
@@ -22,16 +23,17 @@ module Koma
            desc: 'port',
            aliases: :p
     def ssh(host)
-      user, host = host.split('@') if host.include?('@')
-      set :backend, :ssh
-      set :host, host
-      set :request_pty, true
-      ssh_options = Net::SSH::Config.for(host)
-      ssh_options[:user] = user if user
-      ssh_options[:keys] = [options[:identity_file]] if options[:identity_file]
-      ssh_options[:port] = options[:port] if options[:port]
-      set :ssh_options, ssh_options
-      puts JSON.pretty_generate out(options[:key])
+      if host.include?(',')
+        list = host.split(',')
+        results = Parallel.map(list, in_thread: 4) do |h|
+          ssh_out(h, options)
+        end
+        arr = [list, results].transpose
+        puts JSON.pretty_generate(Hash[*arr.flatten])
+      else
+        result = ssh_out(host, options)
+        puts JSON.pretty_generate(result)
+      end
     end
 
     desc 'exec', 'stdout local host inventory'
@@ -42,7 +44,8 @@ module Koma
            aliases: :k
     def exec
       set :backend, :exec
-      puts JSON.pretty_generate out(options[:key])
+      result = out(options[:key])
+      puts JSON.pretty_generate(result)
     end
 
     desc 'keys', 'host inventory keys'
@@ -58,6 +61,19 @@ module Koma
       Specinfra::HostInventory.inventory_keys
     end
 
+    def ssh_out(host, options)
+      user, host = host.split('@') if host.include?('@')
+      set :backend, :ssh
+      set :host, host
+      set :request_pty, true
+      ssh_options = Net::SSH::Config.for(host)
+      ssh_options[:user] = user if user
+      ssh_options[:keys] = [options[:identity_file]] if options[:identity_file]
+      ssh_options[:port] = options[:port] if options[:port]
+      set :ssh_options, ssh_options
+      out(options[:key])
+    end
+
     def out(key = nil)
       out = {}
       keys = if key.nil?

data/lib/koma/version.rb

@@ -1,3 +1,3 @@
 module Koma
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: koma
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - k1LoW
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.48'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement