serverspec 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e33ca47a0fc901359a0863ad44a1472cc6776259
-  data.tar.gz: 7f52fb2b9da01fa14879dfe904a47f5f585e1203
+  metadata.gz: 016ff2d79899cdf9a52322da3f4ea6d7bf2cfb4d
+  data.tar.gz: c89a989e829bc70de0d8a476d0bae6dfd08e9207
 SHA512:
-  metadata.gz: 0bcd8d57689bae9e6b78508701f93e77d52f4e194c838d01af4651043934545bf317f806ece0bc742aa6151126c64d805eb9e0dc853764d58484f025e21d3e3a
-  data.tar.gz: 38ed26a879641a12add9054c8ad2bb19b9df561fa58eb0de9509fc1f40a3c2b58342dd9a0a2164af74638ae18d68e2b78dafe7abc55801b4cb5d43d11b8d353a
+  metadata.gz: 9fc7f6fef6d5cb5f2959e5a1d3bd719b3a5f95a37ef440b19b33b055c60772b3c138f49c847f804ff3e2792213c7f180114169ec6069543668a9dfe68c1f02d9
+  data.tar.gz: 55d001bcabdcd2f5b4b3f6380b6b69955fa21252e43d9848c09d963b18629d4d3611b3f16b0bbc62a347cdc7fb2905ad03b3b5d4cd042c5330967ee10e87bd03

data/lib/serverspec/type/file.rb

@@ -16,10 +16,14 @@ module Serverspec
       end
 
       def contain(pattern, from, to)
-        if (from || to).nil?
-          backend.check_file_contain(@name, pattern)
+        if pattern.is_a?(Array)
+          backend.check_file_contain_lines(@name, pattern, from, to)
         else
-          backend.check_file_contain_within(@name, pattern, from, to)
+          if (from || to).nil?
+            backend.check_file_contain(@name, pattern)
+          else
+            backend.check_file_contain_within(@name, pattern, from, to)
+          end
         end
       end
 

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/serverspec.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "net-ssh"
   spec.add_runtime_dependency "rspec", "~> 2.13"
   spec.add_runtime_dependency "highline"
-  spec.add_runtime_dependency "specinfra", ">= 1.0.0"
+  spec.add_runtime_dependency "specinfra", ">= 1.2.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
   spec.add_development_dependency "octokit", "~> 2.7.2"

data/spec/arch/service_spec.rb

@@ -4,7 +4,7 @@ include SpecInfra::Helper::Arch
 
 describe service('sshd') do
   it { should be_enabled }
-  its(:command) { should eq "systemctl --plain list-dependencies multiuser.target | grep '^sshd.service$'" }
+  its(:command) { should eq "systemctl --plain list-dependencies multi-user.target | grep '^sshd.service$'" }
 end
 
 describe service('invalid-service') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement