enterprise-ohai 0.1.1 → 0.1.2

data/lib/enterprise/ohai/plugins/linux/disk.rb

@@ -20,11 +20,36 @@ by_path_root  = '/dev/disk/by-path'
 by_label_root = '/dev/disk/by-label'
 by_uuid_root  = '/dev/disk/by-uuid'
 
+%x{parted --list --script}.split("\n\n\n").each do |section|
+  path, headers, info = nil, nil, Mash.new
+
+  section.split("\n").each do |line|
+    case line
+    when %r{^Model: (.*)$} then info[:model] = $1
+    when %r{^Disk (.*): (.*)$} then path, info[:size] = $1, $2
+    when %r{^Number\s+} then headers = line.split(/\s{2,}/).map {|h| h.downcase.gsub(/\W/, '_') }
+    when %r{^ \d+} then
+      next if headers.nil?
+      keys    = headers.map {|h| h.downcase.gsub(/\W/, '_') }
+      values  = line.split
+
+      partition_info = keys.zip(values).inject(Mash.new) do |m, (k,v)|
+        m.update(k => v)
+      end
+
+      (info[:partitions] ||= []) << partition_info
+    end
+  end
+
+  (disks[path] ||= Mash.new).merge!(info)
+end
+
 Dir.glob(File.join(by_path_root, '*')).each do |disk_name_link|
   disk_name = File.basename(disk_name_link)
   path      = disk_path(disk_name_link)
 
-  disks[path] ||= Mash.new
+  next unless disks[path]
+
   disks[path][:name] = disk_name
 end
 
@@ -32,7 +57,8 @@ Dir.glob(File.join(by_label_root, '*')).each do |disk_label_link|
   disk_label = File.basename(disk_label_link)
   path       = disk_path(File.join(by_label_root, disk_label))
 
-  disks[path] ||= Mash.new
+  next unless disks[path]
+
   disks[path][:label] = disk_label
 end
 
@@ -40,15 +66,14 @@ Dir.glob(File.join(by_uuid_root, '*')).each do |disk_uuid_link|
   disk_uuid = File.basename(disk_uuid_link)
   path      = disk_path(File.join(by_uuid_root, disk_uuid))
 
-  disks[path] ||= Mash.new
+  next unless disks[path]
+
   disks[path][:uuid] = disk_uuid
 end
 
 disks.keys.each do |device|
   disks[device].update(filesystem[device]) if filesystem[device]
   disks[device].update(:swap => true)      if swap[device]
-
-  disks[device].update(:size => disk_size(device))
 end
 
 disk disks

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: enterprise-ohai
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - GitHub
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 -08:00
+date: 2011-12-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency