spurious-server 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec3cb84c415fb42853c7c4e72740d24ce2945381
-  data.tar.gz: d5a99a5a1d3c8b5dbcd9d0be9c72c95faf2484a4
+  metadata.gz: a78a870b1812bb3c048ea34b731c1fc737922f26
+  data.tar.gz: f2d9fa79559f110eadee3a47c99208e46fea7e47
 SHA512:
-  metadata.gz: 2faf22e7728e255fa26c08513b2b36249b49b73460913bf685776f28c5b112f1a1f33721f0ea9540a669fd259d04df62f7a80c587b56257e5e56d9d1eac4e540
-  data.tar.gz: caa82893f6ebf0631a2efc86c7833f3897c21c5b206168522c0bfd99a39de3e5312434eb318a35f01a2791b50d965fab280baa5498cdf81a470879c3f5eacfd5
+  metadata.gz: 1a7964dfafa370163e54c93a5c8371a24f2d59b684afd825eda7c06c470a8e38900c6a6041005d7d4bac1bc30b43016ef81267fcb06332d29c5c50cbd88c57db
+  data.tar.gz: a956d37ef07aac7b88b855df2a090009b401415d27493df87a98e4126b4fb30f5011d982aa31c27e54e02709965d062dbaeff25c07e418b193022b044f88ad66

data/config/images.yaml

@@ -1,26 +1,37 @@
 'spurious-sqs':
-  :image: 'smaj/spurious-sqs'
+  :image: 'spurious/sqs'
+  :hostname: 'sqs.spurious.localhost'
 
 'spurious-s3':
-  :image: 'smaj/spurious-s3'
+  :image: 'spurious/s3'
+  :hostname: 's3.spurious.localhost'
 
 'spurious-dynamo':
-  :image: 'smaj/spurious-dynamo'
+  :image: 'spurious/dynamodb'
+  :hostname: 'dynamodb.spurious.localhost'
 
 'spurious-memcached':
   :image: 'smaj/memcached'
 
 'spurious-elasticache':
-  :image: 'smaj/fake-elasticache'
+  :image: 'spurious/elasticache'
   :link:
     - 'spurious-memcached:memcached01'
   :env:
     FAKEELASTICACHE_DEFAULT_HOST: '127.0.0.1'
 
 'spurious-elasticache-docker':
-  :image: 'smaj/fake-elasticache'
+  :image: 'spurious/elasticache'
   :ignore:
     :create: true
     :delete: true
   :link:
     - 'spurious-memcached:memcached01'
+
+'spurious-browser':
+  :image: 'spurious/browser'
+  :link:
+    - 'spurious-dynamo:dynamodb.spurious.localhost'
+    - 'spurious-sqs:sqs.spurious.localhost'
+    - 'spurious-s3:s3.spurious.localhost'
+  :hostname: 'browser.spurious.localhost'

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

@@ -33,8 +33,8 @@ module Spurious
             end
             container_cmd = []
 
-            if meta[:image] == 'smaj/spurious-s3'
-              container_cmd = ['-h', docker_host]
+            if meta[:image] == 'spurious/s3'
+              container_cmd = ['-H', meta[:hostname]]
             end
 
             create_container = Proc.new do
@@ -62,7 +62,10 @@ module Spurious
         end
 
         def operation_complete(complete)
-          send("6 containers successfully initialized", :info, true, :green) if complete
+          if complete
+            send("#{app_config.length} containers successfully initialized", :info, false, :green)
+            send("Please add the following to your /etc/hosts file:\n\n#{docker_host} sqs.spurious.localhost s3.spurious.localhost dynamodb.spurious.localhost browser.spurious.localhost\n", :info, true, :blue)
+          end
         end
 
       end

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

@@ -17,15 +17,17 @@ module Spurious
         def execute!
           ports = {}
           spurious_containers.peach do |container|
+            a_config = app_config[container.json['Name'].gsub('/', '')]
             config = container_config(container.json["Name"])
             ports[sanitize(container.json["Name"])] = []
 
             if !container.json["NetworkSettings"]["Ports"].nil? then
+              host = a_config
 
               container.json["NetworkSettings"]["Ports"].each do |guest, mapping|
                 mapping.each do |map|
                   ports[sanitize(container.json["Name"])] << {
-                    :Host       => docker_host_ip,
+                    :Host       => a_config.fetch(:hostname, docker_host_ip),
                     :HostPort   => map["HostPort"]
                  }
                 end

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

@@ -35,8 +35,9 @@ module Spurious
               if container.json["Name"] == '/spurious-sqs' then
                 port_setup = Proc.new do
                   begin
+                    container_config = app_config['spurious-sqs']
                     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_ip}:#{port}/host-details?host=#{container_config[:hostname]}&port=#{port}"))
                   rescue StandardError => e
                   end
                 end

data/lib/spurious/server/version.rb

@@ -1,5 +1,5 @@
 module Spurious
   module Server
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/spurious-server.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "eventmachine"
   spec.add_runtime_dependency "em-synchrony"
-  spec.add_runtime_dependency "docker-api"
+  spec.add_runtime_dependency "docker-api", "1.13.6"
   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.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.13.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.13.6
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement