spurious-server 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0240d9ed86b29f8978894e14c9cd2efb4f91fbd6
-  data.tar.gz: 13373c56366b814de4cfc6f805e5936864cd82b7
+  metadata.gz: 09edc583e4d202cb5264cd24d4d55d75f760fcef
+  data.tar.gz: e2343933109309a60eb97a5cfc589d509e741361
 SHA512:
-  metadata.gz: aba7a4afa4f0d8be5424cd200153c3ff690fe42a9694b21f96be4dfe3fa5e50b57b0f2fd0deb3f6b21accfc20966e091fb15ac9aaba7708d89431be80df80ee0
-  data.tar.gz: d4b96b1b61134451575c4d57013fb075d99f37ad0b7cf23d8d7973ce8e1667d87a04ce201ca61728e63c5fd652161d09208dff51c0994497f42f7b8066e698ad
+  metadata.gz: e8abc2507d5528b743371b1948dda9a427479318061e1fa4f00a1de7647ecfc71b489936a0b89fe236251314b14eeb88a41522b02802ec040b7e540d986adfff
+  data.tar.gz: 5d6ad8c5d6f430297e4397eb9b85719f840802d75840766756ff32dc29a1536d9b7df43d9bfff0c311bf60f34d879fde03c246e1d1e88bf8c67f16f299815301

data/bin/spurious-server

@@ -2,18 +2,6 @@
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 
-require 'spurious/server'
-require 'spurious/server/version'
-require 'daemons'
-require 'eventmachine'
-require 'em-synchrony'
-require 'spurious/server/options'
+require "spurious/server/cli"
 
-options = Spurious::Server::Options.new(ENV)
-ENV['DOCKER_HOST'] = options.ssl_docker_host
-
-if Spurious::Server.docker_daemon_available? ARGV[0]
-  Daemons.run_proc('.spurious-server', :dir => '~/') do
-    EventMachine.synchrony Spurious::Server.handle(options)
-  end
-end
+Spurious::Server::CLI.start

data/lib/spurious/server.rb

@@ -4,24 +4,6 @@ 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(
@@ -32,6 +14,5 @@ module Spurious
         )
       end
     end
-
   end
 end

data/lib/spurious/server/cli.rb

@@ -0,0 +1,135 @@
+require "thor"
+require "spurious/server"
+require "spurious/server/options"
+require "eventmachine"
+require "em-synchrony"
+require "spoon"
+
+module Spurious
+  module Server
+    class CLI < Thor
+      include Thor::Actions
+
+      PID     = File.expand_path "~/.spurious-server.pid"
+      TIMEOUT = 5
+
+      namespace :"spurious-server"
+
+      desc "start", "Starts the spurious-server as a daemon"
+      def start
+        check_and_clear_id
+        if docker_daemon_available?
+          say "Starting server...", :blue
+          pid = can_fork? ? Process.fork(&server_proc) : Spoon.spawn(bin_path, "run-proc")
+          say "Started with pid: ##{pid}", :green
+          File.write(PID, pid)
+        end
+      end
+
+      desc "status", "Shows the status of the spurious-server daemon"
+      def status
+        message = pid_exists? ? "Server running (pid: ##{pid})" : "Server not running"
+        status  = pid_exists? ? :green : :red
+        say message, status
+      end
+
+      desc "stop", "Stops the spurious-server daemon"
+      def stop
+        error "Server isn't running..." unless pid_exists?
+        error "Process isn't runnng..." unless is_process_running?
+
+        say "Stopping server...", :blue
+        kill_process!
+        say "Server successfully stopped", :green
+      end
+
+      desc "run-proc", "Runs the server proc"
+      def run_proc
+        server_proc.call
+      end
+
+      desc "restart", "Restarts the spurious-server daemon"
+      def restart
+        stop
+        start
+      end
+
+      private
+
+      def remove_pid!
+        File.delete PID
+      end
+
+      def kill_process!
+        Process.kill("HUP", pid)
+        remove_pid!
+      end
+
+      def docker_daemon_available?
+        say "Checking is docker daemon is available...", :blue
+        Excon.defaults[:connect_timeout] = Excon.defaults[:read_timeout] = TIMEOUT
+        Docker.info
+        true
+      rescue Excon::Errors::SocketError, Excon::Errors::Timeout, Docker::Error::TimeoutError => e
+        error "Connection to the docker daemon (#{ENV["DOCKER_HOST"]}) failed... Check that it's running"
+        false
+      end
+
+      def server_proc
+        options            = Spurious::Server::Options.new ENV
+        ENV["DOCKER_HOST"] = options.ssl_docker_host
+
+        Proc.new do
+          EventMachine.synchrony Spurious::Server.handle(options)
+          exit
+        end
+      end
+
+      def check_and_clear_id
+        if pid_exists? && ! is_process_running?
+          say "Process isn't running but PID file exists.. removing", :red
+          File.delete PID
+        elsif pid_exists?
+          error "Server already running"
+        end
+      end
+
+      def is_process_running?
+        Process.getpgid pid.to_i
+        true
+      rescue Errno::ESRCH
+        false
+      end
+
+      def error(message)
+        say message, :red
+        exit -1
+      end
+
+      def pid_exists?
+        File.exists? PID
+      end
+
+      def pid
+        File.read(PID).to_i
+      end
+
+      def can_fork?
+        RUBY_PLATFORM != "java"
+      end
+
+      def bin_path
+        File.absolute_path(
+          File.join(
+            File.dirname(__FILE__),
+            "..",
+            "..",
+            "..",
+            "bin",
+            "spurious-server"
+          )
+        )
+      end
+    end
+  end
+end

data/lib/spurious/server/version.rb

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

data/spurious-server.gemspec

@@ -25,8 +25,8 @@ 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 "daemons"
   spec.add_runtime_dependency "peach"
-
+  spec.add_runtime_dependency "thor"
+  spec.add_runtime_dependency "spoon"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spurious-server
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: daemons
+  name: peach
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -109,7 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: peach
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: spoon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -140,6 +154,7 @@ files:
 - config/images.yaml
 - lib/spurious/server.rb
 - lib/spurious/server/app.rb
+- lib/spurious/server/cli.rb
 - lib/spurious/server/config.rb
 - lib/spurious/server/options.rb
 - lib/spurious/server/state/base.rb