specinfra 2.14.4 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78e4cd20118f7da1c280111157c3553b3fc480db
-  data.tar.gz: 08355f950af76fbb57ee56091635e026c41146da
+  metadata.gz: 361d8ffe8fa2b17b7b9eee8351881419f8f5379b
+  data.tar.gz: 330df612efb50b40068c034e33105196fa64aea0
 SHA512:
-  metadata.gz: 877f03d84359256870c26860e03b99364f6153c1e2ceb502ff5478b25a1945d9eece9f118794a9d34ab5107042404203906477539f87f5aada1b0b6e644562e2
-  data.tar.gz: 59cc1afa0bd36ea01ca1f90d9f6c8557a13522d8ce78fb25b8645ac77fd7e553dd262b4a058d4c871fab3de4eb0f7adc2322b7fe57730644591364bfcc581032
+  metadata.gz: 0043e8d43ba0e507d13ff9ad7ddeb08489f926612396d264187e6e5ddd4b800072712bc348e2f588e287da58d552e4a7dcedcb1fc02e61e0ebf5b808ef5171a5
+  data.tar.gz: c7a2d8f61357127fd7d09929e9331c1f959ad15da7187313d0b247c86b5e953f7dfff2e9d910cf5172e499ee724d7fc66b8371d9f75fd75d01bfcbaccbc71e5d

data/Rakefile

@@ -9,7 +9,7 @@ if defined?(RSpec)
   task :spec => 'spec:all'
 
   namespace :spec do
-    task :all => [ :helper, :backend, :configuration, :command ]
+    task :all => [ :helper, :backend, :configuration, :command, :host_inventory ]
 
     RSpec::Core::RakeTask.new(:helper) do |t|
       t.pattern = "spec/helper/*_spec.rb"
@@ -35,5 +35,9 @@ if defined?(RSpec)
     RSpec::Core::RakeTask.new(:command) do |t|
       t.pattern = "spec/command/**/*.rb"
     end
+
+    RSpec::Core::RakeTask.new(:host_inventory) do |t|
+      t.pattern = "spec/host_inventory/*_spec.rb"
+    end
   end
 end

data/lib/specinfra/command.rb

@@ -8,6 +8,7 @@ require 'specinfra/command/module/zfs'
 # Base
 require 'specinfra/command/base'
 require 'specinfra/command/base/bridge'
+require 'specinfra/command/base/bond'
 require 'specinfra/command/base/cron'
 require 'specinfra/command/base/file'
 require 'specinfra/command/base/fstab'
@@ -39,6 +40,7 @@ require 'specinfra/command/base/zfs'
 require 'specinfra/command/linux'
 require 'specinfra/command/linux/base'
 require 'specinfra/command/linux/base/bridge'
+require 'specinfra/command/linux/base/bond'
 require 'specinfra/command/linux/base/file'
 require 'specinfra/command/linux/base/fstab'
 require 'specinfra/command/linux/base/interface'

data/lib/specinfra/command/base/bond.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Base::Bond < Specinfra::Command::Base
+end

data/lib/specinfra/command/linux/base/bond.rb

@@ -0,0 +1,11 @@
+class Specinfra::Command::Linux::Base::Bond < Specinfra::Command::Base::Bond
+  class << self
+    def check_exists(name)
+      "ip link show #{name}"
+    end
+
+    def check_has_interface(name, interface)
+      "grep -o 'Slave Interface: #{interface}' /proc/net/bonding/#{name}"
+    end
+  end
+end

data/lib/specinfra/command/linux/base/inventory.rb

@@ -4,6 +4,10 @@ class Specinfra::Command::Linux::Base::Inventory < Specinfra::Command::Base::Inv
       'cat /proc/meminfo'
     end
 
+    def get_cpu
+      'cat /proc/cpuinfo'
+    end
+
     def get_hostname
       'hostname -s'
     end

data/lib/specinfra/host_inventory.rb

@@ -6,6 +6,7 @@ require 'specinfra/host_inventory/fqdn'
 require 'specinfra/host_inventory/platform'
 require 'specinfra/host_inventory/platform_version'
 require 'specinfra/host_inventory/filesystem'
+require 'specinfra/host_inventory/cpu'
 
 module Specinfra
   class HostInventory

data/lib/specinfra/host_inventory/cpu.rb

