kitchen-docker_cli 0.2.0.beta → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b017b8199ef3de53c08c5272118323eec27674a8
-  data.tar.gz: c95e1536805f6f66fc46508aa85a20a69e977d11
+  metadata.gz: f7f3a5f06608f5e262b3327dae9c4714a942701b
+  data.tar.gz: ab67af775455f5966a48f6a613e7075a9ca1dfb2
 SHA512:
-  metadata.gz: 099f68c752434b508d8a6023082f6d8043a5e571f605d0fe0eb6db9a0d8a85c9ff45d1af40d31b98ddcfb8c501574de397361587e28a82b40db7a7a980b4a61b
-  data.tar.gz: bda1883c6a1eb0e7e40424692ebff729b79842511c7ce7fa797904fd1dec36e647d5fdd14b232540932a1ce8b0a665af54b5b07fffb317e64eab1042e353cdfb
+  metadata.gz: ca4f63b2b912704f62bdf0cdcc7f4e0ef84f8d42d8989102d7d0c7b244e3d9da490fadda5f8d32f7190377a52ccfd8340b2d9a0888b632cfe6ef042d1ac5dab1
+  data.tar.gz: 2dab5ee66aeda1bdeef838ddc63964a8332bcecec261e2f80a89a02150d5925a348b4d586f6a6f1714c1519407ea9a4c54489f3f5b3f095da376b39040fef07c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0
+
+* Use docker exec command to transfer the test-kitchen's sandbox [#1][] 
+
 ## 0.2.0.beta
 
 * Add ```privileged``` option

data/README.md

@@ -1,5 +1,4 @@
-# <a name="title"></a> Kitchen::DockerCli [![Gem Version](https://badge.fury.io/rb/kitchen-docker_cli.svg)](http://badge.fury.io/rb/kitchen-docker_cli) [![Build Status](https://travis-ci.org/marcy-terui/kitchen-docker_cli.svg?branch=master)](https://travis-ci.org/marcy-terui/kitchen-docker_cli) [![Coverage Status](https://coveralls.io/repos/marcy-terui/kitchen-docker_cli/badge.png)](https://coveralls.io/r/marcy-terui/kitchen-docker_cli) [![Code Climate](https://codeclimate.com/github/marcy-terui/kitchen-docker_cli/badges/gpa.svg)](https://codeclimate.com/github/marcy-terui/kitchen-docker_cli)
-
+# <a name="title"></a> Kitchen::DockerCli [![Gem Version](https://badge.fury.io/rb/kitchen-docker_cli.svg)](http://badge.fury.io/rb/kitchen-docker_cli) [![Build Status](https://travis-ci.org/marcy-terui/kitchen-docker_cli.svg?branch=master)](https://travis-ci.org/marcy-terui/kitchen-docker_cli) [![Coverage Status](https://coveralls.io/repos/marcy-terui/kitchen-docker_cli/badge.png)](https://coveralls.io/r/marcy-terui/kitchen-docker_cli)
 A Test Kitchen Driver for Docker command line interface.
 
 This plugin is created with only Docker CLI functions.  
@@ -10,6 +9,8 @@ Therefore, we can test with an environment that has no extra software such as ``
 - Docker (>= 1.3)  
 This driver uses ```docker exec``` command.
 
