taskr 0.3.0 → 0.4.0

data/History.txt

@@ -1,3 +1,22 @@
+=== 0.4.0 :: 2008-12-23
+
+* Log entries in task view can now be filtered by date. By default only entries
+  from the last 24 hours are shown.
+* Added ability to reload and edit existing tasks [dvdplm]
+* Added experimental 'dont_wait' parameter to the Taskr4Rails action that 
+  forces the remote code to be forked so that it does not hold up the entire 
+  server. Currently this will only work if the remote Rails server is running 
+  on Mongrel.
+* Taskr can be configured to send SNMP traps whenever task events are logged.
+  See the config.example.yml file's "LOGGING" section for more info.
+* Task actions and parameters are now again included in the XML views for
+  the task list and for individual tasks.
+* Restr 0.5.0 is now required, due to a bug in Restr 0.4.0 that caused 
+  some actions to log their activities incorrectly.
+* Picnic 0.7.0 is now required, due to changes in environment configuration.
+* Fixed dependency loading problems introduced by upstream changes in RubyGems
+  1.3.1.
+
 === 0.3.0 :: 2008-06-19
 
 * Added "Run Now" function allowing a task to be immediately triggered.
@@ -38,4 +57,4 @@
 
 === 0.1.0 :: 2007-12-21
 
-* First public release.
+* First public release.

data/Rakefile

@@ -11,8 +11,8 @@ require 'hoe'
 include FileUtils
 require File.join(File.dirname(__FILE__), 'lib', 'taskr', 'version')
 
-AUTHOR = "Matt Zukowski"  # can also be an array of Authors
-EMAIL = "matt at roughest dot net"
+AUTHOR = ["Matt Zukowski", "David Palm"]  # can also be an array of Authors
+EMAIL = ["matt at roughest dot net", "dvd plm on googles free email service"]
 DESCRIPTION = "cron-like scheduler service with a RESTful interface"
 GEM_NAME = "taskr" # what ppl will type to install your gem
 RUBYFORGE_PROJECT = "taskr" # The unix name for your project
@@ -21,7 +21,7 @@ HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 
 NAME = "taskr"
 REV = nil
-#REV = `svn info`[/Revision: (\d+)/, 1] rescue nil
+#REV = YAML.load(`svn info`)['Revision']
 VERS = ENV['VERSION'] || (Taskr::VERSION::STRING + (REV ? ".#{REV}" : ""))
                           CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', "taskr documentation",
@@ -54,10 +54,33 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   #p.spec_extras    - A hash of extra values to set in the gemspec.
   
   p.extra_deps = [
-    ['picnic', '~> 0.6.4'], 
+    ['picnic', '~> 0.7.0'], 
     ['reststop', '~> 0.3.0'], 
-    ['restr', '~> 0.4.0'], 
+    ['restr', '~> 0.5.0'], 
     ['rufus-scheduler', '~> 1.0.7']
   ]
   p.spec_extras = {:executables => ['taskr', 'taskr-ctl']}
 end
