sskirby-hydra 0.17.1 → 0.21.0

data/lib/hydra/listener/abstract.rb

@@ -2,7 +2,7 @@ module Hydra #:nodoc:
   module Listener #:nodoc:
     # Abstract listener that implements all the events
     # but does nothing.
-    class Abstract 
+    class Abstract
       # Create a new listener.
       #
       # Output: The IO object for outputting any information.
@@ -10,14 +10,23 @@ module Hydra #:nodoc:
       def initialize(output = $stdout)
         @output = output
       end
+
       # Fired when testing has started
       def testing_begin(files)
       end
 
-      # Fired when testing finishes
+      # Fired when testing finishes, after the workers shutdown
       def testing_end
       end
 
+      # Fired after runner processes have been started
+      def worker_begin(worker)
+      end
+
+      # Fired before shutting down the worker
+      def worker_end(worker)
+      end
+
       # Fired when a file is started
       def file_begin(file)
       end

data/lib/hydra/listener/progress_bar.rb

@@ -34,7 +34,7 @@ module Hydra #:nodoc:
         complete = ((@files_completed.to_f / @total_files.to_f) * width).to_i
         @output.write "\r" # move to beginning
         @output.write 'Hydra Testing ['
-        @output.write @errors ? "\033[1;31m" : "\033[1;32m"
+        @output.write @errors ? "\033[0;31m" : "\033[0;32m"
         complete.times{@output.write '#'}
         @output.write '>'
         (width-complete).times{@output.write ' '}

data/lib/hydra/master.rb

@@ -1,11 +1,15 @@
 require 'hydra/hash'
 require 'open3'
 require 'tmpdir'
+require 'erb'
 require 'yaml'
+
 module Hydra #:nodoc:
   # Hydra class responsible for delegate work down to workers.
   #
   # The Master is run once for any given testing session.
+  class YmlLoadError < StandardError; end
+
   class Master
     include Hydra::Messages::Master
     include Open3
@@ -29,16 +33,23 @@ module Hydra #:nodoc:
     # * :autosort
     #   * Set to false to disable automatic sorting by historical run-time per file
     def initialize(opts = { })
-      trap("SIGINT") do
-        puts "Testing halted by user.  Untested files:"
-        puts @incomplete_files.join("\n")
-        exit
-      end 
-
       opts.stringify_keys!
       config_file = opts.delete('config') { nil }
       if config_file
-        opts.merge!(YAML.load_file(config_file).stringify_keys!)
+
+        begin
+          config_erb = ERB.new(IO.read(config_file)).result(binding)
+        rescue Exception => e
+          raise(YmlLoadError,"config file was found, but could not be parsed with ERB.\n#{$!.inspect}")
+        end
+
+        begin
+          config_yml = YAML::load(config_erb)
+        rescue StandardError => e
+          raise(YmlLoadError,"config file was found, but could not be parsed.\n#{$!.inspect}")
+        end
+
+        opts.merge!(config_yml.stringify_keys!)
       end
       @files = Array(opts.fetch('files') { nil })
       raise "No files, nothing to do" if @files.empty?
@@ -55,9 +66,10 @@ module Hydra #:nodoc:
       @autosort = opts.fetch('autosort') { true }
       @sync = opts.fetch('sync') { nil }
       @environment = opts.fetch('environment') { 'test' }
+      @remote_require = opts.fetch('remote_require') {[]}
 
       if @autosort
-        sort_files_from_report 
+        sort_files_from_report
         @event_listeners << Hydra::Listener::ReportGenerator.new(File.new(heuristic_file, 'w'))
       end
 
@@ -76,8 +88,11 @@ module Hydra #:nodoc:
     end
 
     # Message handling
-    
-    # Send a file down to a worker. 
+    def worker_begin(worker)
+      @event_listeners.each {|l| l.worker_begin(worker) }
+    end
+
+    # Send a file down to a worker.
     def send_file(worker)
       f = @files.shift
       if f
@@ -93,14 +108,20 @@ module Hydra #:nodoc:
     def process_results(worker, message)
       if message.output =~ /ActiveRecord::StatementInvalid(.*)[Dd]eadlock/ or
          message.output =~ /PGError: ERROR(.*)[Dd]eadlock/ or
-         message.output =~ /Mysql::Error: SAVEPOINT(.*)does not exist: ROLLBACK/
+         message.output =~ /Mysql::Error: SAVEPOINT(.*)does not exist: ROLLBACK/ or
+         message.output =~ /Mysql::Error: Deadlock found/
         trace "Deadlock detected running [#{message.file}]. Will retry at the end"
         @files.push(message.file)
