specinfra 2.19.2 → 2.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77242905a70512dc47b7ca8c28e7febd18cf91d8
-  data.tar.gz: 71cf440c0549c5f08e659fb3d6a45ee599c2559e
+  metadata.gz: 65edb36210c9509bf45cb93c1482f00ef3694c58
+  data.tar.gz: 478b31d70f28ae90cbcb1a086214e1edca6b493b
 SHA512:
-  metadata.gz: 0f2aa107b5badfd6010e1b36d50f5ca424802fad7054216650171c8ae0373013224b2dfec2887fbf6c3a748b5792cca54c85096c7fb1c9b620d1d7cc20c6c209
-  data.tar.gz: 3ba44715cd89f879d630cfaa7b1ef2809b4524036b68dd2618c68089d743dbba687cf55f96634dff2a4fb4b0caed3818f3173928d862bdad360d3c665030eb52
+  metadata.gz: 56a05e3f6432cb6dc09a4950012e79445bb755ebd05ea73fcdd9f8176ca29a1bcfbbee1f6eb0f23efba92ee0be5a209fcfd4fa1d935c95e15c77bba9819f94b7
+  data.tar.gz: 35e90405016975cbb90c8ea986b521395d4222e65f47c3752b4179bfb4241d1c2382d005789b1720206b7af61a9c0ddc61dea01b2b22bffde526a6e9935dce33

data/lib/specinfra/helper/detect_os/esxi.rb

@@ -3,9 +3,8 @@ class Specinfra::Helper::DetectOs::Esxi < Specinfra::Helper::DetectOs
     if run_command('vmware -v').success?
       line = run_command('vmware -v').stdout
       if line =~ /VMware ESXi (.*)/
-        release = $1
+        { :family => 'esxi', :release => $1 }
       end
-      { :family => 'esxi', :release => release }
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.19.2"
+  VERSION = "2.19.3"
 end

data/spec/helper/detect_os/esxi_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'specinfra/helper/detect_os/esxi'
+
+describe Specinfra::Helper::DetectOs::Esxi do
+  it 'Should return esxi when esxi is installed.' do
+    allow(Specinfra::Helper::DetectOs::Esxi).to receive(:run_command) { CommandResult.new(:stdout => 'VMware ESXi 5.0.0 build-123445', :exit_status => 0) }
+    expect(Specinfra::Helper::DetectOs::Esxi.detect).to include(:family => 'esxi', :release => '5.0.0 build-123445')
+  end
+
+  it 'Should not return esxi when VMware Workstation is installed.' do
+    allow(Specinfra::Helper::DetectOs::Esxi).to receive(:run_command) { CommandResult.new(:stdout => 'VMware Workstation', :exit_status => 0) }
+    expect(Specinfra::Helper::DetectOs::Esxi.detect).to be_nil
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.19.2
+  version: 2.19.3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -391,6 +391,7 @@ files:
 - spec/command/redhat7/service_spec.rb
 - spec/command/ubuntu/ppa_spec.rb
 - spec/configuration_spec.rb
+- spec/helper/detect_os/esxi_spec.rb
 - spec/helper/os_spec.rb
 - spec/helper/properties_spec.rb
 - spec/helper/set_spec.rb
@@ -450,6 +451,7 @@ test_files:
 - spec/command/redhat7/service_spec.rb
 - spec/command/ubuntu/ppa_spec.rb
 - spec/configuration_spec.rb
+- spec/helper/detect_os/esxi_spec.rb
 - spec/helper/os_spec.rb
 - spec/helper/properties_spec.rb
 - spec/helper/set_spec.rb