specinfra 2.67.7 → 2.67.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3277900939ebf01c5ac42247f8274e4ba198e585
-  data.tar.gz: 760acb4646c250057493ed45a752371070a516a8
+  metadata.gz: 0ec89b1a61e742e944b125ce3f59c1d24c5c82d2
+  data.tar.gz: be037120947aacfa7899bc980dc92a9bcde153c2
 SHA512:
-  metadata.gz: e990b6514c5f0cd223da0520b77a9c4e0ab402a70a926f6b459eeb7ef2212d137ae66de89fc02d4ccbcc5b8995e43a65f6b5c7b2eab02b4a851a59ee7a5dd020
-  data.tar.gz: a96423b03de2ad4903ea3362c06ea20bf20b705574329e102685087623916d3a1161555f73fd55432ef9fb2fc3d9af184623258a324643baa51f46948d292994
+  metadata.gz: 2b5c0ddcb7268f5417c1ace1c9fdd61b93d4235dafb33ed913beab573cad36828c16d0456507b747e2ecdd6302d47d4504f75509d7e8ffbde0223cc6fa52760c
+  data.tar.gz: 64215c8e8ff8e50f6a4354c2712c7dc00b958f2bb290d254b20a62927427036037b44cb238b3692aa57e2b045961d754b475c5fee383c424b91c72ecf1171126

data/lib/specinfra/host_inventory/virtualization.rb

@@ -3,13 +3,13 @@ module Specinfra
     class Virtualization < Base
       def get
         res = {}
-        ## docker 
-        if backend.run_command('ls /.dockerinit').success?
+        ## docker
+        if backend.run_command('grep -Eqa \'docker(/|-[0-9a-f]+)\' /proc/1/cgroup||test -e /.dockerinit').success?
           res[:system] = 'docker'
           return res
         end
 
-        ## OpenVZ on Linux 
+        ## OpenVZ on Linux
         if backend.run_command('test -d /proc/vz -a ! -d /proc/bc').success?
           res[:system] = 'openvz'
           return res
@@ -18,7 +18,7 @@ module Specinfra
         cmd = backend.command.get(:get_inventory_system_product_name)
         ret = backend.run_command(cmd)
         if ret.exit_status == 0
-           res[:system] = parse_system_product_name(ret.stdout)   
+           res[:system] = parse_system_product_name(ret.stdout)
            return res
         end
 
@@ -27,8 +27,8 @@ module Specinfra
           res[:system] = parse_systemd_detect_virt_output(ret.stdout)
         end
 
-        res 
-      end 
+        res
+      end
 
       def parse_system_product_name(ret)
         product_name = case ret

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.67.7"
+  VERSION = "2.67.8"
 end

data/spec/helper/detect_os/suse_spec.rb

@@ -3,7 +3,7 @@ require 'specinfra/helper/detect_os/suse'
 
 describe Specinfra::Helper::DetectOs::Suse do
   suse = Specinfra::Helper::DetectOs::Suse.new(:exec)
-  it 'Should return opensuse 42 when openSUSE 42.2 is installed.' do
+  it 'Should return opensuse 42.2 when openSUSE 42.2 is installed.' do
     allow(suse).to receive(:run_command) {
         CommandResult.new(:stdout => "NAME=\"openSUSE Leap\"\nVERSION=\"42.2\"\nID=opensuse\nID_LIKE=\"suse\"\nVERSION_ID=\"42.2\"\nPRETTY_NAME=\"openSUSE Leap 42.2\"\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:opensuse:leap:42.2\"\nBUG_REPORT_URL=\"https://bugs.opensuse.org\"\nHOME_URL=\"https://www.opensuse.org/\"\n", :exit_status => 0)
     }
@@ -21,13 +21,22 @@ describe Specinfra::Helper::DetectOs::Suse do
       :release => '13.2'
     )
   end
-  it 'Should return sles 12 when SUSE Linux Enterprise Server 12 is installed.' do
+  it 'Should return sles 12.2 when SUSE Linux Enterprise Server 12.2 is installed.' do
     allow(suse).to receive(:run_command) {
-      CommandResult.new(:stdout => "NAME=\"SLES\"\nVERSION=\"12\"\nVERSION_ID=\"12\"\nPRETTY_NAME=\"SUSE Linux Enterprise Server 12\"\nID=\"sles\"\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:suse:sles:12\"\n", :exit_status => 0)
+      CommandResult.new(:stdout => "NAME=\"SLES\"\nVERSION=\"12.2\"\nVERSION_ID=\"12.2\"\nPRETTY_NAME=\"SUSE Linux Enterprise Server 12\"\nID=\"sles\"\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:suse:sles:12\"\n", :exit_status => 0)
     }
     expect(suse.detect).to include(
       :family  => 'sles',
-      :release => '12'
+      :release => '12.2'
+    )
+  end
+  it 'Should return sles 11.4 when SUSE Linux Enterprise Server 11.4 is installed.' do
+    allow(suse).to receive(:run_command) {
+      CommandResult.new(:stdout => "NAME=\"SLES\"\nVERSION=\"11.4\"\nVERSION_ID=\"11.4\"\nPRETTY_NAME=\"SUSE Linux Enterprise Server 11 SP4\"\nID=\"sles\"\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:suse:sles:11:4\"", :exit_status => 0)
+    }
+    expect(suse.detect).to include(
+      :family  => 'sles',
+      :release => '11.4'
     )
   end
 end

data/spec/host_inventory/linux/virtualization_spec.rb

@@ -5,23 +5,23 @@ describe Specinfra::HostInventory::Virtualization do
     set :os, { :family => 'linux' }
   end
 
-  virt = Specinfra::HostInventory::Virtualization.new(host_inventory) 
+  virt = Specinfra::HostInventory::Virtualization.new(host_inventory)
   let(:host_inventory) { nil }
   it 'Docker Image should return :system => "docker"' do
-    allow(virt.backend).to receive(:run_command).with('ls /.dockerinit') do 
-      CommandResult.new(:stdout => '/.dockerinit', :exit_status => 0)
-    end  
+    allow(virt.backend).to receive(:run_command).with('grep -Eqa \'docker(/|-[0-9a-f]+)\' /proc/1/cgroup||test -e /.dockerinit') do
+      CommandResult.new(:stdout => '', :exit_status => 0)
+    end
     expect(virt.get).to include(:system => 'docker')
   end
 
   let(:host_inventory) { nil }
   it 'Debian Wheezy on OpenVZ should return :system => "openvz"' do
-    allow(virt.backend).to receive(:run_command).with('ls /.dockerinit') do
+    allow(virt.backend).to receive(:run_command).with('grep -Eqa \'docker(/|-[0-9a-f]+)\' /proc/1/cgroup||test -e /.dockerinit') do
       CommandResult.new(:stdout => '', :exit_status => 2)
-    end 
+    end
     allow(virt.backend).to receive(:run_command).with('test -d /proc/vz -a ! -d /proc/bc') do
       CommandResult.new(:stdout => '', :exit_status => 0)
-    end 
+    end
     expect(virt.get).to include(:system => 'openvz')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.67.7
+  version: 2.67.8
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp