specinfra 2.36.17 → 2.36.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d39102e5d6b60f2c4e5aa254c95e9559c4ca2f5
-  data.tar.gz: 47387d1f254b6e5e7f96db0d2f3eaf360882c0b2
+  metadata.gz: 9a0f1a1d203c0d6b82d43387e8bd15de5d2f8faf
+  data.tar.gz: 026b90bc6edf30e076a88c01083763dfd8e5df0d
 SHA512:
-  metadata.gz: bef2820b4f8a57c88a882286a8a93e6ccf0c2e552bfe7f7aa723be3b3474a848f0b302670c3bf45ab462dc40f3a4e0b3f4adfb24985159512470fe0b9fb23050
-  data.tar.gz: 85444779c5f8356f8f8cc0b48e717a68c1aff79f63f60bb942ff8bdc4e9faa66fcd9f313aa342d0f9ea94ca46396f050cbe620237157dd5c39e526c2f60dd63d
+  metadata.gz: 8d6ae7dedcf5e5e4bed21ee2800cbc37c35e033d39c3154a8d16f2b13bf24d24d532088339d36e1ba237efa93464d1a6e98006a7a2fc2cd4db1fd3c5ab074bb6
+  data.tar.gz: 9042411075b227466cdf1e3053ba224869f68d6ce5117cf77f6f6d3c6c8104c6eb0053aa4046db7568ceec4195b7397b101deeaba73240dc99b75a51a98c231c

data/lib/specinfra/backend/docker.rb

@@ -58,7 +58,7 @@ module Specinfra
       def create_and_start_container
         opts = { 'Image' => current_image.id }
 
-        if current_image.json["Config"]["Cmd"].nil?
+        if current_image.json["Config"]["Cmd"].nil? && current_image.json["Config"]["Entrypoint"].nil?
           opts.merge!({'Cmd' => ['/bin/sh']})
         end
 

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

@@ -1,8 +1,11 @@
 class Specinfra::Helper::DetectOs::Darwin < Specinfra::Helper::DetectOs
   def detect
-    if run_command('uname -s').stdout =~ /Darwin/i
-      release = run_command('uname -r').stdout.strip
-      { :family => 'darwin', :release => release }
+    if ( uname = run_command('uname -sr').stdout ) && uname =~ /Darwin/i
+      if uname =~ /([\d.]+)$/
+         { :family => 'darwin', :release => $1 }
+      else 
+         { :family => 'darwin', :release => nil }
+      end
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.36.17"
+  VERSION = "2.36.18"
 end

data/spec/helper/detect_os/aix_spec.rb

@@ -42,12 +42,12 @@ describe Specinfra::Helper::DetectOs::Aix do
       :arch    => 'powerpc'
     )
   end
