daemon_objects 0.2.1 → 0.2.2

data/lib/daemon_objects/base.rb

@@ -21,10 +21,6 @@ class DaemonObjects::Base
     @app_directory ||= (defined? Rails) ? Rails.root : Rake.original_dir
   end
 
-  def self.environment
-    @environment ||= (defined? Rails) ? Rails.env : (ENV["DAEMON_ENV"] || "development")
-  end
-
   def self.pid_directory
     File.join(app_directory, "tmp/pids")
   end
@@ -38,14 +34,9 @@ class DaemonObjects::Base
   end
 
   def self.get_consumer
-    consumer_class.new(:logger => logger, :app_directory => app_directory, :environment => environment)
-  rescue Exception => e
-    logger.error("An exception occured while instantiating the consumer #{consumer_class}.  Startup will be aborted.")
-    logger.error("Error: #{e.class}")
-    logger.error("Message: #{e.message}")
-    logger.error(e.backtrace.join("\n"))
-    Airbrake.notify(e) if defined?(Airbrake)
-    raise e
+    consumer_class.new(:logger        => logger,
+                       :app_directory => app_directory,
+                       :environment   => DaemonObjects.environment)
   end
 
   def self.run

data/lib/daemon_objects/{tasks/daemon_objects.rake → rake.rb}

@@ -1,3 +1,4 @@
+require_relative 'loader'
 namespace :daemon do
 
   # create tasks for each daemon to start/stop/restart/run
@@ -8,10 +9,14 @@ namespace :daemon do
       desc "starts the #{description}; can substitute stop or restart for start, " +
         "or use run to run the daemon in the foreground"
 
-      [:start, :stop, :run].each do |action|
-        task action do
-          Rake::Task[:environment].invoke if Rake::Task.task_defined?(:environment)
 
+      task :daemon_environment do
+        Rake::Task[:environment].invoke if Rake::Task.task_defined?(:environment)
+        DaemonObjects.initialize_environment
+      end
+
+      [:start, :stop, :run].each do |action|
+        task action => [:daemon_environment]  do
           require "daemon_objects"
           require "#{DaemonObjects.daemon_path}/#{daemon}_daemon.rb"
           require "#{DaemonObjects.daemon_path}/#{daemon}_consumer.rb"

data/lib/daemon_objects/version.rb

@@ -1,3 +1,3 @@
 module DaemonObjects
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/daemon_objects.rb

@@ -4,7 +4,15 @@ require 'daemons'
 require 'logger'
 require 'bunny'
 
-module DaemonObjects; end
+module DaemonObjects;
+  class << self
+    attr_accessor :environment
+
+    def initialize_environment
+      @environment = (defined? Rails) ? Rails.env : (ENV["DAEMON_ENV"] || "development")
+    end
+  end
+end
 
 require 'daemon_objects/loader'
 require 'daemon_objects/amqp'

data/spec/lib/daemon_objects/base_spec.rb

@@ -42,45 +42,6 @@ describe DaemonObjects::Base do
     end
   end
 
-  describe '#environment' do
-    context 'Rails' do
-      before :each do
-        Rails = Module.new do
-          def self.env
-            "railsenv"
-          end
-        end
-      end
-
-      after :each do
-        Object.send(:remove_const, :Rails)
-      end
-
-      it 'should use Rails.env if Rails is defined' do
-        MyDaemon = Class.new(DaemonObjects::Base)
-        MyDaemon.environment.should == Rails.env
-      end
-    end
-
-    context 'Env variable set' do
-      before :each do
-        ENV["DAEMON_ENV"] = "daemonenv"
-      end
-      after :each do
-        ENV["DAEMON_ENV"] = nil
-      end
-      it 'should use environment variable if Rails is not defined' do
-        MyDaemon = Class.new(DaemonObjects::Base)
-        MyDaemon.environment.should == ENV["DAEMON_ENV"]
-      end
-    end
-
-    it 'should be development if not Rails and no environment set' do
-      MyDaemon = Class.new(DaemonObjects::Base)
-      MyDaemon.environment.should == "development"
-    end
-  end
-
   describe '#extends' do
     it 'should extend logging' do
       MyDaemon = Class.new(DaemonObjects::Base)
@@ -173,10 +134,7 @@ describe DaemonObjects::Base do
     end
 
     it 'should set environment' do
-      def MyDaemon.environment
-        "theenv"
-      end
-
+      DaemonObjects.environment = "theenv"
       consumer.environment.should == "theenv"
     end
 

data/spec/lib/daemon_objects_spec.rb

@@ -14,4 +14,46 @@ describe DaemonObjects do
       DaemonObjects.get_daemon_name(path).should == "daemon_one"
     end
   end
+
+  describe '#environment' do
+    before :each do
+      DaemonObjects.initialize_environment
+    end
+
+    context 'Rails' do
+      before :each do
+        Rails = Module.new do
+          def self.env
+            "railsenv"
+          end
+        end
+        DaemonObjects.initialize_environment
+      end
+
+      after :each do
+        Object.send(:remove_const, :Rails)
+      end
+
+      it 'should use Rails.env if Rails is defined' do
+        DaemonObjects.environment.should == Rails.env
+      end
+    end
+
+    context 'Env variable set' do
+      before :each do
+        ENV["DAEMON_ENV"] = "daemonenv"
+        DaemonObjects.initialize_environment
+      end
+      after :each do
+        ENV["DAEMON_ENV"] = nil
+      end
+      it 'should use environment variable if Rails is not defined' do
+        DaemonObjects.environment.should == ENV["DAEMON_ENV"]
+      end
+    end
+
+    it 'should be development if not Rails and no environment set' do
+      DaemonObjects.environment.should == "development"
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -26,3 +26,4 @@ end
 
 require 'rake'
 require File.join(File.dirname(__FILE__), "../lib/daemon_objects.rb")
+DaemonObjects.initialize_environment

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daemon_objects
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -149,7 +149,7 @@ files:
 - lib/daemon_objects/loader.rb
 - lib/daemon_objects/logging.rb
 - lib/daemon_objects/railtie.rb
-- lib/daemon_objects/tasks/daemon_objects.rake
+- lib/daemon_objects/rake.rb
 - lib/daemon_objects/version.rb
 - spec/fixtures/daemon_path_spec/daemon_one_daemon.rb
 - spec/fixtures/daemon_path_spec/daemon_two_daemon.rb