RubyGems - silk - Versions diffs - 0.0.2 → 0.0.3 - Mend

silk 0.0.2 → 0.0.3

Files changed (17) hide show

data/README.rdoc CHANGED

@@ -24,7 +24,9 @@ for full argument descriptions.
 The system automatically converts the rest URL (only GETs at the moment) into a rake task name - if the name doesn't exist, you'll get a 404. Any query params get passed into the task
-So http://localhost:8888/users/get?login=myles
+  So http://localhost:8888/users/get?login=myles (Returns Plain text)
+  So http://localhost:8888/users/get.json?login=myles (Returns JSON)
+  So http://localhost:8888/users/get.xml?login=myles (Returns XML)
 would run the users:get task. do something like this in the rake task:
@@ -34,9 +36,17 @@ would run the users:get task. do something like this in the rake task:
     task :get do |t, args|
       # args[:login] will be populated with myles
       if args[:login]
-        puts "Success".to_json
+        respond_to do |format|
+          format.text { "Success" }
+          format.xml { "<body>Success</body>" }
+          format.json { "Success".to_json }
+        end
       else
-        $stderr.puts "Fail".to_json
+        error_respond_to do |format|
+          format.text { "Fail" }
+          format.xml { "<error>Fail</error>" }
+          format.json { "Fail".to_json }
+        end
         exit(-1)
       end
     end
@@ -54,8 +64,6 @@ 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
-(Please note: I haven't got complete coverage yet, so I'm not really practicing what I preach. I'm working on it - feel free to help out!)
 == 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.

data/Rakefile CHANGED

@@ -22,6 +22,7 @@ begin
     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"
 end

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.0.2
1	+ 0.0.3

data/install.rb ADDED

@@ -0,0 +1,29 @@
+require 'fileutils'
+class FileExists < StandardError;end
+# Create the default recipe container for the gem
+def write_to(path)
+  if !File.exists?(path)
+    FileUtils.mkdir_p(path)
+  else
+    raise FileExists.new("#{path} already exists")
+  end
+end
+begin
+  write_to('/etc/silk')
+  exit(0)
+rescue FileExists => e
+  puts e
+  exit(0)
+rescue
+  # Just drop through...
+end
+begin
+  write_to(File.join(ENV['HOME'], '.silk'))
+rescue => e
+  puts e
+  exit(-1)
+end

data/lib/silk.rb CHANGED

@@ -7,6 +7,7 @@ require 'daemons'
 require 'options'
 require 'server'
 require 'tasks'
+require 'dsl'
 module Silk
   def self.run

data/lib/silk/dsl.rb ADDED

@@ -0,0 +1,57 @@
+class FormattedResponse
+  def method_missing(symbol, *args, &blk)
+    if [ :json, :xml, :text ].include?(symbol)
+      if block_given?
+        instance_variable_set("@#{symbol.to_s}", yield)
+      else
+        instance_variable_get("@#{symbol.to_s}")
+      end
+    else
+      super
+    end
+  end
+end
+# Allows you to set different outputs based on the requested format.
+# SUpports xml, json and text
+#
+#   respond_to do |format|
+#     format.xml { '<xml>xml</xml>' }
+#     format.json { '{ json }' }
+#     format.text { 'text' }
+#   end
+#
+def respond_to(&blk)
+  response = FormattedResponse.new
+  yield(response)
+  case(ENV['format'])
+  when 'xml'
+    puts response.xml
+  when 'json'
+    puts response.json
+  else
+    puts response.text
+  end
+end
+# Allows you to set different error outputs based on the requested format.
+# SUpports xml, json and text
+#
+#   error_respond_to do |format|
+#     format.xml { '<xml>xml</xml>' }
+#     format.json { '{ json }' }
+#     format.text { 'text' }
+#   end
+#
+def error_respond_to(&blk)
+  response = FormattedResponse.new
+  yield(response)
+  case(ENV['format'])
+  when 'xml'
+    $stderr.puts response.xml
+  when 'json'
+    $stderr.puts response.json
+  else
+    $stderr.puts response.text
+  end
+end

data/lib/silk/options.rb CHANGED

@@ -16,7 +16,7 @@ class Options
       opts.on('-h', '--help', "You're looking at it") do
         puts opts
-        exit(-1)
+        exit(1)
       end
       options[:ontop] = false
@@ -24,11 +24,11 @@ class Options
         options[:ontop] = true
       end
-      options[:filter_paths] = [ File.join('', 'etc', 'silk') ]
-      options[:filter_paths] << File.join(ENV['HOME'], '.silk') if ENV['HOME']
+      options[:recipe_paths] = [ File.join('', 'etc', 'silk') ]
+      options[:recipe_paths] << File.join(ENV['HOME'], '.silk') if ENV['HOME']
       opts.on('-r [recipe]', '--recipes [recipe]', /.+/, 'Reads in additional recipes') do |recipes|
-        options[:filter_paths] << recipes
+        options[:recipe_paths] << recipes
       end
       options[:port] = 8888
@@ -42,13 +42,13 @@ class Options
       end
       options[:bind] = '0.0.0.0'
-      opts.on('-b', '--bind', /.+/, 'Set the IP address to listen to') do |host|
+      opts.on('-b [address]', '--bind', /.+/, 'Set the IP address to listen to') do |host|
         options[:bind] = host
       end
       options[:server] = %w[thin mongrel webrick]
-      opts.on('-s', '--server', /.+/, 'handler used for built-in web server') do |server|
-        options[:server] = server
+      opts.on('-s [server list]', '--server', /.+/, 'handler used for built-in web server') do |server|
+        options[:server] = [ server ]
       end
       opts.on('-v', '--version') do

data/lib/silk/server.rb CHANGED

@@ -4,19 +4,32 @@ require 'sinatra/base'
 module Silk
   class Server < Sinatra::Base
     get %r{\/(.+)} do |c|
-      content_type('application/json')
       options = Silk.options
-      task = c.gsub("/", ":")
+      task = nil
+      format = 'text'
+      query = c.split('.')
+      format = query.pop if query.size > 1
+      task = query.join('.').gsub("/", ":")
+      case(format)
+      when 'json'
+        content_type('application/json')
+      when 'xml'
+        content_type('application/xml')
+      else
+        content_type('text/plain')
+      end
       tasks = Silk::Tasks.new
       unless tasks.list.include?(task)
-        not_found("Not Found".to_json)
+        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
@@ -35,11 +48,11 @@ module Silk
       stderr_read.each do |line|
         results[:stderr] += line
       end
-      Process.waitpid(pid)
+      pid, status = Process.waitpid2(pid)
-      headers('X_PROCESS_EXIT_STATUS' => $?.exitstatus.to_s)
-      if $?.exitstatus != 0
+      headers('X_PROCESS_EXIT_STATUS' => status.exitstatus.to_s)
+      if status.exitstatus != 0
         error(500, results[:stderr].strip)
       else
         results[:stdout].strip

data/lib/silk/tasks.rb CHANGED

@@ -6,7 +6,7 @@ module Silk
       Rake::Task.clear
       @app = Rake::Application.new
       @app.init
-      Silk.options[:filter_paths].each do |path|
+      Silk.options[:recipe_paths].each do |path|
         FileList.new("#{path}/*.rake").each do |file|
           @app.add_import(file)
         end
@@ -18,7 +18,7 @@ module Silk
       return Rake::Task.tasks.map { |task| task.name }
     end
-    def run(task, arguments)
+    def run(task, arguments = {})
       Rake::Task[task].execute(arguments)
     end
   end

data/silk.gemspec ADDED

@@ -0,0 +1,94 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+Gem::Specification.new do |s|
+  s.name = %q{silk}
+  s.version = "0.0.3"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Myles Eftos"]
+  s.date = %q{2010-08-28}
+  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"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/silk",
+     "install.rb",
+     "lib/silk.rb",
+     "lib/silk/dsl.rb",
+     "lib/silk/options.rb",
+     "lib/silk/server.rb",
+     "lib/silk/tasks.rb",
+     "silk.gemspec",
+     "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"
+  ]
+  s.homepage = %q{http://github.com/madpilot/silk}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A framework for creating a hosting console}
+  s.test_files = [
+    "test/test_server.rb",
+     "test/test_silk.rb",
+     "test/test_options.rb",
+     "test/test_dsl.rb",
+     "test/test_tasks.rb",
+     "test/test_helper.rb",
+     "test/helper.rb"
+  ]
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+    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_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
+      s.add_development_dependency(%q<redgreen>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+    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<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
+      s.add_dependency(%q<redgreen>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+    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<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
+    s.add_dependency(%q<redgreen>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+  end
+end

data/test/rakefiles/test.rake CHANGED

@@ -2,23 +2,27 @@ require 'json'
 desc "Level 1"
 task :level_1 do
-  puts "Level 1".to_json
+  puts "Level 1"
 end
 namespace :level_1 do
   desc "Level 2"
   task :level_2 do
-    puts "Level 2".to_json
+    respond_to do |format|
+      format.text { "text" }
+      format.xml { "<xml>xml</xml>" }
+      format.json { "json".to_json }
+    end
   end
   desc "Level 2 with args"
   task :level_2_with_args do |t, args|
-    puts(("Level 2: " + args.inspect).to_json)
+    puts(("Level 2: " + args.inspect))
   end
   namespace :level_2 do
     task :level_3 do
-      puts "Level 3".to_json
+      puts "Level 3"
     end
   end
 end
@@ -26,7 +30,7 @@ end
 namespace :errors do
   desc "Returns an error"
   task :return do
-    $stderr.puts "Error".to_json
-    exit(-1)
+    $stderr.puts "Error"
+    exit(1)
   end
 end

data/test/test_dsl.rb ADDED

@@ -0,0 +1,153 @@
+require 'test_helper'
+class TestDSL < Test::Unit::TestCase
+  context 'TestDSL' do
+    context 'respond_to' do
+      should 'call the text block if ENV[format] == text' do
+        ENV['format'] = 'text'
+        stdout_read, stdout_write = IO.pipe
+        pid = Process.fork do
+          $stdout.reopen stdout_write
+          stdout_read.close
+          respond_to do |format|
+            format.text { 'text' }
+            format.json { 'json'.to_json }
+            format.xml { '<xml>xml</xml>' }
+          end
+        end
+        stdout_write.close
+        stdout = ''
+        stdout_read.each do |line|
+          stdout += line
+        end
+        Process.waitpid(pid)
+        assert_equal 'text', stdout.strip
+      end
+      should 'call the text block if ENV[format] == xml' do
+        ENV['format'] = 'xml'
+        stdout_read, stdout_write = IO.pipe
+        pid = Process.fork do
+          $stdout.reopen stdout_write
+          stdout_read.close
+          respond_to do |format|
+            format.text { 'text' }
+            format.json { 'json'.to_json }
+            format.xml { '<xml>xml</xml>' }
+          end
+        end
+        stdout_write.close
+        stdout = ''
+        stdout_read.each do |line|
+          stdout += line
+        end
+        Process.waitpid(pid)
+        assert_equal '<xml>xml</xml>', stdout.strip
+      end
+      should 'call the text block if ENV[format] == json' do
+        ENV['format'] = 'json'
+        stdout_read, stdout_write = IO.pipe
+        pid = Process.fork do
+          $stdout.reopen stdout_write
+          stdout_read.close
+          respond_to do |format|
+            format.text { 'text' }
+            format.json { 'json'.to_json }
+            format.xml { '<xml>xml</xml>' }
+          end
+        end
+        stdout_write.close
+        stdout = ''
+        stdout_read.each do |line|
+          stdout += line
+        end
+        Process.waitpid(pid)
+        assert_equal 'json'.to_json, stdout.strip
+      end
+    end
+    context 'error_respond_to' do
+      should 'call the text block if ENV[format] == text' do
+        ENV['format'] = 'text'
+        stderr_read, stderr_write = IO.pipe
+        pid = Process.fork do
+          $stderr.reopen stderr_write
+          stderr_read.close
+          error_respond_to do |format|
+            format.text { 'text' }
+            format.json { 'json'.to_json }
+            format.xml { '<xml>xml</xml>' }
+          end
+        end
+        stderr_write.close
+        stderr = ''
+        stderr_read.each do |line|
+          stderr += line
+        end
+        Process.waitpid(pid)
+        assert_equal 'text', stderr.strip
+      end
+      should 'call the text block if ENV[format] == xml' do
+        ENV['format'] = 'xml'
+        stderr_read, stderr_write = IO.pipe
+        pid = Process.fork do
+          $stderr.reopen stderr_write
+          stderr_read.close
+          error_respond_to do |format|
+            format.text { 'text' }
+            format.json { 'json'.to_json }
+            format.xml { '<xml>xml</xml>' }
+          end
+        end
+        stderr_write.close
+        stderr = ''
+        stderr_read.each do |line|
+          stderr += line
+        end
+        Process.waitpid(pid)
+        assert_equal '<xml>xml</xml>', stderr.strip
+      end
+      should 'call the text block if ENV[format] == json' do
+        ENV['format'] = 'json'
+        stderr_read, stderr_write = IO.pipe
+        pid = Process.fork do
+          $stderr.reopen stderr_write
+          stderr_read.close
+          error_respond_to do |format|
+            format.text { 'text' }
+            format.json { 'json'.to_json }
+            format.xml { '<xml>xml</xml>' }
+          end
+        end
+        stderr_write.close
+        stderr = ''
+        stderr_read.each do |line|
+          stderr += line
+        end
+        Process.waitpid(pid)
+        assert_equal 'json'.to_json, stderr.strip
+      end
+    end
+  end
+end

data/test/test_options.rb ADDED

@@ -0,0 +1,202 @@
+require 'test_helper'
+class TestOptions < Test::Unit::TestCase
+  context 'TestOptions' do
+    setup do
+      ENV['HOME'] = '/home/john'
+      ARGV.delete_if { |el| true }
+    end
+    should 'set defaults' do
+      options = Options.parse
+      assert_equal false, options[:verbose]
+      assert_equal false, options[:ontop]
+      assert_equal [ '/etc/silk', '/home/john/.silk' ], options[:recipe_paths]
+      assert_equal 8888, options[:port]
+      assert_equal false, options[:lock]
+      assert_equal '0.0.0.0', options[:bind]
+      assert_equal [ 'thin', 'mongrel', 'webrick' ], options[:server]
+    end
+    should 'set verbose mode if -V is set' do
+      ARGV << '-V'
+      options = Options.parse
+      assert_equal true, options[:verbose]
+    end
+    should 'set verbose mode if --verbose is set' do
+      ARGV << '--verbose'
+      options = Options.parse
+      assert_equal true, options[:verbose]
+    end
+    should 'display help on -h' do
+      ARGV << '-h'
+      stdout_read, stdout_write = IO.pipe
+      pid = Process.fork do
+        $stdout.reopen stdout_write
+        stdout_read.close
+        options = Options.parse
+      end
+      stdout_write.close
+      pid, status = Process.waitpid2(pid)
+      assert_equal 1, status.exitstatus
+    end
+    should 'display help on --help' do
+      ARGV << '--help'
+      stdout_read, stdout_write = IO.pipe
+      pid = Process.fork do
+        $stdout.reopen stdout_write
+        stdout_read.close
+        options = Options.parse
+      end
+      stdout_write.close
+      pid, status = Process.waitpid2(pid)
+      assert_equal 1, status.exitstatus
+    end
+    should 'set ontop to true if -f' do
+      ARGV << '-f'
+      options = Options.parse
+      assert_equal true, options[:ontop]
+    end
+    should 'set ontop to true if --foreground' do
+      ARGV << '--foreground'
+      options = Options.parse
+      assert_equal true, options[:ontop]
+    end
+    should 'add recipes to the recipe list for each -r' do
+      ARGV << '-r'
+      ARGV << '/tmp/recipes'
+      options = Options.parse
+      assert_equal [ '/etc/silk', '/home/john/.silk', '/tmp/recipes' ], options[:recipe_paths]
+      ARGV << '-r'
+      ARGV << '/tmp/recipes'
+      ARGV << '-r'
+      ARGV << '/tmp/recipes_2'
+      options = Options.parse
+      assert_equal [ '/etc/silk', '/home/john/.silk', '/tmp/recipes', '/tmp/recipes_2' ], options[:recipe_paths]
+    end
+    should 'add recipes to the recipe list for each -r' do
+      ARGV << '--recipes'
+      ARGV << '/tmp/recipes'
+      options = Options.parse
+      assert_equal [ '/etc/silk', '/home/john/.silk', '/tmp/recipes' ], options[:recipe_paths]
+      ARGV << '--recipes'
+      ARGV << '/tmp/recipes'
+      ARGV << '--recipes'
+      ARGV << '/tmp/recipes_2'
+      options = Options.parse
+      assert_equal [ '/etc/silk', '/home/john/.silk', '/tmp/recipes', '/tmp/recipes_2' ], options[:recipe_paths]
+    end
+    should 'set port if -p is set' do
+      ARGV << '-p'
+      ARGV << '1234'
+      options = Options.parse
+      assert_equal 1234, options[:port]
+    end
+    should 'set port if --port is set' do
+      ARGV << '--port'
+      ARGV << '1234'
+      options = Options.parse
+      assert_equal 1234, options[:port]
+    end
+    should 'set lock if -x is set' do
+      ARGV << '-x'
+      options = Options.parse
+      assert_equal true, options[:lock]
+    end
+    should 'set lock if --lock is set' do
+      ARGV << '-x'
+      options = Options.parse
+      assert_equal true, options[:lock]
+    end
+    should 'set bind address if -b is set' do
+      ARGV << '-b'
+      ARGV << '1.2.3.4'
+      options = Options.parse
+      assert_equal '1.2.3.4', options[:bind]
+    end
+    should 'set bind address if --bind is set' do
+      ARGV << '--bind'
+      ARGV << '1.2.3.4'
+      options = Options.parse
+      assert_equal '1.2.3.4', options[:bind]
+    end
+    should 'set the server array if -s is set' do
+      ARGV << '-s'
+      ARGV << 'iis'
+      options = Options.parse
+      assert_equal [ 'iis' ], options[:server]
+    end
+    should 'set the server array if -s is set' do
+      ARGV << '--server'
+      ARGV << 'iis'
+      options = Options.parse
+      assert_equal [ 'iis' ], options[:server]
+    end
+    should 'display the VERSION of -v is set' do
+      ARGV << '-v'
+      stdout_read, stdout_write = IO.pipe
+      pid = Process.fork do
+        $stdout.reopen stdout_write
+        stdout_read.close
+        options = Options.parse
+      end
+      stdout_write.close
+      pid, status = Process.waitpid2(pid)
+      assert_equal -1, status.exitstatus
+    end
+    should 'display the VERSION of -v is set' do
+      ARGV << '--version'
+      stdout_read, stdout_write = IO.pipe
+      pid = Process.fork do
+        $stdout.reopen stdout_write
+        stdout_read.close
+        options = Options.parse
+      end
+      result = ''
+      stdout_write.close
+      stdout_read.each do |line|
+        result += line
+      end
+      pid, status = Process.waitpid2(pid)
+      assert_equal 0, status.exitstatus
+      version = ''
+      File.open(File.join(File.dirname(__FILE__), '..', 'VERSION')) do |fh|
+        version = fh.read
+      end
+      assert_equal result, version
+    end
+  end
+end

data/test/test_server.rb CHANGED

@@ -1,53 +1,78 @@
 require 'test_helper'
-class TestSilk < Test::Unit::TestCase
+class TestServer < Test::Unit::TestCase
   include Rack::Test::Methods
   def app
     Silk::Server
   end
-  context '' do
+  context 'TestServer' do
     setup do
-      Silk.options = { :filter_paths => File.join(File.dirname(File.expand_path(__FILE__)), 'rakefiles') }
+      Silk.options = { :recipe_paths => File.join(File.dirname(File.expand_path(__FILE__)), 'rakefiles') }
+    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_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_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_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_equal "<xml>xml</xml>", last_response.body
+      end
     end
     should "return a 404 if the rake task is not found" do
       get '/'
-      assert "application/json", last_response.headers['Content-Type']
       assert last_response.not_found?
     end
     should "return a success if the rake task exists and is successfully run" do
       get '/level_1'
       assert last_response.ok?
-      assert "application/json", last_response.headers['Content-Type']
       assert_equal "0", last_response.headers['X_PROCESS_EXIT_STATUS']
-      assert_equal "Level 1".to_json, last_response.body.to_s
+      assert_equal "Level 1", last_response.body.to_s
     end
     should "return a success if the rake task exists at a second level and is successfully run" do
       get '/level_1/level_2'
       assert last_response.ok?
-      assert "application/json", last_response.headers['Content-Type']
       assert_equal "0", last_response.headers['X_PROCESS_EXIT_STATUS']
-      assert_equal "Level 2".to_json, last_response.body
+      assert_equal "text", last_response.body
     end
     should "return a success if the rake task exists an process arguments if present" do
       get '/level_1/level_2_with_args?argument_1=1&argument_2=2'
       assert last_response.ok?
-      assert "application/json", last_response.headers['Content-Type']
       assert_equal "0", last_response.headers['X_PROCESS_EXIT_STATUS']
-      assert_equal ("Level 2: " + { "argument_1" => "1", "argument_2" => "2" }.inspect).to_json, last_response.body
+      assert_equal ("Level 2: " + { "argument_1" => "1", "argument_2" => "2" }.inspect), last_response.body
     end
     should "return read stderr, and set the exit status, and return 500 if the rake task exists, but returns a non-zero exit code" do
       get '/errors/return'
       assert_equal 500, last_response.status
-      assert "application/json", last_response.headers['Content-Type']
-      assert_equal "255", last_response.headers['X_PROCESS_EXIT_STATUS']
-      assert_equal "Error".to_json, last_response.body
+      assert_equal "1", last_response.headers['X_PROCESS_EXIT_STATUS']
+      assert_equal "Error", last_response.body
     end
   end
 end

data/test/test_silk.rb CHANGED

@@ -1,7 +1,49 @@
-require 'helper'
+require 'test_helper'
 class TestSilk < Test::Unit::TestCase
-  context '' do
+  context 'TestSilk' do
+    context 'run' do
+      should 'use SyslogLogger' do
+        logger_mock = mock
+        options = { :ontop => false }
+        Options.stubs(:parse).returns(options)
+        Daemons.stubs(:call).with(options)
+        SyslogLogger.expects(:new).with('silk').returns(logger_mock)
+        Silk.run
+        assert_equal logger_mock, options[:logger]
+        assert_equal options, Silk.options
+      end
+      should 'use STDOUT for logging if ontop is true' do
+        logger_mock = mock
+        options = { :ontop => true }
+        Options.stubs(:parse).returns(options)
+        Daemons.stubs(:call).with(options)
+        Logger.expects(:new).with(STDOUT).returns(logger_mock)
+        Silk.run
+        assert_equal logger_mock, options[:logger]
+        assert_equal options, Silk.options
+      end
+      should 'change the directory in the child to match the parent' do
+        logger_mock = mock
+        options = { :ontop => true, :multiple => true, :bind => '1.2.3.4', :port => 80 }
+        Options.stubs(:parse).returns(options)
+        Logger.stubs(:new).returns(logger_mock)
+        Dir.expects(:pwd).returns('/tmp/dir')
+        Dir.expects(:chdir).with('/tmp/dir')
+        Silk::Server.stubs(:run!)
+        Silk.run
+      end
+      should 'should start the webserver with the supplied options' do
+        logger_mock = mock
+        options = { :ontop => true, :multiple => true, :bind => '1.2.3.4', :port => 80 }
+        Options.stubs(:parse).returns(options)
+        Logger.stubs(:new).returns(logger_mock)
+        Silk::Server.expects(:run!).with({ :host => '1.2.3.4', :port => 80, :environment => :production })
+        Silk.run
+      end
+    end
   end
 end

data/test/test_tasks.rb CHANGED

@@ -1,9 +1,9 @@
 require 'test_helper'
-class TestSilk < Test::Unit::TestCase
-  context '' do
+class TestTasks < Test::Unit::TestCase
+  context 'TestTasks' do
     setup do
-      Silk.options = { :filter_paths => File.join(File.dirname(File.expand_path(__FILE__)), 'rakefiles') }
+      Silk.options = { :recipe_paths => File.join(File.dirname(File.expand_path(__FILE__)), 'rakefiles') }
       @task = Silk::Tasks.new
     end
@@ -16,6 +16,7 @@ class TestSilk < Test::Unit::TestCase
     end
     should "run a task if it exists" do
+      # I'm guessing this test fails because STDOUT and STDERR are already being captured
       stdout_read, stdout_write = IO.pipe
       stderr_read, stderr_write = IO.pipe
       pid = Process.fork do
@@ -39,11 +40,11 @@ class TestSilk < Test::Unit::TestCase
       end
       Process.waitpid(pid)
-      assert_equal "Level_1".to_json, stdout.strip
-      assert_equal "".to_json, stderr.strip
+      assert_equal "Level 1", stdout.strip
+      assert_equal "", stderr.strip
     end
-    should "run a task and pass in arrguments if it exists" do
+    should "run a task and pass in arguments if it exists" do
       # I'm guessing this test fails because STDOUT and STDERR are already being captured
       stdout_read, stdout_write = IO.pipe
       stderr_read, stderr_write = IO.pipe
@@ -52,7 +53,7 @@ class TestSilk < Test::Unit::TestCase
         $stderr.reopen stderr_write
         stdout_read.close
         stderr_read.close
-        @task.run("level_2_with_args", { 'param_1' => '1' })
+        @task.run("level_1:level_2_with_args", { 'param_1' => '1' })
       end
       stdout_write.close
@@ -68,10 +69,8 @@ class TestSilk < Test::Unit::TestCase
       end
       Process.waitpid(pid)
-      assert_equal(("Level 2: " + { 'param_1' => '1' }.inspect).to_json, stdout.strip)
-      assert_equal "".to_json, stderr.strip
+      assert_equal(("Level 2: " + { 'param_1' => '1' }.inspect), stdout.strip)
+      assert_equal "", stderr.strip
     end
-    should "run the task only once if a new Application is built"
   end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silk
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Myles Eftos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-01-18 00:00:00 +08:00
+date: 2010-08-28 00:00:00 +08:00
 default_executable: silk
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -109,13 +109,18 @@ files:
 - Rakefile
 - VERSION
 - bin/silk
+- install.rb
 - lib/silk.rb
+- lib/silk/dsl.rb
 - lib/silk/options.rb
 - lib/silk/server.rb
 - lib/silk/tasks.rb
+- silk.gemspec
 - 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
@@ -150,6 +155,8 @@ summary: A framework for creating a hosting console
 test_files:
 - test/test_server.rb
 - test/test_silk.rb
+- test/test_options.rb
+- test/test_dsl.rb
 - test/test_tasks.rb
 - test/test_helper.rb
 - test/helper.rb