kitchen-docker_cli 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1aebbb2fe16364552a69eaac3fd4241ebea7339
-  data.tar.gz: d0598beca61df19715ba59d7aa9616cf379340ac
+  metadata.gz: 3269fa4b33bf25f161bcd1af841c00cce6f2cbe6
+  data.tar.gz: af1dc072ceb79cb73c0781ec776527d23c150875
 SHA512:
-  metadata.gz: cf2689759559525535b995598d63cbb56ecedb2f798bf7a74fb795f47aa53dc74d884bc04b6c1bd2015c24eee6d08dbe6a05b3d66f6c10d70f2eb4c4552631ca
-  data.tar.gz: 3603decf5026b403fe1e7dfacdadfefdceffffda1027c0914f3abfdc7f9cb3c8b73e22ac7a1ffd91e8ee5581272320d610edc3271889991467579728f838edfd
+  metadata.gz: d875cd82bf9fe83e52b2c179f3968068b6a40d9b57338456b7b6dba0295d268907639efe7f3aa92c5d62747d00f4586f3e83ff41c58095baf4bba6e4c3d965fe
+  data.tar.gz: 39463c201c7f8ef0f01d3671ac196a62e3c5bbadd217ad3c243cca83b6664c3a6908d79c3d63169063ac2d603e0e4b1b552c5e9ae1fa8c85ed95711efdae47fa

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
 - 2.2.3
 - 2.1.7
 - 2.0.0
-- 1.9.3
 - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.14.2
+
+* Fix error on Circle-CI
+
 ## 0.14.1
 
 * Pull request [#23][]: Add `build_context` option to pass Docker build context ([@nrvale0][])
@@ -110,4 +114,4 @@
 [@hd-deman]: https://github.com/hd-deman
 [@nrvale0]: https://github.com/nrvale0
 [@sawanoboly]: https://github.com/sawanoboly
-[@yewton]: https://github.com/yewton
+[@yewton]: https://github.com/yewton

data/README.md

@@ -5,8 +5,8 @@
 
 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`.
+This plugin is created with only Docker CLI functions.  
+We can test on the environment that has no extra software such as `sshd`.
 
 ## <a name="requirements"></a> Requirements
 

data/lib/kitchen/driver/docker_cli.rb

@@ -63,7 +63,11 @@ module Kitchen
 
       def destroy(state)
         instance.transport.connection(state) do |conn|
-          conn.run_docker("rm -f #{state[:container_id]}") if state[:container_id]
+          begin
+            conn.run_docker("rm -f #{state[:container_id]}") if state[:container_id]
+          rescue => e
+            raise e unless conn.send(:options)[:lxc_driver]
+          end
         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.14.1'
+    DOCKER_CLI_VERSION = '0.14.2'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'kitchen/driver/docker_cli'
 
-describe Kitchen::Driver::DockerCli, "default_image" do
+describe Kitchen::Driver::DockerCli, "#default_image" do
 
   before do
     @docker_cli = Kitchen::Driver::DockerCli.new
@@ -26,7 +26,7 @@ describe Kitchen::Driver::DockerCli, "default_image" do
   end
 end
 
-describe Kitchen::Driver::DockerCli, "default_platform" do
+describe Kitchen::Driver::DockerCli, "#default_platform" do
 
   before do
     @docker_cli = Kitchen::Driver::DockerCli.new
@@ -42,7 +42,7 @@ describe Kitchen::Driver::DockerCli, "default_platform" do
   end
 end
 
-describe Kitchen::Driver::DockerCli, "create" do
+describe Kitchen::Driver::DockerCli, "#create" do
 
   before do
     @docker_cli = Kitchen::Driver::DockerCli.new(config)
@@ -68,7 +68,7 @@ describe Kitchen::Driver::DockerCli, "create" do
   end
 end
 
-describe Kitchen::Driver::DockerCli, "docker_build_command" do
+describe Kitchen::Driver::DockerCli, "#docker_build_command" do
 
   before do
     @docker_cli = Kitchen::Driver::DockerCli.new(config)
@@ -76,7 +76,7 @@ describe Kitchen::Driver::DockerCli, "docker_build_command" do
 
   context 'build_context' do
     let(:config)	{ {:build_context => true} }
-    
+
     example do
       expect(@docker_cli.docker_build_command).to eq 'build .'
     end
@@ -100,7 +100,7 @@ describe Kitchen::Driver::DockerCli, "docker_build_command" do
 
 end
 
-describe Kitchen::Driver::DockerCli, "docker_run_command" do
+describe Kitchen::Driver::DockerCli, "#docker_run_command" do
 
   before do
     @docker_cli = Kitchen::Driver::DockerCli.new(config)
@@ -147,7 +147,7 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
   end
 end
 
-describe Kitchen::Driver::DockerCli, "parse_image_id" do
+describe Kitchen::Driver::DockerCli, "#parse_image_id" do
 
   before do
     @docker_cli = Kitchen::Driver::DockerCli.new()
@@ -165,7 +165,7 @@ describe Kitchen::Driver::DockerCli, "parse_image_id" do
 
 end
 
-describe Kitchen::Driver::DockerCli, "parse_container_id" do
+describe Kitchen::Driver::DockerCli, "#parse_container_id" do
 
   before do
     @docker_cli = Kitchen::Driver::DockerCli.new()
@@ -192,7 +192,7 @@ describe Kitchen::Driver::DockerCli, "parse_container_id" do
 
 end
 
-describe Kitchen::Driver::DockerCli, "docker_file" do
+describe Kitchen::Driver::DockerCli, "#docker_file" do
 
   before do
     @docker_cli = Kitchen::Driver::DockerCli.new(config)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen