specinfra 2.36.6 → 2.36.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e1fdbed94bf68c8fb2084c034c50642115b2d3a
-  data.tar.gz: 3d8e2e16196c7c8358b39f08b51078ca2d707e2b
+  metadata.gz: a81485b18844be9c64fb81fd0e18eb627bb8a504
+  data.tar.gz: 43deacb8e2091415ddbb79b9d754b8959ad384ae
 SHA512:
-  metadata.gz: ff063b8214d627bd27102aaaa2eca8c918f8ab16ffec488e01075ca2293b2238385d39ba52c3fc833fdf546f2b903cf328afe35efdbb0130789e7cd7b306dcb3
-  data.tar.gz: 12e82cdca80594973d621bb6dd97cdbb3fbd6e48e061d5c4d772b2a658f2fec264866e1d0d511fae39c05fef66f7bdac9af066f37b92b785976d063157d3b450
+  metadata.gz: 162918df01b2575d7836c08181d6b858fe206f246554bfec97fe77dd91275e84f895dcc6acd65e60b3efb37841ccdf8e05dbe9cc533ee8e708638c5bfdbb4a0c
+  data.tar.gz: 15ae2bdfb985b05320893f46aaea28e28e824af6c768a69f472d22219dc900d5c2570857c4f9fe2c19a7aa987ffef1ad6eb259fb6a72fe949a0f78b53c0c6b9e

data/lib/specinfra/command.rb

@@ -138,6 +138,7 @@ require 'specinfra/command/darwin'
 require 'specinfra/command/darwin/base'
 require 'specinfra/command/darwin/base/file'
 require 'specinfra/command/darwin/base/host'
+require 'specinfra/command/darwin/base/inventory'
 require 'specinfra/command/darwin/base/service'
 require 'specinfra/command/darwin/base/package'
 require 'specinfra/command/darwin/base/port'
@@ -199,6 +200,7 @@ require 'specinfra/command/opensuse/base/service'
 require 'specinfra/command/freebsd'
 require 'specinfra/command/freebsd/base'
 require 'specinfra/command/freebsd/base/file'
+require 'specinfra/command/freebsd/base/inventory'
 require 'specinfra/command/freebsd/base/package'
 require 'specinfra/command/freebsd/base/port'
 require 'specinfra/command/freebsd/base/service'

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

@@ -0,0 +1,28 @@
+class Specinfra::Command::Darwin::Base::Inventory < Specinfra::Command::Base::Inventory
+  class << self
+    def get_memory
+      'false'
+    end
+
+    def get_cpu
+      'false'
+    end
+
+    def get_hostname
+      'hostname -s'
+    end
+
+    def get_domain
+      'hostname -f | ' +
+      'awk -v h=`hostname -s` \'$1 ~ h { sub(h".", "", $1); print $1 }\''
+    end
+
+    def get_fqdn
+      'hostname -f'
+    end
+
+    def get_filesystem
+      'df -k'
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+class Specinfra::Command::Freebsd::Base::Inventory < Specinfra::Command::Base::Inventory
+  class << self
+    def get_memory
+      'false'
+    end
+
+    def get_cpu
+      'false'
+    end
+
+    def get_hostname
+      'hostname -s'
+    end
+
+    def get_domain
+      'hostname -f | ' +
+      'awk -v h=`hostname -s` \'$1 ~ h { sub(h".", "", $1); print $1 }\''
+    end
+
+    def get_fqdn
+      'hostname -f'
+    end
+
+    def get_filesystem
+      'df -k'
+    end
+  end
+end

data/lib/specinfra/helper/detect_os/aix.rb

@@ -2,8 +2,10 @@ class Specinfra::Helper::DetectOs::Aix < Specinfra::Helper::DetectOs
   def detect
     if run_command('uname -s').stdout =~ /AIX/i
       line = run_command('uname -rvp').stdout
-      if line =~ /(\d)\s+(\d)\s+(.*)/ then
+      if line =~ /(\d+)\s+(\d+)\s+(.*)/ then
         { :family => 'aix', :release => "#{$2}.#{$1}", :arch => $3 }
+      else
+        { :family => 'aix', :release => nil, :arch => nil }
       end
     end
   end