+
+desc "Generate gemspec"
+task :gemspec do |x|
+  # Check the manifest before generating the gemspec
+  manifest = %x[rake check_manifest]
+  manifest.gsub!(/\(in .{1,}\)\n/, "")
+ 
+  unless manifest.empty?
+    print "\n", "#"*68, "\n"
+    print <<-EOS
+  Manifest.txt is not up-to-date. Please review the changes below.
+  If the changes are correct, run 'rake check_manifest | patch'
+  and then run this command again.
+EOS
+    print "#"*68, "\n\n"
+    puts manifest
+  else
+    gemspec = %x[rake debug_gem]
+    gemspec.gsub!(/\(in .{1,}\)\n/, "")
+    File.open("#{GEM_NAME}.gemspec",'w'){|f| f<<gemspec}
+    %x[rake debug_gem > #{GEM_NAME}.gemspec]
+  end
+end

data/config.example.yml

@@ -139,6 +139,19 @@ task_log:
   # ERROR, WARN, INFO, or DEBUG
   level: DEBUG
   
+### SNMP Traps
+# Taskr can be configured to send out SNMP traps whenever task events occur.
+# That is, in addition to logging task events to the Task Log (see above),
+# Taskr can send out SNMP traps notifying an SNMP listener of the event.
+# This functionality relies on the Net-SNMP package's `snmptrap` command-line
+# utility, so make sure you have the PERL Net-SNMP installed on your system
+# before enabling the following configuration options.
+
+#snmp:
+#  send_traps: true
+#  to_host: snmp.example.net
+#  community: public
+#  enterprise_oid: 1.3.6.1.4.1.55555.7007
   
 ##### MISC #####################################################################
 

data/lib/taskr/actions.rb

@@ -58,13 +58,13 @@ module Taskr
       
       def trigger(trigger_args = {})
         begin
-          $LOG.info("Executing task #{self.task.name}")
+          $LOG.info("Executing task #{self.task.name.inspect}")
           execute
           task.update_attribute(:last_triggered, Time.now)
           task.update_attribute(:last_triggered_error, nil)
         rescue => e
           puts
-          $LOG.error(e)
+          $LOG.error("Error while executing task #{self.task.name.inspect}! The error was: #{e}  (see Taskr log for debugging details)")
           $LOG.debug(e.backtrace.join($/))
           details = e.message
           details += "\n\n#{$LAST_ERROR_BODY}" if $LAST_ERROR_BODY # dumb way of reading Restr errors... Restr needs to be fixed
@@ -95,7 +95,7 @@ module Taskr
       
       def trigger(trigger_args = {})
         begin
-          $LOG.info("Executing task #{self.task.name}")
+          $LOG.info("Executing task #{self.task.name.inspect}")
           actions.each do |a|
             a.execute
             LogEntry.info(a, "Action #{a} executed.")
@@ -104,7 +104,7 @@ module Taskr
           task.update_attribute(:last_triggered, Time.now)
           task.update_attribute(:last_triggered_error, nil)
         rescue => e
-          $LOG.error(e)
+          $LOG.error("Error while executing task #{self.task.name.inspect}! The error was: #{e} (see Taskr log for debugging details)")
           $LOG.debug("#{e.backtrace}")
           task.update_attribute(:last_triggered, Time.now)
           task.update_attribute(:last_triggered_error, {:type => e.class.to_s, :details => "#{e.message}"})
@@ -268,8 +268,12 @@ module Taskr
           parameters['params'] = params2
         end
         
-        Restr.logger = LogEntry.logger_for_action(task_action)
-        Restr.do(parameters['method'], parameters['url'], (parameters['params'] unless parameters['params'].blank?), auth)
+        options = {:logger => LogEntry.logger_for_action(task_action)}
+        options.merge!(auth) if auth
+        Restr.do(parameters['method'], 
+          parameters['url'], 
+          (parameters['params'] unless parameters['params'].blank?), 
+          options)
       end
     end
     
@@ -296,19 +300,21 @@ module Taskr
     end
     
     class Taskr4rails < Base
-      self.parameters = ['url', 'auth', 'ruby_code']#, 'shell_command']
+      self.parameters = ['url', 'auth', 'ruby_code', 'dont_wait']#, 'shell_command']
       self.description = "Executes code on a remote Rails server via the taskr4rails plugin."
       
       def execute
         data = {
+          :task_name => task.name,
+          :task_id => task.id,
           :auth => parameters['auth'],
+          :dont_wait => parameters['dont_wait'],
           :ruby_code => parameters['ruby_code']#,
           #:shell_command => parameters['shell_command']
         }
-        
-        
-        Restr.logger = LogEntry.logger_for_action(task_action)
-        Restr.post(parameters['url'], data)
+
+        options = {:logger => LogEntry.logger_for_action(task_action)}
+        Restr.post(parameters['url'], data, options)
       end
     end
   end

data/lib/taskr/controllers.rb

@@ -66,9 +66,117 @@ module Taskr::Controllers
       render :view_task
     end
     
+    def edit(task_id)
+      @task = Task.find(task_id, :include => [:task_actions])
+      @actions = Taskr::Actions.list
+      render :edit_task
+    end
+    
+    def update(task_id)
+      $LOG.debug "Update Input params: #{@input.inspect}"
+      @task = Task.find(task_id, :include => [:task_actions])
+      params = normalize_input(@input)
+      @task.attributes= {
+        :name             => params[:name],
+        :schedule_method  => params[:schedule_method],
+        :schedule_when    => params[:schedule_when],
+        :memo             => params[:memo]
+      }
+
+      @task.task_actions.each do |action|
+        $LOG.debug("Updating parameters for #{action.inspect}")
+        action_params = params[:action].delete("action_id_#{action.id}")
+        $LOG.debug("Using values #{action_params.inspect}")
+        next unless action_params
+        action_params.each do |param_name, value|
+          $LOG.debug("Looking up \"#{param_name}\". Setting value to \"#{value}\"")
+          action.parameters.find_by_name(param_name).update_attribute(:value, value)
+        end
+      end
+      
+      # Create new actions/action_parameters for the remaining params
+      unless params[:action].empty?
+        params[:action].map do |num, params|
+          $LOG.debug "Looping remaining action_parameters: #{params.inspect} (num: #{num})"
+          action_class = get_action_class(params[:action_class_name])
+          action = TaskAction.new(:order => params[:order] || (@task.task_actions.maximum(:order)+1) || num, :action_class_name => action_class.to_s)
+
+          action_class.parameters.each do |p|
+            value = params[p]
+            value = nil if value.blank?
+            action.action_parameters << TaskActionParameter.new(:name => p, :value => value)
+          end
+          @task.task_actions << action
+        end
+      end
+      
+      unless @task.valid?
+        @status = 500
+        @actions = Taskr::Actions.list
+      else
+        @task.save!
+        @status = 200
+      end
+      
+      @task.reload # Ensure any updates to the record goes in
+      
+      Taskr.scheduler.unschedule(@task.scheduler_job_id)
+      @task.schedule! Taskr.scheduler
+      
+      $LOG.info "Task \"#{@task.name}\" (ID: #{@task.id}) updated sucessfully."
+      redirect R(@task)
+    end
+    
+    def normalize_input(hsh)
+      hsh[:task] || hsh["0"] || hsh
+    end
+    
+    def normalize_actions_params(input_params)
+      $LOG.debug "normalize_actions_params Normalizing: #{input_params.inspect}"
+      # some gymnastics here to provide compatibility for the way various
+      # REST client libraries submit data
+      actions_data = input_params[:actions] || input_params[:action]
+      
+      raise ArgumentError, "Missing action(s) parameter." if actions_data.blank?
+      actions = case actions_data
+                when Array 
+                  $LOG.debug "normalize_actions_params Plain Array. Returning as-is."
+                  actions_data
+                when Hash
+                  $LOG.debug "normalize_actions_params Some weird Hash. Injecting."
+                  actions_data.inject([]) do |acc,(i,a)|
+                    $LOG.debug "normalize_actions_params acc: #{acc.inspect} index: #{i.inspect} array: #{a.inspect}."
+                    acc << a
+                    acc
+                  end
+                else
+                  $LOG.debug "normalize_actions_params Not a weird hash.\n\tactions_data[:action]: #{actions_data[:action].inspect}\n\tactions_data[:actions]: #{actions_data[:actions].inspect}\n\tactions_data: #{actions_data.inspect}\n\n"
+                  actions_data[:action] || actions_data[:actions] || actions_data
+                end
+      actions = [actions] unless actions.kind_of? Array
+      $LOG.debug "normalize_actions_params DONE. Returning: #{actions.inspect}"
+      actions
+    end
+    
+    def get_action_class(class_name)
+      action_class_name = "Taskr::Actions::#{class_name}" unless class_name =~ /^Taskr::Actions::/
+      
+      begin
+        action_class = action_class_name.constantize
+        unless action_class.include? Rufus::Schedulable
+          raise ArgumentError, 
+            "#{a[:action_class_name].inspect} cannot be used as an action because it does not include the Rufus::Schedulable module."
+        end
+      rescue NameError
+        raise ArgumentError, 
+          "#{a[:action_class_name].inspect} is not defined (i.e. there is no such action class)."
+      end
+      action_class
+    end
+    
     # Create and schedule a new task.
     def create
-      puts @input.inspect
+      $LOG.debug @input.inspect
       begin
         # the "0" is for compatibility with PHP's Zend_Rest_Client
         task_data = @input[:task] || @input["0"] || @input
@@ -125,7 +233,7 @@ module Taskr::Controllers
           end
           
           action = TaskAction.new(:order => a[:order] || i, :action_class_name => action_class_name)
-          
+          $LOG.debug "Action should be initialized and ready for creation: #{action.inspect}"
           
           action_class.parameters.each do |p|
             value = a[p]
@@ -147,7 +255,7 @@ module Taskr::Controllers
         
         @task.schedule! Taskr.scheduler
         
-        if @task.save
+        if @task.save!
           location = "/tasks/#{@task.id}?format=#{@format}"
           $LOG.debug "#{@task} saved successfuly. Setting Location header to #{location.inspect}."
           @headers['Location'] = location
@@ -174,7 +282,7 @@ module Taskr::Controllers
         # ok to catch exception silently. it should have gotten logged by the action
       end
       
-      render :view_task
+      redirect R(@task)
     end
     
     # Unschedule and delete an existing task.
@@ -197,12 +305,31 @@ module Taskr::Controllers
         _error("Task #{id} was not destroyed.", 500)
       end
     end
+    
+    # Reload a task
+    def reload(id)
+      @task = Task.find(id)
+      $LOG.debug "Re-scheduling task #{@task}..."
+      if @task.scheduler_job_id
+        Taskr.scheduler.unschedule(@task.scheduler_job_id)
+        $LOG.debug "\t...unscheduled task #{@task}..."
+      end
+      @task.schedule! Taskr.scheduler
+      $LOG.debug "\t...scheduled task #{@task}...\n"
+      redirect R(@task)
+    end
   end
   
   class LogEntries < REST 'log_entries'
     def list
+      @since = @input[:since]
+      
+      @level = ['DEBUG', 'INFO', 'WARN', 'ERROR']
+      @level.index(@input[:level]).times {@level.shift} if @input[:level]
+      
       @log_entries = LogEntry.find(:all, 
-        :conditions => ['task_id = ?', @input[:task_id]],
+        :conditions => ['task_id = ? AND IF(?,timestamp > ?,1) AND level IN (?)', 
+                        @input[:task_id], !@since.blank?, @since, @level],
         :order => 'timestamp DESC, id DESC')
       
       render :log_entries_list

data/lib/taskr/environment.rb

@@ -15,34 +15,39 @@
 
 $: << File.dirname(File.expand_path(__FILE__))
 
-# Try to load local versions of Picnic and Reststop if possible...
-$: << File.dirname(File.expand_path(__FILE__))+"/../../../picnic/lib"
-$: << File.dirname(File.expand_path(__FILE__))+"/../../vendor/picnic/lib"
-$: << File.dirname(File.expand_path(__FILE__))+"/../../../reststop/lib"
-$: << File.dirname(File.expand_path(__FILE__))+"/../../vendor/reststop/lib"
-
-# active_resource needs newer versions of active_support, but this conflicts
-# with active_record, so we need a newer version of that as well (yes, it's a mess) 
-#$: << File.dirname(File.expand_path(__FILE__))+"/../../vendor/activeresource/lib"
-#$: << File.dirname(File.expand_path(__FILE__))+"/../../vendor/activesupport/lib"
-#$: << File.dirname(File.expand_path(__FILE__))+"/../../vendor/activerecord/lib"
+# Try to load local version of Picnic if possible (for development purposes)
+alt_picnic_paths = [
+  File.dirname(File.expand_path(__FILE__))+"/../../../picnic/lib",
+  File.dirname(File.expand_path(__FILE__))+"/../../vendor/picnic/lib"
+]
+# Try to load local version of Reststop if possible (for development purposes)
+alt_reststop_paths = [
+  File.dirname(File.expand_path(__FILE__))+"/../../../reststop/lib",
+  File.dirname(File.expand_path(__FILE__))+"/../../vendor/reststop/lib"
+]
 
 require 'rubygems'
 
-require 'active_support'
-#require 'active_resource'
-require 'active_record'
-
-
 # make things backwards-compatible for rubygems < 0.9.0
-unless Object.method_defined? :gem
+if Object.method_defined?(:require_gem)
   alias gem require_gem
 end
 
+if alt_picnic_paths.any?{|path| File.exists? "#{path}/picnic.rb" }
+  alt_picnic_paths.each{|path| $: << path}
+end
 require 'picnic'
-require 'camping/db'
+
+if alt_reststop_paths.any?{|path| File.exists? "#{path}/reststop.rb" }
+  alt_reststop_paths.each{|path| $: << path}
+end
 
 require 'reststop'
 
-gem 'rufus-scheduler', '~> 1.0.7'
+require 'active_record'
+require 'active_support'
+
+require 'camping/db'
+
+gem 'rufus-scheduler', '>=1.0.7'
 require 'rufus/scheduler'

data/lib/taskr/models.rb

@@ -39,7 +39,7 @@ module Taskr::Models
     validates_presence_of :task_actions
     validates_associated :task_actions
     
-    def schedule!(scheduler)
+    def schedule!(scheduler = Taskr.scheduler)
       case schedule_method
       when 'cron'
         method = :schedule
@@ -62,11 +62,20 @@ module Taskr::Models
       
       $LOG.debug "Scheduling task #{name.inspect}: #{self.inspect}"
       
-      if task_actions.length > 0
-        action = prepare_action
+      if self.new_record? # Need to distinguish between the edit/create cases. "Edit" needs to reload the task_actions or nothing works; "Create" needs NOT to relaod the actions, or the validations kick in and nothing works. FIXME!!!!!
+        if task_actions.length > 0
+          action = prepare_action
+        else
+          $LOG.warn "Task #{name.inspect} has no actions and as a result will not be scheduled!"
+          return false
+        end
       else
-        $LOG.warn "Task #{name.inspect} has no actions and as a result will not be scheduled!"
-        return false
+        if task_actions(true).length > 0
+          action = prepare_action
+        else
+          $LOG.warn "Task #{name.inspect} has no actions and as a result will not be scheduled!"
+          return false
+        end
       end
       
       job_id = scheduler.send(method, t || schedule_when, :schedulable => action)
@@ -149,6 +158,7 @@ module Taskr::Models
       :class_name => 'TaskActionParameter', 
       :foreign_key => :task_action_id,
       :dependent => :destroy
+    alias_method :parameters, :action_parameters
     
     has_many :log_entries
     has_one :last_log_entry,
@@ -170,6 +180,10 @@ module Taskr::Models
       self[:action_class_name].constantize
     end
     
+    def description
+      action_class.description
+    end
+    
     def to_xml(options = {})
       options[:indent] ||= 2
       xml = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
@@ -186,7 +200,7 @@ module Taskr::Models
     end
     
     def to_s
-      "#{self.class.name.demodulize}(#{task_action})"
+      "#{self.class.name.demodulize}(#{action_class})"
     end
   end
 
@@ -202,7 +216,7 @@ module Taskr::Models
         xml.tag!('id', {:type => 'integer'}, id)
         xml.tag!('name', name)
         xml.tag!('value') do
-          xml.cdata!(value)
+          xml.cdata!(value.to_s)
         end
       end
     end
@@ -247,6 +261,11 @@ module Taskr::Models
             :data => data
           )
         end
+        
+        # Send SNMP traps through net-snmp if Taskr is configured to send them.
+        if Taskr::Conf[:snmp] && Taskr::Conf[:snmp][:send_traps]
+          send_snmp_trap(level, task, action, data)
+        end
       end
       
       # Produces a Logger-like class that will create log entries for the given
@@ -261,6 +280,57 @@ module Taskr::Models
           log(level, action, data)
         end
       end
+      
+      def send_snmp_trap(level, task, action, data)
+        snmp_community = Taskr::Conf[:snmp][:community]
+        enterprise_oid = Taskr::Conf[:snmp][:enterprise_oid] || '1.3.6.1.4.1.55555.7007'
+        to_host        = Taskr::Conf[:snmp][:to_host]
+        snmp_persistent_dir = Taskr::Conf[:snmp][:snmp_persistent_dir] || '/tmp'
+        my_host        = ENV['HOSTNAME'] || `hostname`.strip || 'taskr'
+        
+        
+        task_oid = '1.3.6.1.4.1.55555.7007.1'
+        task_typ = 's'
+        task_val = task.to_s.gsub(/"/, '\"')
+        
+        
+        # see http://www.oid-info.com/get/1.3.6.1.4.1.9.5.1.14.4.1.2
+        level_oid = '1.3.6.1.4.1.9.5.1.14.4.1.2'
+        level_typ = 'i'
+        case level
+        when 'DEBUG'  then level_val = 8
+        when 'INFO'   then level_val = 7
+        when 'WARN'   then level_val = 5
+        when 'ERROR'  then level_val = 4
+        end
+      
+        # see http://www.oid-info.com/get/1.3.6.1.4.1.9.9.41.1.2.3.1.4
+        sevr_oid = '1.3.6.1.4.1.9.9.41.1.2.3.1.4'
+        sevr_typ = 's'
+        sevr_val = level
+        
+        # TODO: make msg format configurable
+        msg = ("Taskr #{level} on task #{task}[#{action}]: #{data}").gsub(/"/, '\"')
+        
+        # see http://www.oid-info.com/get/1.3.6.1.4.1.9.9.41.1.2.3.1.5
+        msg_oid = '1.3.6.1.4.1.9.9.41.1.2.3.1.5'
+        msg_typ = 's'
+        msg_val = msg
+        
+        cmd = %{snmptrap -v 1 -c #{snmp_community} #{to_host} #{enterprise_oid} #{my_host} 6 #{level_val} '' \
+#{level_oid} #{level_typ} "#{level_val}" \
+#{sevr_oid} #{sevr_typ} "#{sevr_val}" \
+#{task_oid} #{task_typ} "#{task_val}" \
+#{msg_oid} #{msg_typ} "#{msg_val}"}
+        
+        # Band-aid fix for bug in Net-SNMP.
+        # See http://sourceforge.net/tracker/index.php?func=detail&aid=1588455&group_id=12694&atid=112694
+        ENV['SNMP_PERSISTENT_DIR'] ||= snmp_persistent_dir
+        
+        $LOG.debug "SENDING SNMP TRAP: #{cmd}"
+        
+        `#{cmd}`
+      end
     end
     
     # Exposes a Logger-like interface for logging entries for some particular

data/lib/taskr/version.rb

@@ -1,7 +1,7 @@
 module Taskr #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/taskr/views.rb

@@ -24,11 +24,11 @@ module Taskr::Views
     CONTENT_TYPE = 'text/xml'
     
     def tasks_list
-      @tasks.to_xml(:root => 'tasks')#, :include => [:task_actions])
+      @tasks.to_xml(:root => 'tasks', :include => [:task_actions])
     end
     
     def view_task
-      @task.to_xml(:root => 'task')#, :include => [:task_actions])
+      @task.to_xml(:root => 'task', :include => [:task_actions])
     end
   end
   
@@ -52,6 +52,7 @@ module Taskr::Views
               th "Job ID"
               th "Created On"
               th "Created By"
+              th ""
             end
           end
           tbody do
@@ -73,6 +74,7 @@ module Taskr::Views
                 td(:class => "job-id") {t.scheduler_job_id}
                 td t.created_on
                 td t.created_by
+                td {a(:href => R(t, 'edit')) {"Edit"}}
               end
             end
           end
@@ -83,6 +85,96 @@ module Taskr::Views
       end
     end
     
+    def edit_task
+      html_scaffold do
+        script(:type => 'text/javascript') do
+          %{
+            function show_action_parameters(num) {
+              new Ajax.Updater('parameters_'+num, '#{R(Actions)}', {
+                  method: 'get',
+                  parameters: { 
+                    id: $F('action_class_name_'+num), 
+                    action: 'parameters_form',
+                    num: num
+                  }
+              });
+            }
+          }
+        end
+
+        a(:href => R(Tasks, :list)) {"Back to Task List"}
+
+        form :method => 'put', :action => R(@task, 'update') do
+          h1 "Edit Task \"#{@task.name}\""
+
+          p do
+            label 'name' 
+            br
+            input :type => 'text', :name => 'name', :value => @task.name, :size => 40
+          end
+          
+          p do
+            label 'schedule'
+            br
+            select(:name => 'schedule_method') do
+              ['every','at','in','cron'].each do |method|
+                if @task.schedule_method == method
+                  option(:value => method, :selected => 'selected') {method}
+                else
+                  option(:value => method) {method}
+                end
+              end
+            end
+            input :type => 'text', :name => 'schedule_when', :value => @task.schedule_when, :size => 30
+          end
+          
+          p do
+            label 'description/memo' 
+            br
+            textarea(:name => 'memo', :cols => '60', :rows => '4'){@task.memo}
+          end
+          
+          p do
+            label "Actions:"
+            @task.task_actions.each do |action|
+              div {action_parameters_form(action)}
+            end
+            # div do 
+            #   if @task.task_actions.length > 1
+            #     ol(:style => 'padding-left: 20px') do
+            #       @task.task_actions.each do |ta|
+            #         html_task_action_li(ta)
+            #       end
+            #     end
+            #   else
+            #     html_task_action_li(@task.task_actions.first)
+            #   end
+            # end
+          end
+          
+          
+          p do
+            a(:id => 'add_action', :href => '#'){'Add another action'}
+          end
+
+          script(:type => 'text/javascript') do
+            %{
+              Event.observe('add_action', 'click', function() {
+                new Ajax.Updater('add_action', '#{R(Actions, :new)}', {
+                    method: 'get',
+                    parameters: { num: $$('select.action_class_name').size() },
+                    insertion: Insertion.Before
+                });
+                return false;
+              })
+            }
+          end
+          
+          button(:type => 'submit') {"Save"}
+        end
+      end
+    end
+
     def new_task
       html_scaffold do
         script(:type => 'text/javascript') do
@@ -158,6 +250,9 @@ module Taskr::Views
         form(:method => 'put', :style => 'display: inline', :action => R(@task, 'run')) do
           button(:type => 'submit', :value => 'run') {"Run Now!"}
         end
+        form(:method => 'put', :style => 'display: inline', :action => R(@task, 'reload')) do
+          button(:type => 'submit', :value => 'reload') {"Reload!"}
+        end
         br
         a(:href => R(Tasks, :list)) {"Back to Task List"}
         
@@ -222,7 +317,40 @@ module Taskr::Views
           end
         end
         
-        iframe(:src => R(LogEntries, :list, :task_id => @task.id), :style => 'width: 100%; margin-top: 20px;')
+        script %{
+          function clickbold(el) {
+            $$('#logfilter a').each(function(a){a.style.fontWeight = 'normal'})
+            el.style.fontWeight = 'bold'
+          } 
+        }
+        
+        p(:style => "margin-top: 20px; border-top: 1px dotted black; padding-top: 10px", :id => 'logfilter') do
+          strong "Show: "
+          a(:href => R(LogEntries, :list, :task_id => @task.id, :since => (Time.now - 1.day).to_formatted_s(:db)),
+            :target => 'log', :onclick => "clickbold(this)", :style => 'font-weight: bold') {"Last 24 Hours"}
+          text "|"
+          a(:href => R(LogEntries, :list, :task_id => @task.id, :since => (Time.now - 2.days).to_formatted_s(:db)),
+            :target => 'log', :onclick => "clickbold(this)") {"48 Hours"}
+          text "|"
+          a(:href => R(LogEntries, :list, :task_id => @task.id),
+            :target => 'log', :onclick => "clickbold(this)") {"All"}
+          br
+          
+          strong "Level: "
+          a(:href => R(LogEntries, :list, :task_id => @task.id, :level => 'DEBUG'),
+            :target => 'log', :onclick => "clickbold(this)") {"DEBUG"}
+          text "|"
+          a(:href => R(LogEntries, :list, :task_id => @task.id, :level => 'INFO'),
+            :target => 'log', :onclick => "clickbold(this)") {"INFO"}
+          text "|"
+          a(:href => R(LogEntries, :list, :task_id => @task.id, :level => 'WARN'),
+            :target => 'log', :onclick => "clickbold(this)") {"WARN"}
+          text "|"
+          a(:href => R(LogEntries, :list, :task_id => @task.id, :level => 'ERROR'),
+            :target => 'log', :onclick => "clickbold(this)") {"ERROR"}
+        end        
+        iframe(:src => R(LogEntries, :list, :task_id => @task.id, :since => (Time.now - 1.day).to_formatted_s(:db)), 
+                :style => 'width: 100%; height: 300px', :name => 'log')
       end
     end
     
@@ -248,16 +376,20 @@ module Taskr::Views
       end
     end
     
-    def action_parameters_form
+    def action_parameters_form(action = @action)
       @num ||= 0
       
-      p {em @action.description}
+      p {em action.description}
       
-      @action.parameters.each do |param|
+      action.parameters.each do |param|
         p do
           label param
           br
-          input :type => 'text', :name => "action[#{@num}][#{param}]", :size => 50
+          unless action.is_a?(Taskr::Models::TaskAction) # Setting up a new task
+            input :type => 'text', :name => "action[#{@num}][#{param}]", :size => 50
+          else # Editing an existing task
+            input :type => 'text', :name => "action[action_id_#{action.id}][#{param.name}]", :size => 50, :value => param.value
+          end
         end
       end
     end
@@ -286,6 +418,12 @@ module Taskr::Views
    
     def log_entries_list
       h2 "Log"
+      
+      p(:style => 'margin: 0px') do
+        em(:style => "font-weight: normal; font-size: 9pt"){"Entries since #{@since}<br />"} unless @since.blank?
+        em(:style => "font-weight: normal; font-size: 9pt"){"With levels #{@level.join(", ")}<br />"} unless @level.blank?
+      end
+            
       table do
         @log_entries.each do |entry|
           case entry.level.downcase.intern

data/taskr4rails/lib/taskr4rails_controller.rb

@@ -37,22 +37,40 @@ class Taskr4railsController < ActionController::Base
     
     io = StringIO.new
     prev_stdout, prev_stderr = $stdout, $stderr
-    output = ""
     $stdout = io
     $stderr = io
+    err = false # start off assuming there's no error
     begin
-      eval(params[:ruby_code]) if params[:ruby_code]
-      #output << (`cd #{RAILS_ROOT}; #{params[:shell_command]}` || "") if params[:shell_command]
-      err = false
+      if !params[:dont_wait].blank? && params[:dont_wait] != 0 && params[:dont_wait] != '0'
+        puts "Task #{params[:task_name].inspect} will be forked to its own process because the 'dont_wait' parameter was set to true."
+        
+        # Monkey-patch Mongrel to not remove its pid file in the child
+        # See: http://geekblog.vodpod.com/?p=26
+        require 'mongrel'
+        Mongrel::Configurator.class_eval("def remove_pid_file; puts 'child no-op'; end")
+        
+        pid = fork do
+          RAILS_DEFAULT_LOGGER.debug("*** Taskr4Rails -- Executing task #{params[:task_name].inspect} with Ruby code: #{params[:ruby_code]}")
+          eval(params[:ruby_code]) 
+        end
+        
+        RAILS_DEFAULT_LOGGER.debug("*** Taskr4Rails -- Task #{params[:task_name].inspect} is being forked into its own thread.")
+        
+        Process.detach(pid)
+      else
+        RAILS_DEFAULT_LOGGER.debug("*** Taskr4Rails -- Executing task #{params[:task_name].inspect} with Ruby code: #{params[:ruby_code]}")
+        RAILS_DEFAULT_LOGGER.debug("*** Taskr4Rails -- Waiting for task #{params[:task_name].inspect} to complete.")
+        eval(params[:ruby_code]) 
+      end
     rescue => e
-      output << "#{e.class}: #{e}\n\nBACKTRACE:\n#{e.backtrace.join("\n")}"
+      puts "#{e.class}: #{e}\n\nBACKTRACE:\n#{e.backtrace.join("\n")}"
       err = true
     end
     $stdout = prev_stdout
     $stderr = prev_stderr
-    output = io.read(nil)
+    output = io.string
     
     render :text => output, :status => (err ? 500 : 200)
   end
   
-end
+end

metadata

@@ -1,28 +1,31 @@
 --- !ruby/object:Gem::Specification 
 name: taskr
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Matt Zukowski
+- David Palm
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-06-19 00:00:00 -04:00
+date: 2008-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: picnic
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.4
+        version: 0.7.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: reststop
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,15 +35,17 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: restr
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rufus-scheduler
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -48,8 +53,20 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.7
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.2
+    version: 
 description: cron-like scheduler service with a RESTful interface
-email: matt at roughest dot net
+email: 
+- matt at roughest dot net
+- dvd plm on googles free email service
 executables: 
 - taskr
 - taskr-ctl
@@ -120,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: taskr
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: cron-like scheduler service with a RESTful interface