servitude 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dce6d48e55e0ea709cbac0ab8bb83576f5d4f855
-  data.tar.gz: c96667392283ea694bd05cdccbfe48a054a40416
+  metadata.gz: 85cc543e4150da3e50ab21b3d7da7327000136ba
+  data.tar.gz: 86d3362587eca8a8d697f248084ecd061bf5370a
 SHA512:
-  metadata.gz: b79ae5973d8b1788a8ff27956081e746bc61bd91f53bab9bd5f509d04994950dd395883a0e87aa8c80b2ce256301805c65632000dfeaa859927d31e16a736a4a
-  data.tar.gz: f0946a59b22f543d219a45c3286ea3c93d6e26ae77080399c10faf137285b9ac231cb726200c64d71a4344fac8decc2fb6c83caeb07f0dd6c5c5a4e8b3c9b470
+  metadata.gz: eb87b5cb3a43be43341eae3dd78414dd3183d1e5e8b2c303b9562aeb38ebb991ad8ca372abc2a0fb8deea129e09e7553fa0fc8b065feb6a64d76735f3bd40e0b
+  data.tar.gz: 3e92d301380d50a38960b101e0625f2f0c39998fe857fc240bc9f25c32d7a66e4fbdb6526ecc6a73b59b5dac1fd6323ed0df01e62907158ab73cdb4b998e99a3

data/README.md

@@ -102,23 +102,17 @@ For details on how to add commands to your custom or standard service CLIs see t
 ### Servitude::Configuration
 
 All Servitude servers automatically have a configuration instantiated for them (although it may be empty).  The default class for the configuration is
-Servitude::Configuration.  In order to define a custom configuration, define a custom configuraiton class (which may inherit from Servitude::Configuration)
-and simply override the Servitude::Server#configuration method in your Server class.  Be sure the custom configuration calss accepts the command line
+Servitude::Configuration.  In order to define a custom configuration, define a custom configuration class (which may inherit from Servitude::Configuration)
+and simply override the Servitude::Cli::Service#configuration method in your Server class.  Be sure the custom configuration calss accepts the command line
 options and passes them to the super class's initializer or configuration will be completely broken.
 
     module AwesomeServer
-      class Configuration < Servitude::Configuration
-        def initialize( cli_options )
-          super( cli_options )
-          # possibly do something else ...
-        end
-      end
-
-      class Server
-        include Servitude::Server
-
-        def configuration_class
-          AwesomeServer::Configuration
+      class Cli < Servitude::Cli::Base
+        # necessary so Thor does not pick this method up as a CLI method
+        no_commands do
+          def configuration_class
+            AwesomeServer::Configuration
+          end
         end
       end
     end

data/examples/5_echo_server_with_cli_daemon_and_env_config

@@ -53,9 +53,18 @@ module EchoServer
        attribution: "v#{VERSION} \u00A9#{Time.now.year} LFE",
        author: 'LFE',
        use_config: true,
-       default_config_path: "#{PROJECT_ROOT}/config/5.conf",
+       default_config_path: "#{PROJECT_ROOT}/config/5.conf"
 
   class Cli < Servitude::Cli::Service
+
+    no_commands do
+
+      def configuration_class
+        Servitude::EnvironmentConfiguration
+      end
+
+    end
+
   end
 
   class Server
@@ -88,10 +97,6 @@ module EchoServer
 
   protected
 
-    def configuration_class
-      Servitude::EnvironmentConfiguration
-    end
-
     def config_filters
       %w(threads)
     end

data/lib/servitude/cli/service.rb

@@ -41,22 +41,32 @@ 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( configuration( options, use_config: Servitude::USE_CONFIG, log: 'STDOUT' ))
+          binding.pry
           server.start
         end
 
         def start_daemon
-          server = Servitude::Daemon.new( options.merge( use_config: Servitude::USE_CONFIG ))
+          server = Servitude::Daemon.new( configuration( options, use_config: Servitude::USE_CONFIG ))
           server.start
         end
 
+        def configuration_class
+          Servitude::Configuration
+        end
+
+        def configuration( options, additional_options={} )
+          options = options.merge( additional_options )
+          Servitude.configuration = configuration_class.load( options )
+        end
+
       end
 
       desc "status", "Check the status of the server daemon"
       pid_option
       method_option :quiet, type: :boolean, aliases: '-q', desc: "Do not prompt to remove an old PID file", default: false
       def status
-        result = Servitude::Daemon.new( options.merge( use_config: Servitude::USE_CONFIG )).status
+        result = Servitude::Daemon.new( configuration( options, use_config: Servitude::USE_CONFIG  )).status
         at_exit { exit result }
       end
 
@@ -64,7 +74,7 @@ module Servitude
       pid_option
       method_option :quiet, type: :boolean, aliases: '-q', desc: "Do not prompt to remove an old PID file", default: false
       def stop
-        server = Servitude::Daemon.new( options.merge( use_config: Servitude::USE_CONFIG ))
+        server = Servitude::Daemon.new( configuration( options, use_config: Servitude::USE_CONFIG ))
         server.stop
       end
 

data/lib/servitude/server.rb

@@ -29,7 +29,6 @@ module Servitude
       @cli_options = cli_options
 
       run_hook :before_initialize
-      initialize_config
       initialize_loggers
       run_hook :after_initialize
     end
@@ -52,14 +51,6 @@ module Servitude
       raise NotImplementedError
     end
 
-    def initialize_config
-      Servitude.configuration = configuration_class.load( cli_options )
-    end
-
-    def configuration_class
-      Servitude::Configuration
-    end
-
   private
 
     def finalize

data/lib/servitude/version.rb

@@ -1,3 +1,3 @@
 module Servitude
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servitude
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jason Harrelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler