serverspec 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e36c6ee6a2dcb7bfd4581b1c2d9c4a0929261ee6
-  data.tar.gz: cd368bdfd8855ef11cc2153bee23d44452eca881
+  metadata.gz: 2a3700953c925debcbea16eab1e7d9a91119f8d0
+  data.tar.gz: 3917363452032c05e21025078ff2b1da086aaf74
 SHA512:
-  metadata.gz: 37b9973d685f6aae3ebecb9f4445983629074b78cad169fd65ee862ee22a3b4cdc7a98812b3e0a92d950f117e99f617bae7af0769f7a703997d73f3de502a98e
-  data.tar.gz: 961ea420b33ef1311317c9eda56a21e71a158f32caae641923535395daef5f715c6fce5565f5fbef18428461513ced6c6b40c0ffecf0b85493f6c2ffa6bf6b35
+  metadata.gz: 59d589134f92052fe138aea40c6b152c3f2736ea01f4948919d03095071cdcb9c80cd19934fb7fbcce0853bc8206f4bf6644872f73bed7d967ac3ddc46a327c5
+  data.tar.gz: 4deab1fbd20b41beb3d5001afe5874d1f14ed44f6ae8e922bba0812f93cfa8193d4f1b00d1496bac637385edd385a1c7e6200d50a7da397da8412914e874f5be

data/lib/serverspec/backend/exec.rb

@@ -37,8 +37,8 @@ module Serverspec
         path = Serverspec.configuration.path || RSpec.configuration.path
         if path
           cmd = "env PATH=#{path}:$PATH #{cmd}"
-          cmd.gsub!(/(\&\&\s*\(?)/, "\\1env PATH=#{path}:$PATH ")
-          cmd.gsub!(/(\|\|\s*\(?)/, "\\1env PATH=#{path}:$PATH ")
+          cmd.gsub!(/(\&\&\s*!?\(?\s*)/, "\\1env PATH=#{path}:$PATH ")
+          cmd.gsub!(/(\|\|\s*!?\(?\s*)/, "\\1env PATH=#{path}:$PATH ")
         end
         cmd
       end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Exec
+
+describe 'build command with path' do
+  before :each do
+    RSpec.configure do |c|
+      c.path = '/sbin:/usr/sbin'
+    end
+  end
+
+  context 'command pattern 1' do
+    subject { backend.build_command('test -f /etc/passwd') }
+    it { should eq 'env PATH=/sbin:/usr/sbin:$PATH test -f /etc/passwd' }
+  end
+
+  context 'command pattern 2' do
+    subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
+      it { should eq 'env PATH=/sbin:/usr/sbin:$PATH test ! -f /etc/selinux/config || (env PATH=/sbin:/usr/sbin:$PATH getenforce | grep -i -- disabled && env PATH=/sbin:/usr/sbin:$PATH grep -i -- ^SELINUX=disabled$ /etc/selinux/config)' }
+  end
+
+  context 'command pattern 3' do
+    subject { backend.build_command("dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'") }
+    it { should eq "env PATH=/sbin:/usr/sbin:$PATH dpkg -s apache2 && ! env PATH=/sbin:/usr/sbin:$PATH dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
+  end
+
+  after :each do
+    RSpec.configure do |c|
+      c.path = nil
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -203,6 +203,7 @@ files:
 - lib/serverspec/type/zfs.rb
 - lib/serverspec/version.rb
 - serverspec.gemspec
+- spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/configuration_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/backend/ssh/configuration_spec.rb
@@ -333,6 +334,7 @@ signing_key:
 specification_version: 4
 summary: RSpec tests for your servers configured by Puppet, Chef or anything else
 test_files:
+- spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/configuration_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/backend/ssh/configuration_spec.rb