minus5_daemon 0.2.0 → 0.2.4

data/lib/minus5_daemon.rb

@@ -7,10 +7,11 @@ require 'yaml'
 #gems
 require 'rubygems'
 
-gem 'daemons', '= 1.1.3'
+gem 'daemons', '= 1.1.4'
 require 'daemons'
+require 'hashie'
 
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/minus5_daemon/"
 require 'runner.rb'
 require 'base.rb'
-require 'em_base.rb'
+require 'em_base.rb'

data/lib/minus5_daemon/runner.rb

@@ -10,19 +10,19 @@ module Minus5
 
     class Runner
 
-      def initialize(klass = nil)
+      def initialize(klass)
         @klass = klass
-        # asserts
         init_logger
-        @options = OpenStruct.new(
+        @config_file_set = false
+        @options = Hashie::Mash.new(
           :daemonize => true,
           :config_file => 'config.yml',
-          :config_file_set => false,
           :environment => 'production',
           :app_name => start_script_name,
           :app_root => app_root)
         parse_arg_options
         load_config
+        load_environment_file
       end
 
       attr_reader :logger
@@ -39,12 +39,19 @@ module Minus5
 
       private
 
+      def load_environment_file
+        file = "#{@options.app_root}/config/#{@options.environment}.yml"
+        if File.exists?(file)
+          @options.merge!(YAML.load_file(file))
+        end
+      end
+
       def load_config
         config_file = "#{@options.app_root}/config/#{@options.config_file}"
         if File.exists?(config_file)
-          @options.config = YAML.load_file config_file
+          @options.config = Hashie::Mash.new(YAML.load_file(config_file))
         else
-          if @options.config_file_set
+          if @config_file_set
             msg = "config file #{config_file} not found"
             @logger.error msg
             raise msg
@@ -74,7 +81,7 @@ module Minus5
           opts.on('-c','--config=file',"Use specified config file. This is yaml config file name from app_root/config dir.") do |file|
             file = "#{file}.yml" unless file.include?(".")
             @options.config_file = file
-            @options.config_file_set = true
+            @config_file_set = true
           end
           opts.on('-a','--app-name=file',"Use specified application name for daemon process.") do |name|
             @options.app_name = name
@@ -122,4 +129,4 @@ module Minus5
     end
 
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minus5_daemon
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Igor Anic
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 +02:00
+date: 2011-07-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,14 +26,46 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 27
         segments: 
         - 1
         - 1
-        - 3
-        version: 1.1.3
+        - 4
+        version: 1.1.4
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hashie
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 12
+        - 10
+        version: 0.12.10
+  type: :runtime
+  version_requirements: *id003
 description: "  minus5_daemon is a simple lib for crating Ruby daemons\n  it is built on top daemons.rb (http://daemons.rubyforge.org/)\n"
 email: ianic@minus5.hr
 executables: []