kitchen-docker_cli 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 578fd12a2895cf8cce53b02cc1dffb35f6e43e87
-  data.tar.gz: 03d454b75385391c889b8db2e815704672f68892
+  metadata.gz: 67692c61b4cd109d6454fa31f8d25e28f70bc901
+  data.tar.gz: 19e7c9629cafc3a90ee405ca1d4167f692fde894
 SHA512:
-  metadata.gz: d6ede05041d8b80d95653ff24e401c031b5b5aa24206dffeedb6b64d4fe584aa07669eea4ebd93b155d5e899b4b4f8ec81f1a0089a1ba81b75504de53e1b19d7
-  data.tar.gz: a3eaded6a5e0cf8a1d007bef4110622c574580b1e241b1623c4520fd24c4909b69de28debefc3ad084cae92b6da31b49dad9f7850ca6378c143f4aa99be6342c
+  metadata.gz: 6dfe3bd361b618bb3579d11a909ce37b208a3d29c35a63a19e4bbb6b4e0c24d516acddff8415190fa74d91f74654ecba5ba313b25b163f69b74b9900272b1e6a
+  data.tar.gz: e5e58fd795a5416547c295de30e032642aa81aa72bf32d59ad772d18c779ddc19686add4b05f15ab70da1ce626870339c980fd4bf930a609522f53935c9dc5c6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.0
+
+* Add `instance_host_name` option
+
 ## 0.7.1
 
 * Fix error on `fedora`

data/README.md

@@ -174,6 +174,17 @@ Examples:
   hostname: example.local
 ```
 
+### instance_host_name
+Use instance name to hostname.
+
+The default value is `false`.
+
+Examples:
+
+```yml
+  instance_host_name: true
+```
+
 ### link
 
 Set `container_name`(and alias) of other container(s) that connect from the suite container.

data/lib/kitchen/driver/docker_cli.rb

@@ -30,6 +30,7 @@ module Kitchen
       default_config :no_cache, false
       default_config :command, 'sh -c \'while true; do sleep 1d; done;\''
       default_config :privileged, false
+      default_config :instance_host_name, false
 
       default_config :image do |driver|
         driver.default_image
@@ -132,7 +133,11 @@ module Kitchen
         cmd << " -c #{config[:cpu_shares]}" if config[:cpu_shares]
         cmd << ' --privileged' if config[:privileged]
         cmd << " --net #{config[:network]}" if config[:network]
-        cmd << " -h #{config[:hostname]}" if config[:hostname]
+        if config[:hostname]
+          cmd << " -h #{config[:hostname]}"
+        elsif config[:instance_host_name]
+          cmd << " -h #{instance.name}"
+        end
         Array(config[:publish]).each { |pub| cmd << " -p #{pub}" }
         Array(config[:volume]).each { |vol| cmd << " -v #{vol}" }
         Array(config[:link]).each { |link| cmd << " --link #{link}" }

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.7.1'
+    DOCKER_CLI_VERSION = '0.8.0'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -218,6 +218,9 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
 
   before do
     @docker_cli = Kitchen::Driver::DockerCli.new(config)
+    instance = double('instance')
+    instance.stub(:name).and_return("default-centos-66")
+    @docker_cli.stub(:instance).and_return(instance)
   end
 
   context 'default' do
@@ -229,6 +232,15 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
     end
   end
 
+  context 'instance_host_name' do
+    let(:config)       { {:command => '/bin/bash', :instance_host_name => true} }
+
+    example do
+      cmd = "run -d -t -h default-centos-66 test /bin/bash"
+      expect(@docker_cli.docker_run_command('test')).to eq cmd
+    end
+  end
+
   context 'set configs' do
     let(:config) do
       {
@@ -242,7 +254,8 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
         :memory_limit => '256m',
         :cpu_shares => 512,
         :network => 'none',
-        :hostname => 'example.local'
+        :hostname => 'example.local',
+        :instance_host_name => true
       }
     end
 

metadata

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