silk 0.0.3 → 0.0.4

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.add_dependency 'sinatra'
     gem.add_dependency 'SyslogLogger'
     
-    gem.add_development_dependency "thoughtbot-shoulda"
+    gem.add_development_dependency "shoulda"
     gem.add_development_dependency "rack-test"
     gem.add_development_dependency "redgreen"
     gem.add_development_dependency "mocha"

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/silk.rb

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

data/lib/silk/dsl.rake

@@ -0,0 +1,131 @@
+require 'rexml/document'
+
+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
+
+class ProcessResult
+  attr_accessor :stdout, :stderr, :exitstatus
+
+  def initialize(stdout, stderr, exitstatus)
+    @stdout = stdout
+    @stderr = stderr
+    @exitstatus = exitstatus
+  end
+
+  def to_json
+    {
+      :stdout => self.stdout,
+      :stderr => self.stderr,
+      :exitstatus => self.exitstatus
+    }.to_json
+  end
+
+  def to_xml
+    doc = REXML::Document.new
+    doc.add(REXML::XMLDecl.new)
+    result = REXML::Element.new('process_result')
+
+    stdOutEl = REXML::Element.new('stdout')
+    stdOutEl.add_text(self.stdout.to_s)
+    
+    stdErrEl = REXML::Element.new('stderr')
+    stdErrEl.add_text(self.stderr.to_s)
+    
+    exitStatusEl = REXML::Element.new('exitstatus')
+    exitStatusEl.add_text(self.exitstatus.to_s)
+    
+    result.add_element(stdOutEl)
+    result.add_element(stdErrEl)
+    result.add_element(exitStatusEl)
+    
+    doc.add(result);
+    doc.to_s
+  end
+
+  def to_s
+    self.stdout || self.stderr
+  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
+
+def run(command)
+  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
+    Kernel.exec command
+  end
+  
+  stdout_write.close
+  stderr_write.close
+  
+  stdout = ''
+  stdout_read.each do |line|
+    stdout += line
+  end
+  stderr = ''
+  stderr_read.each do |line|
+    stderr += line
+  end
+  pid, status = Process.waitpid2(pid)
+
+  return ProcessResult.new(stdout, stderr, status.exitstatus)
+end

data/lib/silk/options.rb

@@ -55,7 +55,7 @@ class Options
         File.open(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')) do |fh|
           puts fh.read
         end
-        exit(0)
+        exit(1)
       end
     end
  
@@ -64,7 +64,7 @@ class Options
       options
     rescue OptionParser::InvalidOption => e
       puts optparse
-      exit(-1)
+      exit(1)
     end
   end
 end

data/lib/silk/tasks.rb

@@ -6,6 +6,8 @@ module Silk
       Rake::Task.clear
       @app = Rake::Application.new
       @app.init
+      @app.rake_require 'dsl'
+      
       Silk.options[:recipe_paths].each do |path|
         FileList.new("#{path}/*.rake").each do |file|
           @app.add_import(file)
@@ -19,7 +21,8 @@ module Silk
     end
 
     def run(task, arguments = {})
-      Rake::Task[task].execute(arguments)
+      task = Rake::Task[task]
+      task.execute(arguments)
     end
   end
 end

data/silk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{silk}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   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.date = %q{2010-08-29}
   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}
@@ -28,11 +28,13 @@ Gem::Specification.new do |s|
      "bin/silk",
      "install.rb",
      "lib/silk.rb",
-     "lib/silk/dsl.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",
@@ -45,28 +47,28 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.7}
   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/helper.rb",
      "test/test_dsl.rb",
-     "test/test_tasks.rb",
      "test/test_helper.rb",
-     "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::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= 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<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
       s.add_development_dependency(%q<redgreen>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
@@ -75,7 +77,7 @@ Gem::Specification.new do |s|
       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<shoulda>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<redgreen>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
@@ -85,7 +87,7 @@ Gem::Specification.new do |s|
     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<shoulda>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<redgreen>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])

data/test/bin/failure

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

data/test/bin/successful

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

data/test/test_dsl.rb

@@ -1,7 +1,54 @@
 require 'test_helper'
 
+# Need some helper classes so we can call the methods defined in the rake include file
+eval <<-EOF
+  module Silk
+    module DSL
+      #{File.read(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'silk', 'dsl.rake')))}
+    end
+  end
+EOF
+
+class FakeRake
+  include Silk::DSL
+end
+
 class TestDSL < Test::Unit::TestCase
   context 'TestDSL' do
+    setup do
+      @context = FakeRake.new
+    end
+
+    context 'ProcessResult' do
+      setup do
+        @result = Silk::DSL::ProcessResult.new('Standard Output', 'Standard Error', 0)
+      end
+
+      context 'to_xml' do
+        should 'return an XML representation of the object'
+      end
+
+      context 'to_json' do
+        should 'return an JSON respresentation of the object' do
+          obj = JSON::parse(@result.to_json)
+          assert_equal 'Standard Output', obj['stdout']
+          assert_equal 'Standard Error', obj['stderr']
+          assert_equal 0, obj['exitstatus']
+        end
+      end
+
+      context 'to_s' do
+        should 'return stdout if defined' do
+          assert_equal 'Standard Output', @result.to_s
+        end
+        
+        should 'return stderr if stdout if not defined' do
+          @result.stdout = nil
+          assert_equal 'Standard Error', @result.to_s
+        end
+      end
+    end
+
     context 'respond_to' do
       should 'call the text block if ENV[format] == text' do
         ENV['format'] = 'text'
@@ -11,7 +58,7 @@ class TestDSL < Test::Unit::TestCase
           $stdout.reopen stdout_write
           stdout_read.close
           
-          respond_to do |format|
+          @context.respond_to do |format|
             format.text { 'text' }
             format.json { 'json'.to_json }
             format.xml { '<xml>xml</xml>' }
@@ -35,7 +82,7 @@ class TestDSL < Test::Unit::TestCase
           $stdout.reopen stdout_write
           stdout_read.close
           
-          respond_to do |format|
+          @context.respond_to do |format|
             format.text { 'text' }
             format.json { 'json'.to_json }
             format.xml { '<xml>xml</xml>' }
@@ -59,7 +106,7 @@ class TestDSL < Test::Unit::TestCase
           $stdout.reopen stdout_write
           stdout_read.close
           
-          respond_to do |format|
+          @context.respond_to do |format|
             format.text { 'text' }
             format.json { 'json'.to_json }
             format.xml { '<xml>xml</xml>' }
@@ -85,7 +132,7 @@ class TestDSL < Test::Unit::TestCase
           $stderr.reopen stderr_write
           stderr_read.close
           
-          error_respond_to do |format|
+          @context.error_respond_to do |format|
             format.text { 'text' }
             format.json { 'json'.to_json }
             format.xml { '<xml>xml</xml>' }
@@ -109,7 +156,8 @@ class TestDSL < Test::Unit::TestCase
           $stderr.reopen stderr_write
           stderr_read.close
           
-          error_respond_to do |format|
+          
+          @context.error_respond_to do |format|
             format.text { 'text' }
             format.json { 'json'.to_json }
             format.xml { '<xml>xml</xml>' }
@@ -133,7 +181,7 @@ class TestDSL < Test::Unit::TestCase
           $stderr.reopen stderr_write
           stderr_read.close
           
-          error_respond_to do |format|
+          @context.error_respond_to do |format|
             format.text { 'text' }
             format.json { 'json'.to_json }
             format.xml { '<xml>xml</xml>' }
@@ -149,5 +197,27 @@ class TestDSL < Test::Unit::TestCase
         assert_equal 'json'.to_json, stderr.strip
       end
     end
+
+    context 'run' do
+      should 'capture standard input and return a ProcessResult object' do
+        result = @context.run File.join(File.dirname(__FILE__), '..', 'test', 'bin', 'successful')
+        assert_equal Silk::DSL::ProcessResult, result.class
+      end
+
+      should 'set the stdout value' do
+        result = @context.run File.join(File.dirname(__FILE__), '..', 'test', 'bin', 'successful')
+        assert_equal 'Success!', result.stdout.strip
+      end
+      
+      should 'set the stdout value' do
+        result = @context.run File.join(File.dirname(__FILE__), '..', 'test', 'bin', 'failure')
+        assert_equal 'Fail :(', result.stderr.strip
+      end
+      
+      should 'set the exitstatus value' do
+        result = @context.run File.join(File.dirname(__FILE__), '..', 'test', 'bin', 'failure')
+        assert_equal 1, result.exitstatus
+      end
+    end
   end
 end

data/test/test_options.rb

@@ -89,7 +89,7 @@ class TestOptions < Test::Unit::TestCase
       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
+    should 'add recipes to the recipe list for each --recipes' do
       ARGV << '--recipes'
       ARGV << '/tmp/recipes'
       options = Options.parse
@@ -151,7 +151,7 @@ class TestOptions < Test::Unit::TestCase
       assert_equal [ 'iis' ], options[:server]
     end
 
-    should 'set the server array if -s is set' do
+    should 'set the server array if --server is set' do
       ARGV << '--server'
       ARGV << 'iis'
       options = Options.parse
@@ -168,13 +168,23 @@ class TestOptions < Test::Unit::TestCase
         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 -1, status.exitstatus
+      assert_equal 1, status.exitstatus
+      version = ''
+      
+      File.open(File.join(File.dirname(__FILE__), '..', 'VERSION')) do |fh|
+        version = fh.read
+      end
+      assert_equal result, version
     end
 
-    should 'display the VERSION of -v is set' do
+    should 'display the VERSION of --version is set' do
       ARGV << '--version'
       
       stdout_read, stdout_write = IO.pipe
@@ -191,7 +201,8 @@ class TestOptions < Test::Unit::TestCase
         result += line
       end
       pid, status = Process.waitpid2(pid)
-      assert_equal 0, status.exitstatus
+      assert_equal 1, status.exitstatus
+      
       version = ''
       File.open(File.join(File.dirname(__FILE__), '..', 'VERSION')) do |fh|
         version = fh.read

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: silk
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Myles Eftos
@@ -9,89 +15,121 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +08:00
+date: 2010-08-29 00:00:00 +08:00
 default_executable: silk
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: daemons
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: SyslogLogger
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: redgreen
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  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: 
@@ -111,11 +149,13 @@ files:
 - bin/silk
 - install.rb
 - lib/silk.rb
-- lib/silk/dsl.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
@@ -134,29 +174,35 @@ 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"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 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_options.rb
-- test/test_dsl.rb
 - test/test_tasks.rb
-- test/test_helper.rb
-- test/helper.rb

data/lib/silk/dsl.rb

@@ -1,57 +0,0 @@
-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