spurious-server 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cfbf2cf494c6d343c7d03ffd283fc256f27edc2
-  data.tar.gz: 4b1c7df840777138786a87e9ee3b1c850b165691
+  metadata.gz: 19f55a1b5c6d49a367b38d3d562e2ca8c9598bc8
+  data.tar.gz: 8625d6c9b6401b5c48bbaaeb7d104db643dff8d8
 SHA512:
-  metadata.gz: 20a74b83f99bb52d367892bd39a8436b9b1be5c4b5a70944a4e6eeeb90b1288c7cf4ecdc0875ff715affc23bf2d7920e0ce4f8ec4f065c4ac0762edcd4fa623c
-  data.tar.gz: dcdcd072cb3705af6408c2b80ad4cb24730d45ade571855fc830b8c4efece1280115dbd43e0249be7267c5f993ec910305f945cf6e2581269897679b0c7a27b7
+  metadata.gz: 18d5128a1933f0c477fa36472f74f6f3a6d54419a414cda20a75f44d777158021f485873fd7a6ddf8d20f4b5d13c57f61d36a244eff8fc59d8a8f0c9be97aab1
+  data.tar.gz: b1b4637dbfa38ce2713a951fc75d8e4c00efc8c2e815d3c1b5de35a84a292a4689fda5712d3ef044940cacea640bc23549df50695551b8bef1eb50d5da01fd9c

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

@@ -14,7 +14,7 @@ module Spurious
         def self.create(type, connection, config, options)
           case type.to_sym
           when :init
-            Init.new(connection, config)
+            Init.new(connection, config, options.docker_host)
           when :start
             Start.new(connection, config, options.docker_host)
           when :stop

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

@@ -8,7 +8,12 @@ module Spurious
     module State
       class Init < Base
 
-        attr_accessor :completed_containers
+        attr_accessor :completed_containers, :docker_host
+
+        def initialize(connection, config, docker_host)
+          super(connection, config)
+          @docker_host = docker_host
+        end
 
         def execute!
           this = self
@@ -17,12 +22,17 @@ module Spurious
           app_config.each do |name, meta|
             image_meta = { 'fromImage' => meta[:image]}
             image_meta['Env'] = meta[:env] unless meta[:env].nil?
+            container_cmd = []
+
+            if meta[:image] == 'smaj/spurious-s3'
+              container_cmd = ['-h', docker_host]
+            end
 
             container_operation = Proc.new do
 
               begin
                 this.send "Creating container with name: #{name}"
-                Docker::Container.create("name" => name, "Image" => meta[:image])
+                Docker::Container.create("name" => name, "Image" => meta[:image], 'Cmd' => container_cmd)
               rescue Exception => e
                 case e.message
                 when /409 Conflict/

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

@@ -7,11 +7,11 @@ module Spurious
   module Server
     module State
       class Start < Base
-        attr_accessor :docker_host_ip
+        attr_accessor :docker_host
 
-        def initialize(connection, config, docker_host_ip)
+        def initialize(connection, config, docker_host)
           super(connection, config)
-          @docker_host_ip = docker_host_ip
+          @docker_host = docker_host
         end
 
         def execute!
@@ -26,7 +26,7 @@ module Spurious
               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_ip}:#{port}/host-details?host=#{docker_host_ip}&port=#{port}"))
+                  Net::HTTP.get(URI("http://#{docker_host}:#{port}/host-details?host=#{docker_host}&port=#{port}"))
                 end
 
                 EM.add_timer(5) { EM.defer(port_setup) }

data/lib/spurious/server/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spurious-server
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: The server component that the spurious cli client connects to