koma 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce41129abc2085330f040e7d51db8dd1f5ef2653
-  data.tar.gz: 726a1778def941727237e40eb11f385df5e90251
+  metadata.gz: f46ff7aca0cb294d271c2303a06e036ca557b4d1
+  data.tar.gz: 889bcf68fefb14832aa53709621dcd844a1c4e60
 SHA512:
-  metadata.gz: 6941ee3cc399bcc5806557da2d84ba2b35a6dd3c34c4f80e4de234485dbfeaa206919f18bf6851274d4f639a540da2c877507dcaf4ccc187678e90a59f7473ab
-  data.tar.gz: 823cbea35c3d79c90fd0535ae83f0ff4e6fb009656e5b64e3a10e6f2c73ba20effe52b037265335422a7b9621a075e77b67a9f14c45abcd5234a2527f359a076
+  metadata.gz: 6fcbb276e6518cbe64883858c3f49485a3607f0111b25513828af277ea2dd248d1ba55c20c250adde0b4c6734c3b25ff864db7939e309b92c8d7832bdf0c38f9
+  data.tar.gz: f91c31e0247d7667dc06b29bec966de40c3b7ea168ae22363f1f09252310dda4983c37589917c48bfa1d3665d82b394fe7d28a23c49c1d14d9fdc5c188212a91

data/lib/koma/cli.rb

@@ -5,7 +5,7 @@ require 'yaml'
 module Koma
   class CLI < Thor
     class_option :version, type: :boolean, aliases: :V
-   
+
     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

data/lib/koma/ext.rb

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

data/lib/koma/ext/specinfra/host_inventory/base.rb

@@ -1,34 +1,8 @@
 module Specinfra
   class HostInventory
     class Base
-      private
-
-      def create_parser_class(resource_type)
-        os_info = backend.os
-        family = os_info[:family]
-        version = os_info[:release] ? "V#{os_info[:release].to_i}" : nil
-        common_class = Specinfra::HostInventory::Parser
-        base_class = common_class.const_get('Base')
-        os_class = family.nil? ? base_class : common_class.const_get(family.capitalize)
-
-        if family && version
-          begin
-            version_class = os_class.const_get(version)
-          rescue
-            version_class = os_class.const_get('Base')
-          end
-        elsif family.nil?
-          version_class = os_class
-        elsif family != 'base' && version.nil?
-          version_class = os_class.const_get('Base')
-        end
-
-        begin
-          parser_class = version_class.const_get(resource_type.to_camel_case)
-        rescue
-        end
-
-        parser_class.create(backend)
+      def parser
+        Specinfra::HostInventory::ParserFactory.instance
       end
     end
   end

data/lib/koma/ext/specinfra/host_inventory/package.rb

@@ -4,7 +4,7 @@ module Specinfra
       def get
         cmd = backend.command.get(:get_inventory_package)
         ret = backend.run_command(cmd)
-        if ret.exit_status == 0
+        if ret.success?
           parse(ret.stdout)
         else
           nil
@@ -12,14 +12,7 @@ module Specinfra
       end
 
       def parse(cmd_ret)
-        packages = {}
-        lines = cmd_ret.split(/\n/)
-        lines.each do |line|
-          h = Hash[line.split("\t").map { |f| f.split(':', 2) }]
-          idx = h['name']
-          packages[idx] = h
-        end
-        packages
+        parser.get('package').parse(cmd_ret)
       end
     end
   end

data/lib/koma/ext/specinfra/host_inventory/parser.rb

@@ -1,10 +1,17 @@
 class Specinfra::HostInventory::Parser;end;
 
 require 'koma/ext/specinfra/host_inventory/parser/base'
+require 'koma/ext/specinfra/host_inventory/parser/base/package'
+require 'koma/ext/specinfra/host_inventory/parser/base/service'
+
+require 'koma/ext/specinfra/host_inventory/parser/linux'
+require 'koma/ext/specinfra/host_inventory/parser/linux/base'
+require 'koma/ext/specinfra/host_inventory/parser/linux/base/package'
+require 'koma/ext/specinfra/host_inventory/parser/linux/base/service'
+
 require 'koma/ext/specinfra/host_inventory/parser/redhat'
 require 'koma/ext/specinfra/host_inventory/parser/redhat/base'
+require 'koma/ext/specinfra/host_inventory/parser/redhat/base/package'
 require 'koma/ext/specinfra/host_inventory/parser/redhat/base/service'
 require 'koma/ext/specinfra/host_inventory/parser/redhat/v7'
 require 'koma/ext/specinfra/host_inventory/parser/redhat/v7/service'
-
-

data/lib/koma/ext/specinfra/host_inventory/parser/base/package.rb

@@ -0,0 +1,2 @@
+class Specinfra::HostInventory::Parser::Base::Package < Specinfra::HostInventory::Parser::Base
+end

data/lib/koma/ext/specinfra/host_inventory/parser/base/service.rb

@@ -0,0 +1 @@
+class Specinfra::HostInventory::Parser::Base::Service < Specinfra::HostInventory::Parser::Base;end

data/lib/koma/ext/specinfra/host_inventory/parser/linux.rb

@@ -0,0 +1 @@
+class Specinfra::HostInventory::Parser::Linux; end

data/lib/koma/ext/specinfra/host_inventory/parser/linux/base.rb

@@ -0,0 +1,2 @@
+class Specinfra::HostInventory::Parser::Linux::Base < Specinfra::HostInventory::Parser::Base
+end

