specinfra 2.43.3 → 2.43.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95b470a3c79b70d4ad58ea8f7e7fc91b39479a7b
-  data.tar.gz: 13898b2f4af620e05d1377fab1c1c65f0ab7945c
+  metadata.gz: 703f43204811bef2b8d6a652f6bff4884af76f35
+  data.tar.gz: 25566911bfc3b5053e8de83f5dfa915974c9d7d7
 SHA512:
-  metadata.gz: e7a5dffb749f8d90fb700c3b01fb350b3baf07af22b51705758fe3b277884fa3107ac004541579176e8fcf97cded126934ba9f1d1643ef2cfdfacc2c006661f3
-  data.tar.gz: 81ed9e06277284cacc36ab274c2fd8ceb20a18756b2027ed9549db5cd719c9373575535bcbbfde04e064c566bf8d560431e176b7367e0447abdec0674b520301
+  metadata.gz: d25a4b8f3518d8fb00bea86c135c0205a3921eebcc9fafe687eca9dd036a276a6c49265a5df849377ab78d6b36333576261c5678cfb42454a2f75df22c3f7687
+  data.tar.gz: a6ef7fca60dd9e51a3085ec50b3fa5b24e9f09c503a4258074c9b57fb9efb147099ae6ae0bf03d10b17d80629ba4b8f5e90d90cf8dc567ca84c53799cbe51261

data/lib/specinfra/backend/ssh.rb

@@ -121,7 +121,7 @@ module Specinfra
             abort "FAILED: couldn't execute command (ssh.channel.exec)" if !success
             channel.on_data do |ch, data|
               if data.match retry_prompt
-                abort 'Wrong sudo password! Please confirm your password.'
+                abort "Wrong sudo password! Please confirm your password on #{get_config(:host)}."
               elsif data.match /^#{prompt}/
                 channel.send_data "#{get_config(:sudo_password)}\n"
               else

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

@@ -27,5 +27,10 @@ class Specinfra::Command::Linux::Base::Inventory < Specinfra::Command::Base::Inv
     def get_kernel
       'uname -s -r'
     end
+
+    def get_block_device
+      block_device_dirs = '/sys/block/*/{size,removable,device/{model,rev,state,timeout,vendor},queue/rotational}'
+      "for f in $(ls #{block_device_dirs}); do echo -e \"${f}\t$(cat ${f})\"; done"
+    end
   end
 end

data/lib/specinfra/host_inventory.rb

@@ -12,6 +12,7 @@ module Specinfra
       cpu
       virtualization
       kernel
+      block_device
     }
 
     include Enumerable

data/lib/specinfra/host_inventory/block_device.rb

@@ -0,0 +1,35 @@
+module Specinfra
+  class HostInventory
+    class BlockDevice < Base
+      # examples:
+      #   /sys/block/sda/size	10000
+      #   /sys/block/sr0/device/model	CD-ROM
+      BLOCK_DEVICE_REGEX = %r|\A/sys/block/(\w+)/(\w+)(?:/(\w+))?\t(.+)\z|
+
+      def get
+        cmd = backend.command.get(:get_inventory_block_device)
+        ret = backend.run_command(cmd)
+        if ret.exit_status == 0
+          parse(ret.stdout)
+        else
+          nil
+        end
+      end
+      def parse(ret)
+        block_device = {}
+        ret.each_line do |line|
+          line.strip!
+          if m = line.match(BLOCK_DEVICE_REGEX)
+            device = m[1].to_s
+            check = m[3].nil? ? m[2].to_s : m[3].to_s
+            value = m[4].to_s
+
+            block_device[device] = {} if block_device[device].nil?
+            block_device[device][check] = value
+          end
+        end
+        block_device
+      end
+    end
+  end
+end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.43.3"
+  VERSION = "2.43.4"
 end

data/spec/command/linux/inventory_spec.rb

@@ -13,3 +13,8 @@ end
 describe get_command(:get_inventory_kernel) do
   it { should eq 'uname -s -r' }
 end
+
+describe get_command(:get_inventory_block_device) do
+  block_device_dirs = '/sys/block/*/{size,removable,device/{model,rev,state,timeout,vendor},queue/rotational}'
+  it { should eq "for f in $(ls #{block_device_dirs}); do echo -e \"${f}\t$(cat ${f})\"; done" }
+end

data/spec/host_inventory/linux/block_device_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+## Output from:
+#
+# for f in $(ls /sys/block/*/{size,removable,device/{model,rev,state,timeout,vendor},queue/rotational}); do
+#     echo -e "${f}\t$(cat ${f})"
+# done
+str = <<-EOH
+/sys/block/loop0/queue/rotational	1
+/sys/block/loop0/removable	0
+/sys/block/loop0/size	0
+/sys/block/sda/device/model	HARDDISK
+/sys/block/sda/device/rev	1.0
+/sys/block/sda/device/state	running
+/sys/block/sda/device/timeout	30
+/sys/block/sda/device/vendor	ATA
+/sys/block/sda/queue/rotational	1
+/sys/block/sda/removable	0
+/sys/block/sda/size	40960000
+EOH
+
+describe Specinfra::HostInventory::BlockDevice 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::BlockDevice.new(host_inventory).parse(str)
+    example "/sys/block/loop0" do
+      expect(ret["loop0"]).to include(
+        "rotational" => "1",
+        "removable"  => "0",
+        "size"       => "0"
+      )
+    end
+    example "/sys/block/sda" do
+      expect(ret["sda"]).to include(
+        "model"      => "HARDDISK",
+        "rev"        => "1.0",
+        "state"      => "running",
+        "timeout"    => "30",
+        "vendor"     => "ATA",
+        "rotational" => "1",
+        "removable"  => "0",
+        "size"       => "40960000"
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.43.3
+  version: 2.43.4
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -437,6 +437,7 @@ files:
 - lib/specinfra/helper/set.rb
 - lib/specinfra/host_inventory.rb
 - lib/specinfra/host_inventory/base.rb
+- lib/specinfra/host_inventory/block_device.rb
 - lib/specinfra/host_inventory/cpu.rb
 - lib/specinfra/host_inventory/domain.rb
 - lib/specinfra/host_inventory/ec2.rb
@@ -517,6 +518,7 @@ files:
 - spec/host_inventory/aix/filesystem_spec.rb
 - spec/host_inventory/darwin/filesystem_spec.rb
 - spec/host_inventory/freebsd/filesystem_spec.rb
+- spec/host_inventory/linux/block_device_spec.rb
 - spec/host_inventory/linux/cpu_spec.rb
 - spec/host_inventory/linux/filesystem_spec.rb
 - spec/host_inventory/linux/kernel_spec.rb
@@ -617,6 +619,7 @@ test_files:
 - spec/host_inventory/aix/filesystem_spec.rb
 - spec/host_inventory/darwin/filesystem_spec.rb
 - spec/host_inventory/freebsd/filesystem_spec.rb
+- spec/host_inventory/linux/block_device_spec.rb
 - spec/host_inventory/linux/cpu_spec.rb
 - spec/host_inventory/linux/filesystem_spec.rb
 - spec/host_inventory/linux/kernel_spec.rb
@@ -626,3 +629,4 @@ test_files:
 - spec/host_inventory/openbsd/filesystem_spec.rb
 - spec/host_inventory/solaris/filesystem_spec.rb
 - spec/spec_helper.rb
+has_rdoc: