serverspec 0.1.4 → 0.1.5

data/lib/serverspec/commands/base.rb

@@ -43,6 +43,13 @@ module Serverspec
         "grep -q '#{expected_pattern}' #{file}"
       end
 
+      def check_file_contain_within file, expected_pattern, from=nil, to=nil
+        from ||= '1'
+        to ||= '$'
+        checker = check_file_contain("-", expected_pattern)
+        "sed -n '#{from},#{to}p' #{file} | #{checker}"
+      end
+
       def check_mode file, mode
         "stat -c %a #{file} | grep #{mode}"
       end

data/lib/serverspec/matchers/contain.rb

@@ -1,6 +1,26 @@
-RSpec::Matchers.define :contain do |expected|
-  match do |actual|
-    ret = ssh_exec(commands.check_file_contain(actual, expected))
+RSpec::Matchers.define :contain do |pattern|
+  match do |file|
+    if (@from || @to).nil?
+      cmd = commands.check_file_contain(file, pattern)
+    else
+      cmd = commands.check_file_contain_within(file, pattern, @from, @to)
+    end
+    ret = ssh_exec(cmd)
     ret[:exit_code] == 0
   end
+  # for contain(pattern).from(/A/).to(/B/)
+  chain :from do |from|
+    @from = Regexp.new(from).inspect
+  end
+  chain :to do |to|
+    @to = Regexp.new(to).inspect
+  end
+  # for contain(pattern).after(/A/)
+  chain :after do |after|
+    @from = Regexp.new(after).inspect
+  end
+  # for contain(pattern).before(/B/)
+  chain :before do |before|
+    @to = Regexp.new(before).inspect
+  end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/debian/commands_spec.rb

@@ -42,6 +42,22 @@ describe commands.check_file_contain('/etc/passwd', 'root') do
   it { should eq "grep -q 'root' /etc/passwd" }
 end
 
+describe commands.check_file_contain_within('Gemfile', 'rspec') do
+  it { should eq "sed -n '1,$p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/') do
+  it { should eq "sed -n '/^group :test do/,$p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', nil, '/^end/') do
+  it { should eq "sed -n '1,/^end/p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/', '/^end/') do
+  it { should eq "sed -n '/^group :test do/,/^end/p' Gemfile | grep -q 'rspec' -" }
+end
+
 describe commands.check_mode('/etc/sudoers', 440) do
   it { should eq 'stat -c %a /etc/sudoers | grep 440' }
 end

data/spec/debian/matchers_spec.rb

@@ -7,6 +7,9 @@ describe 'Serverspec matchers of Debian family', :os => :debian do
   it_behaves_like 'support be_listening matcher', 22
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'See the sshd_config(5) manpage'
+  it_behaves_like 'support contain.from.to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/
+  it_behaves_like 'support contain.after matcher', 'Gemfile', 'rspec', /^group :test do/
+  it_behaves_like 'support contain.before matcher', 'Gemfile', 'rspec', /^end/
   it_behaves_like 'support be_user matcher', 'root'
   it_behaves_like 'support be_group matcher', 'wheel'
 

data/spec/gentoo/commands_spec.rb

@@ -42,6 +42,22 @@ describe commands.check_file_contain('/etc/passwd', 'root') do
   it { should eq "grep -q 'root' /etc/passwd" }
 end
 
+describe commands.check_file_contain_within('Gemfile', 'rspec') do
+  it { should eq "sed -n '1,$p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/') do
+  it { should eq "sed -n '/^group :test do/,$p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', nil, '/^end/') do
+  it { should eq "sed -n '1,/^end/p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/', '/^end/') do
+  it { should eq "sed -n '/^group :test do/,/^end/p' Gemfile | grep -q 'rspec' -" }
+end
+
 describe commands.check_mode('/etc/sudoers', 440) do
   it { should eq 'stat -c %a /etc/sudoers | grep 440' }
 end

data/spec/gentoo/matchers_spec.rb

@@ -8,6 +8,9 @@ describe 'Serverspec matchers of Gentoo family', :os => :gentoo do
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support be_directory matcher', '/etc/ssh'
   it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'
+  it_behaves_like 'support contain.from.to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/
+  it_behaves_like 'support contain.after matcher', 'Gemfile', 'rspec', /^group :test do/
+  it_behaves_like 'support contain.before matcher', 'Gemfile', 'rspec', /^end/
   it_behaves_like 'support be_user matcher', 'root'
   it_behaves_like 'support be_group matcher', 'wheel'
 

data/spec/redhat/commands_spec.rb

@@ -42,6 +42,22 @@ describe commands.check_file_contain('/etc/passwd', 'root') do
   it { should eq "grep -q 'root' /etc/passwd" }
 end
 
+describe commands.check_file_contain_within('Gemfile', 'rspec') do
+  it { should eq "sed -n '1,$p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/') do
+  it { should eq "sed -n '/^group :test do/,$p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', nil, '/^end/') do
+  it { should eq "sed -n '1,/^end/p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/', '/^end/') do
+  it { should eq "sed -n '/^group :test do/,/^end/p' Gemfile | grep -q 'rspec' -" }
+end
+
 describe commands.check_mode('/etc/sudoers', 440) do
   it { should eq 'stat -c %a /etc/sudoers | grep 440' }
 end

data/spec/redhat/matchers_spec.rb

@@ -8,6 +8,9 @@ describe 'Serverspec matchers of Red Hat family', :os => :redhat do
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support be_directory matcher', '/etc/ssh'
   it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'
+  it_behaves_like 'support contain.from.to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/
+  it_behaves_like 'support contain.after matcher', 'Gemfile', 'rspec', /^group :test do/
+  it_behaves_like 'support contain.before matcher', 'Gemfile', 'rspec', /^end/
   it_behaves_like 'support be_user matcher', 'root'
   it_behaves_like 'support be_group matcher', 'wheel'
 

data/spec/solaris/commads_spec.rb

@@ -42,6 +42,22 @@ describe commands.check_file_contain('/etc/passwd', 'root') do
   it { should eq "grep -q 'root' /etc/passwd" }
 end
 
+describe commands.check_file_contain_within('Gemfile', 'rspec') do
+  it { should eq "sed -n '1,$p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/') do
+  it { should eq "sed -n '/^group :test do/,$p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', nil, '/^end/') do
+  it { should eq "sed -n '1,/^end/p' Gemfile | grep -q 'rspec' -" }
+end
+
+describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/', '/^end/') do
+  it { should eq "sed -n '/^group :test do/,/^end/p' Gemfile | grep -q 'rspec' -" }
+end
+
 describe commands.check_mode('/etc/sudoers', 440) do
   it { should eq 'stat -c %a /etc/sudoers | grep 440' }
 end

data/spec/solaris/matchers_spec.rb

@@ -8,6 +8,9 @@ describe 'Serverspec matchers of Solaris family', :os => :solaris do
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support be_directory matcher', '/etc/ssh'
   it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'Configuration file for sshd(1m) (see also sshd_config(4))'
+  it_behaves_like 'support contain.from.to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/
+  it_behaves_like 'support contain.after matcher', 'Gemfile', 'rspec', /^group :test do/
+  it_behaves_like 'support contain.before matcher', 'Gemfile', 'rspec', /^end/
   it_behaves_like 'support be_user matcher', 'root'
   it_behaves_like 'support be_group matcher', 'root'
 

data/spec/support/shared_matcher_examples.rb

@@ -92,6 +92,42 @@ shared_examples_for 'support contain matcher' do |valid_file, pattern|
   end
 end
 
+shared_examples_for 'support contain.from.to matcher' do |valid_file, pattern, from, to|
+  describe 'contain' do
+    describe valid_file do
+      it { should contain(pattern).from(from).to(to) }
+    end
+
+    describe '/etc/ssh/sshd_config' do
+      it { should_not contain('This is invalid text!!').from(from).to(to) }
+    end
+  end
+end
+
+shared_examples_for 'support contain.after matcher' do |valid_file, pattern, after|
+  describe 'contain' do
+    describe valid_file do
+      it { should contain(pattern).after(after) }
+    end
+
+    describe '/etc/ssh/sshd_config' do
+      it { should_not contain('This is invalid text!!').after(after) }
+    end
+  end
+end
+
+shared_examples_for 'support contain.before matcher' do |valid_file, pattern, before|
+  describe 'contain' do
+    describe valid_file do
+      it { should contain(pattern).before(before) }
+    end
+
+    describe '/etc/ssh/sshd_config' do
+      it { should_not contain('This is invalid text!!').before(before) }
+    end
+  end
+end
+
 shared_examples_for 'support be_user matcher' do |valid_user|
   describe 'be_user' do
     describe valid_user do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your servers provisioned by Puppet, Chef or anything else