kitchen-docker_cli 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86d1304084493a93678033f12fb9c16782cb72d4
-  data.tar.gz: 225c65f8e05d2eea4ae1376d4a0dd8028afa52dc
+  metadata.gz: a6c75bef1be02229951e309089476996c89eedd4
+  data.tar.gz: 208335c455ac0e33b9288a20c62b6e7b314f66e7
 SHA512:
-  metadata.gz: a78202c0d1dc6344ac7c79aac2cd11ed7694ced1e475dc687a4dd4af1f238341179a0b24117ecb7ed22ac062928c6f20a5d20ed8685541348147d481ebd7957c
-  data.tar.gz: b97a94d845e713af5f7336b5a79cbd1b16919f17cc48f00c1c978e5bea59fdb92e6f5c1db23dd89fc7e45a15bfd0ffdbbce243ede8bebb377cb3f174cee422ef
+  metadata.gz: 4d76af1e6d52ad14d63af9f278032a7a1191a4d2fc1f98adfc4f043c72f5fc4dc2de54d20a8a768f659c436afa06f464186308945e2c8f5054d4ab7b7f4b6a0f
+  data.tar.gz: 5acc2d85837073b3c7ee3a58f4363ce1e4ea624dd25dcfc92f9c24e0acc42264e081772ede8008772ec2ca60835f856c8dc967138b3e2e98cb41a95fe20c31c3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.1
+
+* Bugfix
+
 ## 0.9.0
 
 * Change custom Dockerfile to ERB template [#11][] [#12][]
@@ -58,4 +62,4 @@
 [#11]: https://github.com/marcy-terui/kitchen-docker_cli/issues/11
 [#12]: https://github.com/marcy-terui/kitchen-docker_cli/issues/12
 [@grubernaut]: https://github.com/grubernaut
-[@hd-deman]: https://github.com/hd-deman
+[@hd-deman]: https://github.com/hd-deman

data/lib/kitchen/docker_cli/dockerfile_template.rb

@@ -24,8 +24,10 @@ module Kitchen
 
     class DockerfileTemplate
       def initialize(vars={}, config={})
-        vars.each do |k, v|
-          instance_variable_set("@#{k.to_s}", v)
+        if vars.is_a?(Hash)
+          vars.each do |k, v|
+            instance_variable_set("@#{k.to_s}", v)
+          end
         end
         self.class.class_eval <<-EOF
           def config

data/lib/kitchen/driver/docker_cli.rb

@@ -33,6 +33,7 @@ module Kitchen
       default_config :privileged, false
       default_config :instance_host_name, false
       default_config :transport, "docker_cli"
+      default_config :dockerfile_vars, {}
 
       default_config :image do |driver|
         driver.default_image

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.9.0'
+    DOCKER_CLI_VERSION = '0.9.1'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -232,6 +232,22 @@ describe Kitchen::Driver::DockerCli, "docker_file" do
       ret = <<-EOH
 FROM ubuntu/12.04
 ENV LANG ja_JP.UTF-8
+EOH
+      expect(@docker_cli.send(:docker_file)).to eq ret
+    end
+  end
+  context 'dockerfile template when dockerfile_vars is nil' do
+    let(:config) {
+      {
+        image: "ubuntu/12.04",
+        platform: "ubuntu",
+        dockerfile: File.join(File.dirname(__FILE__), 'dockerfile_nil.erb'),
+        dockerfile_vars: nil
+      }
+    }
+    example do
+      ret = <<-EOH
+FROM ubuntu/12.04
 EOH
       expect(@docker_cli.send(:docker_file)).to eq ret
     end

data/spec/kitchen/driver/dockerfile_nil.erb

@@ -0,0 +1 @@
+FROM <%= config[:image] %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -127,6 +127,7 @@ files:
 - lib/kitchen/transport/docker_cli.rb
 - spec/kitchen/driver/docker_cli_spec.rb
 - spec/kitchen/driver/dockerfile.erb
+- spec/kitchen/driver/dockerfile_nil.erb
 - spec/spec_helper.rb
 homepage: https://github.com/marcy-terui/kitchen-docker_cli
 licenses:
@@ -155,4 +156,5 @@ summary: A Test Kitchen Driver for Docker native CLI
 test_files:
 - spec/kitchen/driver/docker_cli_spec.rb
 - spec/kitchen/driver/dockerfile.erb
+- spec/kitchen/driver/dockerfile_nil.erb
 - spec/spec_helper.rb