milhouse-spork 0.7.5 → 0.7.5.1

data/lib/spork/runner.rb

@@ -1,90 +1,90 @@
-require 'optparse'
-
-module Spork
-  # This is used by bin/spork. It's wrapped in a class because it's easier to test that way.
-  class Runner
-    attr_reader :test_framework
-    
-    def self.run(args, output, error)
-      self.new(args, output, error).run
-    end
-    
-    def initialize(args, output, error)
-      raise ArgumentError, "expected array of args" unless args.is_a?(Array)
-      @output = output
-      @error = error
-      @options = {}
-      opt = OptionParser.new
-      opt.banner = "Usage: spork [test framework name] [options]\n\n"
-      
-      opt.separator "Options:"
-      opt.on("-b", "--bootstrap")  {|ignore| @options[:bootstrap] = true }
-      opt.on("-d", "--diagnose")  {|ignore| @options[:diagnose] = true }
-      opt.on("-h", "--help")  {|ignore| @options[:help] = true }
-      opt.on("-p", "--port [PORT]") {|port| @options[:port] = port }
-      non_option_args = args.select { |arg| ! args[0].match(/^-/) }
-      @options[:server_matcher] = non_option_args[0]
-      opt.parse!(args)
-      
-      if @options[:help]
-        @output.puts opt
-        @output.puts
-        @output.puts supported_test_frameworks_text
-        exit(0)
-      end
-    end
-    
-    def supported_test_frameworks_text
-      text = StringIO.new
-      
-      text.puts "Supported test frameworks:"
-      text.puts Spork::TestFramework.supported_test_frameworks.sort { |a,b| a.short_name <=> b.short_name }.map { |s| (s.available? ? '(*) ' : '( ) ') + s.short_name }
-      text.puts "\nLegend: ( ) - not detected in project   (*) - detected\n"
-      text.string
-    end
-    
-    # Returns a server for the specified (or the detected default) testing framework.  Returns nil if none detected, or if the specified is not supported or available.
-    def find_test_framework
-      Spork::TestFramework.factory(@output, @error, options[:server_matcher])
-    rescue Spork::TestFramework::NoFrameworksAvailable => e
-      @error.puts e.message
-    rescue Spork::TestFramework::FactoryException => e
-      @error.puts "#{e.message}\n\n#{supported_test_frameworks_text}"
-    end
-    
-    def run
-      return false unless test_framework = find_test_framework
-      ENV["DRB"] = 'true'
-      @error.puts "Using #{test_framework.short_name}"
-      @error.flush
-
-      case
-      when options[:bootstrap]
-        test_framework.bootstrap
-      when options[:diagnose]
-        require 'spork/diagnoser'
-        
-        Spork::Diagnoser.install_hook!(test_framework.entry_point)
-        test_framework.preload
-        Spork::Diagnoser.output_results(@output)
-        return true
-      else
-        Spork.using_spork!
-        run_strategy = Spork::RunStrategy.factory(test_framework)
-        return(false) unless run_strategy.preload
-        Spork::Server.run(:port => @options[:port] || test_framework.default_port, :run_strategy => run_strategy)
-        return true
-      end
-    end
-    
-    private
-    attr_reader :options 
-
-  end
-end
-
-
-
-
-
-
+require 'optparse'
+
+module Spork
+  # This is used by bin/spork. It's wrapped in a class because it's easier to test that way.
+  class Runner
+    attr_reader :test_framework
+    
+    def self.run(args, output, error)
+      self.new(args, output, error).run
+    end
+    
+    def initialize(args, output, error)
+      raise ArgumentError, "expected array of args" unless args.is_a?(Array)
+      @output = output
+      @error = error
+      @options = {}
+      opt = OptionParser.new
+      opt.banner = "Usage: spork [test framework name] [options]\n\n"
+      
+      opt.separator "Options:"
+      opt.on("-b", "--bootstrap")  {|ignore| @options[:bootstrap] = true }
+      opt.on("-d", "--diagnose")  {|ignore| @options[:diagnose] = true }
+      opt.on("-h", "--help")  {|ignore| @options[:help] = true }
+      opt.on("-p", "--port [PORT]") {|port| @options[:port] = port }
+      non_option_args = args.select { |arg| ! args[0].match(/^-/) }
+      @options[:server_matcher] = non_option_args[0]
+      opt.parse!(args)
+      
+      if @options[:help]
+        @output.puts opt
+        @output.puts
+        @output.puts supported_test_frameworks_text
+        exit(0)
+      end
+    end
+    
+    def supported_test_frameworks_text
+      text = StringIO.new
+      
+      text.puts "Supported test frameworks:"
+      text.puts Spork::TestFramework.supported_test_frameworks.sort { |a,b| a.short_name <=> b.short_name }.map { |s| (s.available? ? '(*) ' : '( ) ') + s.short_name }
+      text.puts "\nLegend: ( ) - not detected in project   (*) - detected\n"
+      text.string
+    end
+    
+    # Returns a server for the specified (or the detected default) testing framework.  Returns nil if none detected, or if the specified is not supported or available.
+    def find_test_framework
+      Spork::TestFramework.factory(@output, @error, options[:server_matcher])
+    rescue Spork::TestFramework::NoFrameworksAvailable => e
+      @error.puts e.message
+    rescue Spork::TestFramework::FactoryException => e
+      @error.puts "#{e.message}\n\n#{supported_test_frameworks_text}"
+    end
+    
+    def run
+      return false unless test_framework = find_test_framework
+      ENV["DRB"] = 'true'
+      @error.puts "Using #{test_framework.short_name}"
+      @error.flush
+
+      case
+      when options[:bootstrap]
+        test_framework.bootstrap
+      when options[:diagnose]
+        require 'spork/diagnoser'
+        
+        Spork::Diagnoser.install_hook!(test_framework.entry_point)
+        test_framework.preload
+        Spork::Diagnoser.output_results(@output)
+        return true
+      else
+        Spork.using_spork!
+        run_strategy = Spork::RunStrategy.factory(test_framework)
+        return(false) unless run_strategy.preload
+        Spork::Server.run(:port => @options[:port] || test_framework.default_port, :run_strategy => run_strategy)
+        return true
+      end
+    end
+    
+    private
+    attr_reader :options 
+
+  end
+end
+
+
+
+
+
+

data/lib/spork/server.rb

@@ -1,74 +1,74 @@
-require 'drb/drb'
-require 'rbconfig'
-require 'spork/forker.rb'
-require 'spork/custom_io_streams.rb'
-require 'spork/app_framework.rb'
-
-# An abstract class that is implemented to create a server
-#
-# (This was originally based off of spec_server.rb from rspec-rails (David Chelimsky), which was based on Florian Weber's TDDMate)
-class Spork::Server
-  attr_reader :run_strategy
-  include Spork::CustomIOStreams
-  
-  def initialize(options = {})
-    @run_strategy = options[:run_strategy]
-    @port = options[:port]
-  end
-  
-  def self.run(options = {})
-    new(options).listen
-  end
-  
-  # Sets up signals and starts the DRb service. If it's successful, it doesn't return. Not ever.  You don't need to override this.
-  def listen
-    raise RuntimeError, "you must call Spork.using_spork! before starting the server" unless Spork.using_spork?
-    trap("SIGINT") { sig_int_received }
-    trap("SIGTERM") { abort; exit!(0) }
-    trap("USR2") { abort; restart } if Signal.list.has_key?("USR2")
-    @drb_service = DRb.start_service("druby://127.0.0.1:#{port}", self)
-    Spork.each_run { @drb_service.stop_service } if @run_strategy.class == Spork::RunStrategy::Forking
-    stderr.puts "Spork is ready and listening on #{port}!"
-    stderr.flush
-    DRb.thread.join
-  end
-  
-  attr_accessor :port
-
-  # This is the public facing method that is served up by DRb.  To use it from the client side (in a testing framework):
-  # 
-  #   DRb.start_service("druby://localhost:0") # this allows Ruby to do some magical stuff so you can pass an output stream over DRb.
-  #                                            # see http://redmine.ruby-lang.org/issues/show/496 to see why localhost:0 is used.
-  #   spec_server = DRbObject.new_with_uri("druby://127.0.0.1:8989")
-  #   spec_server.run(options.argv, $stderr, $stdout)
-  #
-  # When implementing a test server, don't override this method: override run_tests instead.
-  def run(argv, stderr, stdout)
-    run_strategy.run(argv, stderr, stdout)
-  end
-  
-  def abort
-    run_strategy.abort
-  end
-
-  private
-    def restart
-      stderr.puts "restarting"
-      stderr.flush
-      config       = ::Config::CONFIG
-      ruby         = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
-      command_line = [ruby, $0, ARGV].flatten.join(' ')
-      exec(command_line)
-    end
-    
-    def sig_int_received
-      stdout.puts "\n"
-      if run_strategy.running?
-        abort
-        stderr.puts "Running tests stopped.  Press CTRL-C again to stop the server."
-        stderr.flush
-      else
-        exit!(0)
-      end
-    end
-end
+require 'drb/drb'
+require 'rbconfig'
+require 'spork/forker.rb'
+require 'spork/custom_io_streams.rb'
+require 'spork/app_framework.rb'
+
+# An abstract class that is implemented to create a server
+#
+# (This was originally based off of spec_server.rb from rspec-rails (David Chelimsky), which was based on Florian Weber's TDDMate)
+class Spork::Server
+  attr_reader :run_strategy
+  include Spork::CustomIOStreams
+  
+  def initialize(options = {})
+    @run_strategy = options[:run_strategy]
+    @port = options[:port]
+  end
+  
+  def self.run(options = {})
+    new(options).listen
+  end
+  
+  # Sets up signals and starts the DRb service. If it's successful, it doesn't return. Not ever.  You don't need to override this.
+  def listen
+    raise RuntimeError, "you must call Spork.using_spork! before starting the server" unless Spork.using_spork?
+    trap("SIGINT") { sig_int_received }
+    trap("SIGTERM") { abort; exit!(0) }
+    trap("USR2") { abort; restart } if Signal.list.has_key?("USR2")
+    @drb_service = DRb.start_service("druby://127.0.0.1:#{port}", self)
+    Spork.each_run { @drb_service.stop_service } if @run_strategy.class == Spork::RunStrategy::Forking
+    stderr.puts "Spork is ready and listening on #{port}!"
+    stderr.flush
+    DRb.thread.join
+  end
+  
+  attr_accessor :port
+
+  # This is the public facing method that is served up by DRb.  To use it from the client side (in a testing framework):
+  # 
+  #   DRb.start_service("druby://localhost:0") # this allows Ruby to do some magical stuff so you can pass an output stream over DRb.
+  #                                            # see http://redmine.ruby-lang.org/issues/show/496 to see why localhost:0 is used.
+  #   spec_server = DRbObject.new_with_uri("druby://127.0.0.1:8989")
+  #   spec_server.run(options.argv, $stderr, $stdout)
+  #
+  # When implementing a test server, don't override this method: override run_tests instead.
+  def run(argv, stderr, stdout)
+    run_strategy.run(argv, stderr, stdout)
+  end
+  
+  def abort
+    run_strategy.abort
+  end
+
+  private
+    def restart
+      stderr.puts "restarting"
+      stderr.flush
+      config       = ::Config::CONFIG
+      ruby         = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
+      command_line = [ruby, $0, ARGV].flatten.join(' ')
+      exec(command_line)
+    end
+    
+    def sig_int_received
+      stdout.puts "\n"
+      if run_strategy.running?
+        abort
+        stderr.puts "Running tests stopped.  Press CTRL-C again to stop the server."
+        stderr.flush
+      else
+        exit!(0)
+      end
+    end
+end

data/lib/spork/test_framework/cucumber.rb

@@ -1,24 +1,24 @@
-class Spork::TestFramework::Cucumber < Spork::TestFramework
-  DEFAULT_PORT = 8990
-  HELPER_FILE = File.join(Dir.pwd, "features/support/env.rb")
-
-  class << self
-    # REMOVE WHEN SUPPORT FOR 0.3.95 AND EARLIER IS DROPPED
-    attr_accessor :mother_object
-  end
-
-  def preload
-    require 'cucumber'
-    begin
-      @step_mother = ::Cucumber::StepMother.new
-      @step_mother.load_programming_language('rb')
-    rescue NoMethodError => pre_cucumber_0_4 # REMOVE WHEN SUPPORT FOR PRE-0.4 IS DROPPED
-      @step_mother = Spork::Server::Cucumber.mother_object
-    end
-    super
-  end
-
-  def run_tests(argv, stderr, stdout)
-    ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!(@step_mother)
-  end
-end
+class Spork::TestFramework::Cucumber < Spork::TestFramework
+  DEFAULT_PORT = 8990
+  HELPER_FILE = File.join(Dir.pwd, "features/support/env.rb")
+
+  class << self
+    # REMOVE WHEN SUPPORT FOR 0.3.95 AND EARLIER IS DROPPED
+    attr_accessor :mother_object
+  end
+
+  def preload
+    require 'cucumber'
+    begin
+      @step_mother = ::Cucumber::StepMother.new
+      @step_mother.load_programming_language('rb')
+    rescue NoMethodError => pre_cucumber_0_4 # REMOVE WHEN SUPPORT FOR PRE-0.4 IS DROPPED
+      @step_mother = Spork::Server::Cucumber.mother_object
+    end
+    super
+  end
+
+  def run_tests(argv, stderr, stdout)
+    ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!(@step_mother)
+  end
+end

data/lib/spork/test_framework/rspec.rb

@@ -1,14 +1,14 @@
-class Spork::TestFramework::RSpec < Spork::TestFramework
-  DEFAULT_PORT = 8989
-  HELPER_FILE = File.join(Dir.pwd, "spec/spec_helper.rb")
-
-  def run_tests(argv, stderr, stdout)
-    ::Spec::Runner::CommandLine.run(
-      ::Spec::Runner::OptionParser.parse(
-        argv,
-        stderr,
-        stdout
-      )
-    )
-  end
-end
+class Spork::TestFramework::RSpec < Spork::TestFramework
+  DEFAULT_PORT = 8989
+  HELPER_FILE = File.join(Dir.pwd, "spec/spec_helper.rb")
+
+  def run_tests(argv, stderr, stdout)
+    ::Spec::Runner::CommandLine.run(
+      ::Spec::Runner::OptionParser.parse(
+        argv,
+        stderr,
+        stdout
+      )
+    )
+  end
+end