kitchen-dokken 2.6.7 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a89d307232e9b860eba18cc0c517d06dc04477e3d74a482f095e3089f1a39c0
-  data.tar.gz: 8fcd0a4081baad30a0388e382b7c0b7c19f75515f9aa79d253b983fcf4787721
+  metadata.gz: e1a5ce770e7c2c74257a1e33147dec2b2a693e0a265f516bafc87b4acf09c460
+  data.tar.gz: 7c1fa1eb07842721dfd72362c5c6dda9b2acb86deae54eea3c46b1dd230917d8
 SHA512:
-  metadata.gz: b83fd14987af66b23fb24dd5a0229b1a6d98494adac947cd38c2f0fee5869ddb8b12a4c7e77429d8875de89cb0075d6c7404fd66d50fffb230a8fdb8307b3042
-  data.tar.gz: d2e29f811fc23b0d8e5a58b122998fe502ff08795ddb526a67c78cb6652368696b038663836bd1580aad76e23d0261ed92c30154ff214a7f84776c5013f1da9d
+  metadata.gz: e57f9c8c6f0a104ab1ecc50ad4b1660af9104b326db55e3e66af4fda0a879763f1dd3264a0d0860860ed3a6c6180ab7d178f0b9d6163b300a0f1d5673029aefe
+  data.tar.gz: c8f5ca66e58bfeb1a4a388c9d1b765a04b9428830e2e0a76eabd680eb19d383896f7a89f1d2d212470f3463d5f000109691ad44ca01526aea7a25d3089177a38

data/lib/kitchen/driver/dokken.rb

@@ -438,7 +438,6 @@ module Kitchen
               rescue ::Docker::Error::ConflictError
                 debug "driver - rescue ConflictError: #{args['name']}"
                 with_retries { @container = ::Docker::Container.get(args['name'], {}, docker_connection) }
-
               end
             end
           rescue ::Docker::Error => e

data/lib/kitchen/driver/dokken_version.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Sean OMeara (<sean@sean.io>)
 #
@@ -19,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '2.6.7'.freeze
+    DOKKEN_VERSION = '2.6.8'.freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -24,7 +24,7 @@ module Dokken
     def insecure_ssh_public_key
       <<-EOF
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCoJwyW7qNhw+NTuOjC4+RVpESl+JBXebXzB7JqxRgKAbymq6B39azEAiNx5NzHkWcQmOyQNhFpKFSAufegcXRS4ctS1LcElEoXe9brDAqKEBSkmnXYfZXMNIG0Enw4+5W/rZxHFCAlsUSAHYtYZEs+3CgbIWuHhZ95C8UC6nGLWHNZOjcbsYZFrnFfO0qg0ene2w8LKhxqj5X0MRSdCIn1IwyxIbl5NND5Yk1Hx8JKsJtTiNTdxssiMgmM5bvTbYQUSf8pbGrRI30VQKBgQ8/UkidZbaTfvzWXYpwcDUERSbzEYCvkUytTemZIv6uhpPxqkfjl6KEOOml/iGqquPEr test-kitchen-rsa
-EOF
+      EOF
     end
 
     def insecure_ssh_private_key
@@ -56,7 +56,7 @@ D58kDk7684mKwKotr34NfqkFl2ZJ8T+f8pVwmUNvtPtX0j8IO7/6bfIjPTFyNeFJ
 XuIb2Qt4MLHABySsk653LDw/jTIGV26c068nZryq5OUPxk67Xgod54jKgOwjgjZS
 X8N2N9ZNnORJqK374yGj1jWUU66mQhPvn49QpG8P2HEoh2RQjNvyHA==
 -----END RSA PRIVATE KEY-----
-EOF
+      EOF
     end
 
     def data_dockerfile
