spurious-server 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b00c1454c5618c7808f7b7a374f1b4b4f020a04
-  data.tar.gz: 4b6b8c18d0dcae10060988c3950b5260208e2bbf
+  metadata.gz: fc578dfb5d5cbd126d50837e83c4af755ec0f55b
+  data.tar.gz: 25293d3e128a347e2d70db1156a27b78c94391fd
 SHA512:
-  metadata.gz: 815c667179bd03cff5d31b54a30d63ace256741d403542e691096ce8ee862e6b970eb45b6ab4e6851304756cecb97ae468b88e66a295647ed6e8b9a8614e2d61
-  data.tar.gz: 179d4b5eeac8d8872242ea9f50e6339a0c1cdb9a689d623cbcb94e6593087aea050ab1f3392a46133884efbe11fdc55f5068c799becd972a5b834978f417e9ef
+  metadata.gz: a98b2092ce91a88dac21b93efb9ad047cb0b2ee1e2910f0a76bd8cd899e98469101c4e4de4bab0d59c576253346af1218f1ffee7620fe0ffc5cc429fcd0cdc44
+  data.tar.gz: 1c56e932cd9a63050b6a9dc40299b1e2ff8a69f65a9ac8dfeb33065857c647ec4a3a6b335299412cdfd2994f1178af08681e718d58ff3a18f492eb4afa646eb5

data/bin/spurious-server

@@ -1,16 +1,19 @@
 #!/usr/bin/env ruby
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
+
 require 'spurious/server'
+require "spurious/server/version"
 require 'daemons'
+require "eventmachine"
+
+Docker.url = ENV.fetch('DOCKER_HOST', 'tcp://0.0.0.0:2375')
+ip         = ENV.fetch('SPURIOUS_SERVER_IP', '0.0.0.0')
+port       = ENV.fetch('SPURIOUS_SERVER_PORT', 4590)
+
+Excon.defaults[:write_timeout]  = 20000
+Excon.defaults[:read_timeout]   = 20000
 
-Daemons.run_proc(
-  'Spurious Server', # name of daemon
-  :dir => '/tmp', # directory where pid file will be stored
-  :log_output => true
-) do
-  Docker.url = 'http://0.0.0.0:2375'
-  EventMachine.run {
-    Spurious::Server.run!
-  }
+Daemons.run_proc('Spurious Server', :dir => '/tmp', :log_output => true) do
+  EventMachine.run Spurious::Server.handle(ip, port)
 end

data/config/images.yaml

@@ -7,6 +7,9 @@
 'spurious-dynamo':
   :image: 'smaj/local-dynamo'
 
+'spurious-memcached':
+  :image: 'smaj/memcached'
+
 'spurious-elasticache':
   :image: 'smaj/fake-elasticache'
   :link:
@@ -18,6 +21,3 @@
   :image: 'smaj/fake-elasticache'
   :link:
     - 'spurious-memcached:memcached01'
-
-'spurious-memcached':
-  :image: 'smaj/memcached'

data/lib/spurious/server.rb

@@ -5,18 +5,10 @@ require "spurious/server/app"
 module Spurious
   module Server
 
-    @@containers = []
-
-    def self.add_container(name, meta)
-      @@containers[name] = meta
-    end
-
-    def self.get_container(name)
-      @@containers[name]
-    end
-
-    def self.run!
-      EventMachine.start_server '0.0.0.0', 4590, Spurious::Server::App
+    def self.handle(ip, port)
+      Proc.new do
+        EventMachine.start_server ip, port, Spurious::Server::App
+      end
     end
 
   end

data/lib/spurious/server/app.rb

@@ -9,8 +9,8 @@ module Spurious
     class App < EventMachine::Connection
 
       def receive_data data
-        payload = parse_payload data
-        state(payload[:type]).execute!
+          payload = parse_payload data
+          state(payload[:type]).execute!
       rescue Exception => e
         puts e.message
         state(:error).tap { |s| s.message = "JSON payload malformed" }.execute!

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

@@ -22,6 +22,8 @@ module Spurious
         def spurious_containers
           Docker::Container.all(:all => true).select do |container|
             config.name_exists?(sanitize(container.json["Name"]))
+          end.sort do |e1, e2|
+            app_config.keys.index(sanitize(e1.json["Name"])) <=> app_config.keys.index(sanitize(e2.json["Name"]))
           end
         end
 
@@ -33,8 +35,12 @@ module Spurious
           config.for sanitize(image)
         end
 
-        def send(data)
-          connection.send_data JSON.generate({:type => state_identifer, :response => data}) + "\n"
+        def send(data, close = false)
+          connection.send_data "#{JSON.generate({:type => state_identifer, :response => data, :close => close})}\n"
+        end
+
+        def error(message, close = false)
+          connection.send_data "#{JSON.generate({:type => 'error', :response => message, :close => close})}\n"
         end
 
         def sanitize(name)

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

@@ -16,7 +16,7 @@ module Spurious
               c.delete(:force => true)
             end
           end
-          send "#{containers} containers successfully removed"
+          send "#{containers} containers successfully removed", true
 
           connection.unbind
         rescue Exception => e

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

@@ -1,5 +1,5 @@
 require 'spurious/server/state/init'
-require 'spurious/server/state/up'
+require 'spurious/server/state/start'
 require 'spurious/server/state/stop'
 require 'spurious/server/state/delete'
 require 'spurious/server/state/update'
@@ -15,8 +15,8 @@ module Spurious
           case type.to_sym
           when :init
             Init.new(connection, config)
-          when :up
-            Up.new(connection, config)
+          when :start
+            Start.new(connection, config)
           when :stop
             Stop.new(connection, config)
           when :ports

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

@@ -8,28 +8,58 @@ module Spurious
     module State
       class Init < Base
 
+        attr_accessor :completed_containers
+
         def execute!
+          this = self
+          completed_containers = 0
 
           app_config.each do |name, meta|
-            begin
-              send "Pulling #{name} from the public repo..."
-              image_meta = { 'fromImage' => meta[:image]}
-              image_meta['Env'] = meta[:env] unless meta[:env].nil?
-              Docker::Image.create(image_meta)
-
-              send "Creating container with name: #{name}"
-              Docker::Container.create("name" => name, "Image" => meta[:image])
-
-            rescue Exception => e
-              case e.message
-              when /409 Conflict/
-                puts "Container with name: #{name} already exists"
+            image_meta = { 'fromImage' => meta[:image]}
+            image_meta['Env'] = meta[:env] unless meta[:env].nil?
+
+            container_operation = Proc.new do
+
+              begin
+                this.send "Creating container with name: #{name}"
+                Docker::Container.create("name" => name, "Image" => meta[:image])
+              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
               end
+
+            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
+              begin
+                this.send "Pulling #{name} from the public repo..."
+                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)
+              end
+            end
+
+            EM.add_timer(1) do
+              EM.defer(image_operation, image_callback)
             end
           end
 
-          send "#{config.app.length} containers successfully initialized"
-          connection.unbind
         end
 
       end

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

@@ -27,7 +27,7 @@ module Spurious
             end
 
           end
-          send ports
+          send ports, true
 
           connection.unbind
         rescue Exception => e

data/lib/spurious/server/state/{up.rb → start.rb}

@@ -5,7 +5,7 @@ require 'spurious/server/state/base'
 module Spurious
   module Server
     module State
-      class Up < Base
+      class Start < Base
 
         def execute!
           spurious_containers.each do |container|
@@ -15,7 +15,7 @@ module Spurious
             meta["Links"] = config[:link] unless config[:link].nil?
             container.start meta
           end
-          send "#{spurious_containers.length} containers successfully started"
+          send "#{spurious_containers.length} containers successfully started", true
 
           connection.unbind
         rescue Exception => e

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

@@ -12,7 +12,7 @@ module Spurious
             send "Stopping container #{container.json["Name"]}..."
             container.stop
           end
-          send "#{spurious_containers.length} containers successfully stopped"
+          send "#{spurious_containers.length} containers successfully stopped", true
 
           connection.unbind
         rescue Exception => e

data/lib/spurious/server/version.rb

@@ -1,5 +1,5 @@
 module Spurious
   module Server
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/spec/server_spec.rb

@@ -1,13 +1,15 @@
 require "helper/spec"
 
 describe Spurious::Server do
+  let(:ip) { '127.0.0.1' }
+  let(:port) { 4590 }
 
   it "starts a server and receives data" do
     EventMachine.run {
 
-      Spurious::Server.run!
+      Spurious::Server.handle(ip, port).call
       expect_any_instance_of(Spurious::Server::App).to receive(:receive_data)
-      EventMachine.connect '0.0.0.0', 4590, Helper::Client
+      EventMachine.connect ip, port, Helper::Client
 
       event_timer
 

data/spec/state_init_spec.rb

@@ -16,8 +16,8 @@ describe Spurious::Server::State::Init do
     allow(Docker::Image).to receive(:create).once.with('fromImage' => 'foo/bar').and_return(true)
     allow(Docker::Container).to receive(:create).once.with('name' => 'foo-bar', 'Image' => 'foo/bar').and_return(true)
 
-    expect(connection_double).to receive(:send_data).exactly(3).times
-    expect(connection_double).to receive(:unbind)
+    allow(EM).to receive(:add_timer).twice
+
     state.execute!
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spurious-server
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,8 +119,8 @@ files:
 - lib/spurious/server/state/factory.rb
 - lib/spurious/server/state/init.rb
 - lib/spurious/server/state/ports.rb
+- lib/spurious/server/state/start.rb
 - lib/spurious/server/state/stop.rb
-- lib/spurious/server/state/up.rb
 - lib/spurious/server/state/update.rb
 - lib/spurious/server/version.rb
 - spec/app_spec.rb
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The server component that the spurious cli client connects to