-  it 'Should return aix when AIX is installed.' do
+  it 'Should return aix nil nil when AIX FooBar is installed.' do
     allow(aix).to receive(:run_command).with('uname -s') {
       CommandResult.new(:stdout => 'AIX', :exit_status => 0)
     }
     allow(aix).to receive(:run_command).with('uname -rvp') {
-      CommandResult.new(:stdout => '', :exit_status => 1)
+      CommandResult.new(:stdout => 'Foo Bar batz', :exit_status => 1)
     }
     expect(aix.detect).to include(
       :family  => 'aix',

data/spec/helper/detect_os/darwin_spec.rb

@@ -4,11 +4,8 @@ require 'specinfra/helper/detect_os/darwin'
 describe Specinfra::Helper::DetectOs::Darwin do
   darwin = Specinfra::Helper::DetectOs::Darwin.new(:exec)
   it 'Should return darwin 13.4.0 when Mac OS X 10.9.5 (Mavericks) is installed.' do
-    allow(darwin).to receive(:run_command).with('uname -s') {
-      CommandResult.new(:stdout => 'Darwin', :exit_status => 0)
-    }
-    allow(darwin).to receive(:run_command).with('uname -r') {
-      CommandResult.new(:stdout => '13.4.0', :exit_status => 0)
+    allow(darwin).to receive(:run_command) {
+      CommandResult.new(:stdout => 'Darwin 13.4.0', :exit_status => 0)
     }
     expect(darwin.detect).to include(
       :family  => 'darwin',
@@ -16,11 +13,8 @@ describe Specinfra::Helper::DetectOs::Darwin do
     )
   end
   it 'Should return darwin 12.6.0 when Mac OS X 10.8.5 (Mountain Lion) is installed.' do
-    allow(darwin).to receive(:run_command).with('uname -s') {
-      CommandResult.new(:stdout => 'Darwin', :exit_status => 0)
-    }
-    allow(darwin).to receive(:run_command).with('uname -r') {
-      CommandResult.new(:stdout => '12.6.0', :exit_status => 0)
+    allow(darwin).to receive(:run_command) {
+      CommandResult.new(:stdout => 'Darwin 12.6.0', :exit_status => 0)
     }
     expect(darwin.detect).to include(
       :family  => 'darwin',
@@ -28,15 +22,21 @@ describe Specinfra::Helper::DetectOs::Darwin do
     )
   end
   it 'Should return darwin 11.4.2 when Mac OS X 10.7.5 (Lion) is installed.' do
-    allow(darwin).to receive(:run_command).with('uname -s') {
-      CommandResult.new(:stdout => 'Darwin', :exit_status => 0)
-    }
-    allow(darwin).to receive(:run_command).with('uname -r') {
-      CommandResult.new(:stdout => '11.4.2', :exit_status => 0)
+    allow(darwin).to receive(:run_command) {
+      CommandResult.new(:stdout => 'Darwin 11.4.2', :exit_status => 0)
     }
     expect(darwin.detect).to include(
       :family  => 'darwin',
       :release => '11.4.2'
     )
   end
+  it 'Should return darwin nil when Darwin FooBar is installed.' do
+    allow(darwin).to receive(:run_command) {
+      CommandResult.new(:stdout => 'Darwin FooBar', :exit_status => 0)
+    }
+    expect(darwin.detect).to include(
+      :family  => 'darwin',
+      :release => nil
+    )
+  end
 end

data/spec/helper/detect_os/esxi_spec.rb

@@ -2,13 +2,21 @@ require 'spec_helper'
 require 'specinfra/helper/detect_os/esxi'
 
 describe Specinfra::Helper::DetectOs::Esxi do
+  esxi = Specinfra::Helper::DetectOs::Esxi.new(:exec)
   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')
+    allow(esxi).to receive(:run_command) {
+      CommandResult.new(:stdout => 'VMware ESXi 5.0.0 build-123445', :exit_status => 0)
+    }
+    expect(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
+    allow(esxi).to receive(:run_command) {
+      CommandResult.new(:stdout => 'VMware Workstation', :exit_status => 0)
+    }
+    expect(esxi.detect).to be_nil
   end
-end
+end

data/spec/helper/detect_os/freebsd_spec.rb

@@ -3,13 +3,13 @@ require 'specinfra/helper/detect_os/freebsd'
 
 describe Specinfra::Helper::DetectOs::Freebsd do
   freebsd = Specinfra::Helper::DetectOs::Freebsd.new(:exec)
-  it 'Should return freebsd 8 when FreeBSD 8.2-RELEASE-p3 is installed.' do
+  it 'Should return freebsd 10 when FreeBSD 10.1-RELEASE is installed.' do
     allow(freebsd).to receive(:run_command) {
-      CommandResult.new(:stdout => 'FreeBSD 8.2-RELEASE-p3', :exit_status => 0)
+      CommandResult.new(:stdout => 'FreeBSD 10.1--RELEASE', :exit_status => 0)
     }
     expect(freebsd.detect).to include(
       :family  => 'freebsd',
-      :release => '8'
+      :release => '10'
     )
   end
   it 'Should return freebsd 9 when FreeBSD 9.3-RELEASE is installed.' do
@@ -21,13 +21,22 @@ describe Specinfra::Helper::DetectOs::Freebsd do
       :release => '9'
     )
   end
-  it 'Should return freebsd 10 when FreeBSD 10.1-RELEASE is installed.' do
+  it 'Should return freebsd 8 when FreeBSD 8.2-RELEASE-p3 is installed.' do
     allow(freebsd).to receive(:run_command) {
-      CommandResult.new(:stdout => 'FreeBSD 10.1--RELEASE', :exit_status => 0)
+      CommandResult.new(:stdout => 'FreeBSD 8.2-RELEASE-p3', :exit_status => 0)
     }
     expect(freebsd.detect).to include(
       :family  => 'freebsd',
-      :release => '10'
+      :release => '8'
+    )
+  end
+  it 'Should return freebsd nil when FreeBSD FooBar is installed.' do
+    allow(freebsd).to receive(:run_command) {
+      CommandResult.new(:stdout => 'FreeBSD FooBar', :exit_status => 0)
+    }
+    expect(freebsd.detect).to include(
+      :family  => 'freebsd',
+      :release => nil 
     )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.36.17
+  version: 2.36.18
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp