serverspec 2.24.0 → 2.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 072e9221dbec759258719f66f89547e8d979c4d1
-  data.tar.gz: f11f81e00792b28d36676157271c5b5752875662
+  metadata.gz: ba897330aa5f45c546c1ef4cd97771a318ceaea6
+  data.tar.gz: 78c6830d00bdeb2d3e9f199d1e2f1d75352c6483
 SHA512:
-  metadata.gz: 4de08a8977d4dbf0c3153a022f2d1c1f8e20c4fbcddee60a6a1b3b9ff07ffd5cfd2b6b8d61f09e9e204d751a785ffad7a60f2ff51f770fe8b92d4972c91b753d
-  data.tar.gz: 0d21196c571710bb1ead4e9b7e4f167a01b6a986de206955b3cf2bca7efd0c6b486df0bca8a1ab3fad66e1c9338f9e3e5a0175ed4f908c3ccfac1da27de92077
+  metadata.gz: 1f206c35791814365553d076e9a90f3c6329f96d95fd25d72b159e8554fb9cd98caf8c4768849a0139a01bbf90f229f49eb0b9d61c4f69a960f1d0b2a9da599e
+  data.tar.gz: e277aafb65c7d3e677c83c4108c0f0f33e1618cdc01c6e0405ab24d53258de437458d1a8e7c3d3259b193d0e6d91009ef92652bf82c99c60d0e9ff3539df32d3

data/lib/serverspec/type/docker_base.rb

@@ -9,7 +9,8 @@ module Serverspec::Type
     def [](key)
       value = inspection
       key.split('.').each do |k|
-        value = value[k]
+        is_index = k.start_with?('[') && k.end_with?(']')
+        value = value[is_index ? k.to_i : k]
       end
       value
     end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.24.0"
+  VERSION = "2.24.1"
 end

data/spec/type/base/host_spec.rb

@@ -34,3 +34,14 @@ describe host('example.jp') do
   let(:stdout) { "1.2.3.4\r\n" }
   its(:ipaddress) { should eq '1.2.3.4' }
 end
+
+describe host('example.jp') do
+  let(:stdout) { "1.2.3.4\r\n" }
+  its(:ipv4_address) { should match(/^[\d.]+$/) }
+end
+
+describe host('example.jp') do
+  let(:stdout) { "2001:db8::1234\r\n" }
+  its(:ipv6_address) { should match(/^[a-f\d:]+$/i) }
+end
+

data/spec/type/linux/docker_container_spec.rb

@@ -15,6 +15,7 @@ describe docker_container('c1') do
   it { should have_volume('/tmp', '/data') }
   its(:inspection) { should include 'Driver' => 'aufs' }
   its(['Config.Cmd']) { should include '/bin/sh' }
+  its(['HostConfig.PortBindings.80.[0].HostPort']) { should eq '8080' }
 end
 
 describe docker_container('restarting') do
@@ -73,7 +74,14 @@ def inspect_container
         "Links": null,
         "LxcConf": [],
         "NetworkMode": "bridge",
-        "PortBindings": {},
+        "PortBindings": {
+            "80": [
+                {
+                    "HostIp": "",
+                    "HostPort": "8080"
+                }
+            ]
+        },
         "Privileged": false,
         "PublishAllPorts": false,
         "VolumesFrom": null

data/spec/type/linux/selinux_spec.rb

@@ -6,10 +6,18 @@ describe selinux do
   it { should be_enforcing }
 end
 
+describe selinux do
+  it { should be_enforcing.with_policy('mls') }
+end
+
 describe selinux do
   it { should be_permissive }
 end
 
+describe selinux do
+  it { should be_permissive.with_policy('targeted') }
+end
+
 describe selinux do
   it { should be_disabled }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.24.0
+  version: 2.24.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -446,3 +446,4 @@ test_files:
 - spec/type/windows/scheduled_task_spec.rb
 - spec/type/windows/service_spec.rb
 - spec/type/windows/user_spec.rb
+has_rdoc: