docker-swarm-api 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04b3f0bbdfe51472c479d55d01b295dd1fbd700a
-  data.tar.gz: ea9e5330f567696ad9e3feae4fd49c809502cb5a
+  metadata.gz: 7be7483768fca3556ef820aede393f082ea9112d
+  data.tar.gz: 46d6a6c0831df578aef01dd6ced0c6d38f79ef84
 SHA512:
-  metadata.gz: 605b03b067f0762243ff3cd7942c48313918550ec7589b2c0a43c0644ec08cbd46f6b56c77183643d5bbb4033ab660b3256b26f03ee6e5420eca6e4d494c9f42
-  data.tar.gz: 01d83aaa468cfc32fcadc2e570407565ce26affec0983ce579c3eb47cb14945e2546973cd23b66012bdf34b41a1656a4063107677a6ebc8406b0941402cd64fe
+  metadata.gz: da9b11be6fb1cd7dd935e04779cc7f4c05fb05ee48def067d4f7d64017f1278483106a5e0ee984a7ab50897197821da4af0b9090d7808800ed092c2f784602d6
+  data.tar.gz: e231e65865010eea0be3b362a50a9d3ba28825aeda8d269eb84b67a99c18dca93aa9fcf52d8544f5ae1caf5ee955679e47d8ab21343e92cafcbc1aafc4ad8aec

data/lib/docker/swarm/node.rb

@@ -45,8 +45,24 @@ class Docker::Swarm::Node
     return @hash['Status']['State']
   end
   
-  def drain
+  def drain(opts = {})
     change_availability(:drain)
+    if (opts[:wait_for_drain])
+      opts[:wait_seconds]
+      while (running_tasks.length > 0)
+        puts "Waiting for node (#{host_name}) to drain.  Still has #{running_tasks.length} tasks running."
+      end
+    end
+  end
+  
+  def running_tasks
+    return tasks.select {|t| t.status == 'running'}
+  end
+  
+  def tasks
+    return @swarm.tasks.select {|t| 
+      t.node.id == self.id
+    }
   end
 
   def activate
@@ -54,19 +70,41 @@ class Docker::Swarm::Node
   end
   
   def remove
-    Docker::Swarm::Node.remove(id(), @connection)
+    leave(true)
+    refresh
+    start_time = Time.now
+    while (self.status != 'down')
+      refresh
+      raise "Node not down 60 seconds after leaving swarm: #{self.host_name}" if (Time.now.to_i - start_time.to_i > 60)
+    end
+    Docker::Swarm::Node.remove(self.id, @swarm.connection)
   end
   
-  def change_availability(availability)
+  def leave(force = true)
+    drain(wait_for_drain: true, wait_seconds: 60)
+    # change_availability(:active)
+    @swarm.leave(self, force)
+  end
+  
+  def change_availability(new_availability)
     raise "Bad availability param: #{availability}" if (!AVAILABILITY[availability])
-    @hash['Spec']['Availability'] = AVAILABILITY[availability]
-    query = {version: @hash['Version']['Index']}
-    response = @swarm.connection.post("/nodes/#{self.id}/update", query, :body => @hash['Spec'].to_json)
+    refresh
+    if (self.availability != new_availability)
+      @hash['Spec']['Availability'] = AVAILABILITY[new_availability]
+      query = {version: @hash['Version']['Index']}
+      response = @swarm.connection.post("/nodes/#{self.id}/update", query, :body => @hash['Spec'].to_json, expects: [200, 500], full_response: true)
+      if (response.status != 200)
+        raise "Error changing node availability: #{response.body} HTTP-#{response.status}"
+      end
+    end
   end
   
-  def remove
+  def self.remove(node_id, connection)
     query = {}
-    response = @swarm.connection.delete("/nodes/#{self.id}", query, expects: [200, 406])
+    response = connection.delete("/nodes/#{node_id}", query, expects: [200, 406, 500], full_response: true)
+    if (response.status != 200)
+      raise "Error deleting node: #{response.body}"
+    end
   end
   
   

data/lib/docker/swarm/swarm.rb

@@ -7,12 +7,16 @@ class Docker::Swarm::Swarm
 
   def initialize(hash, manager_connection)
     @hash = hash
+#    @manager_connection = manager_connection
     @id = hash['ID']
     @worker_join_token = hash['JoinTokens']['Worker']
     @manager_join_token = hash['JoinTokens']['Manager']
-    manager_node = nodes(manager_connection).first
     @node_hash = {}
-    @node_hash[manager_node.id] = {hash: manager_node.hash, connection: manager_connection}
+    nodes(manager_connection).each do |node|
+      #  Resolv::DNS.new.getaddress("devlog")
+      @node_hash[node.id] = {hash: node.hash, connection: manager_connection}
+      
+    end
   end
 
   def join(node_connection, join_token)
@@ -26,12 +30,15 @@ class Docker::Swarm::Swarm
             "RemoteAddrs" => ["#{master_ip}:2377"],
             "JoinToken" => join_token
           }
+    new_node = nil
     resp = node_connection.post('/swarm/join', query, :body => join_options.to_json, expects: [200])
     nodes.each do |node|
       if (!node_ids_before.include? node.id)
+        new_node = node
         @node_hash[node.id] = {hash: node.hash, connection: node_connection}
       end
     end
+    return new_node
   end
   
   def connection
@@ -41,7 +48,7 @@ class Docker::Swarm::Swarm
         return node_info[:connection]
       end
     end
-    raise "No manager connection found for swarm"
+    return @manager_connection
   end
 
   def join_worker(node_connection)
@@ -53,6 +60,10 @@ class Docker::Swarm::Swarm
   end
 
   def remove
+    services().each do |service|
+      service.remove()
+    end
+    
     worker_nodes.each do |node|
       leave(node, true)
     end
@@ -138,7 +149,18 @@ class Docker::Swarm::Swarm
     hash = JSON.parse(response)
     return Docker::Swarm::Service.new(self, hash)
   end
-
+  
+  def services
+    items = []
+    query = {}
+    opts = {}
+    response = self.connection.get("/services", query, :body => opts.to_json)
+    hashes = JSON.parse(response)
+    hashes.each do |hash|
+      items << Docker::Swarm::Service.new(self, hash)
+    end
+    return items
+  end
 
   # Initialize Swarm
   def self.init(opts, connection)
@@ -164,9 +186,19 @@ class Docker::Swarm::Swarm
   def self.leave(force, connection)
     query = {}
     query['force'] = force
-    connection.post('/swarm/leave', query, expects: [200, 406])
+    response = connection.post('/swarm/leave', query, expects: [200, 406, 500], full_response: true)
+    if (response.status == 500)
+      raise "Error leaving: #{response.body}  HTTP-#{response.status}"
+    end
   end
   
+  def self.find(connection)
+    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)
+    end
+  end
   
 
 end

data/lib/docker/swarm/task.rb

@@ -24,6 +24,10 @@ class Docker::Swarm::Task
     @hash['NodeID']
   end
   
+  def node
+    return @swarm.nodes.find {|n| n.id == self.node_id}
+  end
+  
   def created_at
     return DateTime.parse(@hash.first['CreatedAt'])
   end

data/lib/docker/swarm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-swarm-api
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Mike Moore / Rogue Wave Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.33.1
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: retry_block
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: retry_block
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement