koma 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eee13c68f078a3f02b2d19e063eff87acd4e0fb
-  data.tar.gz: 3f0b322b862a2059da3ee03eb62fdbb8b555b47e
+  metadata.gz: 383af2846d313675f2b9194c6c7a1ea1219911d6
+  data.tar.gz: 732fc3eb5a5e422ea97ecaac95e286d6f2c2df06
 SHA512:
-  metadata.gz: 3349038bfe0a67bc48dc05eb1568efd4d5c1b6b8a84fa02eb27ffda0c723f78a395a9a2ae90064c1c52acb7d6bf966dae359c17ff1a3cc9c3cef10af9d5071cc
-  data.tar.gz: 5115f5fbd67158edb19ab6ea258fca8447ac14f32d1714b8a179c98512ed10f977dd50271b13e3dc69c94b3fd82b752396f1bf2855d265c20c785bbf1be1cb70
+  metadata.gz: 4f676fd8818f751fc9e4d0423670807570f81d66241ae04a91b6f92aa8c99c16f06301902c1cc7d5bc70d7c285eae81bd31bdc8c945b665408e5ac76a14c350f
+  data.tar.gz: d61ba847dcf476e333b466efe99dd1d609dd14d3b9e2690a0db2e19ab33538670981d8e65eddd3c0980af9665f1caf616e119cc6882b29474ada52392a297292

data/README.md

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

data/lib/koma/backend/base.rb

@@ -0,0 +1,32 @@
+include Specinfra::Helper::Set
+
+class Koma::Backend::Base
+  attr_reader :host, :options
+
+  def initialize(host, options)
+    @host = host
+    @options = options
+  end
+
+  def out(key = nil)
+    out = {}
+    keys = if key.nil?
+             inventory_keys
+           else
+             key.split(',')
+           end
+    keys.each do |k|
+      begin
+        out[k] = Specinfra.backend.host_inventory[k]
+        out[k] = Specinfra.backend.host_inventory[k].inspect if k == 'ec2'
+      rescue NotImplementedError
+        out[k] = nil
+      end
+    end
+    out
+  end
+
+  def inventory_keys
+    Specinfra::HostInventory.inventory_keys
+  end
+end

data/lib/koma/backend/exec.rb

@@ -0,0 +1,10 @@
+module Koma
+  module Backend
+    class Exec < Base
+      def gather
+        set :backend, :exec
+        result = out(options[:key])
+      end
+    end
+  end
+end

data/lib/koma/backend/ssh.rb

@@ -0,0 +1,36 @@
+require 'parallel'
+
+module Koma
+  module Backend
+    class Ssh < Base
+      attr_reader :host, :options
+
+      def gather
+        if host.include?(',')
+          list = host.split(',')
+          results = Parallel.map(list, in_thread: 4) do |h|
+            gather_via_ssh(h, options)
+          end
+          arr = [list, results].transpose
+          result = Hash[*arr.flatten]
+        else
+          result = gather_via_ssh(host, options)
+        end
+        result
+      end
+
+      def gather_via_ssh(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
+    end
+  end
+end

data/lib/koma/backend.rb

@@ -0,0 +1,8 @@
+module Koma
+  module Backend
+  end
+end
+
+require 'koma/backend/base'
+require 'koma/backend/exec'
+require 'koma/backend/ssh'

data/lib/koma/cli.rb

@@ -1,8 +1,6 @@
 require 'thor'
 require 'json'
-require 'parallel'
-
-include Specinfra::Helper::Set
+require 'yaml'
 
 module Koma
   class CLI < Thor
@@ -23,17 +21,8 @@ module Koma
            desc: 'port',
            aliases: :p
     def ssh(host)
-      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
+      backend = Koma::Backend::Ssh.new(host, options)
+      puts JSON.pretty_generate(backend.gather)
     end
 
     desc 'exec', 'stdout local host inventory'
@@ -43,53 +32,15 @@ module Koma
            desc: 'inventory keys',
            aliases: :k
     def exec
-      set :backend, :exec
-      result = out(options[:key])
-      puts JSON.pretty_generate(result)
+      backend = Koma::Backend::Exec.new(nil, options)
+      puts JSON.pretty_generate(backend.gather)
     end
 
     desc 'keys', 'host inventory keys'
     def keys
-      inventory_keys.each do |key|
+      Specinfra::HostInventory.inventory_keys.each do |key|
         puts key
       end
     end
-
-    private
-
-    def inventory_keys
-      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?
-               inventory_keys
-             else
-               key.split(',')
-             end
-      keys.each do |k|
-        begin
-          out[k] = Specinfra.backend.host_inventory[k]
-          out[k] = Specinfra.backend.host_inventory[k].inspect if k == 'ec2'
-        rescue NotImplementedError
-          out[k] = nil
-        end
-      end
-      out
-    end
   end
 end

data/lib/koma/version.rb

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

data/lib/koma.rb

@@ -3,6 +3,7 @@ require 'net/ssh'
 require 'specinfra'
 require 'specinfra/helper/set'
 require 'koma/ext'
+require 'koma/backend'
 require 'koma/cli'
 require 'koma/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koma
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -171,6 +171,10 @@ files:
 - exe/koma
 - koma.gemspec
 - lib/koma.rb
+- lib/koma/backend.rb
+- lib/koma/backend/base.rb
+- lib/koma/backend/exec.rb
+- lib/koma/backend/ssh.rb
 - lib/koma/cli.rb
 - lib/koma/ext.rb
 - lib/koma/ext/specinfra/command/base/inventory.rb