spurious-server 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14fd78da1669839cfe6209fc0601205e1db24ddf
-  data.tar.gz: 5f9d7051975ef4464abd6a7ca7dd6e19ee4ee0ed
+  metadata.gz: 0240d9ed86b29f8978894e14c9cd2efb4f91fbd6
+  data.tar.gz: 13373c56366b814de4cfc6f805e5936864cd82b7
 SHA512:
-  metadata.gz: a7748c40353a0919a53e7b2d10b5968aa31332aab102be7eae4daf58c4bd3c7a9deb4e398cf85ea4bbefaff1943fb57e418717cca15790032a5b8685fa8140a2
-  data.tar.gz: 659a1f3e3720732b9d22622d62a5725c4793a82bb8b4f9b659cb1b606de53c2106c3d9bae9e7aa318400aeee590f3771d5f4c05d43f0b5d01c8cafd94a7293ac
+  metadata.gz: aba7a4afa4f0d8be5424cd200153c3ff690fe42a9694b21f96be4dfe3fa5e50b57b0f2fd0deb3f6b21accfc20966e091fb15ac9aaba7708d89431be80df80ee0
+  data.tar.gz: d4b96b1b61134451575c4d57013fb075d99f37ad0b7cf23d8d7973ce8e1667d87a04ce201ca61728e63c5fd652161d09208dff51c0994497f42f7b8066e698ad

data/bin/spurious-server

@@ -12,6 +12,8 @@ require 'spurious/server/options'
 options = Spurious::Server::Options.new(ENV)
 ENV['DOCKER_HOST'] = options.ssl_docker_host
 
-Daemons.run_proc('Spurious_Server', :dir => '/tmp', :log_output => true) do
-  EventMachine.synchrony Spurious::Server.handle(options)
+if Spurious::Server.docker_daemon_available? ARGV[0]
+  Daemons.run_proc('.spurious-server', :dir => '~/') do
+    EventMachine.synchrony Spurious::Server.handle(options)
+  end
 end

data/lib/spurious/server.rb

@@ -5,6 +5,23 @@ require "spurious/server/app"
 module Spurious
   module Server
 
+    TIMEOUT     = 5
+    SHELL_RED   = "\e[31m"
+    SHELL_GREEN = "\e[32m"
+    SHELL_CLEAR = "\e[0m"
+
+    def self.docker_daemon_available?(daemon_action)
+      if daemon_action == 'start'
+        puts "#{SHELL_GREEN} Checking docker daemon is available...#{SHELL_CLEAR}"
+        Excon.defaults[:connect_timeout] = Excon.defaults[:read_timeout] = TIMEOUT
+        !Docker.info.nil?
+      end
+      true
+    rescue Excon::Errors::SocketError, Excon::Errors::Timeout, Docker::Error::TimeoutError => e
+      puts "#{SHELL_RED} Connecting to the docker daemon (#{ENV["DOCKER_HOST"]}) failed... Check that it's running"
+      exit -1
+    end
+
     def self.handle(options)
       Proc.new do
         EventMachine.start_server(

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

@@ -19,6 +19,7 @@ module Spurious
           Excon.defaults[:write_timeout]   = write
           Excon.defaults[:read_timeout]    = read
           Excon.defaults[:connect_timeout] = connect
+          Excon.defaults[:ssl_verify_peer] = false
         end
 
         def execute!

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

@@ -11,7 +11,7 @@ module Spurious
 
         def initialize(connection, config, docker_host)
           super(connection, config)
-          connection_timeouts 2, 600, 600
+          connection_timeouts 2, 3600, 3600
           @docker_host = docker_host
         end
 

data/lib/spurious/server/version.rb

@@ -1,5 +1,5 @@
 module Spurious
   module Server
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spurious-server
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler