specinfra 2.23.0 → 2.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfd61185b0ebcd78346dd1c4f967f068ecbc38a3
-  data.tar.gz: 29739a15583eb339d5f32d8d21b9b6192bf93758
+  metadata.gz: 36304d05e8dc32b0aca739dc27b5794b4ad98d33
+  data.tar.gz: 9df5c5f46c9eb95cb2127ca6afd2fac5df8acda8
 SHA512:
-  metadata.gz: 10782176063c73a571e5d60d6f58c93ba3a0a5cb2eb7822314237ff09c43297321c8aa61d8dd321a977c19fecf875b471f3230c4c2f0fd658070dd1681c702c1
-  data.tar.gz: defd5e7c88132840fe9e46403ee22560ee09c4a0d71d40568451f17f00b2ddb8b79e6aeac733c8d50e06f8907669b3af0a41b20492841a01ed55ac6152967c8b
+  metadata.gz: c3e754f052c2814056e1f0eb1a461454376df60abbf48a5117f88ae6a0070a7385adb352325d85a78de1e8c710e5abe6015ff248790dbfdb938a2e7060b99999
+  data.tar.gz: 508181175062039ba2c075706fb22b8de1530fb17019f52d2562f6f24a412a523fee756ff43e155b5034f181abe11f143bd967d678cb1e4cc21c0197b3a455a9

data/lib/specinfra/backend/base.rb

@@ -34,6 +34,10 @@ module Specinfra::Backend
       CommandFactory.new(os_info)
     end
 
+    def host_inventory
+      @inventory ||= HostInventory.new(self)
+    end
+
     def set_example(e)
       @example = e
     end

data/lib/specinfra/backend/ssh.rb

@@ -90,7 +90,7 @@ module Specinfra::Backend
       tmp = File.join('/tmp', File.basename(to))
       scp = get_config(:scp)
       scp.upload!(from, tmp, opt)
-      run_command(Specinfra.command.get(:move_file, tmp, to))
+      run_command(command.get(:move_file, tmp, to))
     end
 
     def ssh_exec!(command)

data/lib/specinfra/ec2_metadata.rb

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 module Specinfra
   class Ec2Metadata
-    def initialize
+    def initialize(host_inventory)
+      @host_inventory = host_inventory
+
       @base_uri = 'http://169.254.169.254/latest/meta-data/'
       @metadata = {}
     end
@@ -16,7 +18,7 @@ module Specinfra
         begin
           require "specinfra/ec2_metadata/#{key}"
           inventory_class = Specinfra::Ec2Metadata.const_get(key.to_s.to_camel_case)
-          @metadata[key] = inventory_class.get
+          @metadata[key] = inventory_class.new(@host_inventory).get
         rescue LoadError
           @metadata[key] = nil
         end
@@ -59,7 +61,7 @@ module Specinfra
     def get_metadata(path='')
       metadata = {}
 
-      keys = Specinfra::Runner.run_command("curl -s #{@base_uri}#{path}").stdout.split("\n")
+      keys = @host_inventory.backend.run_command("curl -s #{@base_uri}#{path}").stdout.split("\n")
 
       keys.each do |key|
         if key =~ %r{/$}
@@ -79,7 +81,7 @@ module Specinfra
     end
 
     def get_endpoint(path)
-      ret = Specinfra::Runner.run_command("curl -s #{@base_uri}#{path}")
+      ret = @host_inventory.backend.run_command("curl -s #{@base_uri}#{path}")
       if ret.success?
         ret.stdout
       else

data/lib/specinfra/host_inventory.rb

@@ -1,11 +1,29 @@
 module Specinfra
   class HostInventory
-    include Singleton
+    KEYS = %w{
+      memory
+      ec2
+      hostname
+      domain
+      fqdn
+      platform
+      platform_version
+      filesystem
+      cpu
+    }
+
     include Enumerable
 
-    def initialize
+    attr_reader :backend
+
+    def self.instance
       property[:host_inventory] ||= {}
-      @inventory = property[:host_inventory]
+      self.new(Specinfra.backend, property[:host_inventory])
+    end
+
+    def initialize(backend, inventory = {})
+      @backend = backend
+      @inventory = inventory
     end
 
     def [](key)
@@ -13,7 +31,7 @@ module Specinfra
       if @inventory[key.to_sym].empty?
         begin
           inventory_class = Specinfra::HostInventory.const_get(key.to_s.to_camel_case)
-          @inventory[key.to_sym] = inventory_class.get
+          @inventory[key.to_sym] = inventory_class.new(self).get
         rescue
           @inventory[key.to_sym] = nil
         end
@@ -22,39 +40,27 @@ module Specinfra
     end
 
     def each
-      keys.each do |k|
+      KEYS.each do |k|
         yield k, self[k]
       end
     end
 
     def each_key
-      keys.each do |k|
+      KEYS.each do |k|
         yield k
       end
     end
 
     def each_value
-      keys.each do |k|
+      KEYS.each do |k|
         yield self[k]
       end
     end
 
-    def keys
-      %w{
-        memory
-        ec2
-        hostname
-        domain
-        fqdn
-        platform
-        platform_version
-        filesystem
-        cpu
-      }
-    end
   end
 end
 
-Specinfra::HostInventory.instance.keys.each do |k|
+require "specinfra/host_inventory/base"
+Specinfra::HostInventory::KEYS.each do |k|
   require "specinfra/host_inventory/#{k}"
 end

data/lib/specinfra/host_inventory/base.rb

