kitchen-docker_cli 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d09c1ca759499f465522eac8a5450d03c9a156f6
-  data.tar.gz: 3c02d60023b1f6cd810209756de6494a51961ea6
+  metadata.gz: 7a1a3609b2d7b773c920391bee3bc159e6bb0cf3
+  data.tar.gz: fa900ccf46df506b136ce27ad05deb805780d55c
 SHA512:
-  metadata.gz: a756a6c2d28cc7f572d38fcb9b561487f82be6cff4efbc440ad02a86ac8cf7d984eee63a1cb01b370f3b36e74c17cf2bb02eeecd70a8d2be05d3cdf488f4e775
-  data.tar.gz: 1273593f19790281578cf9522e79a1f4378038b8af3d861dc1d4294147f667ae422a22b285ed2d3ee53ed34db7eeba7a44ed7fccafe95cdab5dd02e099b2c31b
+  metadata.gz: 71df0f96e65c3fe44bd9ae36deb3f4501fd8d89b48cd0bf10df0b9d06c37073397f35ff0a229c827c6243622781699d1d571c5a0e080666d281ffe2b84b81e84
+  data.tar.gz: 67708ec9dd0abccb214d7037935b1afd291d7f3ea3256f280c5d3c1d83da1d400c08b2605c9a6b9daeb994d62ce53fb0e9e24a0ad8fb972b7d96572b1c95c7ee

data/.kitchen.yml

@@ -19,11 +19,3 @@ suites:
       dns:
         - 8.8.8.8
         - 199.85.126.10
-
-  - name: ansible
-    provisioner:
-      name: ansible_playbook
-      playbook: test/integration/ansible/default.yml
-      hosts: 127.0.0.1
-    verifier:
-      ruby_bindir: /usr/bin

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.13.1
+
+- Fix output of `destroy` action in the case of the container does not exist.
+
 ## 0.13.0
 
 * Support Docker LXC driver(for CircleCI)

data/README.md

@@ -3,10 +3,10 @@
 [![Build Status](https://travis-ci.org/marcy-terui/kitchen-docker_cli.svg?branch=master)](https://travis-ci.org/marcy-terui/kitchen-docker_cli) [![Circle CI](https://circleci.com/gh/marcy-terui/kitchen-docker_cli.svg?style=svg)](https://circleci.com/gh/marcy-terui/kitchen-docker_cli)  
 [![Join the chat at https://gitter.im/marcy-terui/kitchen-docker_cli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/marcy-terui/kitchen-docker_cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-A Test Kitchen Driver for Docker command line interface.
+A Test Kitchen Driver(and Transport) for Docker command line interface.
 
 This plugin is created with only Docker CLI functions.
-Therefore, we can test with an environment that has no extra software such as ```sshd```.
+Therefore, we can test with an environment that has no extra software such as `sshd`.
 
 ## <a name="requirements"></a> Requirements
 
@@ -269,8 +269,8 @@ Examples:
 
 ```yml
 expose:
-    - 80
-    - 22
+  - 80
+  - 22
 ```
 
 ### volume

data/kitchen-docker_cli.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Kitchen::Driver::DOCKER_CLI_VERSION
   spec.authors       = ['Masashi Terui']
   spec.email         = ['marcy9114@gmail.com']
-  spec.description   = %q{A Test Kitchen Driver for Docker native CLI}
+  spec.description   = %q{A Test Kitchen Driver(and Transport) for Docker native CLI}
   spec.summary       = spec.description
   spec.homepage      = 'https://github.com/marcy-terui/kitchen-docker_cli'
   spec.license       = 'Apache 2.0'

data/lib/kitchen/driver/docker_cli.rb

@@ -62,7 +62,7 @@ module Kitchen
 
       def destroy(state)
         instance.transport.connection(state) do |conn|
-          conn.run_docker("rm -f #{state[:container_id]}") rescue false
+          conn.run_docker("rm -f #{state[:container_id]}") if state[:container_id]
         end
       end
 

data/lib/kitchen/driver/docker_cli_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for DockerCli Kitchen driver
-    DOCKER_CLI_VERSION = '0.13.0'
+    DOCKER_CLI_VERSION = '0.13.1'
   end
 end

data/spec/kitchen/transport/docker_cli_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+require 'kitchen/driver/docker_cli'
+
+describe Kitchen::Driver::DockerCli, "default_image" do
+
+  before do
+    @docker_cli = Kitchen::Driver::DockerCli.new
+  end
+
+  example do
+    platform = double('platform')
+    instance = double('instance')
+    platform.stub(:name).and_return("centos-6.4")
+    instance.stub(:platform).and_return(platform)
+    @docker_cli.stub(:instance).and_return(instance)
+    expect(@docker_cli.default_image).to eq 'centos:centos6'
+  end
+
+  example do
+    platform = double('platform')
+    instance = double('instance')
+    platform.stub(:name).and_return("ubuntu-12.04")
+    instance.stub(:platform).and_return(platform)
+    @docker_cli.stub(:instance).and_return(instance)
+    expect(@docker_cli.default_image).to eq 'ubuntu:12.04'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Test Kitchen Driver for Docker native CLI
+description: A Test Kitchen Driver(and Transport) for Docker native CLI
 email:
 - marcy9114@gmail.com
 executables: []
@@ -129,6 +129,7 @@ files:
 - spec/kitchen/driver/docker_cli_spec.rb
 - spec/kitchen/driver/dockerfile.erb
 - spec/kitchen/driver/dockerfile_nil.erb
+- spec/kitchen/transport/docker_cli_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/marcy-terui/kitchen-docker_cli
 licenses:
@@ -153,7 +154,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A Test Kitchen Driver for Docker native CLI
+summary: A Test Kitchen Driver(and Transport) for Docker native CLI
 test_files:
 - integration-test/.gitignore
 - integration-test/.kitchen.yml
@@ -168,4 +169,5 @@ test_files:
 - spec/kitchen/driver/docker_cli_spec.rb
 - spec/kitchen/driver/dockerfile.erb
 - spec/kitchen/driver/dockerfile_nil.erb
+- spec/kitchen/transport/docker_cli_spec.rb
 - spec/spec_helper.rb