data/lib/specinfra/helper/detect_os/darwin.rb

@@ -1,7 +1,8 @@
 class Specinfra::Helper::DetectOs::Darwin < Specinfra::Helper::DetectOs
   def detect
     if run_command('uname -s').stdout =~ /Darwin/i
-      { :family => 'darwin', :release => nil }
+      release = run_command('uname -r').stdout.strip
+      { :family => 'darwin', :release => release }
     end
   end
 end

data/lib/specinfra/helper/detect_os/freebsd.rb

@@ -1,8 +1,8 @@
 class Specinfra::Helper::DetectOs::Freebsd < Specinfra::Helper::DetectOs
   def detect
     if ( uname = run_command('uname -sr').stdout ) && uname =~ /FreeBSD/i
-      if uname =~ /10./
-        { :family => 'freebsd', :release => 10 }
+      if uname =~ /(\d+)\./
+        { :family => 'freebsd', :release => $1 }
       else
         { :family => 'freebsd', :release => nil }
       end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.36.6"
+  VERSION = "2.36.7"
 end

data/spec/host_inventory/darwin/filesystem_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+## Output from 'df -k'
+str = <<-EOH
+Filesystem                        1024-blocks      Used Available Capacity  Mounted on
+/dev/disk0s2                        243358976 213852680  29250296    88%    /
+devfs                                     126       126         0   100%    /dev
+map -hosts                                  0         0         0   100%    /net
+map auto_home                               0         0         0   100%    /home
+localhost:/zbXdxUd1sN5zY6jeNUAx8l   243358976 243358976         0   100%    /Volumes/MobileBackups
+EOH
+
+describe Specinfra::HostInventory::Filesystem do
+  let(:host_inventory) { nil }
+  describe 'Example Darwin (MacOS X) release 11.4.2' do
+    ret = Specinfra::HostInventory::Filesystem.new(host_inventory).parse(str)
+    example "/dev/disk0s2" do
+      expect(ret["/dev/disk0s2"]).to include(
+       "kb_available"  => "29250296",
+       "kb_size"       => "243358976",
+       "kb_used"       => "213852680",
+       "mount"         => "/",
+       "percent_used"  => "88%"
+      )
+    end
+    example "map -hosts" do
+      expect(ret["map -hosts"]).to include(
+        "kb_available" => "0",
+        "kb_size"      => "0",
+        "kb_used"      => "0",
+        "mount"        => "/net",
+        "percent_used" => "100%"
+      )
+    end
+    example "map auto_home" do
+      expect(ret["map auto_home"]).to include(
+        "kb_available" => "0",
+        "kb_size"      => "0",
+        "kb_used"      => "0",
+        "mount"        => "/home",
+        "percent_used" => "100%"
+      )
+    end
+    example "devfs" do
+      expect(ret["devfs"]).to include(
+        "kb_available" => "0",
+        "kb_size"      => "126",
+        "kb_used"      => "126",
+        "mount"        => "/dev",
+        "percent_used" => "100%"
+      )
+    end
+    example "localhost:/zbXdxUd1sN5zY6jeNUAx8l" do
+      expect(ret["localhost:/zbXdxUd1sN5zY6jeNUAx8l"]).to include(
+        "kb_available" => "0",
+        "kb_size"      => "243358976",
+        "kb_used"      => "243358976",
+        "mount"        => "/Volumes/MobileBackups",
+        "percent_used" => "100%"
+      )
+    end
+  end
+end

data/spec/host_inventory/freebsd/filesystem_spec.rb

@@ -0,0 +1,123 @@
+require 'spec_helper'
+
+## Output from 'df -k'
+str = <<-EOH
+Filesystem         1024-blocks    Used   Avail Capacity  Mounted on
+zroot/ROOT/default     2500692 1345720 1154972    54%    /
+devfs                        1       1       0   100%    /dev
+zroot/tmp              1155148     176 1154972     0%    /tmp
+zroot/usr/home         1353676  198704 1154972    15%    /usr/home
+zroot/usr/ports        2306832 1151860 1154972    50%    /usr/ports
+zroot/usr/src          1155116     144 1154972     0%    /usr/src
+zroot/var              1361412  206440 1154972    15%    /var
+zroot/var/crash        1155120     148 1154972     0%    /var/crash
+zroot/var/log          1156184    1212 1154972     0%    /var/log
+zroot/var/mail         1155168     196 1154972     0%    /var/mail
+zroot/var/tmp          1188108   33136 1154972     3%    /var/tmp
+EOH
+
+describe Specinfra::HostInventory::Filesystem do
+  let(:host_inventory) { nil }
+  describe 'Example of FreeBSD 9.3 amd64' do
+    ret = Specinfra::HostInventory::Filesystem.new(host_inventory).parse(str)
+    example "devfs" do
+      expect(ret["devfs"]).to include(
+        "kb_available" => "0",
+        "kb_size"      => "1",
+        "mount"        => "/dev",
+        "percent_used" => "100%",
+        "kb_used"      => "1"
+      )
+    end
+    example "zroot/ROOT/default" do
+      expect(ret["zroot/ROOT/default"]).to include(
+        "kb_available" => "1154972",
+        "kb_size"      => "2500692",
+        "mount"        => "/",
+        "percent_used" => "54%",
+        "kb_used"      => "1345720"
+      )
+    end
+    example "zroot/tmp" do
+      expect(ret["zroot/tmp"]).to include(
+        "kb_available" => "1154972",
+        "kb_size"      => "1155148",
+        "mount"        => "/tmp",
+        "percent_used" => "0%",
+        "kb_used"      => "176"
+      )
+    end
+    example "zroot/usr/home" do
+      expect(ret["zroot/usr/home"]).to include(
+        "kb_available" => "1154972",
+        "kb_size"      => "1353676",
+        "mount"        => "/usr/home",
+        "percent_used" => "15%",
+        "kb_used"      => "198704"
+      )
+    end
+    example "zroot/usr/ports" do
+      expect(ret["zroot/usr/ports"]).to include(
+        "kb_available" => "1154972",
+        "kb_size"      => "2306832",
+        "mount"        => "/usr/ports",
+        "percent_used" => "50%",
+        "kb_used"      => "1151860"
+      )
+    end
+    example "zroot/usr/src" do
+      expect(ret["zroot/usr/src"]).to include(
+        "kb_available" => "1154972",
+        "kb_size"      => "1155116",
+        "mount"        => "/usr/src",
+        "percent_used" => "0%",
+        "kb_used"      => "144"
+      )
+    end
+    example "zroot/var" do
+      expect(ret["zroot/var"]).to include(
+        "kb_available" => "1154972",
+        "kb_size"      => "1361412",
+        "mount"        => "/var",
+        "percent_used" => "15%",
+        "kb_used"      => "206440"
+      )
+    end
+    example "zroot/var/crash" do
+      expect(ret["zroot/var/crash"]).to include(
+        "kb_available" => "1154972",
+        "kb_size"      => "1155120",
+        "mount"        => "/var/crash",
+        "percent_used" => "0%",
+        "kb_used"      => "148"
+      )
+    end
+    example "zroot/var/mail" do
+      expect(ret["zroot/var/mail"]).to include(
+        "kb_available" => "1154972",
+        "kb_size"      => "1155168",
+        "mount"        => "/var/mail",
+        "percent_used" => "0%",
+        "kb_used"      => "196"
+      )
+    end
+    example "zroot/var/log" do
+      expect(ret["zroot/var/log"]).to include(
+        "kb_available" => "1154972",
+        "kb_size"      => "1156184",
+        "mount"        => "/var/log",
+        "percent_used" => "0%",
+        "kb_used"      => "1212"
+      )
+    end
+    example "zroot/var/tmp" do
+      expect(ret["zroot/var/tmp"]).to include(
+        "kb_available" => "1154972",
+        "kb_size"      => "1188108",
+        "mount"        => "/var/tmp",
+        "percent_used" => "3%",
+        "kb_used"      => "33136"
+      )
+    end
+  end 
+end

data/spec/host_inventory/{filesystem_spec.rb → linux/filesystem_spec.rb}

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+## Output from 'df -P'
 str = <<-EOH
 Filesystem                         1024-blocks     Used Available Capacity Mounted on
 /dev/mapper/vg_idefix-lv_root         51475068  8840540  40013088      19% /
@@ -8,12 +9,20 @@ tmpfs                                   509696      872    508824       1% /dev/
 /dev/mapper/vg_idefix-lv_home         20857444 17905852   1885404      91% /home
 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)
-    example do
+    example "/dev/mapper/vg_idefix-lv_home" do
+      expect(ret["/dev/mapper/vg_idefix-lv_home"]).to include(
+        "kb_used"      => "17905852",
+        "kb_size"      => "20857444",
+        "kb_available" => "1885404",
+        "mount"        => "/home",
+        "percent_used" => "91%"
+      )
+    end
+    example "/dev/mapper/vg_idefix-lv_root" do
       expect(ret["/dev/mapper/vg_idefix-lv_root"]).to include(
         "kb_used"      => "8840540",
         "kb_size"      => "51475068",
@@ -22,7 +31,7 @@ describe Specinfra::HostInventory::Filesystem do
         "percent_used" => "19%"
       )
     end
-    example do
+    example "/dev/sdb3" do
       expect(ret["/dev/sdb3"]).to include(
         "kb_used"      => "124828",
         "kb_size"      => "487652",
@@ -31,7 +40,7 @@ describe Specinfra::HostInventory::Filesystem do
         "percent_used" => "28%"
       )
     end
-    example do
+    example "tmpfs" do
       expect(ret["tmpfs"]).to include(
         "kb_used"      => "872",
         "kb_size"      => "509696",
@@ -40,14 +49,5 @@ describe Specinfra::HostInventory::Filesystem do
         "percent_used" => "1%"
       )
     end
-    example do
-      expect(ret["/dev/mapper/vg_idefix-lv_home"]).to include(
-        "kb_used"      => "17905852",
-        "kb_size"      => "20857444",
-        "kb_available" => "1885404",
-        "mount"        => "/home",
-        "percent_used" => "91%"
-      )
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.36.6
+  version: 2.36.7
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -199,6 +199,7 @@ files:
 - lib/specinfra/command/darwin/base.rb
 - lib/specinfra/command/darwin/base/file.rb
 - lib/specinfra/command/darwin/base/host.rb
+- lib/specinfra/command/darwin/base/inventory.rb
 - lib/specinfra/command/darwin/base/package.rb
 - lib/specinfra/command/darwin/base/port.rb
 - lib/specinfra/command/darwin/base/service.rb
@@ -221,6 +222,7 @@ files:
 - lib/specinfra/command/freebsd.rb
 - lib/specinfra/command/freebsd/base.rb
 - lib/specinfra/command/freebsd/base/file.rb
+- lib/specinfra/command/freebsd/base/inventory.rb
 - lib/specinfra/command/freebsd/base/package.rb
 - lib/specinfra/command/freebsd/base/port.rb
 - lib/specinfra/command/freebsd/base/service.rb
@@ -435,9 +437,11 @@ files:
 - spec/helper/os_spec.rb
 - spec/helper/properties_spec.rb
 - spec/helper/set_spec.rb
-- spec/host_inventory/cpu_spec.rb
-- spec/host_inventory/filesystem_spec.rb
-- spec/host_inventory/memory_spec.rb
+- spec/host_inventory/darwin/filesystem_spec.rb
+- spec/host_inventory/freebsd/filesystem_spec.rb
+- spec/host_inventory/linux/cpu_spec.rb
+- spec/host_inventory/linux/filesystem_spec.rb
+- spec/host_inventory/linux/memory_spec.rb
 - spec/spec_helper.rb
 - specinfra.gemspec
 homepage: ''
@@ -507,8 +511,9 @@ test_files:
 - spec/helper/os_spec.rb
 - spec/helper/properties_spec.rb
 - spec/helper/set_spec.rb
-- spec/host_inventory/cpu_spec.rb
-- spec/host_inventory/filesystem_spec.rb
-- spec/host_inventory/memory_spec.rb
+- spec/host_inventory/darwin/filesystem_spec.rb
+- spec/host_inventory/freebsd/filesystem_spec.rb
+- spec/host_inventory/linux/cpu_spec.rb
+- spec/host_inventory/linux/filesystem_spec.rb
+- spec/host_inventory/linux/memory_spec.rb
 - spec/spec_helper.rb
-has_rdoc: