docker-swarm-api 1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7be7483768fca3556ef820aede393f082ea9112d
-  data.tar.gz: 46d6a6c0831df578aef01dd6ced0c6d38f79ef84
+  metadata.gz: f0b90891a651e044750fc2bc7b1956679634db08
+  data.tar.gz: 7fd85045899307db8a32fb3d94654167f4ba8ef2
 SHA512:
-  metadata.gz: da9b11be6fb1cd7dd935e04779cc7f4c05fb05ee48def067d4f7d64017f1278483106a5e0ee984a7ab50897197821da4af0b9090d7808800ed092c2f784602d6
-  data.tar.gz: e231e65865010eea0be3b362a50a9d3ba28825aeda8d269eb84b67a99c18dca93aa9fcf52d8544f5ae1caf5ee955679e47d8ab21343e92cafcbc1aafc4ad8aec
+  metadata.gz: 4083515f3553d91273ea6e8f0b3959f71996529f9ab3340fd8f6e756677bf6cca787748e9491ec5b2e778d17e89b48ca1bc7a8c50b778e7b492f8bce6f119b17
+  data.tar.gz: a0e8a29a37b6eabc9c42e5963db95de9568cc2070b6c6e9fc00c008eb973d81ee38383ab2308873b6187af16076f49f32d1e1f37b8b6ad11c952ad0f0c17974d

data/lib/docker/swarm/swarm.rb

@@ -5,16 +5,30 @@ class Docker::Swarm::Swarm
   include Docker
   attr_reader :worker_join_token, :manager_join_token, :id, :hash, :node_hash
 
-  def initialize(hash, manager_connection)
+  def initialize(hash, manager_connection, options = {})
     @hash = hash
 #    @manager_connection = manager_connection
     @id = hash['ID']
     @worker_join_token = hash['JoinTokens']['Worker']
     @manager_join_token = hash['JoinTokens']['Manager']
     @node_hash = {}
-    nodes(manager_connection).each do |node|
-      #  Resolv::DNS.new.getaddress("devlog")
-      @node_hash[node.id] = {hash: node.hash, connection: manager_connection}
+    @manager_connection = manager_connection
+    nodes.each do |node|
+      node_connection = nil
+      docker_port = options[:docker_api_port] || 2375
+      if (node.hash['ManagerStatus'])
+        ip_address = node.hash['ManagerStatus']['Addr'].split(":").first
+        manager_ip_address = @manager_connection.url.split('//').last.split(':').first
+        if (ip_address == manager_ip_address)
+          node.connection = @manager_connection
+        else
+          node.connection = Docker::Swarm::Connection.new("tcp://#{ip_address}:#{docker_port}")
+        end
+      else
+        ip_address = Resolv::DNS.new.getaddress(node.host_name())
+        node.connection = Docker::Swarm::Connection.new("tcp://#{ip_address}:#{docker_port}")
+      end
+      @node_hash[node.id] = {hash: node.hash, connection: node.connection}
       
     end
   end
@@ -118,15 +132,16 @@ class Docker::Swarm::Swarm
   end
   
   # Return all of the Nodes.
-  def nodes(conn = self.connection)
+  def nodes
     opts = {}
     query = {}
-    response = conn.get('/nodes', query, :body => opts.to_json, expects: [200, 406], full_response: true)
+    response = self.connection.get('/nodes', query, :body => opts.to_json, expects: [200, 406], full_response: true)
     if (response.status == 200)
       hashes = JSON.parse(response.body)
       nodes = []
       hashes.each do |node_hash|
-        nodes << Docker::Swarm::Node.new(self, node_hash)
+        node  = Docker::Swarm::Node.new(self, node_hash)
+        nodes << node
       end
       return nodes || []
     else
@@ -161,6 +176,11 @@ class Docker::Swarm::Swarm
     end
     return items
   end
+  
+  def discover_nodes
+    # {discover_nodes: true, worker_docker_port: 2375}
+    
+  end
 
   # Initialize Swarm
   def self.init(opts, connection)
@@ -192,11 +212,14 @@ class Docker::Swarm::Swarm
     end
   end
   
-  def self.find(connection)
+  def self.find(connection, options = {})
     query = {}
     response = connection.get('/swarm', query, expects: [200, 406], full_response: true)
     if (response.status == 200)
-      return Docker::Swarm::Swarm.new(JSON.parse(response.body), connection)
+      swarm = Docker::Swarm::Swarm.new(JSON.parse(response.body), connection, options)
+      return swarm
+    else 
+      raise "Error finding swarm: HTTP-#{response.status} #{response.body}"
     end
   end
   

data/lib/docker/swarm/version.rb

@@ -1,7 +1,7 @@
 module Docker
   module Swarm
     # The version of the docker-api gem.
-    VERSION = '1.2'
+    VERSION = '1.2.1'
 
     # The version of the compatible Docker remote API.
     API_VERSION = '1.24'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-swarm-api
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.2.1
 platform: ruby
 authors:
 - Mike Moore / Rogue Wave Software