@@ -1,70 +1,42 @@ -require 'rake' require 'rubygems' -require 'rake/testtask' -require 'rake/rdoctask' -require 'spec/rake/spectask' -require 'rake/contrib/sshpublisher' - -desc 'Default: run unit tests.' -task :default => :test - -desc 'Test the backgroundrb plugin.' -Rake::TestTask.new(:test) do |t| - t.libs << 'lib' - t.pattern = 'test/**/*_test.rb' - t.verbose = true -end - -desc "Run all specs" -Spec::Rake::SpecTask.new('specs') do |t| - t.spec_opts = ["--format", "specdoc"] - t.libs = ['lib', 'server/lib' ] - t.spec_files = FileList['specs/**/*_spec.rb'] -end - -desc "RCov" -Spec::Rake::SpecTask.new('rcov') do |t| - t.spec_files = FileList['specs/**/*_spec.rb'] - t.libs = ['lib', 'server/lib' ] - t.rcov = true +require 'rake/gempackagetask' + +PLUGIN = "backgroundrb_merb" +NAME = "backgroundrb_merb" +VERSION = "1.0.3" +AUTHOR = "George Palmer" +EMAIL = "george.palmer@gmail.com" +HOMEPAGE = "not yet" +SUMMARY = "Merb plugin that provides backgroundrb" + +spec = Gem::Specification.new do |s| + s.name = NAME + s.version = VERSION + s.platform = Gem::Platform::RUBY + s.has_rdoc = true + s.extra_rdoc_files = ["README", "LICENSE", 'TODO'] + s.summary = SUMMARY + s.description = s.summary + s.author = AUTHOR + s.email = EMAIL + s.homepage = HOMEPAGE + s.add_dependency('merb', '>= 0.9.2') + s.require_path = 'lib' + s.autorequire = PLUGIN + s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{config,generators,lib,script,server,specs}/**/*") end -desc 'Generate documentation for the backgroundrb plugin.' -Rake::RDocTask.new(:rdoc) do |rdoc| - rdoc.rdoc_dir = 'rdoc' - rdoc.title = 'Backgroundrb' - rdoc.options << '--line-numbers' << '--inline-source' - rdoc.rdoc_files.include('README') - rdoc.rdoc_files.include('LICENSE') - rdoc.rdoc_files.include('lib/*.rb') - rdoc.rdoc_files.include('lib/backgroundrb/*.rb') - rdoc.rdoc_files.include('server/*.rb') - rdoc.rdoc_files.include('server/lib/*.rb') - rdoc.template = 'jamis' +Rake::GemPackageTask.new(spec) do |pkg| + pkg.gem_spec = spec end -module Rake - class BackgrounDRbPublisher < SshDirPublisher - attr_reader :project, :proj_id, :user - def initialize(projname, user) - super( - "#{user}@rubyforge.org", - "/var/www/gforge-projects/backgroundrb", - "doc/output") - end - end +task :install => [:package] do + sh %{sudo gem install pkg/#{NAME}-#{VERSION}} end -desc "Publish documentation to Rubyforge" -task :publish_rdoc => [:rdoc] do - user = ENV['RUBYFORGE_USER'] - publisher = Rake::BackgrounDRbPublisher.new('backgroundrb', user) - publisher.upload -end - -namespace :git do - desc "Push changes to central git repo" - task :push do - sh("git push origin master") +namespace :jruby do + desc "Run :package and install the resulting .gem with jruby" + task :install => :package do + sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri} end -end +end \ No newline at end of file Rakefile @@ -1,30 +1,33 @@ #!/usr/bin/env ruby -rails_root = File.expand_path(File.join(File.dirname(__FILE__)+"/..")) -RAILS_HOME = rails_root -PACKET_APP = rails_root + "/vendor/plugins/backgroundrb" -WORKER_ROOT = rails_root + "/lib/workers" +# Add backgroundrb folders to load path +backgroundrb_dir = Dir.glob(File.expand_path(File.dirname(__FILE__) + "/../gems/gems/backgroundrb_merb*")).last +["lib/backgroundrb_merb", "server/lib"].each { |x| $LOAD_PATH.unshift(backgroundrb_dir + "/#{x}")} -["server","server/lib","lib","lib/backgroundrb"].each { |x| $LOAD_PATH.unshift(PACKET_APP + "/#{x}")} +# Add workers to load path +WORKER_ROOT = File.expand_path(File.dirname(__FILE__) + "/../lib/workers") $LOAD_PATH.unshift(WORKER_ROOT) -require RAILS_HOME + '/config/boot.rb' - -# parse CLI options and set RAILS_ENV before loading RoR environment -require "bdrb_config.rb" -BackgrounDRb::Config.parse_cmd_options ARGV - -require RAILS_HOME + '/config/environment' +# Take preference to local merb gems require "rubygems" +Gem.clear_paths +Gem.path.unshift(File.expand_path(File.dirname(__FILE__) + "/../gems/gems")) + +# Require dependencies +require 'merb-core' +require 'activerecord' require "yaml" require "erb" require "logger" require "packet" -require "backgroundrb_server" +require "bdrb_config.rb" +require "master_worker.rb" -CONFIG_FILE = BackgrounDRb::Config.read_config("#{RAILS_HOME}/config/backgroundrb.yml") -pid_file = "#{RAILS_HOME}/tmp/pids/backgroundrb_#{CONFIG_FILE[:backgroundrb][:port]}.pid" -SERVER_LOGGER = "#{RAILS_HOME}/log/backgroundrb_server_#{CONFIG_FILE[:backgroundrb][:port]}.log" +# Parse CLI options +BackgrounDRbMerb::Config.parse_cmd_options ARGV +CONFIG_FILE = BackgrounDRbMerb::Config.read_config("#{Merb.root}/config/backgroundrb.yml") +pid_file = "#{Merb.root}/tmp/backgroundrb_#{CONFIG_FILE[:backgroundrb][:port]}.pid" +SERVER_LOGGER = "#{Merb.root}/log/backgroundrb_server_#{CONFIG_FILE[:backgroundrb][:port]}.log" case ARGV[0] when 'start' @@ -39,7 +42,7 @@ when 'start' [STDIN, STDOUT, STDERR].each {|desc| desc.reopen(log_file)} end - BackgrounDRb::MasterProxy.new() + BackgrounDRbMerb::MasterProxy.new() end when 'stop' pid = nil @@ -57,5 +60,5 @@ when 'stop' File.delete(pid_file) if File.exists?(pid_file) end else - BackgrounDRb::MasterProxy.new() -end + BackgrounDRbMerb::MasterProxy.new() +end \ No newline at end of file script/backgroundrb @@ -1,4 +1,4 @@ -module BackgrounDRb +module BackgrounDRbMerb class CronTrigger WDAYS = { 0 => "Sunday",1 => "Monday",2 => "Tuesday",3 => "Wednesday", 4 => "Thursday", 5 => "Friday", 6 => "Saturday" } LeapYearMonthDays = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] server/lib/cron_trigger.rb @@ -1,4 +1,4 @@ -module BackgrounDRb +module BackgrounDRbMerb class InvalidDumpError < RuntimeError end end server/lib/invalid_dump_error.rb @@ -3,7 +3,7 @@ class LogWorker < Packet::Worker #set_no_auto_load(true) attr_accessor :log_file def worker_init - @log_file = Logger.new("#{RAILS_HOME}/log/backgroundrb_#{CONFIG_FILE[:backgroundrb][:port]}.log") + @log_file = Logger.new("#{Merb.root}/log/backgroundrb_#{CONFIG_FILE[:backgroundrb][:port]}.log") end def receive_data p_data server/lib/log_worker.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -module BackgrounDRb +module BackgrounDRbMerb # Class wraps a logger object for debugging internal errors within server class DebugMaster attr_accessor :log_mode,:logger,:log_flag @@ -9,7 +9,7 @@ module BackgrounDRb if @log_mode == :foreground @logger = ::Logger.new(STDOUT) else - @logger = ::Logger.new("#{RAILS_HOME}/log/backgroundrb_#{CONFIG_FILE[:backgroundrb][:port]}_debug.log") + @logger = ::Logger.new("#{Merb.root}/log/backgroundrb_#{CONFIG_FILE[:backgroundrb][:port]}_debug.log") end end @@ -154,12 +154,12 @@ module BackgrounDRb attr_accessor :config_file,:reloadable_workers,:worker_triggers,:reactor def initialize raise "Running old Ruby version, upgrade to Ruby >= 1.8.5" unless check_for_ruby_version - @config_file = BackgrounDRb::Config.read_config("#{RAILS_HOME}/config/backgroundrb.yml") + @config_file = BackgrounDRbMerb::Config.read_config("#{Merb.root}/config/backgroundrb.yml") log_flag = CONFIG_FILE[:backgroundrb][:debug_log].nil? ? true : CONFIG_FILE[:backgroundrb][:debug_log] debug_logger = DebugMaster.new(CONFIG_FILE[:backgroundrb][:log],log_flag) - load_rails_env + load_merb_env find_reloadable_worker @@ -204,9 +204,9 @@ module BackgrounDRb case value[:trigger_args] when String cron_args = value[:trigger_args] || "0 0 0 0 0" - trigger = BackgrounDRb::CronTrigger.new(cron_args) + trigger = BackgrounDRbMerb::CronTrigger.new(cron_args) when Hash - trigger = BackgrounDRb::Trigger.new(value[:trigger_args]) + trigger = BackgrounDRbMerb::Trigger.new(value[:trigger_args]) end worker_method_triggers[key] = { :trigger => trigger,:data => value[:data],:runtime => trigger.fire_after_time(Time.now).to_i } end @@ -257,21 +257,18 @@ module BackgrounDRb end end - def load_rails_env + def load_merb_env run_env = CONFIG_FILE[:backgroundrb][:environment] || 'development' - ENV["RAILS_ENV"] = run_env - RAILS_ENV.replace(run_env) if defined?(RAILS_ENV) - require RAILS_HOME + '/config/environment.rb' lazy_load = CONFIG_FILE[:backgroundrb][:lazy_load].nil? ? true : CONFIG_FILE[:backgroundrb][:lazy_load].nil? - p lazy_load - load_rails_models unless lazy_load + require_merb_files unless lazy_load ActiveRecord::Base.allow_concurrency = true end - def load_rails_models - model_root = RAILS_HOME + "/app/models" - models = Dir["#{model_root}/**/*.rb"] - models.each { |x| + def require_merb_files + debug_logger = DebugMaster.new(CONFIG_FILE[:backgroundrb][:log],true) + + files = Dir["#{Merb.root}/app/models/**/*.rb"] + files.each { |x| begin require x rescue LoadError @@ -300,7 +297,4 @@ module BackgrounDRb def check_for_ruby_version; return RUBY_VERSION >= "1.8.5"; end end # end of module BackgrounDRb -end - - - +end \ No newline at end of file server/lib/master_worker.rb @@ -1,4 +1,4 @@ -module BackgrounDRb +module BackgrounDRbMerb # this class is a dummy class that implements things required for passing data to # actual logger worker class PacketLogger @@ -182,9 +182,9 @@ module BackgrounDRb # does initialization of worker stuff and invokes create method in # user defined worker class def worker_init - @config_file = BackgrounDRb::Config.read_config("#{RAILS_HOME}/config/backgroundrb.yml") + @config_file = BackgrounDRbMerb::Config.read_config("#{Merb.root}/config/backgroundrb.yml") log_flag = @config_file[:backgroundrb][:debug_log].nil? ? true : @config_file[:backgroundrb][:debug_log] - load_rails_env + load_merb_env @logger = PacketLogger.new(self,log_flag) @thread_pool = ThreadPool.new(pool_size || 20,@logger) @@ -260,9 +260,9 @@ module BackgrounDRb case value[:trigger_args] when String cron_args = value[:trigger_args] || "0 0 0 0 0" - trigger = BackgrounDRb::CronTrigger.new(cron_args) + trigger = BackgrounDRbMerb::CronTrigger.new(cron_args) when Hash - trigger = BackgrounDRb::Trigger.new(value[:trigger_args]) + trigger = BackgrounDRbMerb::Trigger.new(value[:trigger_args]) end @worker_method_triggers[key] = { :trigger => trigger,:data => value[:data],:runtime => trigger.fire_after_time(Time.now).to_i } end @@ -345,14 +345,11 @@ module BackgrounDRb end private - def load_rails_env - db_config_file = YAML.load(ERB.new(IO.read("#{RAILS_HOME}/config/database.yml")).result) + def load_merb_env + db_config_file = YAML.load(ERB.new(IO.read("#{Merb.root}/config/database.yml")).result) run_env = @config_file[:backgroundrb][:environment] || 'development' - ENV["RAILS_ENV"] = run_env - RAILS_ENV.replace(run_env) if defined?(RAILS_ENV) - ActiveRecord::Base.establish_connection(db_config_file[run_env]) + ActiveRecord::Base.establish_connection(db_config_file[run_env.to_sym]) ActiveRecord::Base.allow_concurrency = true end - end # end of class MetaWorker end # end of module BackgrounDRb server/lib/meta_worker.rb @@ -1,4 +1,4 @@ -module BackgrounDRb +module BackgrounDRbMerb class Trigger attr_accessor :start_time, :end_time, :repeat_interval server/lib/trigger.rb TODO.org lib/backgroundrb.rb lib/backgroundrb/bdrb_config.rb lib/backgroundrb/bdrb_conn_error.rb lib/backgroundrb/rails_worker_proxy.rb tasks/backgroundrb_tasks.rake 72f731818a0c62ba63ebb399ba67d769bb45021a George Palmer george@bablo.com http://github.com/georgepalmer/backgroundrb_merb/commit/4da9bfbba79a59998a92aa74a494496f7cf14e0b 4da9bfbba79a59998a92aa74a494496f7cf14e0b 2008-05-01T09:32:02-07:00 2008-05-01T09:32:02-07:00 First attempt at fork to MERB 7d747c4464c803f143f8cab71d89fec86ae755fd George Palmer george@bablo.com