+- tar (GNU Tar)  
+
 ## <a name="installation"></a> Installation and Setup
 
 ```sh

data/lib/kitchen/driver/docker_cli.rb

@@ -62,7 +62,8 @@ module Kitchen
 
         execute(docker_exec_command(state[:container_id], provisioner.install_command, :tty => true)) if provisioner.install_command
         execute(docker_exec_command(state[:container_id], provisioner.init_command, :tty => true)) if provisioner.init_command
-        execute(docker_transfer_command(provisioner, state[:container_id]))
+        execute(docker_pre_transfer_command(provisioner, state[:container_id]))
+        run_command(docker_transfer_command(provisioner, state[:container_id]))
         execute(docker_exec_command(state[:container_id], provisioner.prepare_command, :tty => true)) if provisioner.prepare_command
         execute(docker_exec_command(state[:container_id], provisioner.run_command, :tty => true)) if provisioner.run_command
 
@@ -113,6 +114,10 @@ module Kitchen
         parse_container_id(output)
       end
 
+      def docker_command(cmd)
+        "docker #{cmd}"
+      end
+
       def docker_build_command
         cmd = 'build'
         cmd << ' --no-cache' if config[:no_cache]
@@ -120,7 +125,7 @@ module Kitchen
       end
 
       def docker_run_command(image)
-        cmd = "run -d -v #{Dir::tmpdir}:/tmp:rw"
+        cmd = "run -d"
         cmd << " --name #{config[:container_name]}" if config[:container_name]
         cmd << ' -P' if config[:publish_all]
         cmd << ' --privileged' if config[:privileged]
@@ -138,14 +143,18 @@ module Kitchen
         exec_cmd << " #{container_id} #{cmd}"
       end
 
-      def docker_transfer_command(provisioner, container_id)
-        cmd = "rm -rf #{provisioner[:root_path]}"
-        cmd << " && mkdir #{provisioner[:root_path]}"
-        cmd << " && cp -rp #{provisioner.sandbox_path}/*"
-        cmd << " #{provisioner[:root_path]}/"
+      def docker_pre_transfer_command(provisioner, container_id)
+        cmd = "mkdir -p #{provisioner[:root_path]}"
+        cmd << " && rm -rf #{provisioner[:root_path]}/*"
         docker_exec_command(container_id, cmd)
       end
 
+      def docker_transfer_command(provisioner, container_id)
+        remote_cmd = "tar x -C #{provisioner[:root_path]}"
+        local_cmd  = "cd #{provisioner.sandbox_path} && tar cf - ./"
+        "#{local_cmd} | #{docker_command(docker_exec_command(container_id, remote_cmd, :interactive => true))}"
+      end
+
       def parse_image_id(output)
         unless output.chomp.match(/Successfully built ([0-9a-z]{12})$/)
           raise ActionFailed, 'Could not parse IMAGE ID.'
@@ -165,10 +174,10 @@ module Kitchen
         case config[:platform]
         when 'debian', 'ubuntu'
           file << 'RUN apt-get update'
-          file << 'RUN apt-get -y install sudo curl'
+          file << 'RUN apt-get -y install sudo curl tar'
         when 'rhel', 'centos'
           file << 'RUN yum clean all'
-          file << 'RUN yum -y install sudo curl'
+          file << 'RUN yum -y install sudo curl tar'
         else
           # TODO: Support other distribution
         end
@@ -177,8 +186,7 @@ module Kitchen
       end
 
       def execute(cmd, opts = {})
-        cmd = "docker #{cmd}"
-        run_command(cmd, opts)
+        run_command(docker_command(cmd), opts)
       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.2.0.beta'
+    DOCKER_CLI_VERSION = '0.3.0'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -83,7 +83,9 @@ describe Kitchen::Driver::DockerCli, "converge" do
     instance.stub(:provisioner).and_return(provisioner)
     @docker_cli.stub(:instance).and_return(instance)
     @docker_cli.stub(:docker_transfer_command)
+    @docker_cli.stub(:docker_pre_transfer_command)
     @docker_cli.stub(:execute)
+    @docker_cli.stub(:run_command)
   end
 
   example do
@@ -222,7 +224,7 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
     let(:config)       { {:command => '/bin/bash'} }
 
     example do
-      cmd = "run -d -v #{Dir::tmpdir}:/tmp:rw test /bin/bash"
+      cmd = "run -d test /bin/bash"
       expect(@docker_cli.docker_run_command('test')).to eq cmd
     end
   end
@@ -241,7 +243,7 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
     end
 
     example do
-      cmd = "run -d -v #{Dir::tmpdir}:/tmp:rw --name web -P --privileged -p 80:8080 -p 22:2222 -v /dev:/dev --link mysql:db test /bin/bash"
+      cmd = "run -d --name web -P --privileged -p 80:8080 -p 22:2222 -v /dev:/dev --link mysql:db test /bin/bash"
       expect(@docker_cli.docker_run_command('test')).to eq cmd
     end
   end
@@ -308,7 +310,7 @@ describe Kitchen::Driver::DockerCli, "docker_file" do
     example do
       ret = "FROM centos/centos6\n"
       ret << "RUN yum clean all\n"
-      ret << "RUN yum -y install sudo curl"
+      ret << "RUN yum -y install sudo curl tar"
       expect(@docker_cli.send(:docker_file)).to eq ret
     end
   end
@@ -325,13 +327,24 @@ describe Kitchen::Driver::DockerCli, "docker_file" do
       ret = "FROM ubuntu/12.04\n"
       ret = "FROM ubuntu/12.04\n"
       ret << "RUN apt-get update\n"
-      ret << "RUN apt-get -y install sudo curl\n"
+      ret << "RUN apt-get -y install sudo curl tar\n"
       ret << "RUN test\nRUN test2"
       expect(@docker_cli.send(:docker_file)).to eq ret
     end
   end
 end
 
+describe Kitchen::Driver::DockerCli, "docker_command" do
+
+  before do
+    @docker_cli = Kitchen::Driver::DockerCli.new()
+  end
+
+  example do
+    expect(@docker_cli.docker_command('exec')).to eq "docker exec"
+  end
+end
+
 describe Kitchen::Driver::DockerCli, "docker_exec_command" do
 
   before do
@@ -349,6 +362,19 @@ describe Kitchen::Driver::DockerCli, "docker_exec_command" do
   end
 end
 
+describe Kitchen::Driver::DockerCli, "docker_pre_transfer_command" do
+
+  before do
+    @docker_cli = Kitchen::Driver::DockerCli.new()
+  end
+
+  example do
+    provisoner = {:root_path => '/tmp/kitchen'}
+    cmd = "exec abc mkdir -p /tmp/kitchen && rm -rf /tmp/kitchen/*"
+    expect(@docker_cli.docker_pre_transfer_command(provisoner, 'abc')).to eq cmd
+  end
+end
+
 describe Kitchen::Driver::DockerCli, "docker_transfer_command" do
 
   before do
@@ -358,7 +384,7 @@ describe Kitchen::Driver::DockerCli, "docker_transfer_command" do
   example do
     provisoner = {:root_path => '/tmp/kitchen'}
     provisoner.stub(:sandbox_path).and_return('/tmp/sandbox')
-    cmd = "exec abc rm -rf /tmp/kitchen && mkdir /tmp/kitchen && cp -rp /tmp/sandbox/* /tmp/kitchen/"
+    cmd = "cd /tmp/sandbox && tar cf - ./ | docker exec -i abc tar x -C /tmp/kitchen"
     expect(@docker_cli.docker_transfer_command(provisoner, 'abc')).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.2.0.beta
+  version: 0.3.0
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -131,9 +131,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2