specinfra 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45b0dd4144407ae23367d089d595d93e24a52780
-  data.tar.gz: e2fc78cba42b70f379fb8c1b45d6a6bdb92c5035
+  metadata.gz: e7564d361a058b557084abaadc28f77da9ef9dae
+  data.tar.gz: a4579ec7fecc3c2e7a65ddae762974d18642f451
 SHA512:
-  metadata.gz: bf3bbf50b30218cb9d286804b16121f7b2a6d5180dc14c7e2e96e14d1596e9c7139963a44749fee7657f784a4a5d2afa19255a13f71b09e5d22127fde91c3800
-  data.tar.gz: 86c4208d0fedd6178c15f7f4d5b97b77be7f8090ef786bf4bf52890182f8eddd9d43ea0237129aa3061c4268c4e608bac7a7a3e93e495d1f11a4ce933b7a0c4a
+  metadata.gz: 6ab735f0b9ba1a53c7749582969b65ea4a819ba7688ebc45d5e289ea6c3d04f2810eacc03b37d53caf03015c7ed5d0973872dbfbbfc86fd81cfcbde0659615f2
+  data.tar.gz: 827b0853dddf03c1d7a8bd749ab99d0e281bc8bb845c4f6a291ec7d96a447c11a4e478503ff2cd7e72c778a44ca7931987b3551a4267517eec15c9584b3f6a94

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

@@ -15,5 +15,9 @@ class Specinfra::Command::Linux::Base::Inventory < Specinfra::Command::Base::Inv
     def get_fqdn
       'hostname -f'
     end
+
+    def get_filesystem
+      'df -P'
+    end
   end
 end

data/lib/specinfra/host_inventory.rb

@@ -3,6 +3,9 @@ require 'specinfra/host_inventory/ec2'
 require 'specinfra/host_inventory/hostname'
 require 'specinfra/host_inventory/domain'
 require 'specinfra/host_inventory/fqdn'
+require 'specinfra/host_inventory/platform'
+require 'specinfra/host_inventory/platform_version'
+require 'specinfra/host_inventory/filesystem'
 
 module Specinfra
   class HostInventory

data/lib/specinfra/host_inventory/ec2.rb

@@ -1,3 +1,5 @@
+require 'specinfra/ec2_metadata'
+
 module Specinfra
   class HostInventory
     class Ec2

data/lib/specinfra/host_inventory/filesystem.rb

@@ -0,0 +1,23 @@
+module Specinfra
+  class HostInventory
+    class Filesystem
+      def self.get
+        cmd = Specinfra.command.get(:get_inventory_filesystem)
+        filesystem = {}
+        Specinfra.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
+            filesystem[device] = {}
+            filesystem[device]['kb_size'] = $2
+            filesystem[device]['kb_used'] = $3
+            filesystem[device]['kb_available'] = $4
+            filesystem[device]['percent_used'] = $5
+            filesystem[device]['mount'] = $6
+          end
+        end
+        filesystem
+      end
+    end
+  end
+end

data/lib/specinfra/host_inventory/memory.rb

@@ -4,11 +4,57 @@ module Specinfra
       def self.get
         cmd = Specinfra.command.get(:get_inventory_memory)
         ret = Specinfra.backend.run_command(cmd).stdout
-        memory = {}
+        memory = { 'swap' => {} }
         ret.each_line do |line|
           case line
+          when /^SwapCached:\s+(\d+) (.+)$/
+            memory['swap']['cached'] = "#{$1}#{$2}"
+          when /^SwapTotal:\s+(\d+) (.+)$/
+            memory['swap']['total'] = "#{$1}#{$2}"
+          when /^SwapFree:\s+(\d+) (.+)$/
+            memory['swap']['free'] = "#{$1}#{$2}"
           when /^MemTotal:\s+(\d+) (.+)$/
             memory['total'] = "#{$1}#{$2}"
+          when /^MemFree:\s+(\d+) (.+)$/
+            memory['free'] = "#{$1}#{$2}"
+          when /^Buffers:\s+(\d+) (.+)$/
+            memory['buffers'] = "#{$1}#{$2}"
+          when /^Cached:\s+(\d+) (.+)$/
+            memory['cached'] = "#{$1}#{$2}"
+          when /^Active:\s+(\d+) (.+)$/
+            memory['active'] = "#{$1}#{$2}"
+          when /^Inactive:\s+(\d+) (.+)$/
+            memory['inactive'] = "#{$1}#{$2}"
+          when /^Dirty:\s+(\d+) (.+)$/
+            memory['dirty'] = "#{$1}#{$2}"
+          when /^Writeback:\s+(\d+) (.+)$/
+            memory['writeback'] = "#{$1}#{$2}"
+          when /^AnonPages:\s+(\d+) (.+)$/
+            memory['anon_pages'] = "#{$1}#{$2}"
+          when /^Mapped:\s+(\d+) (.+)$/
+            memory['mapped'] = "#{$1}#{$2}"
+          when /^Slab:\s+(\d+) (.+)$/
+            memory['slab'] = "#{$1}#{$2}"
+          when /^SReclaimable:\s+(\d+) (.+)$/
+            memory['slab_reclaimable'] = "#{$1}#{$2}"
+          when /^SUnreclaim:\s+(\d+) (.+)$/
+            memory['slab_unreclaim'] = "#{$1}#{$2}"
+          when /^PageTables:\s+(\d+) (.+)$/
+            memory['page_tables'] = "#{$1}#{$2}"
+          when /^NFS_Unstable:\s+(\d+) (.+)$/
+            memory['nfs_unstable'] = "#{$1}#{$2}"
+          when /^Bounce:\s+(\d+) (.+)$/
+            memory['bounce'] = "#{$1}#{$2}"
+          when /^CommitLimit:\s+(\d+) (.+)$/
+            memory['commit_limit'] = "#{$1}#{$2}"
+          when /^Committed_AS:\s+(\d+) (.+)$/
+            memory['committed_as'] = "#{$1}#{$2}"
+          when /^VmallocTotal:\s+(\d+) (.+)$/
+            memory['vmalloc_total'] = "#{$1}#{$2}"
+          when /^VmallocUsed:\s+(\d+) (.+)$/
+            memory['vmalloc_used'] = "#{$1}#{$2}"
+          when /^VmallocChunk:\s+(\d+) (.+)$/
+            memory['vmalloc_chunk'] = "#{$1}#{$2}"
           end
         end
         memory

data/lib/specinfra/host_inventory/platform.rb

@@ -0,0 +1,9 @@
+module Specinfra
+  class HostInventory
+    class Platform
+      def self.get
+        os[:family]
+      end
+    end
+  end
+end

data/lib/specinfra/host_inventory/platform_version.rb

@@ -0,0 +1,15 @@
+module Specinfra
+  class HostInventory
+    class PlatformVersion
+      def self.get
+        os[:release]
+      end
+    end
+  end
+end
+
+
+
+
+
+

data/lib/specinfra/processor.rb

@@ -1,5 +1,3 @@
-require 'specinfra/ec2_metadata'
-
 module Specinfra
   class Processor
     def self.check_service_is_running(service)

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.12.0"
+  VERSION = "2.12.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -338,9 +338,12 @@ files:
 - lib/specinfra/host_inventory.rb
 - lib/specinfra/host_inventory/domain.rb
 - lib/specinfra/host_inventory/ec2.rb
+- lib/specinfra/host_inventory/filesystem.rb
 - lib/specinfra/host_inventory/fqdn.rb
 - lib/specinfra/host_inventory/hostname.rb
 - lib/specinfra/host_inventory/memory.rb
+- lib/specinfra/host_inventory/platform.rb
+- lib/specinfra/host_inventory/platform_version.rb
 - lib/specinfra/processor.rb
 - lib/specinfra/properties.rb
 - lib/specinfra/runner.rb