data/lib/koma/ext/specinfra/host_inventory/parser/linux/base/package.rb

@@ -0,0 +1,2 @@
+class Specinfra::HostInventory::Parser::Linux::Package < Specinfra::HostInventory::Parser::Base::Package
+end

data/lib/koma/ext/specinfra/host_inventory/parser/linux/base/service.rb

@@ -0,0 +1,2 @@
+class Specinfra::HostInventory::Parser::Linux::Service < Specinfra::HostInventory::Parser::Base::Service
+end

data/lib/koma/ext/specinfra/host_inventory/parser/redhat/base/package.rb

@@ -0,0 +1,14 @@
+class Specinfra::HostInventory::Parser::Redhat::Base::Package < Specinfra::HostInventory::Parser::Linux::Package
+  class << self
+    def parse(cmd_ret)
+      packages = {}
+      lines = cmd_ret.split(/\n/)
+      lines.each do |line|
+        h = Hash[line.split("\t").map { |f| f.split(':', 2) }]
+        idx = h['name']
+        packages[idx] = h
+      end
+      packages
+    end
+  end
+end

data/lib/koma/ext/specinfra/host_inventory/parser/redhat/base/service.rb

@@ -1,4 +1,4 @@
-class Specinfra::HostInventory::Parser::Redhat::Base::Service < Specinfra::HostInventory::Parser::Base
+class Specinfra::HostInventory::Parser::Redhat::Base::Service < Specinfra::HostInventory::Parser::Linux::Service
   class << self
     def parse(cmd_ret)
       services = {}

data/lib/koma/ext/specinfra/host_inventory/parser/redhat/v7/service.rb

@@ -1,4 +1,4 @@
-class Specinfra::HostInventory::Parser::Redhat::V7::Service < Specinfra::HostInventory::Parser::Base
+class Specinfra::HostInventory::Parser::Redhat::V7::Service < Specinfra::HostInventory::Parser::Redhat::Base::Service
   class << self
     def parse(cmd_ret)
       services = {}

data/lib/koma/ext/specinfra/host_inventory/parser_factory.rb

@@ -0,0 +1,53 @@
+module Specinfra
+  class HostInventory
+    class ParserFactory
+      def self.instance
+        self.new(os)
+      end
+
+      def initialize(os_info)
+        @os_info = os_info
+      end
+
+      def get(resource_type)
+        create_parser_class(resource_type)
+      end
+
+      private
+
+      def create_parser_class(resource_type)
+        family = @os_info[:family]
+        version = @os_info[:release] ? "V#{@os_info[:release].to_i}" : nil
+        common_class = Specinfra::HostInventory::Parser
+        base_class = common_class.const_get('Base')
+        begin
+          os_class = family.nil? ? base_class : common_class.const_get(family.capitalize)
+        rescue
+          parser_class = base_class.const_get(resource_type.to_camel_case)
+          return parser_class.create(Specinfra.backend)
+        end
+
+        if family && version
+          begin
+            version_class = os_class.const_get(version)
+          rescue
+            version_class = os_class.const_get('Base')
+          end
+        elsif family.nil?
+          version_class = os_class
+        elsif family != 'base' && version.nil?
+          version_class = os_class.const_get('Base')
+        end
+
+        begin
+          parser_class = version_class.const_get(resource_type.to_camel_case)
+        rescue
+          version_class = os_class.const_get('Base')
+          parser_class = version_class.const_get(resource_type.to_camel_case)
+        end
+
+        parser_class.create(Specinfra.backend)
+      end
+    end
+  end
+end

data/lib/koma/ext/specinfra/host_inventory/service.rb

@@ -12,8 +12,7 @@ module Specinfra
       end
 
       def parse(cmd_ret)
-        parser = create_parser_class('service')
-        parser.parse(cmd_ret)
+        parser.get('service').parse(cmd_ret)
       end
     end
   end

data/lib/koma/version.rb

@@ -1,3 +1,3 @@
 module Koma
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koma
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -198,11 +198,19 @@ files:
 - lib/koma/ext/specinfra/host_inventory/package.rb
 - lib/koma/ext/specinfra/host_inventory/parser.rb
 - lib/koma/ext/specinfra/host_inventory/parser/base.rb
+- lib/koma/ext/specinfra/host_inventory/parser/base/package.rb
+- lib/koma/ext/specinfra/host_inventory/parser/base/service.rb
+- lib/koma/ext/specinfra/host_inventory/parser/linux.rb
+- lib/koma/ext/specinfra/host_inventory/parser/linux/base.rb
+- lib/koma/ext/specinfra/host_inventory/parser/linux/base/package.rb
+- lib/koma/ext/specinfra/host_inventory/parser/linux/base/service.rb
 - lib/koma/ext/specinfra/host_inventory/parser/redhat.rb
 - lib/koma/ext/specinfra/host_inventory/parser/redhat/base.rb
+- lib/koma/ext/specinfra/host_inventory/parser/redhat/base/package.rb
 - lib/koma/ext/specinfra/host_inventory/parser/redhat/base/service.rb
 - lib/koma/ext/specinfra/host_inventory/parser/redhat/v7.rb
 - lib/koma/ext/specinfra/host_inventory/parser/redhat/v7/service.rb
+- lib/koma/ext/specinfra/host_inventory/parser_factory.rb
 - lib/koma/ext/specinfra/host_inventory/service.rb
 - lib/koma/host_inventory.rb
 - lib/koma/version.rb