kitchen-docker_cli 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cf7d32aaf8c8c0a88609685e0f7a0796c5f1dd4
-  data.tar.gz: 90bd2649a796053fd6f7a652849720134a73c785
+  metadata.gz: bae98699d7d3b34bef27eacb29a366356767d345
+  data.tar.gz: 7f96358226626d63b6108aaa48f7c65712dde248
 SHA512:
-  metadata.gz: 4eb36eefabfac676adef52433aa4d944d41e8e81b772463f28a28d31898eda7a86415ebb9dd4659083ca8aab56d56456c3d64b49f697130b18243fd4b409277c
-  data.tar.gz: 0a066b16e595bb25bb68ba5729f306033d3305b3b4a60d75b820cd1fa81e0cabdd715e42f69a9566c1262561d314a496d2802067dcf833aa11b948eea239ca6c
+  metadata.gz: 6339eddfa1d6b6e2029a1ca9b8affcea89fbf8ccf14995c8b22fdf338113a9f107419e81eb5e3062d29e678e0f56e6f52125a41620bb45fafb8b47c838375476
+  data.tar.gz: d5d0895c3d944bd6484436ac455944a991932666b81d9c973b2522911c6e9958e6c37ec51d2810e269f4962ed73d15cb05aabedbfa2dbb60fe63017f81b6af75

data/.circleci/config.yml

@@ -0,0 +1,19 @@
+---
+version: 2
+jobs:
+  test:
+    services:
+      - docker
+    docker:
+      - image: circleci/ruby:2.5
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run: bundle install --path=vendor/bundle
+      - run: bundle exec kitchen test
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.19.0
+
+* Pull request [#43][]: Add pre_create_command to driver ([@ysgard][])
+* Pull request [#42][] [#44][]: Quote environments value to support spaces ([@ahelal][])
+* Pull request [#41][]: Add `build_pull` opt to pull the latest docker image ([@s-bernard][])
+* Pull request [#38][]: Never force tty when opening transport ([@bdellegrazie][])
+
 ## 0.18.0
 
 * Pull request [#33][]: Strengthen destroy ([@s-bernard][])
@@ -133,9 +140,21 @@
 [#23]: https://github.com/marcy-terui/kitchen-docker_cli/issues/23
 [#29]: https://github.com/marcy-terui/kitchen-docker_cli/issues/29
 [#30]: https://github.com/marcy-terui/kitchen-docker_cli/issues/30
+[#31]: https://github.com/marcy-terui/kitchen-docker_cli/issues/31
+[#32]: https://github.com/marcy-terui/kitchen-docker_cli/issues/32
+[#33]: https://github.com/marcy-terui/kitchen-docker_cli/issues/33
+[#38]: https://github.com/marcy-terui/kitchen-docker_cli/issues/38
+[#41]: https://github.com/marcy-terui/kitchen-docker_cli/issues/41
+[#42]: https://github.com/marcy-terui/kitchen-docker_cli/issues/42
+[#43]: https://github.com/marcy-terui/kitchen-docker_cli/issues/43
+[#44]: https://github.com/marcy-terui/kitchen-docker_cli/issues/44
+[@ahelal]: https://github.com/ahelal
+[@bdellegrazie]: https://github.com/bdellegrazie
+[@fphilippon]: https://github.com/fphilippon
 [@grubernaut]: https://github.com/grubernaut
 [@hd-deman]: https://github.com/hd-deman
 [@nrvale0]: https://github.com/nrvale0
 [@s-bernard]: https://github.com/s-bernard
 [@sawanoboly]: https://github.com/sawanoboly
 [@yewton]: https://github.com/yewton
+[@ysgard]: https://github.com/ysgard

data/README.md

@@ -129,6 +129,16 @@ environment:
 
 Pass the basedir as the Docker build context: 'docker build <options> .' Default is 'false'.
 
+### build_pull
+
+Set option `--pull` to the defined value on `docker build`.
+
+The default value is nil which is currently interpreted as `false` by Docker.
+
+```yml
+  build_pull: true
+```
+
 ### no_cache
 
 Not use the cached image on `docker build`.
@@ -497,6 +507,18 @@ Example:
   docker_base: sudo /path/to/lxc-console
 ```
 
+### pre_create_command
+
+A script or shell command to run locally prior to creating the
+container.  Used to prep the build environment, e.g. performing a login
+to a private docker repository where the test images are housed.
+
+Example:
+
+```yml
+  pre_create_command: ./path/to/script.sh
+```
+
 ## <a name="development"></a> Development
 
 * Source hosted at [GitHub][repo]

data/lib/kitchen/driver/docker_cli.rb

@@ -60,10 +60,22 @@ module Kitchen
       end
 
       def create(state)
+        pre_create_command
         state[:image] = build(state) unless state[:image]
         state[:container_id] = run(state) unless state[:container_id]
       end
 
+      def pre_create_command
+        if config[:pre_create_command]
+          system(config[:pre_create_command])
+          if $?.exitstatus.nonzero?
+            raise ActionFailed,
+                  "pre_create_command '#{config[:pre_create_command]}' failed to execute \
+                  (exit status #{$?.exitstatus})"
+          end
+        end
+      end
+      
       def destroy(state)
         instance.transport.connection(state) do |conn|
           begin
@@ -99,6 +111,7 @@ module Kitchen
 
       def docker_build_command
         cmd = String.new('build')
+        cmd << " --pull=#{config[:build_pull]}" if config[:build_pull]
         cmd << ' --no-cache' if config[:no_cache]
         if config[:build_context]
           cmd << ' .'
@@ -174,7 +187,7 @@ module Kitchen
               # TODO: Support other distribution
             end
           end
-          Array(config[:environment]).each { |env, value| file << "ENV #{env}=#{value}" }
+          Array(config[:environment]).each { |env, value| file << "ENV #{env}=\"#{value}\"" }
           Array(config[:run_command]).each { |cmd| file << "RUN #{cmd}" }
           file.join("\n")
         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.18.0'
+    DOCKER_CLI_VERSION = '0.19.0'
   end
 end

data/lib/kitchen/transport/docker_cli.rb

@@ -73,7 +73,7 @@ module Kitchen
             if @options[:lxc_driver]
               run_lxc(lxc_exec_command(@options[:container_id], cmd))
             else
-              run_docker(docker_exec_command(@options[:container_id], cmd, :tty => true))
+              run_docker(docker_exec_command(@options[:container_id], cmd, :tty => false))
             end
           end
         end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -75,13 +75,21 @@ describe Kitchen::Driver::DockerCli, "#docker_build_command" do
   end
 
   context 'build_context' do
-    let(:config)	{ {:build_context => true} }
+    let(:config)       { {:build_context => true} }
 
     example do
       expect(@docker_cli.docker_build_command).to eq 'build .'
     end
   end
 
+  context 'build_pull set to true' do
+    let(:config)       { {:build_pull => true} }
+
+    example do
+      expect(@docker_cli.docker_build_command).to include '--pull=true'
+    end
+  end
+
   context 'default' do
     let(:config)       { {:no_cache => true} }
 
@@ -241,7 +249,7 @@ describe Kitchen::Driver::DockerCli, "#docker_file" do
       ret = "FROM ubuntu/12.04\n"
       ret << "RUN apt-get update\n"
       ret << "RUN apt-get -y install sudo curl tar\n"
-      ret << "ENV test=hoge\n"
+      ret << "ENV test=\"hoge\"\n"
       ret << "RUN test\n"
       ret << "RUN test2"
       expect(@docker_cli.send(:docker_file)).to eq ret

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -101,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".coveralls.yml"
 - ".gitignore"
 - ".kitchen.yml"
@@ -110,7 +111,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- circle.yml
 - integration-test/.gitignore
 - integration-test/.kitchen.yml
 - integration-test/Gemfile
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver(and Transport) for Docker native CLI

data/circle.yml

@@ -1,15 +0,0 @@
----
-machine:
-  ruby:
-    version: 2.1.5
-  services:
-    - docker
-
-dependencies:
-  override:
-    - bundle install --path=vendor/bundle:
-        pwd: integration-test
-test:
-  override:
-    - bundle exec kitchen test:
-        pwd: integration-test