silk 0.0.4 → 0.0.5

data/Gemfile

@@ -0,0 +1,17 @@
+source 'http://rubygems.org'
+
+gem 'daemons', '>= 0'
+gem 'json', '>= 0'
+gem 'sinatra', '>= 0'
+gem 'SyslogLogger', '>= 0'
+gem 'rdoc'
+
+group :development, :test do
+  gem 'shoulda', '>= 0'
+  gem 'mocha', '>= 0'
+  gem 'bundler', '~> 1.0.0'
+  gem 'jeweler', '~> 1.6.4'
+  gem 'rcov', '>= 0'
+  gem 'rack-test', '>= 0'
+  gem 'redgreen', '1.2.2'
+end

data/Gemfile.lock

@@ -0,0 +1,48 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    SyslogLogger (1.4.0)
+      hoe (>= 1.2.0)
+    daemons (1.1.0)
+    git (1.2.5)
+    hoe (2.6.1)
+      rake (>= 0.8.7)
+      rubyforge (>= 2.0.4)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    json (1.4.6)
+    json_pure (1.4.6)
+    mocha (0.9.12)
+    rack (1.2.3)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rake (0.9.2)
+    rcov (0.9.8)
+    rdoc (3.8)
+    redgreen (1.2.2)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    shoulda (2.11.3)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    tilt (1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  SyslogLogger
+  bundler (~> 1.0.0)
+  daemons
+  jeweler (~> 1.6.4)
+  json
+  mocha
+  rack-test
+  rcov
+  rdoc
+  redgreen (= 1.2.2)
+  shoulda
+  sinatra

data/README.rdoc

@@ -58,15 +58,35 @@ By default it runs on port 8888 and will probably need to be run as root to make
 
 Eventually it'll support SSL certificates etc, but until then, I suggest you either use SSH tunnels, and/or (at the very least) lock down via a firewall. You could also build a rack.up file, and run it behind a web server that gives you more control (Rack.up file is on the todo list).
 
-== Testing
+== Testing your recipes
 
-There is a test suite. It uses shoulda + mocha + test::rack
+There are two ways to test your recipes - you can chose to just run them on the command line, using the -t switch
 
-If you are going to submit patches, please try to make sure the tests pass, and that you have created a test covering the changes you have made
+  silk -t --param user=joe --param email=joe@blogs.com --format json
+
+or via unit tests.
+
+  require 'silk'
+
+  class TestDSL < Test::Unit::TestCase
+    results = Runner.execute('task:name', { 'user' => 'joe', 'email' => 'joe@blogs.com' })
+  end
+
+the results hash will have three elements: stdout, stderr and a process result object
 
-== Status
+  results[:stdout]
+  results[:stderr]
+  results[:status]
 
-This is a really early release, that still needs more testing (This is so far more proof of concept at this point), and may blow up at any given moment. Feel free to fork and help out.
+To get the exit status of the task:
+
+ status = results[:status].exitstatus
+
+== Testing Silk
+
+There is a test suite. It uses shoulda + mocha + test::rack
+
+If you are going to submit patches, please try to make sure the tests pass, and that you have created a test covering the changes you have made
 
 == Note on Patches/Pull Requests
  
@@ -81,4 +101,4 @@ This is a really early release, that still needs more testing (This is so far mo
 
 == Copyright
 
-Copyright (c) 2010 Myles Eftos. See LICENSE for details.
+Copyright (c) 2010,2011 Myles Eftos. See LICENSE for details.

data/Rakefile

@@ -1,31 +1,28 @@
+# encoding: utf-8
+
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "silk"
-    gem.executables = "silk"
-    gem.summary = %Q{A framework for creating a hosting console}
-    gem.description = %Q{It allows you to write rake tasks to do common tasks, such as creating email addresses, adding users etc. Silk provides a HTTP wrapper the the rake tasks, and allows communication via JSON objects, which makes it dead easy for them to be called from a web app.}
-    gem.email = "myles@madpilot.com.au"
-    gem.homepage = "http://github.com/madpilot/silk"
-    gem.authors = ["Myles Eftos"]
-    
-    gem.add_dependency 'daemons'
-    gem.add_dependency 'json'
-    gem.add_dependency 'sinatra'
-    gem.add_dependency 'SyslogLogger'
-    
-    gem.add_development_dependency "shoulda"
-    gem.add_development_dependency "rack-test"
-    gem.add_development_dependency "redgreen"
-    gem.add_development_dependency "mocha"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # dependencies defined in Gemfile
+  gem.name = "silk"
+  gem.executables = "silk"
+  gem.summary = %Q{A framework for creating a hosting console}
+  gem.description = %Q{It allows you to write rake tasks to do common tasks, such as creating email addresses, adding users etc. Silk provides a HTTP wrapper the the rake tasks, and allows communication via JSON objects, which makes it dead easy for them to be called from a web app.}
+  gem.email = "myles@madpilot.com.au"
+  gem.homepage = "http://github.com/madpilot/silk"
+  gem.authors = ["Myles Eftos"]
 end
+Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -34,24 +31,18 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+require 'rcov/rcovtask'
+Rcov::RcovTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+  test.rcov_opts << '--exclude "gems/*"'
 end
 
-task :test => :check_dependencies
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/silk.rb

@@ -5,6 +5,8 @@ require 'rake'
 require 'syslog_logger'
 require 'daemons'
 require 'options'
+require 'runner'
+require 'exceptions/task_not_found'
 require 'server'
 require 'tasks'
 
@@ -25,7 +27,11 @@ module Silk
     Daemons.call(options) do
       $0 = old_proc_name
       Dir.chdir pwd
-      Server.run! :host => options[:bind], :port => options[:port], :environment => :production
+      if options[:test]
+        puts Runner.test(options[:test_task], options[:test_params]) 
+      else
+        Server.run! :host => options[:bind], :port => options[:port], :environment => :production
+      end
     end
   end
 

data/lib/silk/exceptions/task_not_found.rb

@@ -0,0 +1,6 @@
+module Silk
+  module Exceptions
+    class TaskNotFound < StandardError
+    end
+  end
+end

data/lib/silk/options.rb

@@ -50,7 +50,25 @@ class Options
       opts.on('-s [server list]', '--server', /.+/, 'handler used for built-in web server') do |server|
         options[:server] = [ server ]
       end
- 
+
+      options[:test] = false
+      options[:test_task] = nil
+      opts.on('-t [task]', '--test', /.+/, 'Test the supplied rake task on the command line') do |test|
+        options[:test] = true
+        options[:test_task] = test
+        options[:ontop] = true
+      end
+
+      options[:test_params] = {}
+      opts.on('--param [param]', '--parameter', /.+/, 'Parameters to pass in to the test task. Enter as key/value pairs, ie user=joe') do |param|
+        k, v = param.split('=')
+        options[:test_params][k] = v
+      end
+
+      opts.on('--format [format]', /.+/, 'Output format') do |format|
+        ENV['format'] = format
+      end
+
       opts.on('-v', '--version') do
         File.open(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')) do |fh|
           puts fh.read

data/lib/silk/runner.rb

@@ -0,0 +1,48 @@
+module Silk
+  class Runner
+    def self.execute(task, params)
+      tasks = Silk::Tasks.new
+      raise Silk::Exceptions::TaskNotFound unless tasks.list.include?(task)
+
+      results = { :stdout => '', :stderr => '', :status => nil }
+      params.delete("captures")
+
+      stdout_read, stdout_write = IO.pipe
+      stderr_read, stderr_write = IO.pipe
+      pid = Process.fork do
+        $stdout.reopen stdout_write
+        $stderr.reopen stderr_write
+        stdout_read.close
+        stderr_read.close
+        tasks.run(task, params)
+      end
+      
+      stdout_write.close
+      stderr_write.close
+      
+      stdout_read.each do |line|
+        results[:stdout] += line
+      end
+      stderr_read.each do |line|
+        results[:stderr] += line
+      end
+      
+      pid, status = Process.waitpid2(pid)
+      results[:status] = status
+      results[:stdout].strip!
+      results[:stderr].strip!
+      
+      return results
+    end
+
+    def self.test(task, params)
+      results = self.execute(task, params)
+
+      if results[:status].exitstatus != 0
+        "Error: #{results[:stderr]}"
+      else
+        "Success: #{results[:stdout]}"
+      end
+    end
+  end
+end

data/lib/silk/server.rb

@@ -3,12 +3,12 @@ require 'sinatra/base'
 
 module Silk
   class Server < Sinatra::Base
-    get %r{\/(.+)} do |c|
+    def process(context, params)
       options = Silk.options
       task = nil
       format = 'text'
       
-      query = c.split('.')
+      query = context.split('.')
       format = query.pop if query.size > 1
       task = query.join('.').gsub("/", ":")
      
@@ -20,43 +20,42 @@ module Silk
       else
         content_type('text/plain')
       end
-
-      tasks = Silk::Tasks.new
-      unless tasks.list.include?(task)
-        not_found("Not Found")
-      end
-
-      results = { :stdout => '', :stderr => '' }
-      params.delete("captures")
+      
       ENV['format'] = format
-
-      stdout_read, stdout_write = IO.pipe
-      stderr_read, stderr_write = IO.pipe
-      pid = Process.fork do
-        $stdout.reopen stdout_write
-        $stderr.reopen stderr_write
-        stdout_read.close
-        stderr_read.close
-        tasks.run(task, params)
-      end
+ 
+      begin
+        results = Runner.execute(task, params)
+        headers('X_PROCESS_EXIT_STATUS' => results[:status].exitstatus.to_s)
+       
+        if results[:status].exitstatus != 0
+          error(500, results[:stderr])
+        else
+          results[:stdout]
+        end
       
-      stdout_write.close
-      stderr_write.close
-      stdout_read.each do |line|
-        results[:stdout] += line
-      end
-      stderr_read.each do |line|
-        results[:stderr] += line
+      rescue Silk::Exceptions::TaskNotFound
+        not_found("Not found")
       end
-      pid, status = Process.waitpid2(pid)
+    end
+
+    get %r{\/(.+)} do |context|
+      process context, params
+    end
+
+    post %r{\/(.+)} do |context|
+      process context, params
+    end
     
-      headers('X_PROCESS_EXIT_STATUS' => status.exitstatus.to_s)
-     
-      if status.exitstatus != 0
-        error(500, results[:stderr].strip)
-      else
-        results[:stdout].strip
-      end
+    put %r{\/(.+)} do |context|
+      process context, params
+    end
+    
+    delete %r{\/(.+)} do |context|
+      process context, params
+    end
+
+    not_found do
+      'Not found'
     end
   end
 end

data/silk.gemspec

@@ -1,96 +1,102 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{silk}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Myles Eftos"]
-  s.date = %q{2010-08-29}
+  s.date = %q{2011-07-30}
   s.default_executable = %q{silk}
   s.description = %q{It allows you to write rake tasks to do common tasks, such as creating email addresses, adding users etc. Silk provides a HTTP wrapper the the rake tasks, and allows communication via JSON objects, which makes it dead easy for them to be called from a web app.}
   s.email = %q{myles@madpilot.com.au}
   s.executables = ["silk"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/silk",
-     "install.rb",
-     "lib/silk.rb",
-     "lib/silk/dsl.rake",
-     "lib/silk/options.rb",
-     "lib/silk/server.rb",
-     "lib/silk/tasks.rb",
-     "silk.gemspec",
-     "test/bin/failure",
-     "test/bin/successful",
-     "test/helper.rb",
-     "test/rakefiles/test.rake",
-     "test/test_dsl.rb",
-     "test/test_helper.rb",
-     "test/test_options.rb",
-     "test/test_server.rb",
-     "test/test_silk.rb",
-     "test/test_tasks.rb"
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/silk",
+    "install.rb",
+    "lib/silk.rb",
+    "lib/silk/dsl.rake",
+    "lib/silk/exceptions/task_not_found.rb",
+    "lib/silk/options.rb",
+    "lib/silk/runner.rb",
+    "lib/silk/server.rb",
+    "lib/silk/tasks.rb",
+    "silk.gemspec",
+    "test/bin/failure",
+    "test/bin/successful",
+    "test/helper.rb",
+    "test/rakefiles/test.rake",
+    "test/test_dsl.rb",
+    "test/test_helper.rb",
+    "test/test_options.rb",
+    "test/test_runner.rb",
+    "test/test_server.rb",
+    "test/test_silk.rb",
+    "test/test_tasks.rb"
   ]
   s.homepage = %q{http://github.com/madpilot/silk}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A framework for creating a hosting console}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_dsl.rb",
-     "test/test_helper.rb",
-     "test/test_options.rb",
-     "test/test_server.rb",
-     "test/test_silk.rb",
-     "test/test_tasks.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<SyslogLogger>, [">= 0"])
+      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rack-test>, [">= 0"])
-      s.add_development_dependency(%q<redgreen>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
+      s.add_development_dependency(%q<redgreen>, ["= 1.2.2"])
     else
       s.add_dependency(%q<daemons>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<SyslogLogger>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<redgreen>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
+      s.add_dependency(%q<redgreen>, ["= 1.2.2"])
     end
   else
     s.add_dependency(%q<daemons>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<SyslogLogger>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<redgreen>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
+    s.add_dependency(%q<redgreen>, ["= 1.2.2"])
   end
 end
 

data/test/bin/failure

@@ -1,3 +1,3 @@
-#!/bin/env ruby
+#!/usr/bin/env ruby
 $stderr.puts "Fail :("
 exit(1)

data/test/bin/successful

@@ -1,3 +1,3 @@
-#!/bin/env ruby
+#!/usr/bin/env ruby
 puts "Success!"
 exit(0)

data/test/helper.rb

@@ -1,4 +1,12 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'test/unit'
 require 'shoulda'
 

data/test/test_dsl.rb

@@ -209,7 +209,7 @@ class TestDSL < Test::Unit::TestCase
         assert_equal 'Success!', result.stdout.strip
       end
       
-      should 'set the stdout value' do
+      should 'set the stderr value' do
         result = @context.run File.join(File.dirname(__FILE__), '..', 'test', 'bin', 'failure')
         assert_equal 'Fail :(', result.stderr.strip
       end

data/test/test_helper.rb

@@ -2,7 +2,6 @@ $:.unshift File.join(File.dirname(File.expand_path(__FILE__)), '..', 'lib')
 require 'rubygems' 
 require 'silk'
  
-require 'redgreen'
 require 'test/unit'
 require 'mocha'
 require 'shoulda'

data/test/test_options.rb

@@ -158,6 +158,55 @@ class TestOptions < Test::Unit::TestCase
       assert_equal [ 'iis' ], options[:server]
     end
 
+    should 'set the test flag if -t is set' do
+      ARGV << '-t'
+      options = Options.parse
+      assert options[:test]
+    end
+
+    should 'set the test flag if --test is set' do
+      ARGV << '--test'
+      ARGV << "test:task"
+      options = Options.parse
+      assert options[:test]
+      assert_equal "test:task", options[:test_task]
+    end
+
+    should 'set the ontop flag if -t is set' do
+      ARGV << '-t'
+      ARGV << "test:task"
+      options = Options.parse
+      assert_equal true, options[:ontop]
+      assert_equal "test:task", options[:test_task]
+    end
+
+    should 'set the optop flag if --test is set' do
+      ARGV << '--test'
+      options = Options.parse
+      assert_equal true, options[:ontop]
+    end
+   
+    should 'add params to the test_params array if --param is set' do
+      ARGV << '--param'
+      ARGV << 'user=joe'
+      options = Options.parse
+      assert_equal 'joe', options[:test_params]['user']
+    end
+
+    should 'add params to the test_params array if --paramaters is set' do
+      ARGV << '--parameter'
+      ARGV << 'user=joe'
+      options = Options.parse
+      assert_equal 'joe', options[:test_params]['user']
+    end
+
+    should 'set the format environment variable if --format is set' do
+      ARGV << '--format'
+      ARGV << 'json'
+      options = Options.parse
+      assert_equal 'json', ENV['format']
+    end
+
     should 'display the VERSION of -v is set' do
       ARGV << '-v'
       

data/test/test_runner.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+class TestRunner < Test::Unit::TestCase
+  context 'TestRunner' do
+    setup do
+      Silk.options = { :recipe_paths => File.join(File.dirname(File.expand_path(__FILE__)), 'rakefiles') }
+      ENV['format'] = nil
+    end
+    
+    should "raise TaskNotFound exception if the task isn't found" do
+      assert_raise Silk::Exceptions::TaskNotFound do
+        Silk::Runner.execute('task:does:not:exist', {})
+      end
+    end
+
+    should 'fill the stdout on success' do
+      assert_nothing_raised do
+        results = Silk::Runner.execute('level_1:level_2', {})
+        assert_equal 'text', results[:stdout].strip
+        assert_equal 0, results[:status].exitstatus
+      end
+    end
+  
+    should 'fill the stderr on error' do
+      assert_nothing_raised do
+        results = Silk::Runner.execute('errors:return', {})
+        assert_equal 'Error', results[:stderr].strip
+        assert_equal 1, results[:status].exitstatus
+      end
+    end
+  end
+end

data/test/test_server.rb

@@ -12,32 +12,38 @@ class TestServer < Test::Unit::TestCase
       Silk.options = { :recipe_paths => File.join(File.dirname(File.expand_path(__FILE__)), 'rakefiles') }
     end
 
+    should 'return simple 404 if the task is not found' do
+      get '/'
+      assert last_response.not_found?
+      assert_match "Not found", last_response.body
+    end
+
     context 'mime_types' do
       should "return 'text/plain' if there is no format" do
         get '/level_1/level_2'
         assert last_response.ok?
-        assert_equal "text/plain", last_response.headers['Content-Type']
+        assert_match /text\/plain/, last_response.headers['Content-Type']
         assert_equal "text", last_response.body
       end
       
       should "return 'text/plain' if the format isn't recognised" do
         get '/level_1/level_2.csv'
         assert last_response.ok?
-        assert_equal "text/plain", last_response.headers['Content-Type']
+        assert_match /text\/plain/, last_response.headers['Content-Type']
         assert_equal "text", last_response.body
       end
       
       should "return 'application/json' if there is no format" do
         get '/level_1/level_2.json'
         assert last_response.ok?
-        assert_equal "application/json", last_response.headers['Content-Type']
+        assert_match /application\/json/, last_response.headers['Content-Type']
         assert_equal "json".to_json, last_response.body
       end
       
       should "return 'application/xml' if there is no format" do
         get '/level_1/level_2.xml'
         assert last_response.ok?
-        assert_equal "application/xml", last_response.headers['Content-Type']
+        assert_match /application\/xml/, last_response.headers['Content-Type']
         assert_equal "<xml>xml</xml>", last_response.body
       end
     end

data/test/test_silk.rb

@@ -44,6 +44,15 @@ class TestSilk < Test::Unit::TestCase
         Silk::Server.expects(:run!).with({ :host => '1.2.3.4', :port => 80, :environment => :production })
         Silk.run
       end
+
+      should 'use run the test runner if in test mode' do
+        logger_mock = mock
+        options = { :test => true, :test_task => 'test:task', :test_params => { 'test' => 'param' } }
+        Options.stubs(:parse).returns(options)
+        Logger.stubs(:new).returns(logger_mock)
+        Silk::Runner.expects(:test).with('test:task', { 'test' => 'param' })
+        Silk.run
+      end
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: silk
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Myles Eftos
@@ -15,121 +14,159 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 +08:00
+date: 2011-07-30 00:00:00 +08:00
 default_executable: silk
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: daemons
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id001
+  name: daemons
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id002
+  name: json
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sinatra
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id003
+  name: sinatra
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
   name: SyslogLogger
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id005
+  name: rdoc
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id006
+  name: shoulda
+  prerelease: false
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rack-test
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id007
+  name: mocha
+  prerelease: false
   type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: redgreen
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  requirement: *id008
+  name: bundler
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
+  requirement: *id009
+  name: jeweler
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id010
+  name: rcov
+  prerelease: false
   type: :development
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id011
+  name: rack-test
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 2
+        version: 1.2.2
+  requirement: *id012
+  name: redgreen
+  prerelease: false
   type: :development
-  version_requirements: *id008
 description: It allows you to write rake tasks to do common tasks, such as creating email addresses, adding users etc. Silk provides a HTTP wrapper the the rake tasks, and allows communication via JSON objects, which makes it dead easy for them to be called from a web app.
 email: myles@madpilot.com.au
 executables: 
@@ -141,7 +178,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -150,7 +188,9 @@ files:
 - install.rb
 - lib/silk.rb
 - lib/silk/dsl.rake
+- lib/silk/exceptions/task_not_found.rb
 - lib/silk/options.rb
+- lib/silk/runner.rb
 - lib/silk/server.rb
 - lib/silk/tasks.rb
 - silk.gemspec
@@ -161,6 +201,7 @@ files:
 - test/test_dsl.rb
 - test/test_helper.rb
 - test/test_options.rb
+- test/test_runner.rb
 - test/test_server.rb
 - test/test_silk.rb
 - test/test_tasks.rb
@@ -169,40 +210,30 @@ homepage: http://github.com/madpilot/silk
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A framework for creating a hosting console
-test_files: 
-- test/helper.rb
-- test/test_dsl.rb
-- test/test_helper.rb
-- test/test_options.rb
-- test/test_server.rb
-- test/test_silk.rb
-- test/test_tasks.rb
+test_files: []
+

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC