serverspec 2.34.0 → 2.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf7439e1ec9e7900ebd5a395bc1e63e1cb0359b1
-  data.tar.gz: a8c845da7060aabd77ba705c58dcb462e29b3974
+  metadata.gz: 609cc80dcfdad218ce5f7d2956aa32ba29c8980a
+  data.tar.gz: 05f826f398abb44f97607c418f793073278fcbe6
 SHA512:
-  metadata.gz: c8fb0b89e757f2b9783d988cc03294e0108f5bdfbb1c5d80fdaa137d43807eebda7fcfae5ec513787510fec09e1f2b9576538510e680e336817784f49691d4a9
-  data.tar.gz: 8b1b314700022e1c914a55824777167fe014747674c50a49cbd3907067ef4bd6b96bcebbdd865298324c5c17f77de062cba1da0f841e0f55e166ee1fb13cbbf6
+  metadata.gz: 1e934fe845e12bfa2595bc9cb0fbc398c4447048db1d0191c5faec12c09db5d8b4f1a5a1763047e6fda40891bd9d4596ba1534ff89373a6de882a0ae9d94570b
+  data.tar.gz: 2223c7bc8076116961b5ac8a143d2affe31db54818a2397ae7b181a96a91ae3eba8a51befef7ba424d6c0ff2220d563ce2ea6ce0cb32991f30b70fbd72550561

data/lib/serverspec/type/file.rb

@@ -1,5 +1,6 @@
 require 'date'
 require 'multi_json'
+require 'yaml'
 
 module Serverspec::Type
   class File < Base
@@ -115,13 +116,15 @@ module Serverspec::Type
     end
 
     def content_as_json
-      if @content_as_json.nil?
-        @content = @runner.get_file_content(@name).stdout if @content.nil?
-        @content_as_json = MultiJson.load(@content)
-      end
+      @content_as_json = MultiJson.load(content) if @content_as_json.nil?
       @content_as_json
     end
 
+    def content_as_yaml
+      @content_as_yaml = YAML.load(content) if @content_as_yaml.nil?
+      @content_as_yaml
+    end
+
     def group
       @runner.get_file_owner_group(@name).stdout.strip
     end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.34.0"
+  VERSION = "2.35.0"
 end

data/spec/type/base/file_spec.rb

@@ -365,6 +365,25 @@ EOF
   its(:content_as_json) { should include('json' => include('array' => include('title' => 'array 2'))) }
 end
 
+describe file('example.yml') do
+  let(:stdout) {<<EOF
+---
+yaml:
+  title: 'this is a yaml'
+  array:
+    -
+      title: 'array 1'
+    -
+      title: 'array 2'
+EOF
+  }
+
+  its(:content_as_yaml) { should include('yaml') }
+  its(:content_as_yaml) { should include('yaml' => include('title' => 'this is a yaml')) }
+  its(:content_as_yaml) { should include('yaml' => include('array' => include('title' => 'array 2'))) }
+end
+
+
 describe file('/etc/pam.d/system-auth') do
   let(:stdout) { "/etc/pam.dsystem-auth-ac\r\n" }
   its(:link_target) { should eq '/etc/pam.dsystem-auth-ac' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.34.0
+  version: 2.35.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec