kitchen-docker_cli 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67692c61b4cd109d6454fa31f8d25e28f70bc901
-  data.tar.gz: 19e7c9629cafc3a90ee405ca1d4167f692fde894
+  metadata.gz: 5c9c4456fdccbcadfaf197bfff4bae971e77223a
+  data.tar.gz: 1b87bccb3bbacd66150b6a0e0422777bad742af3
 SHA512:
-  metadata.gz: 6dfe3bd361b618bb3579d11a909ce37b208a3d29c35a63a19e4bbb6b4e0c24d516acddff8415190fa74d91f74654ecba5ba313b25b163f69b74b9900272b1e6a
-  data.tar.gz: e5e58fd795a5416547c295de30e032642aa81aa72bf32d59ad772d18c779ddc19686add4b05f15ab70da1ce626870339c980fd4bf930a609522f53935c9dc5c6
+  metadata.gz: 98f996d40938f78ccd4698204874f0f6781764b850ed5919a5e5ea53e9d6016494abe17aa9ee7ab47de5c8c4e57158da63963e41d9b1e5c68df985c6d9417947
+  data.tar.gz: 02c9683adb5a47fee7463391d45edc7200e2900852764dc44292aab47be4689a349a8feba93e93fe320cdc23757ef006832f09e246c82486dd31a7c10e3fb372

data/.kitchen.yml

@@ -2,14 +2,17 @@
 driver:
   name: docker_cli
 
+transport:
+  name: docker_cli
+
 driver_config:
   hostname: example.local
 
 platforms:
-  - name: ubuntu-12.04
-  - name: ubuntu-14.04
+#  - name: ubuntu-12.04
+#  - name: ubuntu-14.04
   - name: centos-6.6
-  - name: fedora-20
+#  - name: fedora-20
 
 suites:
   - name: default

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.1
+
+* Support test-kitchen `1.4.0`
+
 ## 0.8.0
 
 * Add `instance_host_name` option

data/README.md

@@ -1,4 +1,8 @@
-# <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 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) [![Circle CI](https://circleci.com/gh/marcy-terui/kitchen-docker_cli.svg?style=svg)](https://circleci.com/gh/marcy-terui/kitchen-docker_cli)  
+[![Join the chat at https://gitter.im/marcy-terui/kitchen-docker_cli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/marcy-terui/kitchen-docker_cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 A Test Kitchen Driver for Docker command line interface.
 
 This plugin is created with only Docker CLI functions.
@@ -35,13 +39,16 @@ bundle install
 
 ## <a name="config"></a> Configuration
 
-At first, put your `.kithcen(.local).yml` like this.
+At first, put your `.kitchen(.local).yml` like this.
 
 ```yml
 ---
 driver:
   name: docker_cli
 
+transport:
+  name: docker_cli
+
 platforms:
   - name: ubuntu-12.04
   - name: centos-6.4

data/circle.yml

@@ -0,0 +1,15 @@
+---
+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

data/integration-test/.gitignore

@@ -0,0 +1,18 @@
+.vagrant
+Berksfile.lock
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+
+# Bundler
+Gemfile.lock
+bin/*
+.bundle/*
+
+.kitchen/
+.kitchen.local.yml
+
+vendor

data/integration-test/.kitchen.yml

@@ -0,0 +1,22 @@
+---
+driver:
+  name: docker_cli
+
+transport:
+  name: docker_cli
+
+driver_config:
+  hostname: example.local
+
+provisioner:
+  name: chef_zero
+
+platforms:
+  - name: ubuntu-12.04
+  - name: centos-6.4
+
+suites:
+  - name: default
+    run_list:
+      - recipe[integration-test::default]
+    attributes:

data/integration-test/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem 'kitchen-docker_cli', path: '../'

data/integration-test/README.md

@@ -0,0 +1,4 @@
+# integration-test
+
+TODO: Enter the cookbook description here.
+

data/integration-test/chefignore

@@ -0,0 +1,95 @@
+# Put files/directories that should be ignored in this file when uploading
+# or sharing to the community site.
+# Lines that start with '# ' are comments.
+
+# OS generated files #
+######################
+.DS_Store
+Icon?
+nohup.out
+ehthumbs.db
+Thumbs.db
+
+# SASS #
+########
+.sass-cache
+
+# EDITORS #
+###########
+\#*
+.#*
+*~
+*.sw[a-z]
+*.bak
+REVISION
+TAGS*
+tmtags
+*_flymake.*
+*_flymake
+*.tmproj
+.project
+.settings
+mkmf.log
+
+## COMPILED ##
+##############
+a.out
+*.o
+*.pyc
+*.so
+*.com
+*.class
+*.dll
+*.exe
+*/rdoc/
+
+# Testing #
+###########
+.watchr
+.rspec
+spec/*
+spec/fixtures/*
+test/*
+features/*
+Guardfile
+Procfile
+
+# SCM #
+#######
+.git
+*/.git
+.gitignore
+.gitmodules
+.gitconfig
+.gitattributes
+.svn
+*/.bzr/*
+*/.hg/*
+*/.svn/*
+
+# Berkshelf #
+#############
+Berksfile
+Berksfile.lock
+cookbooks/*
+tmp
+
+# Cookbooks #
+#############
+CONTRIBUTING
+
+# Strainer #
+############
+Colanderfile
+Strainerfile
+.colander
+.strainer
+
+# Vagrant #
+###########
+.vagrant
+Vagrantfile
+
+# Travis #
+##########
+.travis.yml

data/integration-test/metadata.rb

@@ -0,0 +1,7 @@
+name             'integration-test'
+maintainer       'Masashi Terui'
+maintainer_email 'marcy9114@gmail.com'
+license          'Apache 2.0'
+description      'Installs/Configures integration-test'
+long_description 'Installs/Configures integration-test'
+version          '0.1.0'

data/integration-test/recipes/default.rb

@@ -0,0 +1,9 @@
+#
+# Cookbook Name:: integration-test
+# Recipe:: default
+#
+# Copyright (c) 2015 The Authors, All Rights Reserved.
+
+file "/tmp/integration-test" do
+  content "OK!"
+end

data/integration-test/test/integration/default/serverspec/default_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe file('/tmp/integration-test') do
+  it { should be_file }
+  it { should contain 'OK!' }
+end
+
+describe command('hostname') do
+  its(:stdout) { should match /example\.local/ }
+end

data/integration-test/test/integration/default/serverspec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'serverspec'
+
+set :backend, :exec

data/lib/kitchen/driver/docker_cli.rb

@@ -31,6 +31,7 @@ module Kitchen
       default_config :command, 'sh -c \'while true; do sleep 1d; done;\''
       default_config :privileged, false
       default_config :instance_host_name, false
+      default_config :transport, "docker_cli"
 
       default_config :image do |driver|
         driver.default_image
@@ -53,72 +54,32 @@ module Kitchen
       end
 
       def create(state)
-        state[:image] = build unless state[:image]
-        state[:container_id] = run(state[:image]) unless state[:container_id]
+        state[:image] = build(state) unless state[:image]
+        state[:container_id] = run(state) unless state[:container_id]
       end
 
-      def converge(state)
-        provisioner = instance.provisioner
-        provisioner.create_sandbox
-
-        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_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
-
-      ensure
-        provisioner && provisioner.cleanup_sandbox
-      end
-
-      def setup(state)
-        if busser.setup_cmd
-          execute(docker_exec_command(state[:container_id], busser.setup_cmd, :tty => true))
+      def destroy(state)
+        instance.transport.connection(state) do |conn|
+          conn.run_docker("rm -f #{state[:container_id]}") rescue false
         end
       end
 
-      def verify(state)
-        if busser.sync_cmd
-          execute(docker_exec_command(state[:container_id], busser.sync_cmd, :tty => true))
-        end
-        if busser.run_cmd
-          execute(docker_exec_command(state[:container_id], busser.run_cmd, :tty => true))
+      def build(state)
+        output = ""
+        instance.transport.connection(state) do |conn|
+          output = conn.run_docker(docker_build_command, :input => docker_file)
         end
-      end
-
-      def destroy(state)
-        execute("rm -f #{state[:container_id]}") rescue false
-      end
-
-      def remote_command(state, cmd)
-        execute(docker_exec_command(state[:container_id], cmd))
-      end
-
-      def login_command(state)
-        args = []
-        args << 'exec'
-        args << '-t'
-        args << '-i'
-        args << state[:container_id]
-        args << '/bin/bash'
-        LoginCommand.new(['docker', *args])
-      end
-
-      def build
-        output = execute(docker_build_command, :input => docker_file)
         parse_image_id(output)
       end
 
-      def run(image)
-        output = execute(docker_run_command(image))
+      def run(state)
+        output = ""
+        instance.transport.connection(state) do |conn|
+          output = conn.run_docker(docker_run_command(state[:image]))
+        end
         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]
@@ -144,26 +105,6 @@ module Kitchen
         cmd << " #{image} #{config[:command]}"
       end
 
-      def docker_exec_command(container_id, cmd, opt = {})
-        exec_cmd = "exec"
-        exec_cmd << " -t" if opt[:tty]
-        exec_cmd << " -i" if opt[:interactive]
-        # exec_cmd << " <<-EOH\n#{cmd}\nEOH"
-        exec_cmd << " #{container_id} #{cmd}"
-      end
-
-      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.'
@@ -199,10 +140,6 @@ module Kitchen
         end
       end
 
-      def execute(cmd, opts = {})
-        run_command(docker_command(cmd), opts)
-      end
-
 
     end
   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.8.0'
+    DOCKER_CLI_VERSION = '0.8.1'
   end
 end

data/lib/kitchen/transport/docker_cli.rb

@@ -0,0 +1,86 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Masashi Terui (<marcy9114@gmail.com>)
+#
+# Copyright (C) 2015, Masashi Terui
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "kitchen"
+require 'thor/util'
+
+module Kitchen
+  module Transport
+    class DockerCli < Kitchen::Transport::Base
+
+      class DockerCliFailed < TransportFailed; end
+
+      kitchen_transport_api_version 1
+      plugin_version Kitchen::VERSION
+
+      default_config :host, nil
+
+      def connection(state, &block)
+        options = config.to_hash.merge(state)
+        @connection = Kitchen::Transport::DockerCli::Connection.new(options, &block)
+      end
+
+      class Connection < Kitchen::Transport::DockerCli::Connection
+
+        include ShellOut
+
+        def login_command
+          args = []
+          args << 'exec'
+          args << '-t'
+          args << '-i'
+          args << @options[:container_id]
+          args << '/bin/bash'
+          LoginCommand.new(binary, args)
+        end
+
+        def execute(command)
+          exec_cmd = docker_exec_command(@options[:container_id], command, :tty => true)
+          run_docker(exec_cmd) if command
+        end
+
+        def run_docker(command, options={})
+          run_command("#{binary} #{command}", options)
+        end
+
+        def upload(locals, remote)
+          cmd = "mkdir -p #{remote} && rm -rf #{remote}/*"
+          execute(cmd)
+          Array(locals).each do |local|
+            remote_cmd = "tar x -C #{remote}"
+            remote_cmd = "#{binary} #{docker_exec_command(@options[:container_id], remote_cmd, :interactive => true)}"
+            local_cmd  = "cd #{File.dirname(local)} && tar cf - ./#{File.basename(local)}"
+            run_command("#{local_cmd} | #{remote_cmd}")
+          end
+        end
+
+        def docker_exec_command(container_id, cmd, opt = {})
+          exec_cmd = "exec"
+          exec_cmd << " -t" if opt[:tty]
+          exec_cmd << " -i" if opt[:interactive]
+          exec_cmd << " #{container_id} #{cmd}"
+        end
+
+        def binary
+          "docker"
+        end
+
+      end
+    end
+  end
+end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -68,129 +68,6 @@ describe Kitchen::Driver::DockerCli, "create" do
   end
 end
 
-describe Kitchen::Driver::DockerCli, "converge" do
-
-  before do
-    @docker_cli = Kitchen::Driver::DockerCli.new
-    provisioner = double('provisioner')
-    instance = double('instance')
-    provisioner.stub(:create_sandbox)
-    provisioner.stub(:install_command)
-    provisioner.stub(:init_command)
-    provisioner.stub(:prepare_command)
-    provisioner.stub(:run_command)
-    provisioner.stub(:cleanup_sandbox)
-    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
-    expect { @docker_cli.converge(:container_id => 'abc') }.not_to raise_error
-  end
-end
-
-describe Kitchen::Driver::DockerCli, "setup" do
-
-  before do
-    @docker_cli = Kitchen::Driver::DockerCli.new
-    busser = double('busser')
-    busser.stub(:setup_cmd).and_return('setup')
-    @docker_cli.stub(:busser).and_return(busser)
-    @docker_cli.stub(:execute)
-  end
-
-  example do
-    expect{ @docker_cli.setup(:container_id => 'abc') }.not_to raise_error
-  end
-end
-
-describe Kitchen::Driver::DockerCli, "verify" do
-
-  before do
-    @docker_cli = Kitchen::Driver::DockerCli.new
-    busser = double('busser')
-    busser.stub(:sync_cmd).and_return('setup')
-    busser.stub(:run_cmd).and_return('setup')
-    @docker_cli.stub(:busser).and_return(busser)
-    @docker_cli.stub(:execute)
-  end
-
-  example do
-    expect{ @docker_cli.verify(:container_id => 'abc') }.not_to raise_error
-  end
-end
-
-describe Kitchen::Driver::DockerCli, "destroy" do
-
-  before do
-    @docker_cli = Kitchen::Driver::DockerCli.new
-  end
-
-  example do
-    expect{ @docker_cli.destroy(:container_id => 'abc') }.not_to raise_error
-  end
-end
-
-describe Kitchen::Driver::DockerCli, "remote_command" do
-
-  before do
-    @docker_cli = Kitchen::Driver::DockerCli.new
-    @docker_cli.stub(:execute)
-  end
-
-  example do
-    opt = {:container_id => 'abc'}
-    expect{ @docker_cli.remote_command(opt, "test") }.not_to raise_error
-  end
-end
-
-describe Kitchen::Driver::DockerCli, "login_command" do
-
-  before do
-    @docker_cli = Kitchen::Driver::DockerCli.new()
-  end
-
-  example do
-    login_command = @docker_cli.login_command(:container_id => 'abc')
-    cmd, *args = login_command.cmd_array
-    cmd = "#{cmd} #{args.join(" ")}"
-    expect(cmd).to eq "docker exec -t -i abc /bin/bash"
-  end
-end
-
-describe Kitchen::Driver::DockerCli, "build" do
-
-  before do
-    @docker_cli = Kitchen::Driver::DockerCli.new
-    @docker_cli.stub(:docker_build_command)
-    @docker_cli.stub(:docker_file)
-    @docker_cli.stub(:parse_image_id)
-    @docker_cli.stub(:execute)
-  end
-
-  example do
-    expect{ @docker_cli.build }.not_to raise_error
-  end
-end
-
-describe Kitchen::Driver::DockerCli, "run" do
-
-  before do
-    @docker_cli = Kitchen::Driver::DockerCli.new
-    @docker_cli.stub(:docker_run_command)
-    @docker_cli.stub(:parse_container_id)
-    @docker_cli.stub(:execute)
-  end
-
-  example do
-    expect{ @docker_cli.run('test') }.not_to raise_error
-  end
-end
-
 describe Kitchen::Driver::DockerCli, "docker_build_command" do
 
   before do
@@ -232,15 +109,6 @@ 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
       {
@@ -353,58 +221,3 @@ describe Kitchen::Driver::DockerCli, "docker_file" do
     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
-    @docker_cli = Kitchen::Driver::DockerCli.new()
-  end
-
-  example do
-    cmd = 'exec abc /bin/bash'
-    expect(@docker_cli.docker_exec_command('abc','/bin/bash')).to eq cmd
-  end
-  example do
-    cmd = 'exec -t -i abc /bin/bash'
-    opt = {:interactive => true, :tty => true}
-    expect(@docker_cli.docker_exec_command('abc', '/bin/bash', opt)).to eq cmd
-  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
-    @docker_cli = Kitchen::Driver::DockerCli.new()
-  end
-
-  example do
-    provisoner = {:root_path => '/tmp/kitchen'}
-    provisoner.stub(:sandbox_path).and_return('/tmp/sandbox')
-    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.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -110,12 +110,22 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- circle.yml
+- integration-test/.gitignore
+- integration-test/.kitchen.yml
+- integration-test/Gemfile
+- integration-test/README.md
+- integration-test/chefignore
+- integration-test/metadata.rb
+- integration-test/recipes/default.rb
+- integration-test/test/integration/default/serverspec/default_spec.rb
+- integration-test/test/integration/default/serverspec/spec_helper.rb
 - kitchen-docker_cli.gemspec
 - lib/kitchen/driver/docker_cli.rb
 - lib/kitchen/driver/docker_cli_version.rb
+- lib/kitchen/transport/docker_cli.rb
 - spec/kitchen/driver/docker_cli_spec.rb
 - spec/spec_helper.rb
-- test/integration/default/serverspec/default_spec.rb
 homepage: https://github.com/marcy-terui/kitchen-docker_cli
 licenses:
 - Apache 2.0
@@ -143,4 +153,3 @@ summary: A Test Kitchen Driver for Docker native CLI
 test_files:
 - spec/kitchen/driver/docker_cli_spec.rb
 - spec/spec_helper.rb
-- test/integration/default/serverspec/default_spec.rb

data/test/integration/default/serverspec/default_spec.rb

@@ -1,12 +0,0 @@
-require 'serverspec'
-set :backend, :exec
-
-set :path, '/sbin:/usr/local/sbin:$PATH'
-
-describe file('/tmp') do
-  it { should be_directory }
-end
-
-describe command('hostname') do
-  its(:stdout) { should match /example\.local/ }
-end