@@ -0,0 +1,73 @@
+module Specinfra
+  class HostInventory
+    class Cpu
+      def self.get
+        cmd = Specinfra.command.get(:get_inventory_cpu)
+        ret = Specinfra.backend.run_command(cmd).stdout
+        parse(ret)
+      end
+      def self.parse(cmd_ret)
+        cpuinfo = {}
+        cpus = cmd_ret.split(/[^^]processor/)
+        cpuinfo['total'] = cpus.length.to_s
+        cpus.each_with_index do |cpu, idx|
+          idx = idx.to_s
+          cpuinfo[idx] = {}
+          cpu.each_line do |line|
+            case line
+            when /^vendor_id\s*:\s+(.+)$/
+              cpuinfo[idx]['vendor_id'] = $1
+            when /^cpu family\s*:\s+(\d+)$/
+              cpuinfo[idx]['cpu_family'] = $1
+            when /^model\s*:\s+(\d+)$/
+              cpuinfo[idx]['model'] = $1
+            when /^model\sname\s*:\s+(.+)$/
+              cpuinfo[idx]['model_name'] = $1
+            when /^stepping\s*:\s+(\d+)$/
+              cpuinfo[idx]['stepping'] = $1
+            when /^microcode\s*:\s+(.+)$/
+              cpuinfo[idx]['microcode'] = $1
+            when /^cpu MHz\s*:\s+(.+)$/
+              cpuinfo[idx]['cpu_mhz'] = $1
+            when /^cache size\s*:\s+(\d+) (.+)$/
+              cpuinfo[idx]['cache_size'] = "#{$1}#{$2}"
+            when /^physical id\s*:\s+(\d+)$/
+              cpuinfo[idx]['physical_id'] = $1
+            when /^siblings\s*:\s+(\d+)$/
+              cpuinfo[idx]['siblings'] = $1
+            when /^core id\s*:\s+(\d+)$/
+              cpuinfo[idx]['core_id'] = $1
+            when /^cpu cores\s*:\s+(\d+)$/
+              cpuinfo[idx]['cpu_cores'] = $1
+            when /^apicid\s*:\s+(\d+)$/
+              cpuinfo[idx]['apicid'] = $1
+            when /^initial apicid\s*:\s+(\d+)$/
+              cpuinfo[idx]['initial_apicid'] = $1
+            when /^fpu\s*:\s+(.+)$/
+              cpuinfo[idx]['fpu'] = $1
+            when /^fpu_exception\s*:\s+(.+)$/
+              cpuinfo[idx]['fpu_exception'] = $1
+            when /^cpuid level\s*:\s+(\d+)$/
+              cpuinfo[idx]['cpuid_level'] = $1
+            when /^wp\s*:\s+(.+)$/
+              cpuinfo[idx]['wp'] = $1
+            when /^flags\s*:\s+(.+)$/
+              cpuinfo[idx]['flags'] = $1.split(/\s/)
+            when /^bogomips\s*:\s+(.+)$/
+              cpuinfo[idx]['bogomips'] = $1
+            when /^clflush size\s*:\s+(\d+)$/
+              cpuinfo[idx]['clflush_size'] = $1
+            when /^cache_alignment\s*:\s+(\d+)$/
+              cpuinfo[idx]['cache_alignment'] = $1
+            when /^address sizes\s*:\s+(.+)$/
+              cpuinfo[idx]['address_sizes'] = $1
+            when /^power management\s*:\s+(.*)$/
+              cpuinfo[idx]['power_management'] = $1
+            end
+          end
+        end
+        cpuinfo
+      end
+    end
+  end
+end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.14.4"
+  VERSION = "2.15.0"
 end

data/spec/command/linux/bond_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'linux'
+
+describe get_command(:check_bond_exists, 'bond0') do
+  it { should eq "ip link show bond0" }
+end
+
+describe get_command(:check_bond_has_interface, 'br0', 'eth0') do
+  it { should eq "grep -o 'Slave Interface: eth0' /proc/net/bonding/br0" }
+end

data/spec/command/linux/inventory_spec.rb

@@ -5,3 +5,7 @@ set :os, :family => 'linux'
 describe get_command(:get_inventory_memory) do
   it { should eq 'cat /proc/meminfo' }
 end
+
+describe get_command(:get_inventory_cpu) do
+  it { should eq 'cat /proc/cpuinfo' }
+end