@@ -0,0 +1,14 @@
+module Specinfra
+  class HostInventory
+    class Base
+      def initialize(host_inventory)
+        @host_inventory = host_inventory
+      end
+
+      def backend
+        @host_inventory.backend
+      end
+    end
+  end
+end
+

data/lib/specinfra/host_inventory/cpu.rb

@@ -1,12 +1,12 @@
 module Specinfra
   class HostInventory
-    class Cpu
-      def self.get
-        cmd = Specinfra.command.get(:get_inventory_cpu)
-        ret = Specinfra.backend.run_command(cmd).stdout
+    class Cpu < Base
+      def get
+        cmd = backend.command.get(:get_inventory_cpu)
+        ret = backend.run_command(cmd).stdout
         parse(ret)
       end
-      def self.parse(cmd_ret)
+      def parse(cmd_ret)
         cpuinfo = {}
         cpus = cmd_ret.split(/[^^]processor/)
         cpuinfo['total'] = cpus.length.to_s

data/lib/specinfra/host_inventory/domain.rb

@@ -1,9 +1,9 @@
 module Specinfra
   class HostInventory
-    class Domain
-      def self.get
-        cmd = Specinfra.command.get(:get_inventory_domain)
-        Specinfra.backend.run_command(cmd).stdout.strip
+    class Domain < Base
+      def get
+        cmd = backend.command.get(:get_inventory_domain)
+        backend.run_command(cmd).stdout.strip
       end
     end
   end

data/lib/specinfra/host_inventory/ec2.rb

@@ -2,9 +2,9 @@ require 'specinfra/ec2_metadata'
 
 module Specinfra
   class HostInventory
-    class Ec2
-      def self.get
-        Specinfra::Ec2Metadata.new.get
+    class Ec2 < Base
+      def get
+        Specinfra::Ec2Metadata.new(@host_inventory).get
       end
     end
   end

data/lib/specinfra/host_inventory/filesystem.rb

@@ -1,10 +1,10 @@
 module Specinfra
   class HostInventory
-    class Filesystem
-      def self.get
-        cmd = Specinfra.command.get(:get_inventory_filesystem)
+    class Filesystem < Base
+      def get
+        cmd = backend.command.get(:get_inventory_filesystem)
         filesystem = {}
-        Specinfra.backend.run_command(cmd).stdout.lines do |line|
+        backend.run_command(cmd).stdout.lines do |line|
           next if line =~ /^Filesystem\s+/
           if line =~ /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
             device = $1

data/lib/specinfra/host_inventory/fqdn.rb

@@ -1,9 +1,9 @@
 module Specinfra
   class HostInventory
-    class Fqdn
-      def self.get
-        cmd = Specinfra.command.get(:get_inventory_fqdn)
-        Specinfra.backend.run_command(cmd).stdout.strip
+    class Fqdn < Base
+      def get
+        cmd = backend.command.get(:get_inventory_fqdn)
+        backend.run_command(cmd).stdout.strip
       end
     end
   end

data/lib/specinfra/host_inventory/hostname.rb

@@ -1,9 +1,9 @@
 module Specinfra
   class HostInventory
-    class Hostname
-      def self.get
-        cmd = Specinfra.command.get(:get_inventory_hostname)
-        Specinfra.backend.run_command(cmd).stdout.strip
+    class Hostname < Base
+      def get
+        cmd = backend.command.get(:get_inventory_hostname)
+        backend.run_command(cmd).stdout.strip
       end
     end
   end

data/lib/specinfra/host_inventory/memory.rb

@@ -1,9 +1,9 @@
 module Specinfra
   class HostInventory
-    class Memory
-      def self.get
-        cmd = Specinfra.command.get(:get_inventory_memory)
-        ret = Specinfra.backend.run_command(cmd).stdout
+    class Memory < Base
+      def get
+        cmd = backend.command.get(:get_inventory_memory)
+        ret = backend.run_command(cmd).stdout
         memory = { 'swap' => {} }
         ret.each_line do |line|
           case line

data/lib/specinfra/host_inventory/platform.rb

@@ -1,8 +1,8 @@
 module Specinfra
   class HostInventory
-    class Platform
-      def self.get
-        os[:family]
+    class Platform < Base
+      def get
+        backend.os_info[:family]
       end
     end
   end

data/lib/specinfra/host_inventory/platform_version.rb

@@ -1,8 +1,8 @@
 module Specinfra
   class HostInventory
-    class PlatformVersion
-      def self.get
-        os[:release]
+    class PlatformVersion < Base
+      def get
+        backend.os_info[:release]
       end
     end
   end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.23.0"
+  VERSION = "2.24.0"
 end

data/spec/host_inventory/cpu_spec.rb

@@ -55,8 +55,9 @@ power management:
 EOH
 
 describe Specinfra::HostInventory::Cpu do
+  let(:host_inventory) { nil }
   describe 'Example of Ubuntu 14.04.1 LTS Kernel version 3.13.11' do
-    ret = Specinfra::HostInventory::Cpu.parse(str)
+    ret = Specinfra::HostInventory::Cpu.new(host_inventory).parse(str)
     example do
       expect(ret["0"]).to include(
         "vendor_id" => "GenuineIntel",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.24.0
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -356,6 +356,7 @@ files:
 - lib/specinfra/helper/properties.rb
 - lib/specinfra/helper/set.rb
 - lib/specinfra/host_inventory.rb
+- lib/specinfra/host_inventory/base.rb
 - lib/specinfra/host_inventory/cpu.rb
 - lib/specinfra/host_inventory/domain.rb
 - lib/specinfra/host_inventory/ec2.rb