+        send_file(worker)
       else
         @incomplete_files.delete_at(@incomplete_files.index(message.file))
         trace "#{@incomplete_files.size} Files Remaining"
         @event_listeners.each{|l| l.file_end(message.file, message.output) }
         if @incomplete_files.empty?
+          @workers.each do |worker|
+            @event_listeners.each{|l| l.worker_end(worker) }
+          end
+
           shutdown_all_workers
         else
           send_file(worker)
@@ -112,7 +133,7 @@ module Hydra #:nodoc:
     attr_reader :report_text
 
     private
-    
+
     def boot_workers(workers)
       trace "Booting #{workers.size} workers"
       workers.each do |worker|
@@ -131,12 +152,13 @@ module Hydra #:nodoc:
 
     def boot_local_worker(worker)
       runners = worker.fetch('runners') { raise "You must specify the number of runners" }
-      trace "Booting local worker" 
+      trace "Booting local worker"
       pipe = Hydra::Pipe.new
       child = SafeFork.fork do
         pipe.identify_as_child
         Hydra::Worker.new(:io => pipe, :runners => runners, :verbose => @verbose)
       end
+
       pipe.identify_as_parent
       @workers << { :pid => child, :io => pipe, :idle => false, :type => :local }
     end
@@ -144,12 +166,14 @@ module Hydra #:nodoc:
     def boot_ssh_worker(worker)
       sync = Sync.new(worker, @sync, @verbose)
 
+      custom_require = @remote_require.map {|r| " require '#{r}';"}.join(' ')
+
       runners = worker.fetch('runners') { raise "You must specify the number of runners"  }
-      command = worker.fetch('command') { 
-        "RAILS_ENV=#{@environment} ruby -e \"require 'rubygems'; require 'hydra'; Hydra::Worker.new(:io => Hydra::Stdio.new, :runners => #{runners}, :verbose => #{@verbose});\""
+      command = worker.fetch('command') {
+        "RAILS_ENV=#{@environment} ruby -e \"require 'rubygems'; require 'hydra';#{custom_require} Hydra::Worker.new(:io => Hydra::Stdio.new, :runners => #{runners}, :verbose => #{@verbose}, :remote => '#{sync.connect}');\""
       }
 
-      trace "Booting SSH worker" 
+      trace "Booting SSH worker"
       ssh = Hydra::SSH.new("#{sync.ssh_opts} #{sync.connect}", sync.remote_dir, command)
       return { :io => ssh, :idle => false, :type => :ssh, :connect => sync.connect }
     end
@@ -158,7 +182,7 @@ module Hydra #:nodoc:
       trace "Shutting down all workers"
       @workers.each do |worker|
         worker[:io].write(Shutdown.new) if worker[:io]
-        worker[:io].close if worker[:io] 
+        worker[:io].close if worker[:io]
       end
       @listeners.each{|t| t.exit}
     end
@@ -182,7 +206,7 @@ module Hydra #:nodoc:
               # if it exists and its for me.
               # SSH gives us back echoes, so we need to ignore our own messages
               if message and !message.class.to_s.index("Worker").nil?
-                message.handle(self, worker) 
+                message.handle(self, worker)
               end
             rescue IOError
               trace "lost Worker [#{worker.inspect}]"
@@ -191,7 +215,7 @@ module Hydra #:nodoc:
           end
         end
       end
-      
+
       @listeners.each{|l| l.join}
       @event_listeners.each{|l| l.testing_end}
     end

data/lib/hydra/message/worker_messages.rb

@@ -8,6 +8,12 @@ module Hydra #:nodoc:
         end
       end
 
+      class WorkerBegin < Hydra::Message
+        def handle(master, worker)
+          master.worker_begin(worker)
+        end
+      end
+
       # Message telling the Runner to run a file
       class RunFile < Hydra::Message
         # The file that should be run

data/lib/hydra/messaging_io.rb

@@ -11,6 +11,7 @@ module Hydra #:nodoc:
       raise IOError unless @reader
       message = @reader.gets
       return nil unless message
+      puts message if message.include?(Hydra::Trace::REMOTE_IDENTIFIER)
       return Message.build(eval(message.chomp))
     rescue SyntaxError, NameError
       # uncomment to help catch remote errors by seeing all traffic

data/lib/hydra/runner.rb

@@ -18,6 +18,7 @@ module Hydra #:nodoc:
     def initialize(opts = {})
       @io = opts.fetch(:io) { raise "No IO Object" } 
       @verbose = opts.fetch(:verbose) { false }      
+      @remote = opts.fetch(:remote) { false }      
       $stdout.sync = true
       trace 'Booted. Sending Request for file'
 
@@ -35,10 +36,12 @@ module Hydra #:nodoc:
       trace "Running file: #{file}"
 
       output = ""
-      if file =~ /_spec.rb$/
+      if file =~ /_spec.rb$/i
         output = run_rspec_file(file)
-      elsif file =~ /.feature$/
+      elsif file =~ /.feature$/i
         output = run_cucumber_file(file)
+      elsif file =~ /.js$/i or file =~ /.json$/i
+        output = run_javascript_file(file)
       else
         output = run_test_unit_file(file)
       end
@@ -54,6 +57,14 @@ module Hydra #:nodoc:
       @running = false
     end
 
+    def format_ex_in_file(file, ex)
+      "Error in #{file}:\n  #{format_exception(ex)}"
+    end
+
+    def format_exception(ex)
+      "#{ex.class.name}: #{ex.message}\n    #{ex.backtrace.join("\n    ")}"
+    end
+
     private
 
     # The runner will continually read messages and handle them.
@@ -84,6 +95,9 @@ module Hydra #:nodoc:
       rescue LoadError => ex
         trace "#{file} does not exist [#{ex.to_s}]"
         return ex.to_s
+      rescue Exception => ex
+        trace "Error requiring #{file} [#{ex.to_s}]"
+        return format_ex_in_file(file, ex)
       end
       output = []
       @result = Test::Unit::TestResult.new
@@ -95,7 +109,7 @@ module Hydra #:nodoc:
       begin
         klasses.each{|klass| klass.suite.run(@result){|status, name| ;}}
       rescue => ex
-        output << ex.to_s
+        output << format_ex_in_file(file, ex)
       end
 
       return output.join("\n")
@@ -105,7 +119,7 @@ module Hydra #:nodoc:
     def run_rspec_file(file)
       # pull in rspec
       begin
-        require 'spec'
+        require 'rspec'
         require 'hydra/spec/hydra_formatter'
         # Ensure we override rspec's at_exit
         require 'hydra/spec/autorun_override'
@@ -113,22 +127,15 @@ module Hydra #:nodoc:
         return ex.to_s
       end
       hydra_output = StringIO.new
-      Spec::Runner.options.instance_variable_set(:@formatters, [
-        Spec::Runner::Formatter::HydraFormatter.new(
-          Spec::Runner.options.formatter_options,
-          hydra_output
-        )
-      ])
-      Spec::Runner.options.instance_variable_set(
-        :@example_groups, []
-      )
-      Spec::Runner.options.instance_variable_set(
-        :@files, [file]
-      )
-      Spec::Runner.options.instance_variable_set(
-        :@files_loaded, false
-      )
-      Spec::Runner.options.run_examples
+
+      config = [
+        '-f', 'RSpec::Core::Formatters::HydraFormatter',
+        file
+      ]
+
+      RSpec.instance_variable_set(:@world, nil)
+      RSpec::Core::Runner.run(config, hydra_output, hydra_output)
+
       hydra_output.rewind
       output = hydra_output.read.chomp
       output = "" if output.gsub("\n","") =~ /^\.*$/
@@ -175,6 +182,47 @@ module Hydra #:nodoc:
       return hydra_response.read
     end
 
+    def run_javascript_file(file)
+      errors = []
+      require 'v8'
+      V8::Context.new do |context|
+        context.load(File.expand_path(File.join(File.dirname(__FILE__), 'js', 'lint.js')))
+        context['input'] = lambda{
+          File.read(file)
+        }
+        context['reportErrors'] = lambda{|js_errors|
+          js_errors.each do |e|
+            e = V8::To.rb(e)
+            errors << "\n\e[1;31mJSLINT: #{file}\e[0m"
+            errors << "  Error at line #{e['line'].to_i + 1} " + 
+              "character #{e['character'].to_i + 1}: \e[1;33m#{e['reason']}\e[0m"
+            errors << "#{e['evidence']}"
+          end
+        }
+        context.eval %{
+          JSLINT(input(), {
+            sub: true,
+            onevar: true,
+            eqeqeq: true,
+            plusplus: true,
+            bitwise: true,
+            regexp: true,
+            newcap: true,
+            immed: true,
+            strict: true,
+            rhino: true
+          });
+          reportErrors(JSLINT.errors);
+        }
+      end
+
+      if errors.empty?
+        return '.'
+      else
+        return errors.join("\n")
+      end
+    end
+
     # find all the test unit classes in a given file, so we can run their suites
     def self.find_classes_in_file(f)
       code = ""

data/lib/hydra/spec/autorun_override.rb

@@ -1,12 +1,3 @@
-if defined?(Spec)
-  module Spec
-    module Runner
-      class << self
-        # stop the auto-run at_exit
-        def run
-          return 0
-        end 
-      end
-    end
-  end
+if defined?(RSpec)
+  RSpec::Core::Runner.disable_autorun!
 end

data/lib/hydra/spec/hydra_formatter.rb

@@ -1,14 +1,23 @@
-require 'spec/runner/formatter/progress_bar_formatter'
-module Spec
-  module Runner
-    module Formatter
-      class HydraFormatter < ProgressBarFormatter
+require 'rspec/core/formatters/progress_formatter'
+module RSpec
+  module Core
+    module Formatters
+      class HydraFormatter < ProgressFormatter
+        def example_passed(example)
+        end
+
+        def example_pending(example)
+        end
+
+        def example_failed(example)
+        end
+
         # Stifle the post-test summary
         def dump_summary(duration, example, failure, pending)
         end
 
-        # Stifle the output of pending examples
-        def example_pending(*args)
+        # Stifle pending specs
+        def dump_pending
         end
       end
     end

data/lib/hydra/ssh.rb

@@ -27,6 +27,7 @@ module Hydra #:nodoc:
     # list all the files.
     def initialize(connection_options, directory, command)
       @writer, @reader, @error = popen3("ssh -tt #{connection_options}")
+      @writer.write("mkdir -p #{directory}\n")
       @writer.write("cd #{directory}\n")
       @writer.write(command+"\n")
     end

data/lib/hydra/tasks.rb

@@ -31,6 +31,16 @@ module Hydra #:nodoc:
     #   t.listeners << Hydra::Listener::Notifier.new
     attr_accessor :listeners
 
+    # Set to true if you want to run this task only on the local
+    # machine with one runner. A "Safe Mode" for some test
+    # files that may not play nice with others.
+    attr_accessor :serial
+
+    # When running remote workers with extensions to hydra (such as 
+    # custom messages), you will need to make those extensions 
+    # available to the remote workers by specifying them here.
+    attr_accessor :remote_require
+
     #
     # Search for the hydra config file
     def find_config_file
@@ -40,7 +50,7 @@ module Hydra #:nodoc:
       return @config if File.exists?(@config)
       @config = nil
     end
-    
+
     # Add files to test by passing in a string to be run through Dir.glob.
     # For example:
     #
@@ -59,7 +69,8 @@ module Hydra #:nodoc:
   #     t.add_files 'test/integration/**/*_test.rb'
   #     t.verbose = false # optionally set to true for lots of debug messages
   #     t.autosort = false # disable automatic sorting based on runtime of tests
-  #   end  
+  #     t.remote_require << 'hydra_extensions'
+  #   end
   class TestTask < Hydra::Task
 
     # Create a new HydraTestTask
@@ -68,20 +79,25 @@ module Hydra #:nodoc:
       @files = []
       @verbose = false
       @autosort = true
+      @serial = false
       @listeners = [Hydra::Listener::ProgressBar.new]
+      @remote_require = []
 
       yield self if block_given?
 
       # Ensure we override rspec's at_exit
       require 'hydra/spec/autorun_override'
 
-      @config = find_config_file
+      unless @serial
+        @config = find_config_file
+      end
 
       @opts = {
         :verbose => @verbose,
         :autosort => @autosort,
         :files => @files,
-        :listeners => @listeners
+        :listeners => @listeners,
+        :remote_require => @remote_require
       }
       if @config
         @opts.merge!(:config => @config)
@@ -97,6 +113,10 @@ module Hydra #:nodoc:
     def define
       desc "Hydra Tests" + (@name == :hydra ? "" : " for #{@name}")
       task @name do
+        if Object.const_defined?('RAILS_ENV') && RAILS_ENV == 'development'
+          $stderr.puts %{WARNING: RAILS_ENV is "development". Make sure to set it properly (ex: "RAILS_ENV=test rake hydra")}
+        end
+
         Hydra::Master.new(@opts)
       end
     end
@@ -302,7 +322,7 @@ module Hydra #:nodoc:
   #   Hydra::GlobalTask.new('db:reset')
   #
   # Allows you to run:
-  #   
+  #
   #   rake hydra:db:reset
   #
   # Then, db:reset will be run locally and on all remote workers. This
@@ -324,7 +344,7 @@ module Hydra #:nodoc:
     def define
       Hydra::RemoteTask.new(@name)
       desc "Run #{@name.to_s} Locally and Remotely across all Workers"
-      task "hydra:#{@name.to_s}" => [@name.to_s, "hydra:remote:#{@name.to_s}"] 
+      task "hydra:#{@name.to_s}" => [@name.to_s, "hydra:remote:#{@name.to_s}"]
     end
   end
 end