spurious-server 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e1e67665b759bc849148c943f8222957baf35df
-  data.tar.gz: 1cef1301ecc27616d24386f5850debd455df03f0
+  metadata.gz: 1cfbf2cf494c6d343c7d03ffd283fc256f27edc2
+  data.tar.gz: 4b1c7df840777138786a87e9ee3b1c850b165691
 SHA512:
-  metadata.gz: e65dbf04c5d492a34601eeeffe35500460b13b6dc31ffd88282b54dad69f484d9e74f655fb2d6bbd1cf66ebee431117db8b8e21b2bd39e2c9e30f8025f500992
-  data.tar.gz: 71cc517136fe037e00525518229657a2fb889baaea2b386c404b4be1781544c64401390fcec1771907c99f184179a54ca45d419c05304857f0914056afb0b357
+  metadata.gz: 20a74b83f99bb52d367892bd39a8436b9b1be5c4b5a70944a4e6eeeb90b1288c7cf4ecdc0875ff715affc23bf2d7920e0ce4f8ec4f065c4ac0762edcd4fa623c
+  data.tar.gz: dcdcd072cb3705af6408c2b80ad4cb24730d45ade571855fc830b8c4efece1280115dbd43e0249be7267c5f993ec910305f945cf6e2581269897679b0c7a27b7

data/bin/spurious-server

@@ -3,18 +3,16 @@
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'spurious/server'
-require "spurious/server/version"
+require 'spurious/server/version'
 require 'daemons'
-require "eventmachine"
+require 'eventmachine'
+require 'spurious/server/options'
 
-docker_host = 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)
-Docker.url  = docker_host
+options = Spurious::Server::Options.new(ENV)
 
-Excon.defaults[:write_timeout]  = 20000
-Excon.defaults[:read_timeout]   = 20000
+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(ip, port, docker_host)
+  EventMachine.run Spurious::Server.handle(options)
 end

data/lib/spurious/server.rb

@@ -5,9 +5,14 @@ require "spurious/server/app"
 module Spurious
   module Server
 
-    def self.handle(ip, port, docker_host)
+    def self.handle(options)
       Proc.new do
-        EventMachine.start_server ip, port, Spurious::Server::App, docker_host
+        EventMachine.start_server(
+          options.server_ip,
+          options.server_port,
+          Spurious::Server::App,
+          options
+        )
       end
     end
 

data/lib/spurious/server/app.rb

@@ -7,13 +7,10 @@ require "json"
 module Spurious
   module Server
     class App < EventMachine::Connection
+      attr_accessor :options
 
-      def initialize(docker_host)
-        @docker_host = docker_host
-      end
-
-      def docker_host_ip
-        @docker_host[/\/\/([0-9\.]+):/,1]
+      def initialize(options)
+        @options = options
       end
 
       def receive_data data
@@ -27,7 +24,7 @@ module Spurious
       protected
 
       def state(type)
-        Spurious::Server::State::Factory.create(type, self, config, docker_host_ip)
+        Spurious::Server::State::Factory.create(type, self, config, options)
       end
 
       def config

data/lib/spurious/server/options.rb

@@ -0,0 +1,18 @@
+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
+
+      def initialize(env)
+        @docker_host      = env['DOCKER_HOST'].nil? ? 'localhost' : env['DOCKER_HOST'][/\/\/([0-9a-z\.]+):/,1]
+        @docker_port      = env['DOCKER_HOST'].nil? ? nil : env['DOCKER_HOST'][/:([0-9]+)/,1]
+        @docker_api       = !env['DOCKER_HOST'].nil?
+        @server_port      = env.fetch('SPURIOUS_SERVER_PORT', 4590)
+        @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)
+      end
+
+    end
+  end
+end

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

@@ -11,16 +11,16 @@ module Spurious
     module State
       module Factory
 
-        def self.create(type, connection, config, docker_host_ip)
+        def self.create(type, connection, config, options)
           case type.to_sym
           when :init
             Init.new(connection, config)
           when :start
-            Start.new(connection, config, docker_host_ip)
+            Start.new(connection, config, options.docker_host)
           when :stop
             Stop.new(connection, config)
           when :ports
-            Ports.new(connection, config, docker_host_ip)
+            Ports.new(connection, config, options.docker_host)
           when :delete
             Delete.new(connection, config)
           when :update

data/lib/spurious/server/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spurious-server
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,6 +127,7 @@ files:
 - lib/spurious/server.rb
 - lib/spurious/server/app.rb
 - lib/spurious/server/config.rb
+- lib/spurious/server/options.rb
 - lib/spurious/server/state/base.rb
 - lib/spurious/server/state/delete.rb
 - lib/spurious/server/state/error.rb
@@ -167,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: The server component that the spurious cli client connects to