koma 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ae88014a1a220b9d13805154813b8974523c8b4
-  data.tar.gz: 74fd9919c86669ca86eb4b03265f60506d2e0a9b
+  metadata.gz: 33a965754d80b189a101cea02a9e879803b774ab
+  data.tar.gz: 1808ccb3e7afa6090c289d35735c245b2040a391
 SHA512:
-  metadata.gz: aac147c41110d1676a13ec5529ad5ffb43c11bdc5011fd4ba487a95abd09f33bbb8bdccd6959098a262f17ff4f9f43328a76be1ae13de4f19054df5196de1edd
-  data.tar.gz: 7034dba38a96abe98cc9487b48c38ee1ed7585b5de9d5232aa98ec3f927b423bfe73c3cec30cb190e5df5f700c784653c6046acc0085b182f66947f6645ca40b
+  metadata.gz: 6281c8a5b558259025f43ca058ca32fa7a473cc6c32498871da4ffea6ac9dcd2b36cd95cb0cfeca2be0bcaba174dbf575895ac4844550be14bed361e0e4a9eaf
+  data.tar.gz: d4bc1790b1ba8c7ea700053299e1650f6bc35373d5ce89cf1c0973f913d1a093dd5e131765c34426323e8eb0ef762b68bbd86d75c43adb3bbd6ccd7ea46e6a98

data/README.md

@@ -46,10 +46,32 @@ $ koma ssh example.com,example.jp
 }
 ```
 
-### Pro Tip: Gather multiple hosts with ~/.ssh/config
+### Pro Tip: Gather multiple hosts with ssh_config
 
 ```sh
-$ cat ~/.ssh/config | koma ssh --key platform,platform_version
+$ cat <<EOF > ssh_config_tmp
+Host example_com
+  User k1low
+  Hostname example.com
+  PreferredAuthentications publickey
+  IdentityFile /path/to/example_rsa
+
+Host example_jp
+  User someone
+  Hostname example.jp
+  PreferredAuthentications publickey
+  IdentityFile /path/to/more/example_jp_rsa
+EOF
+
+$ cat ssh_config_tmp | koma ssh
+```
+
+```sh
+$ vagrant ssh-config | koma ssh --key cpu,kernel
+```
+
+```sh
+$ sconb dump example.com | sconb restore | koma ssh --key platform,platform_version
 ```
 
 ## Host inventory keys

data/koma.gemspec

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

data/lib/koma/backend/ssh.rb

@@ -1,8 +1,11 @@
 require 'parallel'
+require 'sconb'
 
 module Koma
   module Backend
     class Ssh < Base
+      attr_accessor :stdin
+
       def gather
         if host.include?(',')
           list = host.split(',').uniq
@@ -22,10 +25,16 @@ module Koma
         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]
+        if stdin
+          parsed = Sconb::SSHConfig.parse(stdin, host, {})
+          ssh_options = Net::SSH::Config.translate(Hash[parsed[host].map { |k, v| [k.downcase, v] }])
+        else
+          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]
+        end
+
         set :ssh_options, ssh_options
         out(options[:key])
       end

data/lib/koma/cli.rb

@@ -35,6 +35,7 @@ module Koma
           stdin = timeout(5) do
             $stdin.read
           end
+
         rescue Timeout::Error
           STDERR.puts 'ERROR: "koma ssh" was called with no arguments'
           STDERR.puts 'Usage: "koma ssh <host1,host2,..>"'
@@ -47,6 +48,7 @@ module Koma
         host = ret.join(',')
       end
       backend = Koma::Backend::Ssh.new(host, options)
+      backend.stdin = stdin if stdin
       if options[:yaml]
         puts YAML.dump(backend.gather)
       else

data/lib/koma/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koma
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sconb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement