serverspec 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09fea80cce64bcddeb8c35c66e5c6588240ca26d
-  data.tar.gz: c3206bd17d6f7564cf2ae803c267fb2cd61ed51d
+  metadata.gz: c971f7ffde09d489689464ca4c19537dc2732cfc
+  data.tar.gz: 33def92c5874f2b856f300f4bf1575f02cf553cc
 SHA512:
-  metadata.gz: f1f369ee39db823f357f0dfd7d42bc06c7a71f3f00e22687c6eafaff19a90799dcad8ea9a71321d3d6b5c38c452615b7b79fe31a06db4295fc2a96e7fcfcbe6a
-  data.tar.gz: e10adf50dd47fbd8b9cb1f650e7e7acb4c585fc5021c7094469a34d0dae7c901a2a1285577cbe943fc2528619e8ef37088d6efa6af202d9948354467404b0032
+  metadata.gz: dfaa2f7870f797adea5392280d35e6cb79e2faef78e3492f2152bf1a174c5c99c8d17827dc4581f8aa45ee07222dd78bcb0d5f8c4bf688df1e4e48b36fd54210
+  data.tar.gz: 9eb049438d22bb921cdb570c79443b5d0f3791db92ee37908d2126b3507fcd186442070a987bedfd7987808a4cb3d2fbe653b2eb4d9192e4339fb9e8492f99c3

data/lib/serverspec/commands/base.rb

@@ -114,9 +114,17 @@ module Serverspec
       end
 
       def check_file_contain(file, expected_pattern)
+        "#{check_file_contain_with_regexp(file, expected_pattern)} || #{check_file_contain_with_fixed_strings(file, expected_pattern)}"
+      end
+
+      def check_file_contain_with_regexp(file, expected_pattern)
         "grep -q -- #{escape(expected_pattern)} #{escape(file)}"
       end
 
+      def check_file_contain_with_fixed_strings(file, expected_pattern)
+        "grep -qF -- #{escape(expected_pattern)} #{escape(file)}"
+      end
+
       def check_file_md5checksum(file, expected)
         regexp = "^#{expected}"
         "md5sum #{escape(file)} | grep -iw -- #{escape(regexp)}"
@@ -130,8 +138,10 @@ module Serverspec
       def check_file_contain_within(file, expected_pattern, from=nil, to=nil)
         from ||= '1'
         to ||= '$'
-        checker = check_file_contain("-", expected_pattern)
-        "sed -n #{escape(from)},#{escape(to)}p #{escape(file)} | #{checker}"
+        sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
+        checker_with_regexp = check_file_contain_with_regexp("-", expected_pattern)
+        checker_with_fixed  = check_file_contain_with_fixed_strings("-", expected_pattern)
+        "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
       end
 
       def check_mode(file, mode)

data/lib/serverspec/commands/solaris.rb

@@ -75,8 +75,10 @@ module Serverspec
       def check_file_contain_within(file, expected_pattern, from=nil, to=nil)
         from ||= '1'
         to ||= '$'
-        checker = check_file_contain("/dev/stdin", expected_pattern)
-        "sed -n #{escape(from)},#{escape(to)}p #{escape(file)} | #{checker}"
+        sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
+        checker_with_regexp = check_file_contain_with_regexp("/dev/stdin", expected_pattern)
+        checker_with_fixed  = check_file_contain_with_fixed_strings("/dev/stdin", expected_pattern)
+        "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
       end
 
       def check_belonging_group(user, group)

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.7.10"
+  VERSION = "0.7.11"
 end

data/spec/darwin/file_spec.rb

@@ -31,12 +31,12 @@ end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain 'This is the sshd server system-wide configuration file' }
-  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
 end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain /^This is the sshd server system-wide configuration file/ }
-  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config"}
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -45,7 +45,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').from(/^group :test do/).to(/^end/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec - || sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -54,7 +54,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').after(/^group :test do/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec - || sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -63,7 +63,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').before(/^end/) }
-  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec - || sed -n 1,/\\^end/p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do

data/spec/debian/file_spec.rb

@@ -31,12 +31,12 @@ end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain 'This is the sshd server system-wide configuration file' }
-  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
 end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain /^This is the sshd server system-wide configuration file/ }
-  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -45,7 +45,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').from(/^group :test do/).to(/^end/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec - || sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -54,7 +54,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').after(/^group :test do/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec - || sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -63,7 +63,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').before(/^end/) }
-  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec - || sed -n 1,/\\^end/p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do

data/spec/gentoo/file_spec.rb

@@ -31,12 +31,12 @@ end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain 'This is the sshd server system-wide configuration file' }
-  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
 end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain /^This is the sshd server system-wide configuration file/ }
-  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -45,7 +45,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').from(/^group :test do/).to(/^end/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec - || sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -54,7 +54,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').after(/^group :test do/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec - || sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -63,7 +63,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').before(/^end/) }
-  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec - || sed -n 1,/\\^end/p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do

data/spec/redhat/file_spec.rb

@@ -31,12 +31,12 @@ end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain 'This is the sshd server system-wide configuration file' }
-  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
 end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain /^This is the sshd server system-wide configuration file/ }
-  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -45,7 +45,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').from(/^group :test do/).to(/^end/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec - || sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -54,7 +54,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').after(/^group :test do/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec - || sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -63,7 +63,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').before(/^end/) }
-  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec -" }
+  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec - || sed -n 1,/\\^end/p Gemfile | grep -qF -- rspec -" }
 end
 
 describe file('/etc/ssh/sshd_config') do

data/spec/solaris/file_spec.rb

@@ -31,12 +31,12 @@ end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain 'This is the sshd server system-wide configuration file' }
-  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
 end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain /^This is the sshd server system-wide configuration file/ }
-  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -45,7 +45,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').from(/^group :test do/).to(/^end/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin || sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -qF -- rspec /dev/stdin" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -54,7 +54,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').after(/^group :test do/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec /dev/stdin" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec /dev/stdin || sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -qF -- rspec /dev/stdin" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -63,7 +63,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').before(/^end/) }
-  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin" }
+  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin || sed -n 1,/\\^end/p Gemfile | grep -qF -- rspec /dev/stdin" }
 end
 
 describe file('/etc/ssh/sshd_config') do

data/spec/solaris11/file_spec.rb

@@ -31,12 +31,12 @@ end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain 'This is the sshd server system-wide configuration file' }
-  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
 end
 
 describe file('/etc/ssh/sshd_config') do
   it { should contain /^This is the sshd server system-wide configuration file/ }
-  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+  its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -45,7 +45,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').from(/^group :test do/).to(/^end/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin || sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -qF -- rspec /dev/stdin" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -54,7 +54,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').after(/^group :test do/) }
-  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec /dev/stdin" }
+  its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec /dev/stdin || sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -qF -- rspec /dev/stdin" }
 end
 
 describe file('/etc/ssh/sshd_config') do
@@ -63,7 +63,7 @@ end
 
 describe file('Gemfile') do
   it { should contain('rspec').before(/^end/) }
-  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin" }
+  its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin || sed -n 1,/\\^end/p Gemfile | grep -qF -- rspec /dev/stdin" }
 end
 
 describe file('/etc/ssh/sshd_config') do

metadata

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