docker_cloud 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c2aefec9011edee7b419eff4d029878d02a2ce
-  data.tar.gz: 1c1e8e87a55587968b446d21e8d692cb748ec82a
+  metadata.gz: 319b4a0aec23043751f0b6188881d0b955bc72e8
+  data.tar.gz: 2f8bd36bf99fd3a8360a68f04578b76306cb5dc7
 SHA512:
-  metadata.gz: 16fd776a797fa45301fb0d48b04421bf969be06d4db2b07b0c04df84eb16bb4ca7d539a18f5cb292f7e43f4d0e18428bbd8b75b26c91328cf96783acc2ae8c94
-  data.tar.gz: 6434be0c98ded603d0c0a472cb1eeb38131f4faab64d1176b81a2a7017922d92ecddbd44fbdd4589883293449f0c2c9c5cc298e8cb0fdf0244c6578db7f8b9a0
+  metadata.gz: 8fd869a3c22b4b1cf80a8fd286e93b27dcc43ce88ddc377600f239fc84985bf1afc084f79d74214ae1bb720bfb989fd047082f06af19761b57d1b5df240bba1a
+  data.tar.gz: b1c18bc6f274743a20518c8c559c5d7e1eaae5cee9ebc7f2d62d948c6459a3204ef71c9bfe9038ad9e8d52fe3f9fc2ad5ab717755adfd9921a9342d7bcfbf395

data/CODE_OF_CONDUCT.md

@@ -35,7 +35,7 @@ This code of conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at tullo_jillian@bah.com. All
+reported by contacting a project maintainer at jillian.tullo@gmail.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. Maintainers are
 obligated to maintain confidentiality with regard to the reporter of an

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 jillianntulloADM
+Copyright (c) 2016 Jillian Tullo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/docker_cloud.rb

@@ -1,5 +1,8 @@
+# helpers
+require 'docker_cloud/helpers/services'
+require 'docker_cloud/helpers/api'
+
 # types
-require 'docker_cloud/helpers'
 require 'docker_cloud/type'
 require 'docker_cloud/availability_zone'
 require 'docker_cloud/version'

data/lib/docker_cloud/api/api.rb

@@ -2,7 +2,7 @@ require 'rest-client'
 
 module DockerCloud
   class API
-    include DockerCloud::Helpers
+    include DockerCloud::Helpers::API
     attr_reader :headers, :type, :client
 
     BASE_API_PATH = 'https://cloud.docker.com/api'.freeze
@@ -32,7 +32,7 @@ module DockerCloud
     end
 
     def http_patch(path, content = {})
-      response = RestClient.patch(url(path), content.to_json, headers)
+      response = RestClient.patch(url("#{path}/"), content.to_json, headers)
       parse(response)
     end
 

data/lib/docker_cloud/api/container_api.rb

@@ -12,27 +12,31 @@ module DockerCloud
     end
 
     def get(uuid)
-      http_get(resource_url(uuid))
+      response = http_get(resource_url(uuid))
       format_object(response, TYPE)
     end
 
     def start(uuid)
       url = "#{uuid}/start/"
-      http_post(resource_url(url))
+      response = http_post(resource_url(url))
+      format_object(response, TYPE)
     end
 
     def stop(uuid)
       url = "#{uuid}/stop/"
-      http_post(resource_url(url))
+      response = http_post(resource_url(url))
+      format_object(response, TYPE)
     end
 
     def logs(uuid)
       url = "#{uuid}/logs/"
-      http_get(resource_url(url))
+      response = http_get(resource_url(url))
+      format_object(response, TYPE)
     end
 
     def terminate(uuid)
-      http_terminate(resource_url(uuid))
+      response = http_delete(resource_url(uuid))
+      format_object(response, TYPE)
     end
   end
 end

data/lib/docker_cloud/api/external_repository_api.rb

@@ -27,7 +27,7 @@ module DockerCloud
     end
 
     def delete(name, user, image)
-      url = "#{name}/#{user}/#{image}"
+      url = "#{name}/#{user}/#{image}/"
       http_delete(resource_url(url))
     end
   end

data/lib/docker_cloud/api/node_api.rb

@@ -17,11 +17,19 @@ module DockerCloud
     end
 
     def deploy(uuid)
-      http_post(resource_url("#{uuid}/deploy"))
+      http_post(resource_url("#{uuid}/deploy/"))
     end
 
     def terminate(uuid)
       http_delete(resource_url(uuid))
     end
+
+    def health_check(uuid)
+      http_post(resource_url("#{uuid}/health-check/"))
+    end
+
+    def docker_upgrade(uuid)
+      http_post(resource_url("#{uuid}/docker-upgrade/"))
+    end
   end
 end

data/lib/docker_cloud/api/node_cluster_api.rb

@@ -36,7 +36,7 @@ module DockerCloud
     end
 
     def deploy(uuid)
-      http_post(resource_url("#{uuid}/deploy"))
+      http_post(resource_url("#{uuid}/deploy/"))
     end
 
     def terminate(uuid)

data/lib/docker_cloud/api/node_type_api.rb

@@ -15,7 +15,7 @@ module DockerCloud
 
     # Returns the details of a specific NodeType
     def get(provider_name, node_type_name)
-      name = "#{provider_name}/#{node_type_name}"
+      name = "#{provider_name}/#{node_type_name}/"
       response = http_get(resource_url(name))
       format_object(response, TYPE)
     end

data/lib/docker_cloud/api/service_api.rb

@@ -22,7 +22,7 @@ module DockerCloud
     end
 
     def logs(uuid)
-      url = "#{uuid}/logs"
+      url = "#{uuid}/logs/"
       http_get(resource_url(url))
     end
 
@@ -33,21 +33,25 @@ module DockerCloud
 
     def start(uuid)
       url = "#{uuid}/start/"
-      http_post(resource_url(url))
+      response = http_post(resource_url(url))
+      format_object(response, TYPE)
     end
 
     def stop(uuid)
       url = "#{uuid}/stop/"
-      http_post(resource_url(url))
+      response = http_post(resource_url(url))
+      format_object(response, TYPE)
     end
 
     def redeploy(uuid)
       url = "#{uuid}/redeploy/"
-      http_post(resource_url(url))
+      response = http_post(resource_url(url))
+      format_object(response, TYPE)
     end
 
     def terminate(uuid)
-      http_delete(resource_url(uuid))
+      response = http_delete(resource_url(uuid))
+      format_object(response, TYPE)
     end
   end
 end

data/lib/docker_cloud/api/stack_api.rb

@@ -32,17 +32,17 @@ module DockerCloud
     end
 
     def stop(uuid)
-      url = "#{uuid}/stop"
+      url = "#{uuid}/stop/"
       http_post(resource_url(url))
     end
 
     def start(uuid)
-      url = "#{uuid}/start"
+      url = "#{uuid}/start/"
       http_post(resource_url(url))
     end
 
     def redeploy(uuid)
-      url = "#{uuid}/redeploy"
+      url = "#{uuid}/redeploy/"
       http_post(resource_url(url))
     end
 

data/lib/docker_cloud/container.rb

@@ -1,5 +1,7 @@
 module DockerCloud
   class Container < DockerCloud::Type
+    include DockerCloud::Helpers::Services
+
     def resource_uri
       info[:resource_uri]
     end
@@ -161,10 +163,6 @@ module DockerCloud
       info[:autodestroy]
     end
 
-    def roles
-      info[:roles]
-    end
-
     def linked_to_container
       info[:linked_to_container]
     end
@@ -173,10 +171,6 @@ module DockerCloud
       info[:link_variables]
     end
 
-    def privileged
-      info[privileged]
-    end
-
     def read_only
       info[:read_only]
     end
@@ -193,12 +187,14 @@ module DockerCloud
       info[:pid]
     end
 
-    def container_ports
-      @container_ports ||= ContainerPorts.new(info[:container_ports])
-    end
-
     def node
       @node ||= client.nodes.get_from_uri(info[:node]) unless info[:node].nil?
     end
+
+    private
+
+    def api
+      client.containers
+    end
   end
 end

data/lib/docker_cloud/helpers/api.rb

@@ -0,0 +1,20 @@
+module DockerCloud
+  module Helpers
+    module API
+      private
+
+      def format_object(response, type)
+        type = Object.const_get "DockerCloud::#{type}"
+        if response.is_a?(Array)
+          formatted = []
+          response.each do |obj|
+            formatted.push(type.new(obj, client))
+          end
+        else
+          formatted = type.new(response, client)
+        end
+        formatted
+      end
+    end
+  end
+end

data/lib/docker_cloud/helpers/services.rb

@@ -0,0 +1,60 @@
+module DockerCloud
+  module Helpers
+    module Services
+      # This class serves both Containers and Services
+
+      class ContainerPorts
+        attr_accessor :protocol, :inner_port, :outer_port, :port_name,
+          :uri_protocol, :endpoint_uri, :published
+
+        def initialize(container_ports)
+          @protocol = container_ports[:protocol]
+          @inner_port = container_ports[:inner_port]
+          @outer_port = container_ports[:outer_port]
+          @port_name = container_ports[:outer_port]
+          @uri_protocol = container_ports[:uri_protocol]
+          @endpoint_uri = container_ports[:endpoint_uri]
+          @published = container_ports[:published]
+        end
+      end
+
+      def start
+        api.start(uuid)
+      end
+
+      def stop
+        api.stop(uuid)
+      end
+
+      def redeploy
+        api.redeploy(uuid)
+      end
+
+      def terminate
+        api.terminate(uuid)
+      end
+
+      def update(params)
+        api.update(uuid, params)
+      end
+
+      def roles
+        info[:roles]
+      end
+
+      def privileged
+        info[:privileged]
+      end
+
+      def container_ports
+        if @container_ports.nil? && !info[:container_ports].nil?
+          @container_ports = []
+          info[:container_ports].each do |port|
+            @container_ports.push(ContainerPorts.new(port))
+          end
+        end
+        @container_ports
+      end
+    end
+  end
+end

data/lib/docker_cloud/node.rb

@@ -95,5 +95,23 @@ module DockerCloud
         @memory = response[:memory]
       end
     end
+
+    def health_check
+      api.health_check(uuid)
+    end
+
+    def terminate
+      api.terminate(uuid)
+    end
+
+    def docker_upgrade
+      api.docker_upgrade(uuid)
+    end
+
+    private
+
+    def api
+      client.nodes
+    end
   end
 end

data/lib/docker_cloud/node_cluster.rb

@@ -22,7 +22,7 @@ module DockerCloud
     end
 
     def nodes
-      if @nodes.nil?
+      if @nodes.nil? && !info[:nodes].nil?
         @nodes = []
         info[:nodes].each do |node_uri|
           @nodes.push(client.nodes.get_from_uri(node_uri))
@@ -63,5 +63,23 @@ module DockerCloud
     def nickname
       info[:nickname]
     end
+
+    def deploy
+      api.deploy(uuid)
+    end
+
+    def terminate
+      api.terminate(uuid)
+    end
+
+    def update(params)
+      api.update(uuid, params)
+    end
+
+    private
+
+    def api
+      client.node_clusters
+    end
   end
 end

data/lib/docker_cloud/service.rb

@@ -1,13 +1,15 @@
 module DockerCloud
   class Service < DockerCloud::Type
-    def resource_uri
-      info[:resource_uri]
-    end
+    include DockerCloud::Helpers::Services
 
     def image_name
       info[:image_name]
     end
 
+    def image
+      @image ||= client.images.get_from_uri(info[:image_tag]) unless info[:image_tag].nil?
+    end
+
     def name
       info[:name]
     end
@@ -71,19 +73,15 @@ module DockerCloud
 
     # def containers; info[:containers]; end
     def containers
-      if @containers.nil?
+      if @containers.nil? && !info[:containers].nil?
         @containers = []
         info[:containers].each do |uri|
-          @containers.push(client.containers.get_by_uri(uri))
+          @containers.push(client.containers.get_from_uri(uri))
         end
       end
       @containers
     end
 
-    def container_ports
-      @container_ports ||= ContainerPorts.new(info[:container_ports])
-    end
-
     def container_env_vars
       info[:container_envvars]
     end
@@ -200,10 +198,6 @@ module DockerCloud
       info[:autodestroy]
     end
 
-    def roles
-      info[:roles]
-    end
-
     def link_variables
       info[:link_variables]
     end
@@ -231,5 +225,11 @@ module DockerCloud
     def nickname
       info[:nickname]
     end
+
+    private
+
+    def api
+      client.services
+    end
   end
 end

data/lib/docker_cloud/stack.rb

@@ -1,9 +1,5 @@
 module DockerCloud
   class Stack < DockerCloud::Type
-    def resource_uri
-      info[:uui]
-    end
-
     def name
       info[:name]
     end
@@ -27,7 +23,7 @@ module DockerCloud
       @services
     end
 
-    def deployed_date
+    def deployed_datevers
       info[:deployed_datetime]
     end
 
@@ -38,5 +34,35 @@ module DockerCloud
     def nickname
       info[:nickname]
     end
+
+    def start
+      api.start(uuid)
+    end
+
+    def redeploy
+      api.redeploy(uuid)
+    end
+
+    def terminate
+      api.terminate(uuid)
+    end
+
+    def stop
+      api.stop(uuid)
+    end
+
+    def update(params)
+      api.update(uuid, params)
+    end
+
+    def export
+      api.export(uuid)
+    end
+
+    private
+
+    def api
+      client.stacks
+    end
   end
 end

data/lib/docker_cloud/type.rb

@@ -1,7 +1,6 @@
 module DockerCloud
   class Type
-    include DockerCloud::Helpers
-    attr_accessor :uuid, :resource_uri
+    attr_reader :info
 
     def initialize(response, client)
       @info = response
@@ -10,10 +9,21 @@ module DockerCloud
       @resource_uri = info[:uuid]
     end
 
+    def reload
+      refreshed = api.get_from_uri(resource_uri)
+      @info = refreshed.info
+    end
+
+    def uuid
+      info[:uuid]
+    end
+
+    def resource_uri
+      info[:resource_uri]
+    end
+
     private
 
     attr_reader :client
-
-    attr_reader :info
   end
 end

data/lib/docker_cloud/version.rb

@@ -1,3 +1,3 @@
 module DockerCloud
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker_cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jillian Tullo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -155,7 +155,8 @@ files:
 - lib/docker_cloud/availability_zone.rb
 - lib/docker_cloud/container.rb
 - lib/docker_cloud/external_repository.rb
-- lib/docker_cloud/helpers.rb
+- lib/docker_cloud/helpers/api.rb
+- lib/docker_cloud/helpers/services.rb
 - lib/docker_cloud/node.rb
 - lib/docker_cloud/node_cluster.rb
 - lib/docker_cloud/node_type.rb

data/lib/docker_cloud/helpers.rb

@@ -1,33 +0,0 @@
-module DockerCloud
-  module Helpers
-    class ContainerPorts
-      attr_accessor :protocol, :inner_port, :outer_port, :port_name,
-        :uri_protocol, :endpoint_uri, :published
-
-      def initialize(container_ports)
-        @protocol = container_ports[:protocol]
-        @inner_port = container_ports[:inner_port]
-        @outer_port = container_ports[:outer_port]
-        @port_name = container_ports[:outer_port]
-        @uri_protocol = container_ports[:uri_protocol]
-        @endpoint_uri = container_ports[:endpoint_uri]
-        @published = container_ports[:published]
-      end
-    end
-
-    private
-
-    def format_object(response, type)
-      type = Object.const_get "DockerCloud::#{type}"
-      if response.is_a?(Array)
-        formatted = []
-        response.each do |obj|
-          formatted.push(type.new(obj, client))
-        end
-      else
-        formatted = type.new(response, client)
-      end
-      formatted
-    end
-  end
-end