rails-carrot 1.0.0 → 1.0.1

data/Manifest

@@ -7,3 +7,4 @@ lib/carrot/extend_server.rb
 lib/carrot/rails.rb
 lib/carrot/server.rb
 lib/carrot/util/timeout.rb
+rails-carrot.gemspec

data/README

@@ -1,12 +1,13 @@
 You can use carrot with celerity, or another driver.
 
-1. gem 'carrot'
+1. gem 'rails-carrot', :require => 'carrot'
 
 2. add a celerity_helper
+/spec/celerity_helper.rb
 
 3. Add some code in celerity_helper
 require 'database_cleaner' 
-require 'celerity'
+require 'celerity' # You can change driver
 require 'carrot'
 
 ENV["RAILS_ENV"] = 'celerity' # You can change it with your enviroment
@@ -28,9 +29,8 @@ Carrot.configure do |config|
   config.run_server = true
 end
 Carrot.register_driver(Celerity::Browser.new)
-Carrot.boot
 
-c) Local, server with external ruby
+c) Local, server with external ruby, You should use jruby to run RSpec.
 
 Carrot.configure do |config|
   config.run_server = true
@@ -41,7 +41,6 @@ Carrot.configure do |config|
   # config.server_debug = true
 end
 Carrot.register_driver(Celerity::Browser.new)
-Carrot.boot
 
 RSpec.configure do |config|
    DatabaseCleaner.strategy = :truncation 
@@ -52,7 +51,6 @@ RSpec.configure do |config|
    end
 
    config.after :all do
-     Carrot.shutdown            # shutdown server
      DatabaseCleaner.clean 
    end
  

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('rails-carrot', '1.0.0') do |p|
+Echoe.new('rails-carrot', '1.0.1') do |p|
   p.description    = "Carrot can make QA test easy with any integration test gem."
   p.url            = "http://github.com/sloanwu/carrot.git"
   p.author         = "Sloan Wu"

data/lib/carrot.rb

@@ -31,12 +31,8 @@ module Carrot
     #
     # === Configurable options
     #
-    # [asset_root = String]               Where static assets are located, used by save_and_open_page
     # [app_host = String]                 The default host to use when giving a relative URL to visit
     # [run_server = Boolean]              Whether to start a Rack server for the given Rack app (Default: true)
-    # [default_selector = :css/:xpath]    Methods which take a selector use the given type by default (Default: CSS)
-    # [default_wait_time = Integer]       The number of seconds to wait for asynchronous processes to finish (Default: 2)
-    # [ignore_hidden_elements = Boolean]  Whether to ignore hidden elements on the page (Default: false)
     #
    
     def configure
@@ -49,6 +45,7 @@ module Carrot
 
     def register_driver(obj)
       @driver = obj
+      Carrot.boot
     end
 
     def boot

data/lib/carrot/extend_server.rb

@@ -4,24 +4,42 @@ require 'uri'
 require 'net/http'
 require 'rack'
 import java.lang.Runtime
+import java.lang.Runnable
 import java.io.InputStreamReader
 import java.io.BufferedReader
 
 module Carrot
   class ExtendServer
     attr_accessor :server_process, :shutdown_process 
-     
+    
+    class ShutdownHook
+      include Runnable
+      def initialize( &block)
+     	super()
+     	@block=block
+      end
+      def run
+        @block[]
+      end
+    end
+          
+    def self.at_exit( &block)
+      	hook = ShutdownHook.new( &block)
+       	Runtime.getRuntime().addShutdownHook(java.lang.Thread.new( hook ))
+    end
+
     def run()
        Thread.new do
           command = ["/bin/bash","-c", "cd #{Carrot.project_path} ; #{Carrot.rails_command}"].to_java(java.lang.String)
           begin
-             @server_process = Runtime.getRuntime().exec(command);
+             @server_process = Runtime.getRuntime().exec(command)
              if Carrot.server_debug
                buf = BufferedReader.new(InputStreamReader.new(@server_process.get_input_stream))
                while line = buf.readLine()
                  puts line
                end
              end
+             ExtendServer.at_exit{ Carrot.shutdown }
              @server_process.wait_for
          rescue Exception => e
             puts e
@@ -35,7 +53,7 @@ module Carrot
       Thread.new do
           command = ["/bin/bash","-c", "cd #{Carrot.project_path} ; kill `cat #{Carrot.project_path}/tmp/pids/server.pid`"].to_java(java.lang.String)
           begin
-             @shutdown_process = Runtime.getRuntime().exec(command);
+             @shutdown_process = Runtime.getRuntime().exec(command)
              @shutdown_process.wait_for
              @shutdown_process.destroy
          rescue Exception => e

data/lib/carrot/server.rb

@@ -59,6 +59,7 @@ module Carrot
          require 'carrot/extend_server'
          Carrot.external_server = ExtendServer.new
          Carrot.external_server.run
+
       elsif @app
         @port = Carrot::Server.ports[@app.object_id]
 

data/rails-carrot.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-carrot}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sloan Wu"]
-  s.date = %q{2010-11-02}
+  s.date = %q{2010-11-03}
   s.description = %q{Carrot can make QA test easy with any integration test gem.}
   s.email = %q{sloanwu@gmail.com}
   s.extra_rdoc_files = ["README", "lib/carrot.rb", "lib/carrot/extend_server.rb", "lib/carrot/rails.rb", "lib/carrot/server.rb", "lib/carrot/util/timeout.rb"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Sloan Wu
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +08:00
+date: 2010-11-03 00:00:00 +08:00
 default_executable: 
 dependencies: []