serverspec 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f6d7aa27e722dbebd2e7c9052d267f2a790b4bc
-  data.tar.gz: c5dce829ed3872a406673ab8872c4dc6811374aa
+  metadata.gz: c11ef86a64f8183dfa28220f2a8f0f3decb729d6
+  data.tar.gz: 63ce70dcced311832c744a3ebfe9870fab383362
 SHA512:
-  metadata.gz: d45ded0ebc80ae93284eba93a1b1c47b37234aaa375312c0bc266f84afcad3a081a5551b4b5da95793f7b0985397299bbe1792730e238ecd0e927e0f337fe9cd
-  data.tar.gz: 798478850c32be2528c8bf14b7040f5d0c4869056241b06aa4f887bff4064ddfabf38d919cb8e862467b02afd65eaa2d5539fbe73df7d98d9a0e4b157d8babcc
+  metadata.gz: c98b2eeec8291a219bbf6e812c7037b555bd8134b278904c3212106ec0549c2a77bf27c3d712b90b3adf94b9ce3cdac75210bc8d0141473881ccb42b1942bf63
+  data.tar.gz: 41073608375f930f27a16457a234fa41b4a3228f7285f6871eb96bd0fd3736b8f3453ebf3eef84200c54a290a479773fd9eed2540c24a1ace222a7ef11300d9e

data/lib/serverspec/helper/type.rb

@@ -8,6 +8,7 @@ module Serverspec
         package php_config port ppa process routing_table selinux
         selinux_module service user yumrepo windows_feature
         windows_hot_fix windows_registry_key windows_scheduled_task zfs
+        docker_base docker_image docker_container
       )
 
       types.each {|type| require "serverspec/type/#{type}" }

data/lib/serverspec/type/docker_base.rb

@@ -0,0 +1,28 @@
+require 'json'
+
+module Serverspec::Type
+  class DockerBase < Base
+    def exist?
+      get_inspection.success?
+    end
+
+    def [](key)
+      value = inspection
+      key.split('.').each do |k|
+        value = value[k]
+      end
+      value
+    end
+
+    def inspection
+      return @inspection if @inspection
+      @inspection = JSON.parse(get_inspection.stdout)[0]
+    end
+
+    private
+    def get_inspection
+      return @get_inspectiob if @get_inspection
+      @get_inspection = @runner.run_command("docker inspect #{@name}")
+    end
+  end
+end

data/lib/serverspec/type/docker_container.rb

@@ -0,0 +1,11 @@
+module Serverspec::Type
+  class DockerContainer < DockerBase
+    def running?
+      inspection['State']['Running']
+    end
+
+    def has_volume?(container_path, host_path)
+      inspection['Volumes'][container_path] == host_path
+    end
+  end
+end

data/lib/serverspec/type/docker_image.rb

@@ -0,0 +1,4 @@
+module Serverspec::Type
+  class DockerImage < DockerBase
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/serverspec.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rspec", "~> 3.0"
   spec.add_runtime_dependency "rspec-its"
+  spec.add_runtime_dependency "json"
   spec.add_runtime_dependency "specinfra", "~> 2.3"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"

data/spec/type/linux/docker_container_spec.rb

@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+property[:os] = nil
+set :os, {:family => 'linux'}
+
+describe docker_container('c1') do
+  it { should exist }
+end
+
+describe docker_container('c1') do
+  let(:stdout) { inspect_container }
+  it { should be_running }
+  it { should have_volume('/tmp', '/data') }
+  its(:inspection) { should include 'Driver' => 'aufs' }
+  its(['Config.Cmd']) { should include '/bin/sh' }
+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": {},
+        "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_image_spec.rb

@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+property[:os] = nil
+set :os, {:family => 'linux'}
+
+describe docker_image('busybox:latest') do
+  it { should exist }
+end
+
+describe docker_image('busybox:latest') do
+  let(:stdout) { inspect_image }
+  its(:inspection) { should include 'Architecture' => 'amd64' }
+  its(['Architecture']) { should eq 'amd64' }
+  its(['Config.Cmd']) { should include '/bin/sh' }
+end
+
+def inspect_image
+  <<'EOS'
+[{
+    "Architecture": "amd64",
+    "Author": "Jérôme Petazzoni \u003cjerome@docker.com\u003e",
+    "Comment": "",
+    "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": "88f18f678e5d",
+        "Image": "e433a6c5b276a31aa38bf6eaba9cd1cfd69ea33f706ed72b3f20bafde5cd8644",
+        "Memory": 0,
+        "MemorySwap": 0,
+        "NetworkDisabled": false,
+        "OnBuild": [],
+        "OpenStdin": false,
+        "PortSpecs": null,
+        "StdinOnce": false,
+        "Tty": false,
+        "User": "",
+        "Volumes": null,
+        "WorkingDir": ""
+    },
+    "Container": "8e73b239682fe73338323d9af83d3c5aa5bb7d22a3fe84cbfcf5f47e756d6636",
+    "ContainerConfig": {
+        "AttachStderr": false,
+        "AttachStdin": false,
+        "AttachStdout": false,
+        "Cmd": [
+            "/bin/sh",
+            "-c",
+            "#(nop) 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": "88f18f678e5d",
+        "Image": "e433a6c5b276a31aa38bf6eaba9cd1cfd69ea33f706ed72b3f20bafde5cd8644",
+        "Memory": 0,
+        "MemorySwap": 0,
+        "NetworkDisabled": false,
+        "OnBuild": [],
+        "OpenStdin": false,
+        "PortSpecs": null,
+        "StdinOnce": false,
+        "Tty": false,
+        "User": "",
+        "Volumes": null,
+        "WorkingDir": ""
+    },
+    "Created": "2014-10-01T20:46:08.914288461Z",
+    "DockerVersion": "1.2.0",
+    "Id": "e72ac664f4f0c6a061ac4ef332557a70d69b0c624b6add35f1c181ff7fff2287",
+    "Os": "linux",
+    "Parent": "e433a6c5b276a31aa38bf6eaba9cd1cfd69ea33f706ed72b3f20bafde5cd8644",
+    "Size": 0
+}
+]
+EOS
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: specinfra
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +143,9 @@ files:
 - lib/serverspec/type/command.rb
 - lib/serverspec/type/cron.rb
 - lib/serverspec/type/default_gateway.rb
+- lib/serverspec/type/docker_base.rb
+- lib/serverspec/type/docker_container.rb
+- lib/serverspec/type/docker_image.rb
 - lib/serverspec/type/file.rb
 - lib/serverspec/type/group.rb
 - lib/serverspec/type/host.rb
@@ -203,6 +220,8 @@ files:
 - spec/type/gentoo/package_spec.rb
 - spec/type/gentoo/service_spec.rb
 - spec/type/linux/cgroup_spec.rb
+- spec/type/linux/docker_container_spec.rb
+- spec/type/linux/docker_image_spec.rb
 - spec/type/linux/file_spec.rb
 - spec/type/linux/interface_spec.rb
 - spec/type/linux/ip6tables_spec.rb
@@ -335,6 +354,8 @@ test_files:
 - spec/type/gentoo/package_spec.rb
 - spec/type/gentoo/service_spec.rb
 - spec/type/linux/cgroup_spec.rb
+- spec/type/linux/docker_container_spec.rb
+- spec/type/linux/docker_image_spec.rb
 - spec/type/linux/file_spec.rb
 - spec/type/linux/interface_spec.rb
 - spec/type/linux/ip6tables_spec.rb