kitchen-docker 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2a4e4a39e8d44bf70ce902291ebc0b741071251
-  data.tar.gz: aa7dcc0bda20be74fb73cbed6b28d0a514a078a0
+  metadata.gz: bd9262b64fc818c54e30e2421c81b662a1189e45
+  data.tar.gz: 7a59d117ce6c46cfacc5ddfe0cdda070e8eac679
 SHA512:
-  metadata.gz: dfd06e8308f2da7360190569f2cb7605fb49140838ec3c8badeece7b213c7d513874006982289a73c4bac2150a47482f3ac97ddfe335d8303c8f634656046b06
-  data.tar.gz: 2db3f33df50a6fc6b66efe79181c291a6848ced772d9e7e5df92c7a8bbff83d937d5d157369fd64ecfed9a1bff0481341d3a1256e21a548f5ae886cc90827285
+  metadata.gz: b36a3b35e69914ac13dab5aa52d3de9bc213e4a5b56482dd01672bcb91f14cc6dbdb85af455aa525ea06cfac2a78726ef27460a8657fdd837a1270245be1e2a7
+  data.tar.gz: 90516dd7f44e0e1341a27b378152dd17e5842b137fd69013820a85d3313b5769413705412cc72678412d60a991db50bf52e0ab5182661ae57268c97af64fee73

data/lib/kitchen/driver/docker.rb

@@ -36,6 +36,11 @@ module Kitchen
       default_config :run_command,   '/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no'
       default_config :username,      'kitchen'
       default_config :password,      'kitchen'
+      default_config :tls,           false
+      default_config :tls_verify,    false
+      default_config :tls_cacert,    nil
+      default_config :tls_cert,      nil
+      default_config :tls_key,       nil
 
       default_config :use_sudo do |driver|
         !driver.remote_socket?
@@ -95,6 +100,11 @@ module Kitchen
       def docker_command(cmd, options={})
         docker = config[:binary].dup
         docker << " -H #{config[:socket]}" if config[:socket]
+        docker << " --tls" if config[:tls]
+        docker << " --tlsverify" if config[:tls_verify]
+        docker << " --tlscacert=#{config[:tls_cacert]}" if config[:tls_cacert]
+        docker << " --tlscert=#{config[:tls_cert]}" if config[:tls_cert]
+        docker << " --tlskey=#{config[:tls_key]}" if config[:tls_key]
         run_command("#{docker} #{cmd}", options.merge(:quiet => !logger.debug?))
       end
 

data/lib/kitchen/driver/docker_version.rb

@@ -19,6 +19,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "1.2.1"
+    DOCKER_VERSION = "1.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -137,11 +137,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Docker
 test_files:
 - test/Dockerfile
 - test/integration/default/serverspec/default_spec.rb
-has_rdoc: