kitchen-docker 0.1.3 → 0.2.0

data/README.md

@@ -14,6 +14,24 @@ A Test Kitchen Driver for Docker.
 
 Please read the [Driver usage][driver_usage] page for more details.
 
+Example `.kitchen.local.yml`:
+
+```
+---
+driver_plugin: docker
+
+platforms:
+- name: ubuntu
+  run_list:
+  - recipe[apt]
+- name: centos
+  driver_config:
+    image: "centos"
+    platform: "rhel"
+  run_list:
+  - recipe[yum]
+```
+
 ## <a name="config"></a> Configuration
 
 ### <a name="config-image"></a> image
@@ -49,6 +67,23 @@ installed. There are several different behaviors available:
 
 The default value is `true`.
 
+### <a name="config-forward"></a> forward
+
+Suite container port(s) to forward to the host machine. You cannot
+specify the host port in the mappings, Docker does this for you.
+
+Examples:
+
+```
+forward: 8080
+```
+
+```
+forward:
+- 22
+- 80
+```
+
 ## <a name="development"></a> Development
 
 * Source hosted at [GitHub][repo]

data/lib/kitchen/driver/docker.rb

@@ -93,7 +93,9 @@ module Kitchen
 
       def parse_image_id(output)
         output.each_line do |line|
-          return line.split(/\s+/).last if line =~ /image id/i
+          if line =~ /image id|build successful|successfully built/i
+            return line.split(/\s+/).last
+          end
         end
         raise ActionFailed,
         'Could not parse Docker build output for image ID'
@@ -126,8 +128,9 @@ module Kitchen
 
       def parse_container_ip(output)
         begin
-          info = JSON.parse(output)
-          info['NetworkSettings']['IpAddress']
+          info = Array(JSON.parse(output)).first
+          settings = info['NetworkSettings']
+          settings['IpAddress'] || settings['IPAddress']
         rescue
           raise ActionFailed,
           'Could not parse Docker inspect output for container IP address'
@@ -147,6 +150,7 @@ module Kitchen
 
       def rm_container(state)
         container_id = state[:container_id]
+        run_command("docker stop #{container_id}")
         run_command("docker rm #{container_id}")
       end
 

data/lib/kitchen/driver/docker_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "0.1.3"
+    DOCKER_VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -3577795496291438005
+      hash: 1909028313139145736
       version: '0'
       segments:
       - 0
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -3577795496291438005
+      hash: 1909028313139145736
       version: '0'
       segments:
       - 0