data/spec/host_inventory/cpu_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+str = <<-EOH
+processor	: 0
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 60
+model name	: Intel(R) Core(TM) i5-4590 CPU @ 3.30GHz
+stepping	: 3
+microcode	: 0x19
+cpu MHz		: 3132.076
+cache size	: 6144 KB
+physical id	: 0
+siblings	: 2
+core id		: 0
+cpu cores	: 2
+apicid		: 0
+initial apicid	: 0
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 5
+wp		: yes
+flags		: fpu vme de pse
+bogomips	: 6264.15
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 1
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 60
+model name	: Intel(R) Core(TM) i5-4590 CPU @ 3.30GHz
+stepping	: 3
+microcode	: 0x19
+cpu MHz		: 3132.076
+cache size	: 6144 KB
+physical id	: 0
+siblings	: 2
+core id		: 1
+cpu cores	: 2
+apicid		: 1
+initial apicid	: 1
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 5
+wp		: yes
+flags		: fpu vme de
+bogomips	: 6264.15
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+EOH
+
+describe Specinfra::HostInventory::Cpu do
+  describe 'Example of Ubuntu 14.04.1 LTS Kernel version 3.13.11' do
+    ret = Specinfra::HostInventory::Cpu.parse(str)
+    example do
+      expect(ret["0"]).to include(
+        "vendor_id" => "GenuineIntel",
+        "cpu_family" => "6",
+        "model" => "60",
+        "model_name" => "Intel(R) Core(TM) i5-4590 CPU @ 3.30GHz",
+        "stepping" => "3",
+        "microcode" => "0x19",
+        "cpu_mhz" => "3132.076",
+        "cache_size" => "6144KB",
+        "physical_id" => "0",
+        "siblings" => "2",
+        "core_id" => "0",
+        "cpu_cores" => "2",
+        "apicid" => "0",
+        "initial_apicid" => "0",
+        "fpu" => "yes",
+        "fpu_exception" => "yes",
+        "cpuid_level" => "5",
+        "wp" => "yes",
+        "flags" => ["fpu", "vme", "de", "pse"],
+        "bogomips" => "6264.15",
+        "clflush_size" => "64",
+        "cache_alignment" => "64",
+        "address_sizes" => "39 bits physical, 48 bits virtual",
+        "power_management" => ""
+      )
+    end
+
+    example do
+      expect(ret["1"]).to include(
+        "vendor_id" => "GenuineIntel",
+        "cpu_family" => "6",
+        "model" => "60",
+        "model_name" => "Intel(R) Core(TM) i5-4590 CPU @ 3.30GHz",
+        "stepping" => "3",
+        "microcode" => "0x19",
+        "cpu_mhz" => "3132.076",
+        "cache_size" => "6144KB",
+        "physical_id" => "0",
+        "siblings" => "2",
+        "core_id" => "1",
+        "cpu_cores" => "2",
+        "apicid" => "1",
+        "initial_apicid" => "1",
+        "fpu" => "yes",
+        "fpu_exception" => "yes",
+        "cpuid_level" => "5",
+        "wp" => "yes",
+        "flags" => ["fpu", "vme", "de"],
+        "bogomips" => "6264.15",
+        "clflush_size" => "64",
+        "cache_alignment" => "64",
+        "address_sizes" => "39 bits physical, 48 bits virtual",
+        "power_management" => ""
+      )
+    end
+
+    example do
+      expect(ret["total"]).to eq "2"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'specinfra'
 require 'rspec/mocks/standalone'
 require 'rspec/its'
 require 'specinfra/helper/set'
+require 'specinfra/helper/host_inventory'
 include Specinfra::Helper::Set
 
 set :backend, :exec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.14.4
+  version: 2.15.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -151,6 +151,7 @@ files:
 - lib/specinfra/command/arch/base/package.rb
 - lib/specinfra/command/arch/base/service.rb
 - lib/specinfra/command/base.rb
+- lib/specinfra/command/base/bond.rb
 - lib/specinfra/command/base/bridge.rb
 - lib/specinfra/command/base/cron.rb
 - lib/specinfra/command/base/file.rb
@@ -213,6 +214,7 @@ files:
 - lib/specinfra/command/gentoo/base/service.rb
 - lib/specinfra/command/linux.rb
 - lib/specinfra/command/linux/base.rb
+- lib/specinfra/command/linux/base/bond.rb
 - lib/specinfra/command/linux/base/bridge.rb
 - lib/specinfra/command/linux/base/file.rb
 - lib/specinfra/command/linux/base/fstab.rb
@@ -338,6 +340,7 @@ files:
 - lib/specinfra/helper/properties.rb
 - lib/specinfra/helper/set.rb
 - lib/specinfra/host_inventory.rb
+- lib/specinfra/host_inventory/cpu.rb
 - lib/specinfra/host_inventory/domain.rb
 - lib/specinfra/host_inventory/ec2.rb
 - lib/specinfra/host_inventory/filesystem.rb
@@ -362,6 +365,7 @@ files:
 - spec/command/debian/service_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/freebsd/file_spec.rb
+- spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
 - spec/command/linux/interface_spec.rb
 - spec/command/linux/inventory_spec.rb
@@ -378,6 +382,7 @@ files:
 - spec/helper/os_spec.rb
 - spec/helper/properties_spec.rb
 - spec/helper/set_spec.rb
+- spec/host_inventory/cpu_spec.rb
 - spec/spec_helper.rb
 - specinfra.gemspec
 - wercker.yml
@@ -418,6 +423,7 @@ test_files:
 - spec/command/debian/service_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/freebsd/file_spec.rb
+- spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
 - spec/command/linux/interface_spec.rb
 - spec/command/linux/inventory_spec.rb
@@ -434,4 +440,5 @@ test_files:
 - spec/helper/os_spec.rb
 - spec/helper/properties_spec.rb
 - spec/helper/set_spec.rb
+- spec/host_inventory/cpu_spec.rb
 - spec/spec_helper.rb