docker-swarm-sdk 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0788875137185f4cd9dc756a4f5472c88b6c095c'
-  data.tar.gz: b8cf6d7b1ea314c346e27481abc87de47839ba74
+  metadata.gz: 80ce05c3772a87ef6d5ac0535192fa4d4fc9eaab
+  data.tar.gz: fb89cd6b07981d2f8d949bfcc8dc2e1be051528b
 SHA512:
-  metadata.gz: 7f036700557339985b766a4f75fff68ed0133efaf89329d1dddaf4f7c13e5739a08cfba2e57e8f9b91b225047c2733cbb111c8029a8f330f0980190b83263abb
-  data.tar.gz: 7e618fffef5ed3b5b966274732524e8da14a423dc7ac1670976f5fb63e93f6875b25b7a59c898d39b6713e26151873618962b0c7cf6a6d65c7d5f150613fa94e
+  metadata.gz: 47f1523152677724924eda382cb0451bfa83a347845d612654ec00ea22e33836344087de47bac60ea43f23d787c0a9b88a13790fc3ae0c720434713256eba62e
+  data.tar.gz: fc1c34a42182692424913556f99ff0d7cca3328eede7b201ed731daed9fc3f1d3e589cba7ad6976993a0a2adec0b61bef01f708528e368e31606739c24b5a75f

data/README.md

@@ -19,6 +19,9 @@ Sample Usage
  # Make a connection to the Swarm manager's API.  (Assumes port 2375 exposed for API)
 master_connection = Docker::Swarm::Connection.new('http://10.20.30.1:2375')
 
+# If swarm on the swarm master and using socket:
+master_connection = Docker::Swarm::Connection.new('unix:///var/run/docker.sock')
+
  # Manager node intializes swarm
 swarm_init_options = { "ListenAddr" => "0.0.0.0:2377" }
 swarm = Docker::Swarm::Swarm.init(swarm_init_options, master_connection)
@@ -90,7 +93,7 @@ tasks = swarm.tasks()
 
  # Scale up or down the number of replicas on a service
 service.scale(20)
-      
+
  # Worker leaves the swarm - no forcing
 swarm.leave(worker_node, node)
 

data/lib/docker/swarm/service.rb

@@ -1,14 +1,14 @@
 require 'docker-api'
+require 'active_support'
 
 class Docker::Swarm::Service
-  #include Docker::Base
   attr_reader :hash
 
   def initialize(swarm, hash)
     @swarm = swarm
     @hash = hash
   end
-  
+
   def name()
     @hash['Spec']['Name']
   end
@@ -16,13 +16,13 @@ class Docker::Swarm::Service
   def id()
     return @hash['ID']
   end
-  
+
   def reload()
     s = @swarm.find_service(id())
     @hash = s.hash
     return self
   end
-  
+
   def network_ids
     network_ids = []
     if (@hash['Endpoint']['VirtualIPs'])
@@ -32,16 +32,23 @@ class Docker::Swarm::Service
     end
     return network_ids
   end
-  
+
   def remove(opts = {})
     query = {}
     @swarm.connection.delete("/services/#{self.id}", query, :body => opts.to_json)
   end
-  
-  def update(opts)
+
+  def update(options = {})
+    specs = @hash['Spec'].deep_merge(options)
     query = {}
     version = @hash['Version']['Index']
-    response = @swarm.connection.post("/services/#{self.id}/update?version=#{version}", query, :body => opts.to_json)
+    response = @swarm.connection.post("/services/#{self.id}/update?version=#{version}", query, :body => specs.to_json)
+  end
+
+  def restart
+    options = {}
+    options['TaskTemplate'] = {'ForceUpdate' => 1}
+    update(options)
   end
 
   def scale(count)
@@ -49,6 +56,10 @@ class Docker::Swarm::Service
     self.update(@hash['Spec'])
   end
 
+  def replicas
+    @hash['Spec']['Mode']['Replicated']['Replicas']
+  end
+
   def self.DEFAULT_OPTIONS
     default_service_create_options = {
         "Name" => "<<Required>>",
@@ -73,7 +84,7 @@ class Docker::Swarm::Service
             },
             "Reservations" => {
 #              "NanoCPUs" => ?
-#              MemoryBytes => 
+#              MemoryBytes =>
            }
           },
           "RestartPolicy" => {
@@ -107,6 +118,4 @@ class Docker::Swarm::Service
       }
     return default_service_create_options
   end
-  
-  
-end
+end

data/lib/docker/swarm/swarm.rb

@@ -8,8 +8,8 @@ class Docker::Swarm::Swarm
   attr_reader :node_ip, :manager_ip, :worker_join_token, :manager_join_token, :id, :hash, :node_hash
 
   def store_manager(manager_connection, listen_address_and_port)
-    node = nodes.find {|n| 
-      (n.hash['ManagerStatus']) && (n.hash['ManagerStatus']['Leader'] == true) && (n.hash['ManagerStatus']['Addr'] == listen_address_and_port) 
+    node = nodes.find {|n|
+      (n.hash['ManagerStatus']) && (n.hash['ManagerStatus']['Leader'] == true) && (n.hash['ManagerStatus']['Addr'] == listen_address_and_port)
     }
     raise "Node not found for: #{listen_address}" if (!node)
     @node_hash[node.id] = {hash: node.hash, connection: manager_connection}
@@ -18,7 +18,7 @@ class Docker::Swarm::Swarm
   def update_data(hash)
     @hash = hash
   end
- 
+
   def socket_connection(node_connection)
     node_connection.url.include?('unix:///')
   end
@@ -32,7 +32,7 @@ class Docker::Swarm::Swarm
       node_ip = node_connection.url.split("//").last.split(":").first
       manager_ip = self.connection.url.split("//").last.split(":").first
     end
-    
+
     join_options = {
             "ListenAddr" => "#{listen_address}",
             "AdvertiseAddr" => "#{node_ip}:2377",
@@ -62,11 +62,11 @@ class Docker::Swarm::Swarm
   def join_worker(node_connection, listen_address = "0.0.0.0:2377")
     join(node_connection, @node_ip, @manager_ip, @worker_join_token)
   end
-  
+
   def join_manager(node_connection, listen_address = "0.0.0.0:2377")
     join(node_connection, @node_ip, @manager_ip, @manager_join_token, listen_address)
   end
-  
+
   def connection
     @node_hash.keys.each do |node_id|
       node_info = @node_hash[node_id]
@@ -81,7 +81,7 @@ class Docker::Swarm::Swarm
     services().each do |service|
       service.remove()
     end
-    
+
     worker_nodes.each do |node|
       leave(node, true)
     end
@@ -89,7 +89,7 @@ class Docker::Swarm::Swarm
       leave(node, true)
     end
   end
-  
+
   def tasks
     items = []
     query = {}
@@ -109,11 +109,11 @@ class Docker::Swarm::Swarm
       Docker::Swarm::Swarm.leave(force, node_info[:connection])
     end
   end
-  
+
   def remove_node(worker_node)
     Swarm::Node.remove(worker_node.id, self.connection)
   end
-  
+
   def manager_nodes
     return nodes.select { |node| node.role == :manager} || []
   end
@@ -121,7 +121,7 @@ class Docker::Swarm::Swarm
   def worker_nodes
     return nodes.select { |node| node.role == :worker} || []
   end
-  
+
   def networks
     all_networks = []
     response = connection.get("/networks", {}, full_response: true)
@@ -135,7 +135,7 @@ class Docker::Swarm::Swarm
     end
     return all_networks
   end
-  
+
   def create_network(options)
     response = connection.post('/networks/create', {},  body: options.to_json, expects: [200, 201, 500], full_response: true)
     if (response.status <= 201)
@@ -148,11 +148,11 @@ class Docker::Swarm::Swarm
       raise "Error creating network: HTTP-#{response.status} - #{response.body}"
     end
   end
-  
+
   def create_network_overlay(network_name)
     subnet_16_parts = [10, 10, 0, 0]
     max_vxlanid = 200
-    
+
     # Sometimes nodes have leftover networks not on other nodes, that have subnets that can't be duplicated in
     # the new overlay network.
     nodes.each do |node|
@@ -165,7 +165,7 @@ class Docker::Swarm::Swarm
             end
           end
         end
-      
+
         # Make sure our new network doesn't duplicate subnet of other network.
         if (network.hash['IPAM']) && (network.hash['IPAM']['Config'])
           network.hash['IPAM']['Config'].each do |subnet_config|
@@ -189,7 +189,7 @@ class Docker::Swarm::Swarm
         end
       end
     end
-    
+
 
     options = {
         "Name" => network_name,
@@ -218,7 +218,7 @@ class Docker::Swarm::Swarm
       }
       create_network(options)
   end
-  
+
   # Return all of the Nodes.
   def nodes
     opts = {}
@@ -249,7 +249,7 @@ class Docker::Swarm::Swarm
     end
     return nil
   end
-  
+
   def find_service(id)
     query = {}
     opts = {}
@@ -257,14 +257,14 @@ class Docker::Swarm::Swarm
     hash = JSON.parse(response)
     return Docker::Swarm::Service.new(self, hash)
   end
-  
+
   def find_service_by_name(name)
     services.each do |service|
       return service if (service.name == name)
     end
     return nil
   end
-  
+
   def services
     items = []
     query = {}
@@ -276,17 +276,18 @@ class Docker::Swarm::Swarm
     end
     return items
   end
-  
-  
+
+
   # Initialize Swarm
   def self.init(opts, connection)
     query = {}
     resp = connection.post('/swarm/init', query, :body => opts.to_json, full_response: true, expects: [200, 404, 406, 500])
     if (resp.status == 200)
       swarm = Docker::Swarm::Swarm.swarm(opts, connection)
-      manager_node = swarm.nodes.find {|n|  
-        (n.hash['ManagerStatus']) && (n.hash['ManagerStatus']['Leader'] == true) 
+      manager_node = swarm.nodes.find {|n|
+        (n.hash['ManagerStatus']) && (n.hash['ManagerStatus']['Leader'] == true)
       }
+      byebug
       listen_address = manager_node.hash['ManagerStatus']['Addr']
       swarm.store_manager(connection, listen_address)
       return swarm
@@ -296,14 +297,14 @@ class Docker::Swarm::Swarm
   end
 
   # docker swarm join-token -q worker
-  def self.swarm(options, connection)
+  def self.swarm(connection, options = {})
     query = {}
     resp = connection.get('/swarm', query, :body => options.to_json, expects: [200, 404, 406], full_response: true)
     if (resp.status == 406) || (resp.status == 404)
       return nil
     elsif (resp.status == 200)
       hash = JSON.parse(resp.body)
-      swarm = self.find_swarm_for_id(hash['ID'])  
+      swarm = self.find_swarm_for_id(hash['ID'])
       if (swarm)
         swarm.update_data(hash)
       else
@@ -313,7 +314,7 @@ class Docker::Swarm::Swarm
       raise "Bad response: #{resp.status} #{resp.body}"
     end
   end
-  
+
   def self.leave(force, connection)
     query = {}
     query['force'] = force
@@ -322,39 +323,39 @@ class Docker::Swarm::Swarm
       raise "Error leaving: #{response.body}  HTTP-#{response.status}"
     end
   end
-  
+
   def self.find(connection, options = {})
     query = {}
     response = connection.get('/swarm', query, expects: [200, 404, 406], full_response: true)
     if (response.status == 200)
       hash = JSON.parse(response.body)
-      swarm = self.find_swarm_for_id(hash['ID'])  
+      swarm = self.find_swarm_for_id(hash['ID'])
       if (swarm)
         swarm.update_data(hash)
       else
         swarm = Docker::Swarm::Swarm.new(hash, connection, options)
       end
-      manager_node = swarm.nodes.find {|n|  
-        (n.hash['ManagerStatus']) && (n.hash['ManagerStatus']['Leader'] == true) 
+      manager_node = swarm.nodes.find {|n|
+        (n.hash['ManagerStatus']) && (n.hash['ManagerStatus']['Leader'] == true)
       }
       listen_address = manager_node.hash['ManagerStatus']['Addr']
       swarm.store_manager(connection, listen_address)
       return swarm
     elsif (response.status > 200)
       return nil
-    else 
+    else
       raise "Error finding swarm: HTTP-#{response.status} #{response.body}"
     end
   end
-  
-  
+
+
  private
  @@swarms = {}
- 
+
  def self.find_swarm_for_id(swarm_id)
    return @@swarms[swarm_id]
  end
- 
+
  def initialize(hash, manager_connection = nil, options = {})
    @hash = hash
    @id = hash['ID']
@@ -366,8 +367,8 @@ class Docker::Swarm::Swarm
    @manager_connection = manager_connection
    @@swarms[@id] = self
  end
- 
- 
-  
+
+
+
 
 end

data/lib/docker/swarm/task.rb

@@ -7,19 +7,19 @@ class Docker::Swarm::Task
     @hash = hash
     @swarm = swarm
   end
-  
-  def id 
+
+  def id
     return @hash['ID']
   end
-  
+
   def image
     return @hash['Spec']['ContainerSpec']['Image']
   end
-  
+
   def service_id
     @hash['ServiceID']
   end
-  
+
   def service
     return @swarm.services.find { |service|
       self.service_id == service.id
@@ -29,19 +29,27 @@ class Docker::Swarm::Task
   def node_id
     @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
-  
+
   def status
     @hash['Status']['State'].to_sym
   end
 
+  def status_timestamp
+    return DateTime.parse(@hash['Status']['Timestamp'])
+  end
+
+  def status_message
+    @hash['Status']['Message']
+  end
+
   def networks
     all_networks = @swarm.networks
     nets = []

data/lib/docker/swarm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-swarm-sdk
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Mike Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -177,5 +205,5 @@ rubyforge_project:
 rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: Ruby SDK for Docker Swarm API
+summary: Ruby API for Docker Swarm
 test_files: []