kitchen-docker_cli 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a1a3609b2d7b773c920391bee3bc159e6bb0cf3
-  data.tar.gz: fa900ccf46df506b136ce27ad05deb805780d55c
+  metadata.gz: bf34c6963a7146a8e728654cf0b4d83553353584
+  data.tar.gz: a970a92c7193edbcd6fb4745bd00ee1ef8618cd6
 SHA512:
-  metadata.gz: 71df0f96e65c3fe44bd9ae36deb3f4501fd8d89b48cd0bf10df0b9d06c37073397f35ff0a229c827c6243622781699d1d571c5a0e080666d281ffe2b84b81e84
-  data.tar.gz: 67708ec9dd0abccb214d7037935b1afd291d7f3ea3256f280c5d3c1d83da1d400c08b2605c9a6b9daeb994d62ce53fb0e9e24a0ad8fb972b7d96572b1c95c7ee
+  metadata.gz: 88dbfa9c5f743e6c7befb74e8df1c940a246fe76df450d82d169fd6d23c4914157cc8b65d5c3843b6aecee8730c273658967840fed9a147567ba276ae996ea0b
+  data.tar.gz: e3ede63db8cd4b92d69da5957e2e35193e75d796890dfe9b37ec1edcce859c1cc2d15bf0c81d0f2bb5592dbf70b759ecf94b1a1787e5096bc193082a5bcacbff

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.14.0
+
+* Pull request [#21][]: Support `--add-host` option ([@sawanoboly][])
+
 ## 0.13.1
 
 - Fix output of `destroy` action in the case of the container does not exist.
@@ -96,6 +100,8 @@
 [#16]: https://github.com/marcy-terui/kitchen-docker_cli/issues/16
 [#17]: https://github.com/marcy-terui/kitchen-docker_cli/issues/17
 [#18]: https://github.com/marcy-terui/kitchen-docker_cli/issues/18
+[#21]: https://github.com/marcy-terui/kitchen-docker_cli/issues/21
 [@grubernaut]: https://github.com/grubernaut
 [@hd-deman]: https://github.com/hd-deman
+[@sawanoboly]: https://github.com/sawanoboly
 [@yewton]: https://github.com/yewton

data/lib/kitchen/driver/docker_cli.rb

@@ -83,13 +83,13 @@ module Kitchen
       end
 
       def docker_build_command
-        cmd = 'build'
+        cmd = String.new('build')
         cmd << ' --no-cache' if config[:no_cache]
         cmd << ' -'
       end
 
       def docker_run_command(image)
-        cmd = "run -d -t"
+        cmd = String.new("run -d -t")
         cmd << " --name #{config[:container_name]}" if config[:container_name]
         cmd << ' -P' if config[:publish_all]
         cmd << " -m #{config[:memory_limit]}" if config[:memory_limit]
@@ -107,6 +107,7 @@ module Kitchen
         Array(config[:link]).each { |link| cmd << " --link #{link}" }
         Array(config[:expose]).each { |exp| cmd << " --expose #{exp}" }
         Array(config[:dns]).each {|dns| cmd << " --dns #{dns}"}
+        Array(config[:add_host]).each {|mapping| cmd << " --add-host #{mapping}"}
         cmd << " #{image} #{config[:command]}"
       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.1'
+    DOCKER_CLI_VERSION = '0.14.0'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -126,12 +126,13 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
         :network => 'none',
         :hostname => 'example.local',
         :instance_host_name => true,
-        :dns => ['8.8.8.8', '8.8.4.4']
+        :dns => ['8.8.8.8', '8.8.4.4'],
+        :add_host => ['myhost:127.0.0.1']
       }
     end
 
     example do
-      cmd = "run -d -t --name web -P -m 256m -c 512 --privileged --net none -h example.local -p 80:8080 -p 22:2222 -v /dev:/dev --volumes-from data --link mysql:db --expose 80 --dns 8.8.8.8 --dns 8.8.4.4 test /bin/bash"
+      cmd = "run -d -t --name web -P -m 256m -c 512 --privileged --net none -h example.local -p 80:8080 -p 22:2222 -v /dev:/dev --volumes-from data --link mysql:db --expose 80 --dns 8.8.8.8 --dns 8.8.4.4 --add-host myhost:127.0.0.1 test /bin/bash"
       expect(@docker_cli.docker_run_command('test')).to eq cmd
     end
   end

metadata

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