sshkit-backend-docker 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa2060f26c718c9651588e7f609a5d4d39ba540e
-  data.tar.gz: 1e42a0fca68ab9bfa2a0bd6f1c5f940e63bf9728
+  metadata.gz: e89f20ce4b32f28e675301f83427854cfaf60ed9
+  data.tar.gz: 971ea2e3471ca9e52715b163488b34a1c4251597
 SHA512:
-  metadata.gz: 964704b2f2e8d3ec70fcb3051a0bdb9a0da53067fc7f254fcf4bdc956ba22379684a4e15294208609e1b439809b03fb285f593a271087ae91d23d9905e509dc4
-  data.tar.gz: 25dd918cbbbdbba32dff80e375705747bb77f861705b4caee79a704b45262f0a38c1c2e1ab759feff5990816142fa023a17e610e7d42eaae3f22336ad30bb550
+  metadata.gz: 7d5b5f9f9c0059ebf5637b4d9aa9d96e5193a2a7a123f1145a4fab0427380ca2a0d63f9ab3ddfd776a88ce7d5c74f40300d218f72c5ec6a716c5b523eb95f88d
+  data.tar.gz: 953a0c6c6c17f820836b8f4931f04fe94aca40fc8a7ea263cbd94f04d828da0c5070f0166b5c531787edc862e1ed5a89121fab5b252c1405b8eb8bcd956beebd

data/lib/sshkit/backend/docker.rb

@@ -16,16 +16,8 @@ module SSHKit
       CONTAINER_WAIT_IO = {}
       attr_accessor :docker_open_stdin
 
-      def self.host_container_map_key(host)
-        key = host.docker_options.dup || {}
-        key.delete :container
-        key.delete :commit
-        key
-      end
-
-      def self.find_cntainer_by_host(host)
-        host.docker_options[:container] ||
-          CONTAINER_MAP[host_container_map_key(host)]
+      def self.find_container_by_host(host)
+        host.docker_options[:container] || CONTAINER_MAP[host.docker_host_id]
       end
 
       def initialize(host, &block)
@@ -41,6 +33,9 @@ module SSHKit
           @container = docker_run_image
           host.hostname.chop! << ", container: #{@container})"
         end
+        if host.respond_to? :roles_array
+          host.hostname.chop! << ", roles: #{host.roles_array.inspect})"
+        end
         @container
       end
 
@@ -108,15 +103,18 @@ module SSHKit
 
         if host.is_a?(String)
           image_name = host
+          host_id = host.__id__
           host = _deep_dup(self.host)
           host.docker_options[:image] = image_name
+          host.docker_host_id = host_id
         elsif host.is_a?(Hash)
           d_opts = host
           host = _deep_dup(self.host)
           host.docker_options = d_opts.symbolize_keys
+          host.docker_host_id = d_opts.__id__
         end
 
-        map_key = self.class.host_container_map_key(host)
+        map_key = host.docker_host_id
         CONTAINER_MAP[map_key] and
           return CONTAINER_MAP[map_key]
 
@@ -166,7 +164,7 @@ module SSHKit
 
         host.docker_options[:commit] or return
 
-        container = self.class.find_cntainer_by_host(host) or
+        container = self.class.find_container_by_host(host) or
           raise "Cannot find container for host #{host.inspect}"
 
         cmd = %w(docker commit)

data/lib/sshkit/backend/docker/version.rb

@@ -1,7 +1,7 @@
 module Sshkit
   module Backend
     module Docker
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

data/lib/sshkit/docker_host_ext.rb

@@ -2,6 +2,7 @@ require 'sshkit'
 module SSHKit
   class Host
     attr_writer :docker_options
+    attr_accessor :docker_host_id
 
     def docker?
       !docker_options.empty?
@@ -12,8 +13,10 @@ module SSHKit
     end
 
     def docker=(hash)
+      @docker_host_id = hash.__id__
       @hostname = "(docker "
       @user ||= 'root'
+      @port = @docker_host_id # Use hash id to ident host by injecting to port
       docker_options.update hash.symbolize_keys
       if docker_options.has_key?(:image)
         @hostname << "image: #{@docker_options[:image]})"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sshkit-backend-docker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tatsuki Sugiura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Docker connector backend for SSHKit