koma 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3b8d86a789ed3ff3c5545798e9cdd974822c2ec
-  data.tar.gz: fe3ac5b2c55c6c8a17c05a1b294d713611718a91
+  metadata.gz: 1e5aab9738be1d947920d666285013ccf374ff92
+  data.tar.gz: 3c073c470b674df0fc401e251e8f1b9f55ae1af9
 SHA512:
-  metadata.gz: 55fbf28ad7bd93ddbf7d48e63ba4aaa2259aa30ccf06de24a3dd5be1478acb2f348e6375cdd87603c5fd2c31b756ab3b02ed7ccea5cd58c032aec9374f26cc7c
-  data.tar.gz: efa90f0252eaaaf04b689d0bad5cb4845624843994f8dd952afaf44ee6e34331ae0776996c40d86603337f35d56b3993501e08e7aed76c039f0fdaaf27da8160
+  metadata.gz: 6a18bb06c7e5523532fd2595929dbccfb4db85f0a7e16449b95a3460c6931527f91053a0da7b09206f025678b3f63e3c5c5f75c04abede35ef27816adc805827
+  data.tar.gz: 547d73eb184b41c174900580a09da841daf2479d9d98c093bd52378757895cd5b71c722d563e21034730973be391d6415d87e9a0225e520f03c55508d6f3a64c

data/lib/koma.rb

@@ -2,10 +2,12 @@ require 'rubygems'
 require 'net/ssh'
 require 'specinfra'
 require 'specinfra/helper/set'
+require 'koma/version'
+require 'koma/error'
 require 'koma/ext'
+require 'koma/host_inventory'
 require 'koma/backend'
 require 'koma/cli'
-require 'koma/version'
 
 module Koma
 end

data/lib/koma/backend/base.rb

@@ -1,11 +1,12 @@
 include Specinfra::Helper::Set
 
 class Koma::Backend::Base
-  attr_reader :host, :options
+  attr_reader :host, :options, :inventory_keys
 
   def initialize(host, options)
     @host = host
     @options = options
+    @inventory_keys = Koma::HostInventory.inventory_keys
   end
 
   def out(key = nil)
@@ -15,7 +16,12 @@ class Koma::Backend::Base
            else
              key.split(',')
            end
+    Koma::HostInventory.disabled_keys.each do |k|
+      keys.push(k) if @options["with-#{k}"]
+    end
+
     keys.each do |k|
+      raise Koma::NotImplementedKeyError unless Koma::HostInventory.all_inventory_keys.include?(k)
       begin
         out[k] = Specinfra.backend.host_inventory[k]
         out[k] = Specinfra.backend.host_inventory[k].inspect if k == 'ec2'
@@ -25,8 +31,4 @@ class Koma::Backend::Base
     end
     out
   end
-
-  def inventory_keys
-    Specinfra::HostInventory.inventory_keys
-  end
 end

data/lib/koma/backend/ssh.rb

@@ -3,8 +3,6 @@ require 'parallel'
 module Koma
   module Backend
     class Ssh < Base
-      attr_reader :host, :options
-
       def gather
         if host.include?(',')
           list = host.split(',')

data/lib/koma/cli.rb

@@ -24,6 +24,11 @@ module Koma
            banner: '<port>',
            desc: 'port',
            aliases: :p
+    Koma::HostInventory.disabled_keys.each do |key|
+      option "with-#{key}",
+             type: :boolean,
+             desc: "enable #{key}"
+    end
     def ssh(host)
       backend = Koma::Backend::Ssh.new(host, options)
       if options[:yaml]
@@ -43,6 +48,11 @@ module Koma
            type: :boolean,
            desc: 'stdout YAML',
            aliases: :y
+    Koma::HostInventory.disabled_keys.each do |key|
+      option "with-#{key}",
+             type: :boolean,
+             desc: "enable #{key}"
+    end
     def exec
       backend = Koma::Backend::Exec.new(nil, options)
       if options[:yaml]
@@ -54,7 +64,8 @@ module Koma
 
     desc 'keys', 'host inventory keys'
     def keys
-      Specinfra::HostInventory.inventory_keys.each do |key|
+      Koma::HostInventory.all_inventory_keys.each do |key|
+        key += ' (disabled)' if Koma::HostInventory.disabled_keys.include?(key)
         puts key
       end
     end

data/lib/koma/error.rb

@@ -0,0 +1,4 @@
+module Koma
+  class NotImplementedKeyError < StandardError
+  end
+end

data/lib/koma/ext.rb

@@ -1,4 +1,4 @@
-require 'koma/ext/specinfra/host_inventory'
+require 'koma/ext/specinfra/host_inventory/base'
 require 'koma/ext/specinfra/host_inventory/parser'
 
 require 'koma/ext/specinfra/command/base/inventory'

data/lib/koma/{ext/specinfra/host_inventory.rb → host_inventory.rb}

@@ -1,12 +1,18 @@
-require 'koma/ext/specinfra/host_inventory/base'
-require 'koma/ext/specinfra/host_inventory/parser'
-
-module Specinfra
+module Koma
   class HostInventory
     EXTRA_KEYS = %w(package user group service)
+    DISABLED_KEYS = %w(ec2)
 
     def self.inventory_keys
-      KEYS + EXTRA_KEYS
+      Specinfra::HostInventory::KEYS + EXTRA_KEYS - DISABLED_KEYS
+    end
+
+    def self.all_inventory_keys
+      Specinfra::HostInventory::KEYS + EXTRA_KEYS
+    end
+
+    def self.disabled_keys
+      DISABLED_KEYS
     end
 
     def each
@@ -29,6 +35,6 @@ module Specinfra
   end
 end
 
-Specinfra::HostInventory::EXTRA_KEYS.each do |k|
+Koma::HostInventory::EXTRA_KEYS.each do |k|
   require "koma/ext/specinfra/host_inventory/#{k}"
 end

data/lib/koma/version.rb

@@ -1,3 +1,3 @@
 module Koma
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: koma
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - k1LoW
@@ -176,11 +176,11 @@ files:
 - lib/koma/backend/exec.rb
 - lib/koma/backend/ssh.rb
 - lib/koma/cli.rb
+- lib/koma/error.rb
 - lib/koma/ext.rb
 - lib/koma/ext/specinfra/command/base/inventory.rb
 - lib/koma/ext/specinfra/command/redhat/base/inventory.rb
 - lib/koma/ext/specinfra/command/redhat/v7/inventory.rb
-- lib/koma/ext/specinfra/host_inventory.rb
 - lib/koma/ext/specinfra/host_inventory/base.rb
 - lib/koma/ext/specinfra/host_inventory/group.rb
 - lib/koma/ext/specinfra/host_inventory/package.rb
@@ -193,6 +193,7 @@ files:
 - lib/koma/ext/specinfra/host_inventory/parser/redhat/v7/service.rb
 - lib/koma/ext/specinfra/host_inventory/service.rb
 - lib/koma/ext/specinfra/host_inventory/user.rb
+- lib/koma/host_inventory.rb
 - lib/koma/version.rb
 - stdout_sample.json
 homepage: https://github.com/k1LoW/koma