servitude 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ed81f9149d3c5085e1e691ad830d40c337f37fe
-  data.tar.gz: 38bdad215162d770e65fd0d863f87bc63e440690
+  metadata.gz: 4198609bfa66c7175300857b96fd908d4f17a5a4
+  data.tar.gz: 10f7f2510caed3307c8bf60e7a76428f0a47b82b
 SHA512:
-  metadata.gz: 0844e314602b73d341053e701279d3130686eaa28ede6b5312c42f32e7ab3e746f50db101a272b7b775802d36f9e549c05a41fc2845db399ca37ff677e1a2733
-  data.tar.gz: a2f0dbabf95bfb36f833726f04680c496d19a20d8b0f4c3b1114b92034467b2e3fa90ce7091c7abd845b3962baade12659462ecf6d745f78a3c7a8f16f369bc1
+  metadata.gz: ce42684319540490db825fea09c969bf224fc455ebd8adde6678de35c9f5158e2c1d16b648953a7c626d60abfc555c8763bb7c2c2997c701e88f75fb0a5e2904
+  data.tar.gz: 6d31b8d6595bd396d4df1c697d3588b25fbcde7d3ff2b9bc7be8058f401a293c2297acdb6b4d155b25d6f8feff7dc7ffcccb56840ef3727ea9ba8d4ff7c7f6ae

data/examples/1_simple_server

@@ -21,6 +21,17 @@ module SimpleServer
   VERSION    = '1.0.0'
 
   PROJECT_ROOT = File.expand_path( '../..', __FILE__ )
+  
+  boot host_namespace: SimpleServer,
+       app_id: 'simple-server',
+       app_name: 'Simple Server',
+       attribution: "v#{VERSION} \u00A9#{Time.now.year} LFE",
+       author: 'LFE',
+       use_config: false,
+       default_config_path: nil,
+       default_log_path: nil,
+       default_pid_path: nil,
+       default_thread_count: nil
 
   class Server
 
@@ -35,17 +46,6 @@ module SimpleServer
     end
 
   end
-
-  boot host_namespace: SimpleServer,
-       app_id: 'simple-server',
-       app_name: 'Simple Server',
-       attribution: "v#{VERSION} \u00A9#{Time.now.year} LFE",
-       author: 'LFE',
-       use_config: false,
-       default_config_path: nil,
-       default_log_path: nil,
-       default_pid_path: nil,
-       default_thread_count: nil
 end
 
 SimpleServer::Server.new.start

data/examples/2_echo_server

@@ -27,6 +27,17 @@ module EchoServer
   VERSION    = '1.0.0'
 
   PROJECT_ROOT = File.expand_path( '../..', __FILE__ )
+  
+  boot host_namespace: EchoServer,
+       app_id: 'echo-server',
+       app_name: 'Echo Server',
+       attribution: "v#{VERSION} \u00A9#{Time.now.year} LFE",
+       author: 'LFE',
+       use_config: false,
+       default_config_path: nil,
+       default_log_path: nil,
+       default_pid_path: nil,
+       default_thread_count: nil
 
   class Server
 
@@ -57,17 +68,6 @@ module EchoServer
     attr_reader :tcp_server
 
   end
-
-  boot host_namespace: EchoServer,
-       app_id: 'echo-server',
-       app_name: 'Echo Server',
-       attribution: "v#{VERSION} \u00A9#{Time.now.year} LFE",
-       author: 'LFE',
-       use_config: false,
-       default_config_path: nil,
-       default_log_path: nil,
-       default_pid_path: nil,
-       default_thread_count: nil
 end
 
 EchoServer::Server.new.start

data/examples/3_echo_server_with_cli_and_daemon

@@ -38,6 +38,20 @@ module EchoServer
   VERSION    = '1.0.0'
 
   PROJECT_ROOT = File.expand_path( '../..', __FILE__ )
+  
+  boot host_namespace: EchoServer,
+       app_id: 'echo-server-with-cli',
+       app_name: 'Echo Server With CLI',
+       attribution: "v#{VERSION} \u00A9#{Time.now.year} LFE",
+       author: 'LFE',
+       use_config: false,
+       default_config_path: "#{PROJECT_ROOT}}/config/#{APP_FOLDER}.conf",
+       default_log_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.log",
+       default_pid_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.pid",
+       default_thread_count: nil
+
+  class Cli < Servitude::Cli::Service
+  end
 
   class Server
 
@@ -74,21 +88,6 @@ module EchoServer
     attr_reader :tcp_server
 
   end
-
-  boot host_namespace: EchoServer,
-       app_id: 'echo-server-with-cli',
-       app_name: 'Echo Server With CLI',
-       attribution: "v#{VERSION} \u00A9#{Time.now.year} LFE",
-       author: 'LFE',
-       use_config: false,
-       default_config_path: "#{PROJECT_ROOT}}/config/#{APP_FOLDER}.conf",
-       default_log_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.log",
-       default_pid_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.pid",
-       default_thread_count: nil
-
-  class Cli < Servitude::Cli::Service
-  end
-
 end
 
 EchoServer::Cli.start

data/examples/4_echo_server_with_cli_daemon_and_file_config

@@ -38,6 +38,20 @@ module EchoServer
   VERSION    = '1.0.0'
 
   PROJECT_ROOT = File.expand_path( '../..', __FILE__ )
+  
+  boot host_namespace: EchoServer,
+       app_id: 'echo-server-with-cli-and-file-config',
+       app_name: 'Echo Server With CLI And File Config',
+       attribution: "v#{VERSION} \u00A9#{Time.now.year} LFE",
+       author: 'LFE',
+       use_config: true,
+       default_config_path: "#{PROJECT_ROOT}/config/4.conf",
+       default_log_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.log",
+       default_pid_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.pid",
+       default_thread_count: nil
+
+  class Cli < Servitude::Cli::Service
+  end
 
   class Server
 
@@ -74,21 +88,6 @@ module EchoServer
     attr_reader :tcp_server
 
   end
-
-  boot host_namespace: EchoServer,
-       app_id: 'echo-server-with-cli-and-file-config',
-       app_name: 'Echo Server With CLI And File Config',
-       attribution: "v#{VERSION} \u00A9#{Time.now.year} LFE",
-       author: 'LFE',
-       use_config: true,
-       default_config_path: "#{PROJECT_ROOT}/config/4.conf",
-       default_log_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.log",
-       default_pid_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.pid",
-       default_thread_count: nil
-
-  class Cli < Servitude::Cli::Service
-  end
-
 end
 
 EchoServer::Cli.start

data/examples/5_echo_server_with_cli_daemon_and_env_config

@@ -46,6 +46,20 @@ module EchoServer
   VERSION    = '1.0.0'
 
   PROJECT_ROOT = File.expand_path( '../..', __FILE__ )
+  
+  boot host_namespace: EchoServer,
+       app_id: 'echo-server-with-cli-and-env-config',
+       app_name: 'Echo Server With CLI And Env Config',
+       attribution: "v#{VERSION} \u00A9#{Time.now.year} LFE",
+       author: 'LFE',
+       use_config: true,
+       default_config_path: "#{PROJECT_ROOT}/config/5.conf",
+       default_log_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.log",
+       default_pid_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.pid",
+       default_thread_count: nil
+
+  class Cli < Servitude::Cli::Service
+  end
 
   class Server
 
@@ -90,21 +104,6 @@ module EchoServer
     attr_reader :tcp_server
 
   end
-
-  boot host_namespace: EchoServer,
-       app_id: 'echo-server-with-cli-and-env-config',
-       app_name: 'Echo Server With CLI And Env Config',
-       attribution: "v#{VERSION} \u00A9#{Time.now.year} LFE",
-       author: 'LFE',
-       use_config: true,
-       default_config_path: "#{PROJECT_ROOT}/config/5.conf",
-       default_log_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.log",
-       default_pid_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.pid",
-       default_thread_count: nil
-
-  class Cli < Servitude::Cli::Service
-  end
-
 end
 
 EchoServer::Cli.start

data/lib/servitude/base.rb

@@ -27,7 +27,7 @@ module Servitude
                 default_log_path: nil,
                 default_pid_path: nil,
                 default_thread_count: nil,
-                server_class: ( host_namespace::Server rescue nil ),
+                server_class: ( host_namespace::Server rescue "#{host_namespace.name}::Server" ),
                 version_copyright: nil ) # TODO: Remove when version_copyright keyword deprecation expires
         unless host_namespace
           raise ArgumentError, 'host_namespace keyword is required'
@@ -53,7 +53,7 @@ module Servitude
         end
 
         unless server_class
-          raise ArgumentError, "server_class keyword is required because the default, #{host_namespace.name}::Server, is not defined"
+          raise ArgumentError, 'server_class keyword is required'
         end
 
         # TODO: Remove when version_copyright keyword deprecation expires

data/lib/servitude/cli/service.rb

@@ -41,7 +41,7 @@ module Servitude
       no_commands do
 
         def start_interactive
-          server = Servitude::SERVER_CLASS.new( options.merge( use_config: Servitude::USE_CONFIG, log: 'STDOUT' ))
+          server = Servitude::server_class.new( options.merge( use_config: Servitude::USE_CONFIG, log: 'STDOUT' ))
           server.start
         end
 

data/lib/servitude/configuration.rb

@@ -23,7 +23,7 @@ module Servitude
     attr_reader :_config
 
     def file_options( file_path )
-      unless File.exists?( file_path )
+      unless File.file?( file_path )
         raise "Configuration file #{file_path} does not exist"
       end
 

data/lib/servitude/daemon.rb

@@ -37,7 +37,7 @@ module Servitude
     end
 
     def run
-      Servitude::SERVER_CLASS.new( options ).start
+      Servitude::server_class.new( options ).start
     end
 
     def stop
@@ -74,7 +74,7 @@ module Servitude
     end
 
     def remove_pid
-      FileUtils.rm( pid_path ) if File.exists?( pid_path )
+      FileUtils.rm( pid_path ) if File.file?( pid_path )
     end
 
     def store_pid( pid )
@@ -87,7 +87,7 @@ module Servitude
     end
 
     def get_pid
-      return nil unless File.exists?( pid_path )
+      return nil unless File.file?( pid_path )
 
       pid = nil
 
@@ -133,7 +133,7 @@ module Servitude
     end
 
     def pid_file_exists?
-      File.exists?( pid_path )
+      File.file? pid_path
     end
 
     def process_exists?

data/lib/servitude/version.rb

@@ -1,3 +1,3 @@
 module Servitude
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/servitude.rb

@@ -40,6 +40,15 @@ module Servitude
         end
       end
     end
+
+    def server_class
+      case SERVER_CLASS
+        when String, Symbol
+          eval SERVER_CLASS.to_s, binding, __FILE__, __LINE__
+        else
+          SERVER_CLASS
+      end
+    end
   end
 
   Servitude.initialize_loggers log_level: :info

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servitude
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jason Harrelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler