taskr 0.2.0 → 0.2.1

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+=== 0.2.1 :: 2008-02-28
+
+* Updated for compatibility with picnic 0.6.1.
+
 === 0.2.0 :: 2008-01-03
 
 * Added Taskr4rails action and accompanying Rails plugin for
@@ -6,6 +10,9 @@
   details.
 * The Howlr action now takes an optional content_type parameter
   to allow for sending out HTML-formatted messages.
+* Better error reporting for Restr-based actions. The remote server's
+  response body is now included in Taskr's error report and the 
+  remote output is printed to the log more cleanly.
 * Change to REST API: the 'action(s)' parameter is now a bit looser. 
   You can use 'action' or 'actions' interchangeably, whether you're 
   scheduling multiple actions or just one.

data/Rakefile

@@ -53,6 +53,10 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   #p.extra_deps     - An array of rubygem dependencies.
   #p.spec_extras    - A hash of extra values to set in the gemspec.
   
-  p.extra_deps = ['picnic', ['reststop',  '~>0.2.0'], 'openwferu-scheduler']
+  p.extra_deps = [
+    ['picnic', '~>0.6.1'], 
+    ['reststop', '~>0.2.0'], 
+    'openwferu-scheduler'
+  ]
   p.spec_extras = {:executables => ['taskr', 'taskr-ctl']}
 end

data/lib/taskr.rb

@@ -39,10 +39,24 @@ require 'taskr/controllers'
 
 module Taskr
   include Taskr::Models
+  
+  def self.authenticate(credentials)
+    credentials[:username] == Taskr::Conf[:authentication][:username] &&
+      credentials[:password] == Taskr::Conf[:authentication][:password]
+  end
 end
 
 include Taskr::Models
 
+if Taskr::Conf[:authentication]
+  Taskr.authenticate_using(Taskr::Conf[:authentication][:method] || :basic)
+end
+
+$CONF[:public_dir] = {
+  :path => "public",
+  :dir  => File.join(File.expand_path(File.dirname(__FILE__)),"public")
+}
+
 def Taskr.create
   $LOG.info "Initializing Taskr..."
   Taskr::Models::Base.establish_connection(Taskr::Conf.database)

data/lib/taskr/controllers.rb

@@ -130,6 +130,7 @@ module Taskr::Controllers
         
         unless @task.valid?
           @status = 500
+          @actions = Taskr::Actions.list
           return render(:new_task)
         end
       

data/lib/taskr/environment.rb

@@ -39,7 +39,7 @@ unless Object.method_defined? :gem
   alias gem require_gem
 end
 
-require 'picnic.rb'
+require 'picnic'
 require 'camping/db'
 
 require 'reststop'

data/lib/taskr/version.rb

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

data/taskr4rails/lib/taskr4rails_controller.rb

@@ -35,17 +35,24 @@ class Taskr4railsController < ActionController::Base
       return false
     end
     
-    out = ""
+    io = StringIO.new
+    prev_stdout, prev_stderr = $stdout, $stderr
+    output = ""
+    $stdout = io
+    $stderr = io
     begin
-      out << (eval(params[:ruby_code]) || "") if params[:ruby_code]
-      out << (`cd #{RAILS_ROOT}; #{params[:shell_command]}` || "") if params[:shell_command]
+      eval(params[:ruby_code]) if params[:ruby_code]
+      #output << (`cd #{RAILS_ROOT}; #{params[:shell_command]}` || "") if params[:shell_command]
       err = false
     rescue => e
-      out << e
+      output << "#{e.class}: #{e}\n\nBACKTRACE:\n#{e.backtrace.join("\n")}"
       err = true
     end
+    $stdout = prev_stdout
+    $stderr = prev_stderr
+    output = io.read(nil)
     
-    render :text => out, :status => (err ? 500 : 200)
+    render :text => output, :status => (err ? 500 : 200)
   end
   
 end

metadata

@@ -1,33 +1,58 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: taskr
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2008-01-03 00:00:00 -05:00
-summary: description of gem
-require_paths: 
-- lib
-email: your contact email for bug fixes and info
-homepage: http://taskr.rubyforge.org
-rubyforge_project: taskr
-description: description of gem
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.2.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - URBACONmzukowski
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-02-28 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: picnic
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: reststop
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.2.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: openwferu-scheduler
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: description of gem
+email: your contact email for bug fixes and info
+executables: 
+- taskr
+- taskr-ctl
+extensions: []
+
+extra_rdoc_files: 
+- CHANGELOG.txt
+- GPLv3-LICENSE.txt
+- History.txt
+- Manifest.txt
+- README.txt
+- taskr4rails/LICENSE.txt
 files: 
 - CHANGELOG.txt
 - GPLv3-LICENSE.txt
@@ -63,50 +88,32 @@ files:
 - test.rb
 - test/taskr_test.rb
 - test/test_helper.rb
-test_files: 
-- test/taskr_test.rb
+has_rdoc: true
+homepage: http://taskr.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- CHANGELOG.txt
-- GPLv3-LICENSE.txt
-- History.txt
-- Manifest.txt
-- README.txt
-- taskr4rails/LICENSE.txt
-executables: 
-- taskr
-- taskr-ctl
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: picnic
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: reststop
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.2.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: openwferu-scheduler
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
+rubyforge_project: taskr
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: description of gem
+test_files: 
+- test/taskr_test.rb