serverspec 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a3700953c925debcbea16eab1e7d9a91119f8d0
-  data.tar.gz: 3917363452032c05e21025078ff2b1da086aaf74
+  metadata.gz: 3f577a8b2bb4528167a44a24f77acaeefddcd033
+  data.tar.gz: b0e3f74bbaf8e8fad8179edb80c52b9081bca831
 SHA512:
-  metadata.gz: 59d589134f92052fe138aea40c6b152c3f2736ea01f4948919d03095071cdcb9c80cd19934fb7fbcce0853bc8206f4bf6644872f73bed7d967ac3ddc46a327c5
-  data.tar.gz: 4deab1fbd20b41beb3d5001afe5874d1f14ed44f6ae8e922bba0812f93cfa8193d4f1b00d1496bac637385edd385a1c7e6200d50a7da397da8412914e874f5be
+  metadata.gz: 92234c676e5d4160ce1bc76f0e27784f8efb26ed2fabaab9769cafcbb4c31debe56ef73f33392b13c03f127611f86a240736a525d423a1a7d6021eea2416fc13
+  data.tar.gz: f0d15cc2a79aa5308aa69c0ff2a1cbac040ef64b4edac9e4f728eb7ddcebc3bdff96238b1212c0524498fa4cd35c3314dd1c864cf5bd1732fac660f65768c222

data/lib/serverspec/commands/base.rb

@@ -111,11 +111,13 @@ module Serverspec
       end
 
       def check_file_md5checksum(file, expected)
-        "md5sum #{escape(file)} | grep -iw -- ^#{escape(expected)}"
+        regexp = "^#{expected}"
+        "md5sum #{escape(file)} | grep -iw -- #{escape(regexp)}"
       end
 
       def check_file_sha256checksum(file, expected)
-        "sha256sum #{escape(file)} | grep -iw -- ^#{escape(expected)}"
+        regexp = "^#{expected}"
+        "sha256sum #{escape(file)} | grep -iw -- #{escape(regexp)}"
       end
 
       def check_file_contain_within(file, expected_pattern, from=nil, to=nil)
@@ -154,10 +156,9 @@ module Serverspec
       end
 
       def check_installed_by_gem(name, version=nil)
-        cmd = "gem list --local | grep -w -- ^#{escape(name)}"
-        if ! version.nil?
-          cmd = "#{cmd} | grep -w -- #{escape(version)}"
-        end
+        regexp = "^#{name}"
+        cmd = "gem list --local | grep -w -- #{escape(regexp)}"
+        cmd = "#{cmd} | grep -w -- #{escape(version)}" unless version.nil?
         cmd
       end
 
@@ -168,10 +169,9 @@ module Serverspec
       end
 
       def check_installed_by_pecl(name, version=nil)
-        cmd = "pecl list | grep -w -- ^#{escape(name)}"
-        if ! version.nil?
-          cmd = "#{cmd} | grep -w -- #{escape(version)}"
-        end
+        regexp = "^#{name}"
+        cmd = "pecl list | grep -w -- #{escape(regexp)}"
+        cmd = "#{cmd} | grep -w -- #{escape(version)}" unless version.nil?
         cmd
       end
 

data/lib/serverspec/version.rb

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

data/spec/darwin/package_spec.rb

@@ -4,7 +4,7 @@ include Serverspec::Helper::Darwin
 
 describe package('jekyll') do
   it { should be_installed.by('gem') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll" }
 end
 
 describe package('invalid-gem') do
@@ -13,7 +13,7 @@ end
 
 describe package('jekyll') do
   it { should be_installed.by('gem').with_version('1.1.1') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll | grep -w -- 1.1.1" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll | grep -w -- 1.1.1" }
 end
 
 describe package('jekyll') do
@@ -41,7 +41,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo" }
 end
 
 describe package('invalid-pecl') do
@@ -50,7 +50,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl').with_version('1.4.1') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo | grep -w -- 1.4.1" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo | grep -w -- 1.4.1" }
 end
 
 describe package('mongo') do

data/spec/debian/file_spec.rb

@@ -373,7 +373,7 @@ end
 
 describe file('/etc/services') do
   it { should match_md5checksum '35435ea447c19f0ea5ef971837ab9ced' }
-  its(:command) { should eq "md5sum /etc/services | grep -iw -- ^35435ea447c19f0ea5ef971837ab9ced" }
+  its(:command) { should eq "md5sum /etc/services | grep -iw -- \\^35435ea447c19f0ea5ef971837ab9ced" }
 end
 
 describe file('invalid-file') do
@@ -382,7 +382,7 @@ end
 
 describe file('/etc/services') do
   it { should match_sha256checksum '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
-  its(:command) { should eq "sha256sum /etc/services | grep -iw -- ^0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
+  its(:command) { should eq "sha256sum /etc/services | grep -iw -- \\^0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
 end
 
 describe file('invalid-file') do

data/spec/debian/package_spec.rb

@@ -13,7 +13,7 @@ end
 
 describe package('jekyll') do
   it { should be_installed.by('gem') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll" }
 end
 
 describe package('invalid-gem') do
@@ -22,7 +22,7 @@ end
 
 describe package('jekyll') do
   it { should be_installed.by('gem').with_version('1.1.1') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll | grep -w -- 1.1.1" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll | grep -w -- 1.1.1" }
 end
 
 describe package('jekyll') do
@@ -50,7 +50,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo" }
 end
 
 describe package('invalid-pecl') do
@@ -59,7 +59,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl').with_version('1.4.1') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo | grep -w -- 1.4.1" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo | grep -w -- 1.4.1" }
 end
 
 describe package('mongo') do

data/spec/gentoo/file_spec.rb

@@ -373,7 +373,7 @@ end
 
 describe file('/etc/services') do
   it { should match_md5checksum '35435ea447c19f0ea5ef971837ab9ced' }
-  its(:command) { should eq "md5sum /etc/services | grep -iw -- ^35435ea447c19f0ea5ef971837ab9ced" }
+  its(:command) { should eq "md5sum /etc/services | grep -iw -- \\^35435ea447c19f0ea5ef971837ab9ced" }
 end
 
 describe file('invalid-file') do
@@ -382,7 +382,7 @@ end
 
 describe file('/etc/services') do
   it { should match_sha256checksum '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
-  its(:command) { should eq "sha256sum /etc/services | grep -iw -- ^0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
+  its(:command) { should eq "sha256sum /etc/services | grep -iw -- \\^0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
 end
 
 describe file('invalid-file') do

data/spec/gentoo/package_spec.rb

@@ -13,7 +13,7 @@ end
 
 describe package('jekyll') do
   it { should be_installed.by('gem') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll" }
 end
 
 describe package('invalid-gem') do
@@ -22,7 +22,7 @@ end
 
 describe package('jekyll') do
   it { should be_installed.by('gem').with_version('1.1.1') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll | grep -w -- 1.1.1" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll | grep -w -- 1.1.1" }
 end
 
 describe package('jekyll') do
@@ -50,7 +50,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo" }
 end
 
 describe package('invalid-pecl') do
@@ -59,7 +59,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl').with_version('1.4.1') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo | grep -w -- 1.4.1" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo | grep -w -- 1.4.1" }
 end
 
 describe package('mongo') do

data/spec/redhat/file_spec.rb

@@ -373,7 +373,7 @@ end
 
 describe file('/etc/services') do
   it { should match_md5checksum '35435ea447c19f0ea5ef971837ab9ced' }
-  its(:command) { should eq "md5sum /etc/services | grep -iw -- ^35435ea447c19f0ea5ef971837ab9ced" }
+  its(:command) { should eq "md5sum /etc/services | grep -iw -- \\^35435ea447c19f0ea5ef971837ab9ced" }
 end
 
 describe file('invalid-file') do
@@ -382,7 +382,7 @@ end
 
 describe file('/etc/services') do
   it { should match_sha256checksum '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
-  its(:command) { should eq "sha256sum /etc/services | grep -iw -- ^0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
+  its(:command) { should eq "sha256sum /etc/services | grep -iw -- \\^0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
 end
 
 describe file('invalid-file') do

data/spec/redhat/package_spec.rb

@@ -31,7 +31,7 @@ end
 
 describe package('jekyll') do
   it { should be_installed.by('gem') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll" }
 end
 
 describe package('invalid-gem') do
@@ -40,7 +40,7 @@ end
 
 describe package('jekyll') do
   it { should be_installed.by('gem').with_version('1.1.1') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll | grep -w -- 1.1.1" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll | grep -w -- 1.1.1" }
 end
 
 describe package('jekyll') do
@@ -68,7 +68,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo" }
 end
 
 describe package('invalid-pecl') do
@@ -77,7 +77,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl').with_version('1.4.1') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo | grep -w -- 1.4.1" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo | grep -w -- 1.4.1" }
 end
 
 describe package('mongo') do

data/spec/solaris/file_spec.rb

@@ -373,7 +373,7 @@ end
 
 describe file('/etc/services') do
   it { should match_md5checksum '35435ea447c19f0ea5ef971837ab9ced' }
-  its(:command) { should eq "md5sum /etc/services | grep -iw -- ^35435ea447c19f0ea5ef971837ab9ced" }
+  its(:command) { should eq "md5sum /etc/services | grep -iw -- \\^35435ea447c19f0ea5ef971837ab9ced" }
 end
 
 describe file('invalid-file') do
@@ -382,7 +382,7 @@ end
 
 describe file('/etc/services') do
   it { should match_sha256checksum '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
-  its(:command) { should eq "sha256sum /etc/services | grep -iw -- ^0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
+  its(:command) { should eq "sha256sum /etc/services | grep -iw -- \\^0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
 end
 
 describe file('invalid-file') do

data/spec/solaris/package_spec.rb

@@ -22,7 +22,7 @@ end
 
 describe package('jekyll') do
   it { should be_installed.by('gem') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll" }
 end
 
 describe package('invalid-gem') do
@@ -31,7 +31,7 @@ end
 
 describe package('jekyll') do
   it { should be_installed.by('gem').with_version('1.1.1') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll | grep -w -- 1.1.1" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll | grep -w -- 1.1.1" }
 end
 
 describe package('jekyll') do
@@ -59,7 +59,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo" }
 end
 
 describe package('invalid-pecl') do
@@ -68,7 +68,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl').with_version('1.4.1') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo | grep -w -- 1.4.1" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo | grep -w -- 1.4.1" }
 end
 
 describe package('mongo') do

data/spec/solaris11/file_spec.rb

@@ -373,7 +373,7 @@ end
 
 describe file('/etc/services') do
   it { should match_md5checksum '35435ea447c19f0ea5ef971837ab9ced' }
-  its(:command) { should eq "md5sum /etc/services | grep -iw -- ^35435ea447c19f0ea5ef971837ab9ced" }
+  its(:command) { should eq "md5sum /etc/services | grep -iw -- \\^35435ea447c19f0ea5ef971837ab9ced" }
 end
 
 describe file('invalid-file') do
@@ -382,7 +382,7 @@ end
 
 describe file('/etc/services') do
   it { should match_sha256checksum '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
-  its(:command) { should eq "sha256sum /etc/services | grep -iw -- ^0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
+  its(:command) { should eq "sha256sum /etc/services | grep -iw -- \\^0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
 end
 
 describe file('invalid-file') do

data/spec/solaris11/package_spec.rb

@@ -22,7 +22,7 @@ end
 
 describe package('jekyll') do
   it { should be_installed.by('gem') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll" }
 end
 
 describe package('invalid-gem') do
@@ -31,7 +31,7 @@ end
 
 describe package('jekyll') do
   it { should be_installed.by('gem').with_version('1.1.1') }
-  its(:command) { should eq "gem list --local | grep -w -- ^jekyll | grep -w -- 1.1.1" }
+  its(:command) { should eq "gem list --local | grep -w -- \\^jekyll | grep -w -- 1.1.1" }
 end
 
 describe package('jekyll') do
@@ -59,7 +59,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo" }
 end
 
 describe package('invalid-pecl') do
@@ -68,7 +68,7 @@ end
 
 describe package('mongo') do
   it { should be_installed.by('pecl').with_version('1.4.1') }
-  its(:command) { should eq "pecl list | grep -w -- ^mongo | grep -w -- 1.4.1" }
+  its(:command) { should eq "pecl list | grep -w -- \\^mongo | grep -w -- 1.4.1" }
 end
 
 describe package('mongo') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh