serverspec 2.24.1 → 2.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba897330aa5f45c546c1ef4cd97771a318ceaea6
-  data.tar.gz: 78c6830d00bdeb2d3e9f199d1e2f1d75352c6483
+  metadata.gz: 5213e206a2e2280342fb3ee736b826dffd7ca479
+  data.tar.gz: e040af39605271dc476c709aa4c54b187436ca4b
 SHA512:
-  metadata.gz: 1f206c35791814365553d076e9a90f3c6329f96d95fd25d72b159e8554fb9cd98caf8c4768849a0139a01bbf90f229f49eb0b9d61c4f69a960f1d0b2a9da599e
-  data.tar.gz: e277aafb65c7d3e677c83c4108c0f0f33e1618cdc01c6e0405ab24d53258de437458d1a8e7c3d3259b193d0e6d91009ef92652bf82c99c60d0e9ff3539df32d3
+  metadata.gz: 617f8c3c28fb04e4666b3912a3d47af75e73fb1579ee9c7479eb5494d84d513da32ba6f5a08700ffe4b6c032c57a917530cac0a1ee70daf0d64844d1bb912c27
+  data.tar.gz: ef3e1c068264f4234f9ba5dede49b659eb093d71e2e0781593da699af41c2adf6c8614a9b8421138a8f034d71f133c8bd18a9a55e94552a0b1b6b2efe3586b21

data/WINDOWS_SUPPORT.md

@@ -76,7 +76,7 @@ describe group('MYDOMAIN\Domain Users') do
 end
 
 describe command('& "ipconfig"') do
-  it { should return_stdout(/IPv4 Address(\.| )*: 192\.168\.1\.100/) }
+  its(:stdout) { should match /IPv4 Address(\.| )*: 192\.168\.1\.100/ }
 end
 
 describe windows_registry_key('HKEY_USERS\S-1-5-21-1319311448-2088773778-316617838-32407\Test MyKey') do

data/appveyor.yml

@@ -21,14 +21,14 @@ matrix:
 clone_depth: 5
 
 cache:
-  - C:\Ruby193\lib\ruby\gems\1.9.1
-  - C:\Ruby193\bin
-  - C:\Ruby200\lib\ruby\gems\2.0.0
-  - C:\Ruby200\bin
-  - C:\Ruby21\lib\ruby\gems\2.1.0
-  - C:\Ruby21\bin
-  - C:\Ruby22\lib\ruby\gems\2.2.0
-  - C:\Ruby22\bin
+  - C:\Ruby193\lib\ruby\gems\1.9.1 -> appveyor.yml
+  - C:\Ruby193\bin                 -> appveyor.yml
+  - C:\Ruby200\lib\ruby\gems\2.0.0 -> appveyor.yml
+  - C:\Ruby200\bin                 -> appveyor.yml
+  - C:\Ruby21\lib\ruby\gems\2.1.0  -> appveyor.yml
+  - C:\Ruby21\bin                  -> appveyor.yml
+  - C:\Ruby22\lib\ruby\gems\2.2.0  -> appveyor.yml
+  - C:\Ruby22\bin                  -> appveyor.yml
 
 install:
   - git submodule update --init --recursive

data/lib/serverspec/type/docker_container.rb

@@ -5,6 +5,22 @@ module Serverspec::Type
     end
 
     def has_volume?(container_path, host_path)
+      if (inspection['Mounts'])
+        check_volume(container_path, host_path)
+      else
+        check_volume_pre_1_8(container_path, host_path)
+      end
+    end
+
+    private
+    def check_volume(container_path, host_path)
+      inspection['Mounts'].find {|mount|
+        mount['Destination'] == container_path &&
+        mount['Source'] == host_path
+      }
+    end
+
+    def check_volume_pre_1_8(container_path, host_path)
       inspection['Volumes'][container_path] == host_path
     end
   end

data/lib/serverspec/version.rb

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

data/spec/type/linux/docker_container_pre_1_8_spec.rb

@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require 'json'
+
+property[:os] = nil
+set :os, {:family => 'linux'}
+
+describe docker_container('c1') do
+  it { should exist }
+end
+
+describe docker_container('c1 pre 1.8') do
+  let(:stdout) { inspect_container }
+  it { should be_running }
+  it { should have_volume('/tmp', '/data') }
+  it { should_not have_volume('/tmp', '/data-bad') }
+  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 pre 1.8') do
+  let(:stdout) do
+    attrs = JSON.parse(inspect_container)
+    attrs.first['State']['Restarting'] = true
+    attrs.to_json
+  end
+
+  it { should_not be_running }
+end
+
+def inspect_container
+  <<'EOS'
+[{
+    "Args": [],
+    "Config": {
+        "AttachStderr": false,
+        "AttachStdin": false,
+        "AttachStdout": false,
+        "Cmd": [
+            "/bin/sh"
+        ],
+        "CpuShares": 0,
+        "Cpuset": "",
+        "Domainname": "",
+        "Entrypoint": null,
+        "Env": [
+            "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+        ],
+        "ExposedPorts": null,
+        "Hostname": "65cd2e2d7963",
+        "Image": "busybox",
+        "Memory": 0,
+        "MemorySwap": 0,
+        "NetworkDisabled": false,
+        "OnBuild": null,
+        "OpenStdin": true,
+        "PortSpecs": null,
+        "StdinOnce": false,
+        "Tty": true,
+        "User": "",
+        "Volumes": null,
+        "WorkingDir": ""
+    },
+    "Created": "2014-09-26T15:08:37.527931773Z",
+    "Driver": "aufs",
+    "ExecDriver": "native-0.2",
+    "HostConfig": {
+        "Binds": [
+            "/data:/tmp"
+        ],
+        "ContainerIDFile": "",
+        "Dns": null,
+        "DnsSearch": null,
+        "Links": null,
+        "LxcConf": [],
+        "NetworkMode": "bridge",
+        "PortBindings": {
+            "80": [
+                {
+                    "HostIp": "",
+                    "HostPort": "8080"
+                }
+            ]
+        },
+        "Privileged": false,
+        "PublishAllPorts": false,
+        "VolumesFrom": null
+    },
+    "HostnamePath": "/mnt/sda1/var/lib/docker/containers/65cd2e2d7963bacaecda2d7fcd89499010bc0d38d70bce5ad0af7112a94a4545/hostname",
+    "HostsPath": "/mnt/sda1/var/lib/docker/containers/65cd2e2d7963bacaecda2d7fcd89499010bc0d38d70bce5ad0af7112a94a4545/hosts",
+    "Id": "65cd2e2d7963bacaecda2d7fcd89499010bc0d38d70bce5ad0af7112a94a4545",
+    "Image": "e72ac664f4f0c6a061ac4ef332557a70d69b0c624b6add35f1c181ff7fff2287",
+    "MountLabel": "",
+    "Name": "/c1",
+    "NetworkSettings": {
+        "Bridge": "docker0",
+        "Gateway": "172.17.42.1",
+        "IPAddress": "172.17.0.24",
+        "IPPrefixLen": 16,
+        "PortMapping": null,
+        "Ports": {}
+    },
+    "Path": "/bin/sh",
+    "ProcessLabel": "",
+    "ResolvConfPath": "/mnt/sda1/var/lib/docker/containers/65cd2e2d7963bacaecda2d7fcd89499010bc0d38d70bce5ad0af7112a94a4545/resolv.conf",
+    "State": {
+        "ExitCode": 0,
+        "FinishedAt": "0001-01-01T00:00:00Z",
+        "Paused": false,
+        "Pid": 4123,
+        "Running": true,
+        "StartedAt": "2014-09-26T15:08:37.737780273Z"
+    },
+    "Volumes": {
+        "/tmp": "/data"
+    },
+    "VolumesRW": {
+        "/tmp": true
+    }
+}
+]
+EOS
+end

data/spec/type/linux/docker_container_spec.rb

@@ -13,6 +13,7 @@ describe docker_container('c1') do
   let(:stdout) { inspect_container }
   it { should be_running }
   it { should have_volume('/tmp', '/data') }
+  it { should_not have_volume('/tmp', '/data-bad') }
   its(:inspection) { should include 'Driver' => 'aufs' }
   its(['Config.Cmd']) { should include '/bin/sh' }
   its(['HostConfig.PortBindings.80.[0].HostPort']) { should eq '8080' }
@@ -111,12 +112,14 @@ def inspect_container
         "Running": true,
         "StartedAt": "2014-09-26T15:08:37.737780273Z"
     },
-    "Volumes": {
-        "/tmp": "/data"
-    },
-    "VolumesRW": {
-        "/tmp": true
-    }
+    "Mounts": [
+        {
+            "Source": "/data",
+            "Destination": "/tmp",
+            "Mode": "",
+            "RW": true
+        }
+    ]
 }
 ]
 EOS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.24.1
+  version: 2.24.2
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -234,6 +234,7 @@ files:
 - spec/type/linux/bond_spec.rb
 - spec/type/linux/bridge_spec.rb
 - spec/type/linux/cgroup_spec.rb
+- spec/type/linux/docker_container_pre_1_8_spec.rb
 - spec/type/linux/docker_container_spec.rb
 - spec/type/linux/docker_image_spec.rb
 - spec/type/linux/file_spec.rb
@@ -376,6 +377,7 @@ test_files:
 - spec/type/linux/bond_spec.rb
 - spec/type/linux/bridge_spec.rb
 - spec/type/linux/cgroup_spec.rb
+- spec/type/linux/docker_container_pre_1_8_spec.rb
 - spec/type/linux/docker_container_spec.rb
 - spec/type/linux/docker_image_spec.rb
 - spec/type/linux/file_spec.rb