specinfra 2.36.4 → 2.36.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 021ab8858f3c62847a0cdbc73263ebce9598fa9d
-  data.tar.gz: e876d0e4589f7f04343a8f68652b382ec1bc6152
+  metadata.gz: 990e9b8e5d812c958087731517182647912473f4
+  data.tar.gz: 03015361eb698abbadb60fef7ccf92b61330fb26
 SHA512:
-  metadata.gz: d7e49a81ed07cde42aa26083a5989e239557a1ededacd8ef211b2bcc7598c98f8299b2fffe3aa1a54858301c275ac2c572ae51650b3952f0ff66d5ee6b394ace
-  data.tar.gz: d7081ae879a14310e757938d93889908c6f2c3c0bbfcc1bfa9bd3ede50ef156fe2a676c77d38f4d1eda6a4601e27c62b33f5486a8bfc8fb5538ad1636b3302e6
+  metadata.gz: 477a03990587990c740a8b6743333a5835cad6554280c8e4c9224bc18908a49eb2a2f697264cdd34d2a9459fcf8299b9f4d37e92acc7581d17e6b74f6bea6c8f
+  data.tar.gz: f83437c9a72764c8b9ad048c6c492802324b483c6918cf28df38ed4f8e3e014af3b7513e6af3fe83a8450f7428f7b4c0057288863fd963fb3c5d2068fd454ead

data/lib/specinfra/host_inventory/cpu.rb

@@ -3,8 +3,12 @@ module Specinfra
     class Cpu < Base
       def get
         cmd = backend.command.get(:get_inventory_cpu)
-        ret = backend.run_command(cmd).stdout
-        parse(ret)
+        ret = backend.run_command(cmd)
+        if ret.exit_status == 0
+           parse(ret.stdout)
+        else
+           nil
+        end
       end
       def parse(cmd_ret)
         cpuinfo = {}

data/lib/specinfra/host_inventory/filesystem.rb

@@ -3,12 +3,16 @@ module Specinfra
     class Filesystem < Base
       def get
         cmd = backend.command.get(:get_inventory_filesystem)
-        ret = backend.run_command(cmd).stdout.lines
-        parse(ret)
+        ret = backend.run_command(cmd)
+        if ret.exit_status == 0
+          parse(ret.stdout)
+        else
+          nil
+        end
       end
       def parse(ret)
         filesystem = {}
-        ret.each do |line|
+        ret.each_line 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/memory.rb

@@ -3,7 +3,14 @@ module Specinfra
     class Memory < Base
       def get
         cmd = backend.command.get(:get_inventory_memory)
-        ret = backend.run_command(cmd).stdout
+        ret = backend.run_command(cmd)
+        if ret.exit_status == 0
+          parse(ret.stdout)
+        else
+          nil
+        end
+      end
+      def parse(ret)
         memory = { 'swap' => {} }
         ret.each_line do |line|
           case line

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.36.4"
+  VERSION = "2.36.5"
 end

data/spec/host_inventory/filesystem_spec.rb

@@ -12,7 +12,7 @@ EOH
 describe Specinfra::HostInventory::Filesystem do
   let(:host_inventory) { nil }
   describe 'Example of CentOS 6.6 Kernel version 2.6.32-504.23.4.el6.i686' do
-    ret = Specinfra::HostInventory::Filesystem.new(host_inventory).parse(str.split(/\n/))
+    ret = Specinfra::HostInventory::Filesystem.new(host_inventory).parse(str)
     example do
       expect(ret["/dev/mapper/vg_idefix-lv_root"]).to include(
         "kb_used"      => "8840540",

data/spec/host_inventory/memory_spec.rb

@@ -0,0 +1,126 @@
+require 'spec_helper'
+
+str = <<-EOH
+MemTotal:        1019392 kB
+MemFree:           88248 kB
+Buffers:           26016 kB
+Cached:           312856 kB
+SwapCached:        87708 kB
+Active:           396664 kB
+Inactive:         444580 kB
+Active(anon):     242816 kB
+Inactive(anon):   308412 kB
+Active(file):     153848 kB
+Inactive(file):   136168 kB
+Unevictable:          16 kB
+Mlocked:              16 kB
+HighTotal:        131912 kB
+HighFree:            312 kB
+LowTotal:         887480 kB
+LowFree:           87936 kB
+SwapTotal:       2064380 kB
+SwapFree:        1760500 kB
+Dirty:                 0 kB
+Writeback:             0 kB
+AnonPages:        473868 kB
+Mapped:            68192 kB
+Shmem:             48856 kB
+Slab:              57696 kB
+SReclaimable:      14152 kB
+SUnreclaim:        43544 kB
+KernelStack:        3240 kB
+PageTables:        12144 kB
+NFS_Unstable:          0 kB
+Bounce:                0 kB
+WritebackTmp:          0 kB
+CommitLimit:     2574076 kB
+Committed_AS:    2517964 kB
+VmallocTotal:     122880 kB
+VmallocUsed:       11204 kB
+VmallocChunk:      95432 kB
+HugePages_Total:       0
+HugePages_Free:        0
+HugePages_Rsvd:        0
+HugePages_Surp:        0
+Hugepagesize:       2048 kB
+DirectMap4k:      907256 kB
+DirectMap2M:           0 kB
+EOH
+
+
+describe Specinfra::HostInventory::Memory do
+  let(:host_inventory) { nil }
+  describe 'Example of CentOS 6.6 Kernel version 2.6.32-504.23.4.el6.i686' do
+    ret = Specinfra::HostInventory::Memory.new(host_inventory).parse(str)
+    example "active" do
+      expect(ret["active"]).to include("396664kB")
+    end
+    example "anon_pages" do
+      expect(ret["anon_pages"]).to include("473868kB")
+    end
+    example "bounce" do
+      expect(ret["bounce"]).to include("0kB")
+    end
+    example "buffers" do
+      expect(ret["buffers"]).to include("26016kB")
+    end
+    example "cached" do
+      expect(ret["cached"]).to include("312856kB")
+    end
+    example "commited_as" do
+      expect(ret["committed_as"]).to include("2517964kB")
+    end
+    example "commit_limit" do
+      expect(ret["commit_limit"]).to include("2574076kB")
+    end
+    example "dirty" do
+      expect(ret["dirty"]).to include("0kB")
+    end
+    example "free" do
+      expect(ret["free"]).to include("88248kB")
+    end
+    example "inactive" do
+      expect(ret["inactive"]).to include("444580kB")
+    end
+    example "mapped" do
+      expect(ret["mapped"]).to include("68192kB")
+    end
+    example "nfs_unstable" do
+      expect(ret["nfs_unstable"]).to include("0kB")
+    end
+    example "page_tables" do
+      expect(ret["page_tables"]).to include("12144kB")
+    end
+    example "slab" do
+      expect(ret["slab"]).to include("57696kB")
+    end
+    example "slab_reclaimable" do
+      expect(ret["slab_reclaimable"]).to include("14152kB")
+    end
+    example "slab_unreclaim" do
+      expect(ret["slab_unreclaim"]).to include("43544kB")
+    end
+    example "swap" do
+      expect(ret["swap"]).to include(
+        "free"   => "1760500kB",
+        "total"  => "2064380kB",
+        "cached" => "87708kB"
+      )
+    end
+    example "total" do
+      expect(ret["total"]).to include("1019392kB")
+    end
+    example "vmalloc_chunk" do
+      expect(ret["vmalloc_chunk"]).to include("95432kB")
+    end
+    example "vmalloc_total" do
+      expect(ret["vmalloc_total"]).to include("122880kB")
+    end
+    example "vmalloc_used" do
+      expect(ret["vmalloc_used"]).to include("11204kB")
+    end
+    example "writeback" do
+      expect(ret["writeback"]).to include("0kB")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.36.4
+  version: 2.36.5
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -436,6 +436,7 @@ files:
 - spec/helper/set_spec.rb
 - spec/host_inventory/cpu_spec.rb
 - spec/host_inventory/filesystem_spec.rb
+- spec/host_inventory/memory_spec.rb
 - spec/spec_helper.rb
 - specinfra.gemspec
 homepage: ''
@@ -506,4 +507,6 @@ test_files:
 - spec/helper/set_spec.rb
 - spec/host_inventory/cpu_spec.rb
 - spec/host_inventory/filesystem_spec.rb
+- spec/host_inventory/memory_spec.rb
 - spec/spec_helper.rb
+has_rdoc: