serverspec 2.32.0 → 2.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d629e86c428878a40544bc2beff61c6869491a31
-  data.tar.gz: fc3996256189a5636032106fd42d559fd94d702f
+  metadata.gz: e8cb6202bb17b2d00ab02b03db491a3f202115c6
+  data.tar.gz: 384cf92bdcfb12da69e2ace11aa9d73556d59715
 SHA512:
-  metadata.gz: dc0c442b4fea567318daa7f51bc196fd2825aec1434e1b30dab7cd9bf01a38bc63bbe7d50e7f568073412d1f290a32a4b70aac8c3fb9fc925dd769afe606f789
-  data.tar.gz: 4ed56238b527ee2d589806b4b288842360e9a691492cb89f1faadb01b87476f9e754e3fca1ca0d74c8567e8a687d0a2402bd054380f6a0c62b627cce83524b59
+  metadata.gz: 612c03a69be35c981006c1df4ada37ba9e7328bbc5c78440328bd816d13989229902265cce594ce9d9c76443364ffca68c76cf41bad291853e6e8749117c3429
+  data.tar.gz: 256da65cc862344419a75e1051758a3462d9609a0548c5a2f5c96d7fc5b96d12e2ddd0dbe800880a106e0ab95d3890840a3d4f6fcf6409fb41903a160026e7fa

data/lib/serverspec/helper/type.rb

@@ -4,7 +4,7 @@ module Serverspec
       types = %w(
         base bridge bond cgroup command cron default_gateway file fstab
         group host iis_website iis_app_pool interface ipfilter ipnat
-        iptables ip6tables kernel_module linux_kernel_parameter lxc
+        iptables ip6tables json_file kernel_module linux_kernel_parameter lxc
         mail_alias mysql_config package php_config port ppa process
         routing_table selinux selinux_module service user yumrepo
         windows_feature windows_hot_fix windows_registry_key

data/lib/serverspec/type/docker_base.rb

@@ -16,14 +16,12 @@ module Serverspec::Type
     end
 
     def inspection
-      return @inspection if @inspection
-      @inspection = ::MultiJson.load(get_inspection.stdout)[0]
+      @inspection ||= ::MultiJson.load(get_inspection.stdout)[0]
     end
 
     private
     def get_inspection
-      return @get_inspection if @get_inspection
-      @get_inspection = @runner.run_command("docker inspect #{@name}")
+      @get_inspection ||= @runner.run_command("docker inspect #{@name}")
     end
   end
 end

data/lib/serverspec/type/json_file.rb

@@ -0,0 +1,9 @@
+require 'json'
+
+module Serverspec::Type
+  class JsonFile < File
+    def content
+      JSON.parse(super)
+    end
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.32.0"
+  VERSION = "2.33.0"
 end

data/spec/type/base/json_file_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+set :os, {:family => 'base'}
+
+describe json_file('example.json') do
+  let(:stdout) {<<EOF
+{
+  "json": {
+    "title": "this is a json",
+    "array" : [
+      {
+        "title": "array 1"
+      },
+      {
+        "title": "array 2"
+      }
+    ]
+  }
+}
+EOF
+  }
+
+  its(:content) { should include('json') }
+  its(:content) { should include('json' => include('title' => 'this is a json')) }
+  its(:content) { should include('json' => include('array' => include('title' => 'array 2'))) }
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.32.0
+  version: 2.33.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -165,6 +165,7 @@ files:
 - lib/serverspec/type/ipfilter.rb
 - lib/serverspec/type/ipnat.rb
 - lib/serverspec/type/iptables.rb
+- lib/serverspec/type/json_file.rb
 - lib/serverspec/type/kernel_module.rb
 - lib/serverspec/type/linux_audit_system.rb
 - lib/serverspec/type/linux_kernel_parameter.rb
@@ -209,6 +210,7 @@ files:
 - spec/type/base/file_spec.rb
 - spec/type/base/group_spec.rb
 - spec/type/base/host_spec.rb
+- spec/type/base/json_file_spec.rb
 - spec/type/base/mail_alias_spec.rb
 - spec/type/base/mysql_config_spec.rb
 - spec/type/base/package_spec.rb
@@ -353,6 +355,7 @@ test_files:
 - spec/type/base/file_spec.rb
 - spec/type/base/group_spec.rb
 - spec/type/base/host_spec.rb
+- spec/type/base/json_file_spec.rb
 - spec/type/base/mail_alias_spec.rb
 - spec/type/base/mysql_config_spec.rb
 - spec/type/base/package_spec.rb