serverspec 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e52d49733ff4dec34b0fbdced1a45884d315b27
-  data.tar.gz: 4fe90f21f904f8e51b09d3f0c878cc22db11d224
+  metadata.gz: 7ec3be10279eb102c596746869b1d1d55709c732
+  data.tar.gz: 325dd53f2dd1f87c39c092425ce26886a5cd379c
 SHA512:
-  metadata.gz: fbe196f725152c1c4133e411fd1201d3881412c3c99d8c1b6ff7bc6616761e5f1f339357d5dd35f0621cc643453b8e3fa4b55c27ab220b25d8bfa8ced85f09c2
-  data.tar.gz: 6b9962d40d1ab0d7877f0f9e3962afce2f228f7918d7b79211cbe104835a28172d0798573e282c3c1dcf727c394afc0695089cccd99742849b7cfd8cd3a68dec
+  metadata.gz: fee7c4b404b30816d84cec6e3c76ee7f9f2c8655e09955d62ba5f28859d7467405b802643fe6069f03246725d1d7ecdec1b20264b78fd26c24a720abc0788d93
+  data.tar.gz: 72bae1f47fcee1cf140074db7ba2b5988543d1f54ab521de402a0c2397320e173747b10bfbcb54ee51c19e5b853e20c33f8083c2e14ad916cb61d1b8d12f04e6

data/lib/serverspec/matcher/contain.rb

@@ -1,6 +1,10 @@
 RSpec::Matchers.define :contain do |pattern|
-  match do |file|
-    file.contain(pattern, @from, @to)
+  match do |resource|
+    if resource.is_a?(String)
+      resource.match(Regexp.new([@from, pattern, @to].compact.join.gsub('/', '.*'), Regexp::MULTILINE))
+    else
+      resource.contain(pattern, @from, @to)
+    end
   end
 
   # for contain(pattern).from(/A/).to(/B/)

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.13.0"
+  VERSION = "2.14.0"
 end

data/spec/type/base/command_spec.rb

@@ -59,4 +59,9 @@ EOF
 
   its(:stdout) { should match /bin/ }
   its(:stdout) { should eq stdout }
+  its(:stdout) { should contain('4260') }
+  its(:stdout) { should contain('4260').from('bin').to('home') }
+  its(:stdout) { should contain('4260').after('bin') }
+  its(:stdout) { should contain('4260').before('home') }
+  its(:stdout) { should_not contain('4260').before('bin') }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec