spurious-server 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19f55a1b5c6d49a367b38d3d562e2ca8c9598bc8
-  data.tar.gz: 8625d6c9b6401b5c48bbaaeb7d104db643dff8d8
+  metadata.gz: 7af8bff11bf2fda45cc441abe270a73dea2a3691
+  data.tar.gz: b2e6b3769c6d72ee57c1e56a45dccc252fa58b6f
 SHA512:
-  metadata.gz: 18d5128a1933f0c477fa36472f74f6f3a6d54419a414cda20a75f44d777158021f485873fd7a6ddf8d20f4b5d13c57f61d36a244eff8fc59d8a8f0c9be97aab1
-  data.tar.gz: b1b4637dbfa38ce2713a951fc75d8e4c00efc8c2e815d3c1b5de35a84a292a4689fda5712d3ef044940cacea640bc23549df50695551b8bef1eb50d5da01fd9c
+  metadata.gz: ffd92f6f4f681176d369506817aa3008bb9613d460532aa864ab212e328480e474bd9d5f412e50f0fa09e26a257fa7ee1e7052e3b646864f05bcbc3a1c89ade8
+  data.tar.gz: a5ba053aea4eab0ce5fb0c8fafeb1b2baaf195da3981e639db37dc8389642aab4efb6099384a7d95accca81fd5c2f5d36ef5b4a466a5414b45cafe0b1be85f82

data/bin/spurious-server

@@ -6,13 +6,12 @@ require 'spurious/server'
 require 'spurious/server/version'
 require 'daemons'
 require 'eventmachine'
+require 'em-synchrony'
 require 'spurious/server/options'
 
 options = Spurious::Server::Options.new(ENV)
+ENV['DOCKER_HOST'] = options.ssl_docker_host
 
-Excon.defaults[:write_timeout] = options.write_timeout
-Excon.defaults[:read_timeout]  = options.read_timeout
-
-Daemons.run_proc('Spurious Server', :dir => '/tmp', :log_output => true) do
-  EventMachine.run Spurious::Server.handle(options)
+Daemons.run_proc('Spurious_Server', :dir => '/tmp', :log_output => true) do
+  EventMachine.synchrony Spurious::Server.handle(options)
 end

data/config/images.yaml

@@ -19,5 +19,8 @@
 
 'spurious-elasticache-docker':
   :image: 'smaj/fake-elasticache'
+  :ignore:
+    :create: true
+    :delete: true
   :link:
     - 'spurious-memcached:memcached01'

data/lib/spurious/server/app.rb

@@ -16,9 +16,14 @@ module Spurious
       def receive_data data
           payload = parse_payload data
           state(payload[:type]).execute!
-      rescue Exception => e
-        puts e.message
-        state(:error).tap { |s| s.message = "JSON payload malformed" }.execute!
+      rescue Excon::Errors::Timeout, Excon::Errors::SocketError => e
+          error('Connection to the docker daemon has failed, please check that docker is running on the host or VM', true)
+      rescue StandardError => e
+        error(e.message, true)
+      end
+
+      def error(message, close = false)
+        send_data "#{JSON.generate({:message_type => 'error', :type => 'error', :response => message, :close => close, :colour => :red})}\n"
       end
 
       protected

data/lib/spurious/server/options.rb

@@ -1,7 +1,7 @@
 module Spurious
   module Server
     class Options
-      attr_reader :docker_full_path, :docker_host, :docker_port, :docker_api, :server_port, :server_ip, :write_timeout, :read_timeout
+      attr_reader :docker_full_path, :docker_host, :docker_port, :docker_api, :server_port, :server_ip, :write_timeout, :read_timeout, :cert_path
 
       def initialize(env)
         @docker_host      = env['DOCKER_HOST'].nil? ? 'localhost' : env['DOCKER_HOST'][/\/\/([0-9a-z\.]+):/,1]
@@ -11,8 +11,33 @@ module Spurious
         @server_ip        = env.fetch('SPURIOUS_SERVER_IP', '0.0.0.0')
         @write_timeout    = env.fetch('EXCON_WRITE_TIMEOUT', 30000)
         @read_timeout     = env.fetch('EXCON_READ_TIMEOUT', 30000)
+        @cert_path        = env.fetch('DOCKER_CERT_PATH', nil)
+        setup_ssl if @cert_path
       end
 
+      def ssl_docker_host
+        "https://#{docker_host}:#{docker_port}"
+      end
+
+      protected
+
+      def setup_ssl
+        Docker.options = {
+          :client_cert => valid_cert_path?('cert.pem'),
+          :client_key  => valid_cert_path?('key.pem'),
+          :ssl_ca_file => valid_cert_path?('ca.pem')
+        }
+      end
+
+      def valid_cert_path?(cert)
+        File.join(absolute_cert_path, cert).tap do |path|
+          raise "Could not find: #{path}, please check it exists in your DOCKER_CERTS_PATH folder" unless File.exists? path
+        end
+      end
+
+      def absolute_cert_path
+        @absolute_cert_path ||= File.expand_path cert_path
+      end
     end
   end
 end

data/lib/spurious/server/state/base.rb

@@ -1,6 +1,7 @@
 require 'docker'
 require 'peach'
 require 'spurious/server'
+require 'excon'
 
 module Spurious
   module Server
@@ -9,8 +10,15 @@ module Spurious
         attr_accessor :connection, :config
 
         def initialize(connection, config)
-          @connection = connection
-          @config     = config
+          @connection      = connection
+          @config          = config
+          connection_timeouts
+        end
+
+        def connection_timeouts(connect = 1, read = 5, write = 5)
+          Excon.defaults[:write_timeout]   = write
+          Excon.defaults[:read_timeout]    = read
+          Excon.defaults[:connect_timeout] = connect
         end
 
         def execute!
@@ -35,18 +43,22 @@ module Spurious
           config.for sanitize(image)
         end
 
-        def send(data, close = false)
-          connection.send_data "#{JSON.generate({:type => state_identifer, :response => data, :close => close})}\n"
+        def send(data, message_type = 'info', close = false, colour = :white)
+          connection.send_data "#{JSON.generate({:message_type => message_type, :type => state_identifer, :response => data, :close => close, :colour => colour})}\n"
         end
 
         def error(message, close = false)
-          connection.send_data "#{JSON.generate({:type => 'error', :response => message, :close => close})}\n"
+          connection.error(message, close)
         end
 
         def sanitize(name)
           name.gsub('/', '')
         end
 
+        def docker_available?
+
+        end
+
         private
 
         def state_identifer

data/lib/spurious/server/state/delete.rb

@@ -7,20 +7,44 @@ module Spurious
     module State
       class Delete < Base
 
+        def initialize(connection, config)
+          super
+          connection_timeouts 2, 600, 600
+        end
+
         def execute!
-          containers = spurious_containers.length
-          spurious_containers.peach do |container|
-            send "Removing container #{container.json["Name"]}..."
-            container.tap do |c|
-              c.kill
-              c.delete(:force => true)
+          containers = spurious_containers.length - 1
+
+          spurious_containers.each_with_index do |container, index|
+            container_name   = container.json["Name"].gsub('/', '')
+            container_config = config.for(container_name)
+            container_meta   = container.json
+
+            remove_container = Proc.new do
+              send "Removing #{container_name}", :debug
+              container.delete(:force => true)
+
+              unless container_config[:ignore] && container_config[:ignore][:delete]
+                image = container_config[:image]
+
+                Docker::Image.get(container_meta["Image"]).tap do |image|
+                  image.remove(:force => true)
+                end
+              end
+
+              index_to_check = index + 1
+              containers == index_to_check
             end
+
+            EM.defer(remove_container, operation_complete)
+
           end
-          send "#{containers} containers successfully removed", true
+        end
 
-          connection.unbind
-        rescue Exception => e
-          puts e.message
+        def operation_complete
+          Proc.new do |complete|
+            send("5 containers successfully removed", :info, true, :green) if complete
+          end
         end
       end
     end

data/lib/spurious/server/state/factory.rb

@@ -2,7 +2,6 @@ require 'spurious/server/state/init'
 require 'spurious/server/state/start'
 require 'spurious/server/state/stop'
 require 'spurious/server/state/delete'
-require 'spurious/server/state/update'
 require 'spurious/server/state/ports'
 require 'spurious/server/state/error'
 
@@ -11,7 +10,7 @@ module Spurious
     module State
       module Factory
 
-        def self.create(type, connection, config, options)
+        def self.create(type, connection, config, options = {})
           case type.to_sym
           when :init
             Init.new(connection, config, options.docker_host)
@@ -23,8 +22,6 @@ module Spurious
             Ports.new(connection, config, options.docker_host)
           when :delete
             Delete.new(connection, config)
-          when :update
-            Update.new(connection, config)
           when :error
             Error.new(connection)
           else

data/lib/spurious/server/state/init.rb

@@ -7,69 +7,62 @@ module Spurious
   module Server
     module State
       class Init < Base
-
         attr_accessor :completed_containers, :docker_host
 
         def initialize(connection, config, docker_host)
           super(connection, config)
+          connection_timeouts 2, 600, 600
           @docker_host = docker_host
         end
 
         def execute!
-          this = self
-          completed_containers = 0
+
+          raise "Containers have already been initilised, please run 'spurious start'" if spurious_containers.length > 0
+
+
+
+          send("Pulling containers from the registry can take some time, please be patient...", :info, false, :blue)
+
+          containers = app_config.length
+          index = 0
 
           app_config.each do |name, meta|
-            image_meta = { 'fromImage' => meta[:image]}
-            image_meta['Env'] = meta[:env] unless meta[:env].nil?
+            image_meta = {}.tap do |h|
+              h['fromImage'] = meta[:image]
+              h['Env']       = meta[:env] unless meta[:env].nil?
+            end
             container_cmd = []
 
             if meta[:image] == 'smaj/spurious-s3'
               container_cmd = ['-h', docker_host]
             end
 
-            container_operation = Proc.new do
-
+            create_container = Proc.new do
               begin
-                this.send "Creating container with name: #{name}"
+                send "Creating #{name} container", :debug
                 Docker::Container.create("name" => name, "Image" => meta[:image], 'Cmd' => container_cmd)
-              rescue Exception => e
-                case e.message
-                when /409 Conflict/
-                  this.error "Container with name: #{name} already exists"
-                else
-                  this.error "Error creating container: #{e.message}"
-                end
+              rescue Docker::Error::ArgumentError, Docker::Error::NotFoundError
+              rescue Excon::Errors::Conflict
+                error "#{name} container already exists"
               end
-
+              index = index + 1
+              operation_complete(containers == index)
             end
 
-            container_callback = Proc.new do
-              completed_containers = completed_containers + 1
-              this.send("#{config.app.length} containers successfully initialized", true) if completed_containers == app_config.length
-            end
-
-            image_operation = Proc.new do
+            create_image = Proc.new do
               begin
-                this.send "Pulling #{name} from the public repo..."
+                send "Pulling latest version of #{name} from registry", :debug
                 Docker::Image.create(image_meta)
-              rescue Exception => e
-                this.error "Error pulling down image: #{e.message}"
-              end
-
-            end
-
-            image_callback = Proc.new do
-              EM.add_timer(1) do
-                EM.defer(container_operation, container_callback)
+              rescue Docker::Error::ArgumentError, Docker::Error::NotFoundError, Excon::Errors::Timeout, Excon::Errors::SocketError
               end
             end
 
-            EM.add_timer(1) do
-              EM.defer(image_operation, image_callback)
-            end
+            EM.defer(create_image, create_container)
           end
+        end
 
+        def operation_complete(complete)
+          send("6 containers successfully initialized", :info, true, :green) if complete
         end
 
       end

data/lib/spurious/server/state/ports.rb

@@ -34,11 +34,12 @@ module Spurious
             end
 
           end
-          send ports, true
+          send ports, :info, true
 
           connection.unbind
         rescue Exception => e
           puts e.message
+          raise('There was a problem connecting to the Docker API (check that docker is running or if not running under linux check the VM hosting docker is running and the API is accesbile')
         end
 
       end

data/lib/spurious/server/state/start.rb

@@ -9,38 +9,51 @@ module Spurious
       class Start < Base
         attr_accessor :docker_host
 
-        def initialize(connection, config, docker_host)
+        def initialize(connection, config, docker_host_ip)
           super(connection, config)
-          @docker_host = docker_host
+          connection_timeouts 2, 600, 600
+          @docker_host_ip = docker_host_ip
         end
 
         def execute!
+          started_containers = 0
+
+          raise "Containers haven't been initialised, please run 'spurious init' first." if spurious_containers.length == 0
+
           spurious_containers.each do |container|
             begin
+              started_containers = started_containers + 1
               config = container_config(container.json["Name"])
-              send "Starting container #{container.json["Name"]}..."
-              meta = {"PublishAllPorts" => true}
-              meta["Links"] = config[:link] unless config[:link].nil?
+              send "Starting #{container.json["Name"].gsub('/', '')}", :debug
+              meta = {}.tap do |m|
+                m["PublishAllPorts"] = true
+                m["Links"] = config[:link] unless config[:link].nil?
+              end
+
               container.start meta
 
               if container.json["Name"] == '/spurious-sqs' then
                 port_setup = Proc.new do
-                  port = container.json["NetworkSettings"]["Ports"]['4568/tcp'].first['HostPort']
-                  Net::HTTP.get(URI("http://#{docker_host}:#{port}/host-details?host=#{docker_host}&port=#{port}"))
+                  begin
+                    port = container.json["NetworkSettings"]["Ports"]['4568/tcp'].first['HostPort']
+                    Net::HTTP.get(URI("http://#{docker_host_ip}:#{port}/host-details?host=#{docker_host_ip}&port=#{port}"))
+                  rescue StandardError => e
+                  end
                 end
-
                 EM.add_timer(5) { EM.defer(port_setup) }
               end
             rescue Exception => e
-              error(e.message)
+              started_containers = started_containers - 1
+              case e.message
+              when /304 Not Modified/
+                error('Container is already running...')
+              else
+                error(e.message)
+              end
             end
           end
 
-          send "#{spurious_containers.length} containers successfully started", true
-
-          connection.unbind
-        rescue Exception => e
-          puts e.message
+          send("Started #{started_containers} containers", :info, true, :green)
         end
 
       end

data/lib/spurious/server/state/stop.rb

@@ -7,17 +7,32 @@ module Spurious
     module State
       class Stop < Base
 
+        def initialize(connection, config)
+          super
+          connection_timeouts 2, 600, 600
+        end
+
         def execute!
-          spurious_containers.peach do |container|
-            send "Stopping container #{container.json["Name"]}..."
-            container.stop
+          containers = spurious_containers.length - 1
+
+          spurious_containers.each_with_index do |container, index|
+            stop_containers = Proc.new do
+
+              send "Stopping #{container.json["Name"].gsub('/', '')}", :debug
+              container.stop
+              index_to_check = index + 1
+              containers == index_to_check
+            end
+            EM.defer(stop_containers, operation_complete)
           end
-          send "#{spurious_containers.length} containers successfully stopped", true
+        end
 
-          connection.unbind
-        rescue Exception => e
-          puts e.message
+        def operation_complete
+          Proc.new do |complete|
+            send("Stopped 6 containers", :info, true, :green) if complete
+          end
         end
+
       end
     end
   end

data/lib/spurious/server/version.rb

@@ -1,5 +1,5 @@
 module Spurious
   module Server
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/spurious-server.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
 
   spec.add_runtime_dependency "eventmachine"
+  spec.add_runtime_dependency "em-synchrony"
   spec.add_runtime_dependency "docker-api"
   spec.add_runtime_dependency "daemons"
   spec.add_runtime_dependency "peach"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spurious-server
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-synchrony
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +150,6 @@ files:
 - lib/spurious/server/state/ports.rb
 - lib/spurious/server/state/start.rb
 - lib/spurious/server/state/stop.rb
-- lib/spurious/server/state/update.rb
 - lib/spurious/server/version.rb
 - spec/app_spec.rb
 - spec/config_spec.rb

data/lib/spurious/server/state/update.rb

@@ -1,20 +0,0 @@
-require 'docker'
-require 'peach'
-require 'json'
-require 'spurious/server/state/base'
-
-module Spurious
-  module Server
-    module State
-      class Update < Base
-
-        def execute!
-          ['stop', 'delete', 'init', 'up'].each do |state|
-            connection.receive_data(JSON.generate({:type => state}))
-          end
-        end
-
-      end
-    end
-  end
-end