@@ -83,7 +83,7 @@ CMD [ "/usr/sbin/sshd", "-D", "-p", "22", "-o", "UseDNS=no", "-o", "UsePrivilege
 
 VOLUME /opt/kitchen
 VOLUME /opt/verifier
-EOF
+      EOF
     end
 
     def create_data_image
@@ -117,14 +117,17 @@ EOF
 
     def docker_info
       @docker_info ||= ::Docker.info
+    rescue Excon::Error::Socket
+      puts "kitchen-dokken could not connect to the docker host at #{default_docker_host}. Is docker running?"
+      exit!
     end
 
     def dokken_create_sandbox
       info("Creating kitchen sandbox at #{dokken_kitchen_sandbox}")
-      FileUtils.mkdir_p(dokken_kitchen_sandbox, :mode => 0o755)
+      FileUtils.mkdir_p(dokken_kitchen_sandbox, mode: 0o755)
 
       info("Creating verifier sandbox at #{dokken_verifier_sandbox}")
-      FileUtils.mkdir_p(dokken_verifier_sandbox, :mode => 0o755)
+      FileUtils.mkdir_p(dokken_verifier_sandbox, mode: 0o755)
     end
 
     def dokken_delete_sandbox

data/lib/kitchen/provisioner/dokken.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Sean OMeara (<sean@sean.io>)
 #

data/lib/kitchen/transport/dokken.rb

@@ -167,7 +167,9 @@ module Kitchen
 
         def login_command
           @runner = options[:instance_name].to_s
-          args = ['exec', '-it', @runner, '/bin/bash', '-login', '-i']
+          cols = `tput cols`
+          lines = `tput lines`
+          args = ['exec', '-e', "COLUMNS=#{cols}", '-e', "LINES=#{lines}", '-it', @runner, '/bin/bash', '-login', '-i']
           LoginCommand.new('docker', args)
         end
 

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.6.8
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: test-kitchen
+  name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.33'
 - !ruby/object:Gem::Dependency
-  name: docker-api
+  name: lockfile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: lockfile
+  name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: A Test Kitchen Driver for Dokken
 email:
 - sean@sean.io
@@ -59,7 +65,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - LICENSE
 - lib/kitchen/driver/dokken.rb
 - lib/kitchen/driver/dokken_version.rb
@@ -85,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver that talks to the Docker Remote API and uses Volumes

data/CHANGELOG.md

@@ -1,176 +0,0 @@
-# Dokken Changelog
-
-# 2.6.7 (2018-03-05)
-
-- Fix a potential race condition that may have led to the error 'Did not find config file: /opt/kitchen/client.rb'
-
-# 2.6.6
-
-- Improving the error message handling with intermediate builder
-- README updates
-
-# 2.6.5
-
-- Fixing cleanup_sandbox bug. Method from test-kitchen was causing the mount to break. Replaced it with one that globs.
-
-# 2.6.4
-
-- Fixing pull_image method to check for new id
-
-# 2.6.3
-
-- tmpfs support
-
-# 2.6.2
-
-- Removing NotFoundError from with_retries method
-
-# 2.6.1
-
-- bugfix issue #118 - Ensuring sandbox cleanup on local docker hosts
-
-# 2.6.0
-
-- Support for testing without provisioner converging
-- entrypoint config
-
-# 2.5.1
-
-- re-adding boot2docker detection
-
-# 2.5.0
-
-- Adding support for exposing ports.
-- Port systax matches docker-compose
-
-  ```
-   driver:
-     hostname: www.computers.biz
-     ports: "1234"
-  ```
-
-  ...or something like
-
-  ```
-   driver:
-     hostname: www.computers.biz
-     ports:
-       - '1234'
-       - '4321:4321/udp'
-  ```
-
-# 2.4.3
-
-- Using better paths for lockfiles
-
-# 2.4.2
-
-- Using lockfile gem around chef-client container and dokken network creation
-
-# 2.4.1
-
-- Adding NotFoundError to with_retries and beefing up rescues
-
-# 2.4.0
-
-- Features meant for 2.2.0, but tested properly this time.
-- Initial support for clusters / inter-suite name resolution
-- Dokken now creates a user-defined network named "dokken" and connects containers to it. This allows us to take advantage of the built in DNS server that in Docker 1.10 and later.
-
-  ```
-   driver:
-     hostname: www.computers.biz
-  ```
-
-# 2.3.1
-
-- Actually doing the things in 2.3.0
-
-# 2.3.0
-
-- Reverting 2.2.x bits to 2.1.x. to restore stability to users.
-- That'll teach me to push gems at odd hours.
-
-# 2.2.4
-
-- bugfix: Only placing runner containers in user defined network
-
-# 2.2.3
-
-- bugfix: Adding gaurd logic for already existing dokken network
-
-# 2.2.2
-
-- bugfix: Creating dokken network before chef container
-
-# 2.2.1
-
-- Putting chef-client container in dokken network
-- casting aliases to Array
-
-# 2.2.0
-
-- Initial support for clusters / inter-suite name resolution
-- Dokken now creates a user-defined network named "dokken" and connects containers to it. This allows us to take advantage of the built in DNS server that in Docker 1.10 and later.
-
-  driver: hostname: www.computers.biz
-
-# 2.1.10
-
-- Adding boot2docker detection
-
-# 2.1.9
-
-- Various fixes around remote docker host usage
-
-# 2.1.8
-
-- Using user specified image_prefix in instance_name
-
-# 2.1.7
-
-- bumping version. must have accidentally pushed a 2.1.6
-
-# 2.1.6
-
-- PR #107 - pass write_timeout to runner exec
-- PR #110 - (fix issue #109) - Add retry feature
-
-# 2.1.5
-
-- Fixing (again) latest/current logic (thanks @tas50)
-
-# 2.1.4
-
-- Fixing up current/stable/latest nomenclature to match Chef release pipeline
-
-# 2.1.3
-
-- Merged a bunch of PRs
-- # 85 - mount default boot2docker shared folder in Windows
-
-- # 93 - fix bundler path issue, should fix issue #92
-
-- # 97 - readme: systemd requires specific mount
-
-## 2.1.2
-
-- Making a CHANGELOG.md
-- Updated gem spec to depend on test-kitchen ~> 1.5
-
-## 2.1.1
-
-- Fixed busser (serverspec, etc) test data uploading
-
-## 2.0.0
-
-- Uses chef/chef (instead of someara/chef)
-
-- Bind mounts data instead of uploading through kitchen-cache container when talking to a local Docker host. (most use cases)
-
-- Renders a Dockefile and builds dokken/kitchen-cache when taling to a remote Docker host. (DOCKER_HOST =~ /^tcp:/)
-
-## 1.0.0
-
-- First stable release.
-- Relied on someara/chef and someara/kitchen-cache from the Docker hub.