specinfra 2.58.0 → 2.59.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b96d6c291a4ad614c1fb935b276b60a48712c2de
-  data.tar.gz: 7d06566103e0dadc909f8a60a6d329db5326dc19
+  metadata.gz: 210fcf5adc3d236c053cc1fba165798c36229b5b
+  data.tar.gz: 05f2723bb8a523c802db1b9f624095a9f56f2e7a
 SHA512:
-  metadata.gz: 8a604b92ac11245c1a1812b1cbbdb946ff7378d714c040839e85b54d84cc27195adfd6e35e44a966e8b1efa46d67d79a273ff7fdd4777f3bafd2346dc78f7e40
-  data.tar.gz: 40a5677d5ca94efcc1e3af7852391830a6ebaa152191b32ff6bc42aee9b412ba71057979364b43fdbad5ce3be37b06dce23ee58483a9be54dbc95f51a1c380a3
+  metadata.gz: 52574f4fb340b334b5e0fbd55b3cab6157ac2f726e9f2be1e8aaed6deef86db9bc3be3259f48d4093c8a358510c5434d71a6c2e6a5d0f410397c06b2c5c29358
+  data.tar.gz: def2c971e0393aabfa5e5f8414b042a1a1ce7d70441a1cf06433608fc3cd752a9c9329fb328a734ef5b9090553b47d0381b1b3958258839d58d48a6be7848c44

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

@@ -3,5 +3,9 @@ class Specinfra::Command::Base::Inventory < Specinfra::Command::Base
     def get_user
       'getent passwd'
     end
+
+    def get_group
+      'getent group'
+    end
   end
 end

data/lib/specinfra/host_inventory.rb

@@ -14,6 +14,7 @@ module Specinfra
       kernel
       block_device
       user
+      group
     }
 
     include Enumerable

data/lib/specinfra/host_inventory/group.rb

@@ -0,0 +1,34 @@
+module Specinfra
+  class HostInventory
+    class Group < Base
+      def get
+        cmd = backend.command.get(:get_inventory_group)
+        ret = backend.run_command(cmd)
+        if ret.exit_status == 0
+          parse(ret.stdout)
+        else
+          nil
+        end
+      end
+
+      def parse(cmd_ret)
+        groups = {}
+        lines = cmd_ret.split(/\n/)
+        lines.each do |line|
+          group = line.split(':')
+          members = if group[3]
+                      group[3].split(',')
+                    else
+                      []
+                    end
+          groups[group[0]] = {
+            'name' => group[0],
+            'gid' => group[2],
+            'members' => members
+          }
+        end
+        groups
+      end
+    end
+  end
+end

data/lib/specinfra/host_inventory/virtualization.rb

@@ -19,7 +19,13 @@ module Specinfra
         ret = backend.run_command(cmd)
         if ret.exit_status == 0
            res[:system] = parse_system_product_name(ret.stdout)   
-        end 
+           return res
+        end
+
+        ret = backend.run_command('systemd-detect-virt')
+        if ret.success?
+          res[:system] = parse_systemd_detect_virt_output(ret.stdout)
+        end
 
         res 
       end 
@@ -40,6 +46,17 @@ module Specinfra
         product_name
       end
 
+      def parse_systemd_detect_virt_output(ret)
+        detected = ret.strip
+
+        case detected
+        when 'vmware', 'kvm'
+          detected
+        when 'oracle'
+          'vbox'
+        end
+      end
+
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.58.0"
+  VERSION = "2.59.0"
 end

data/spec/host_inventory/base/group_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+str = <<-EOH
+root:x:0:
+bin:x:1:
+daemon:x:2:
+sys:x:3:
+adm:x:4:
+tty:x:5:
+disk:x:6:
+lp:x:7:
+mem:x:8:
+kmem:x:9:
+wheel:x:10:hoge
+cdrom:x:11:
+mail:x:12:postfix
+man:x:15:
+dialout:x:18:
+floppy:x:19:
+games:x:20:
+tape:x:30:
+video:x:39:
+ftp:x:50:
+lock:x:54:
+audio:x:63:
+nobody:x:99:
+users:x:100:
+avahi-autoipd:x:170:
+utmp:x:22:
+utempter:x:35:
+ssh_keys:x:999:
+input:x:998:
+systemd-journal:x:190:
+systemd-bus-proxy:x:997:
+systemd-network:x:996:
+dbus:x:81:
+polkitd:x:995:
+dip:x:40:
+tss:x:59:
+postdrop:x:90:
+postfix:x:89:
+sshd:x:74:
+ntp:x:38:
+hoge:x:1000:
+EOH
+
+describe Specinfra::HostInventory::Group do
+  let(:host_inventory) { nil }
+  describe 'Example of CentOS Linux release 7.2.1511' do
+    ret = Specinfra::HostInventory::Group.new(host_inventory).parse(str)
+    example do
+      expect(ret).to include(
+        'adm' => {'name'=>'adm', 'gid'=>'4', 'members'=>[]},
+        'audio' => {'name'=>'audio', 'gid'=>'63', 'members'=>[]},
+        'avahi-autoipd' => {'name'=>'avahi-autoipd', 'gid'=>'170', 'members'=>[]},
+        'bin' => {'name'=>'bin', 'gid'=>'1', 'members'=>[]},
+        'cdrom' => {'name'=>'cdrom', 'gid'=>'11', 'members'=>[]},
+        'daemon' => {'name'=>'daemon', 'gid'=>'2', 'members'=>[]},
+        'dbus' => {'name'=>'dbus', 'gid'=>'81', 'members'=>[]},
+        'dialout' => {'name'=>'dialout', 'gid'=>'18', 'members'=>[]},
+        'dip' => {'name'=>'dip', 'gid'=>'40', 'members'=>[]},
+        'disk' => {'name'=>'disk', 'gid'=>'6', 'members'=>[]},
+        'floppy' => {'name'=>'floppy', 'gid'=>'19', 'members'=>[]},
+        'ftp' => {'name'=>'ftp', 'gid'=>'50', 'members'=>[]},
+        'games' => {'name'=>'games', 'gid'=>'20', 'members'=>[]},
+        'hoge' => {'name'=>'hoge', 'gid'=>'1000', 'members'=>[]},
+        'input' => {'name'=>'input', 'gid'=>'998', 'members'=>[]},
+        'kmem' => {'name'=>'kmem', 'gid'=>'9', 'members'=>[]},
+        'lock' => {'name'=>'lock', 'gid'=>'54', 'members'=>[]},
+        'lp' => {'name'=>'lp', 'gid'=>'7', 'members'=>[]},
+        'mail' => {'name'=>'mail', 'gid'=>'12', 'members'=>['postfix']},
+        'man' => {'name'=>'man', 'gid'=>'15', 'members'=>[]},
+        'mem' => {'name'=>'mem', 'gid'=>'8', 'members'=>[]},
+        'nobody' => {'name'=>'nobody', 'gid'=>'99', 'members'=>[]},
+        'ntp' => {'name'=>'ntp', 'gid'=>'38', 'members'=>[]},
+        'polkitd' => {'name'=>'polkitd', 'gid'=>'995', 'members'=>[]},
+        'postdrop' => {'name'=>'postdrop', 'gid'=>'90', 'members'=>[]},
+        'postfix' => {'name'=>'postfix', 'gid'=>'89', 'members'=>[]},
+        'root' => {'name'=>'root', 'gid'=>'0', 'members'=>[]},
+        'ssh_keys' => {'name'=>'ssh_keys', 'gid'=>'999', 'members'=>[]},
+        'sshd' => {'name'=>'sshd', 'gid'=>'74', 'members'=>[]},
+        'sys' => {'name'=>'sys', 'gid'=>'3', 'members'=>[]},
+        'systemd-bus-proxy' => {'name'=>'systemd-bus-proxy', 'gid'=>'997', 'members'=>[]},
+        'systemd-journal' => {'name'=>'systemd-journal', 'gid'=>'190', 'members'=>[]},
+        'systemd-network' => {'name'=>'systemd-network', 'gid'=>'996', 'members'=>[]},
+        'tape' => {'name'=>'tape', 'gid'=>'30', 'members'=>[]},
+        'tss' => {'name'=>'tss', 'gid'=>'59', 'members'=>[]},
+        'tty' => {'name'=>'tty', 'gid'=>'5', 'members'=>[]},
+        'users' => {'name'=>'users', 'gid'=>'100', 'members'=>[]},
+        'utempter' => {'name'=>'utempter', 'gid'=>'35', 'members'=>[]},
+        'utmp' => {'name'=>'utmp', 'gid'=>'22', 'members'=>[]},
+        'video' => {'name'=>'video', 'gid'=>'39', 'members'=>[]},
+        'wheel' => {'name'=>'wheel', 'gid'=>'10', 'members'=>['hoge']}
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.58.0
+  version: 2.59.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -456,6 +456,7 @@ files:
 - lib/specinfra/host_inventory/ec2.rb
 - lib/specinfra/host_inventory/filesystem.rb
 - lib/specinfra/host_inventory/fqdn.rb
+- lib/specinfra/host_inventory/group.rb
 - lib/specinfra/host_inventory/hostname.rb
 - lib/specinfra/host_inventory/kernel.rb
 - lib/specinfra/host_inventory/memory.rb
@@ -539,6 +540,7 @@ files:
 - spec/helper/properties_spec.rb
 - spec/helper/set_spec.rb
 - spec/host_inventory/aix/filesystem_spec.rb
+- spec/host_inventory/base/group_spec.rb
 - spec/host_inventory/base/user_spec.rb
 - spec/host_inventory/darwin/filesystem_spec.rb
 - spec/host_inventory/freebsd/filesystem_spec.rb
@@ -651,6 +653,7 @@ test_files:
 - spec/helper/properties_spec.rb
 - spec/helper/set_spec.rb
 - spec/host_inventory/aix/filesystem_spec.rb
+- spec/host_inventory/base/group_spec.rb
 - spec/host_inventory/base/user_spec.rb
 - spec/host_inventory/darwin/filesystem_spec.rb
 - spec/host_inventory/freebsd/filesystem_spec.rb