hireling 0.1.5 → 0.2.1

data/Rakefile

@@ -6,7 +6,7 @@ specification = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.name   = "hireling"
   s.summary = "Simple scheduled process structure for Rails apps."
-  s.version = "0.1.5"
+  s.version = "0.2.1"
   s.author = "David Vollbracht, Scott Conley"
   s.description = s.summary
   s.email = "scott.conley@flipstone.com"

data/bin/hirelings_ctl

@@ -2,8 +2,6 @@
 require 'rubygems'
 require "daemons"
 
-options = {:dir => "log/", :monitor => false, :multiple => false, :dir_mode => :normal}
-
-ENV["foo"] ||= Dir.pwd
+options = {:dir => "log/", :monitor => false, :multiple => false, :dir_mode => :normal, :rails_root => Dir.pwd}
 
 Daemons.run File.dirname(__FILE__) + '/../lib/hireling/hirelings.rb', options

data/lib/hireling.rb

@@ -1,2 +1,5 @@
+#!/usr/bin/env ruby
+#
+# This file is loaded by Rails during gem initialization
+#
 require 'hireling/hireling'
-require 'hireling/hirelings'

data/lib/hireling/hireling.rb

@@ -5,15 +5,18 @@ class Hireling
     attr_accessor :schedule
   end
 
-  def self.each_app_hireling_name
-    Dir[File.join(Rails.root, %w(app hirelings *.rb))].each do |hireling_file|
+  def self.each_app_hireling_name(rails_root)
+    hireling_classes ||= Dir[File.join(rails_root, %w(app hirelings *.rb))]
+    hireling_classes ||= Dir[File.join(%w(app hirelings *.rb))]
+    hireling_classes.each do |hireling_file|
+      require hireling_file
       hireling_name = File.basename(hireling_file, '.rb')
       yield hireling_name.to_sym
     end
   end
 
   def self.schedule_with_scheduler(scheduler)
-    NewHire.schedule.schedule(scheduler, new)
+    Hireling.schedule.schedule(scheduler, new)
     info "scheduled"
   end
 
@@ -39,7 +42,7 @@ class Hireling
   end
 
   def self.info(message)
-    Rails.logger.info "WorkingGirl #{name} at #{Time.now}: #{message}"
+    Rails.logger.info "Hireling #{name} at #{Time.now}: #{message}"
   end
 
   class Schedule
@@ -52,8 +55,8 @@ class Hireling
 
     def schedule(rufus_scheduler, hireling)
       proxy = @proxies[hireling.class.name.underscore.to_sym]
-      raise "No schedule found for #{hireling.class}" unless proxy
-      proxy.replay(rufus_scheduler,\nling)
+      raise "No schedule found for #{hireling.class.name.underscore.to_sym}" unless proxy
+      proxy.replay(rufus_scheduler,hireling)
     end
   end
 

data/lib/hireling/hirelings.rb

@@ -1,14 +1,20 @@
 #!/usr/bin/env ruby
 #
+# This file is invoked by the Daemons.run and launches the hirelings.
+# Hireling control relies on the Rails environment for:
+#  - config/initializers/hirelings_schedule.rb
+#  - app/hirelings/<your_hirelings>.rb
+#
 ENV["RAILS_ENV"] ||= "development"
 
-require "#{ENV['foo']}/config/environment"
+require "daemons"
 require 'rufus/scheduler'
+require "#{Daemons.controller.options[:rails_root]}/config/environment"
 
 scheduler = Rufus::Scheduler.start_new
 
-Hireling.each_app_hireling_name do |hireling_name|
-  hireling_class = hireling_name.to_s.classify.constantize
+Hireling.each_app_hireling_name(Daemons.controller.options[:rails_root]) do |hireling_name|
+  hireling_class = hireling_name.to_s.camelize.constantize
   hireling_class.schedule_with_scheduler scheduler
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hireling
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 21
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 5
-  version: 0.1.5
+  version: 0.2.1
 platform: ruby
 authors: 
 - David Vollbracht, Scott Conley