github-migration/whenever
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve eval'ing of schedule file to reveal the filename in backtraces

Browse Source
This commit is contained in:
Javan Makhmali 2011-07-31 14:16:23 -04:00
parent 8bb0f04131
commit ab877e3cbb
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/whenever/job_list.rb
View File

@ -3,21 +3,20 @@ module Whenever
def initialize(options) def initialize(options)
@jobs, @env, @set_variables, @pre_set_variables = {}, {}, {}, {} @jobs, @env, @set_variables, @pre_set_variables = {}, {}, {}, {}
case options if options.is_a? String
when String options = { :string => options }
config = options
when Hash
config = if options[:string]
options[:string]
elsif options[:file]
File.read(options[:file])
end
pre_set(options[:set])
end end
setup = File.read("#{File.expand_path(File.dirname(__FILE__))}/setup.rb") pre_set(options[:set])
eval(setup + config) setup = File.read("#{File.expand_path(File.dirname(__FILE__))}/setup.rb")
schedule = if options[:string]
options[:string]
elsif options[:file]
File.read(options[:file])
end
instance_eval(setup + schedule, options[:file] || '<eval>')
end end
def set(variable, value) def set(variable, value)