marcinbunsch-bolt 0.2.7 → 0.2.8

data/.bolt

@@ -1 +1,2 @@
+runner: legacy_test_unit
 verbose: true

data/lib/bolt.rb

@@ -38,7 +38,16 @@ module Bolt
   
   # check for verbose execution
   def self.verbose?
-    @@config['verbose'] || false
+    @@config['verbose'] == true
+  end
+  
+  # Trap appropriate signals
+  def self.trap_signals
+    # ctrl-c should exit
+    trap 'INT' do
+      $stdout.puts "\n** Exiting Bolt..."
+      exit(0)
+    end
   end
   
   # start bolt
@@ -51,13 +60,21 @@ module Bolt
     # read the arguments passed
     Bolt.read_argv
     
-    Bolt::Listener.new
+    # trap signals
+    Bolt.trap_signals
+    
+    listener = Bolt::Listener.new
+    
+    # display info to user
+    listener.selected.notifier.info 'Bolt running', "Bolt is enabled and running in #{Dir.pwd}"
+    
+    # if in Rails, start environment
+    listener.selected.start
   end
-  
-  autoload :Mapper, 'bolt/mapper'
-  autoload :Runner, 'bolt/runner'
-  autoload :Notifier, 'bolt/notifier'
-  autoload :Listener, 'bolt/listener'
+
+  autoload :Runner, File.dirname(__FILE__) + '/bolt/runner'
+  autoload :Notifier, File.dirname(__FILE__) + '/bolt/notifier'
+  autoload :Listener, File.dirname(__FILE__) + '/bolt/listener'
   
   #
   # Bolt::Listeners
@@ -65,9 +82,9 @@ module Bolt
   # Wrapper for specific listeners
   #
   module Listeners
-    autoload :Generic, 'bolt/listeners/generic'
-    autoload :Kqueue, 'bolt/listeners/kqueue'
-    autoload :Osx, 'bolt/listeners/osx'
+    autoload :Generic, File.dirname(__FILE__) + '/bolt/listeners/generic'
+    autoload :Kqueue, File.dirname(__FILE__) + '/bolt/listeners/kqueue'
+    autoload :Osx, File.dirname(__FILE__) + '/bolt/listeners/osx'
   end
   
   #
@@ -86,10 +103,11 @@ module Bolt
       @@noticed_files
     end
     
-    autoload :Base, 'bolt/runners/base'
-    autoload :Cucumber, 'bolt/runners/cucumber'
-    autoload :TestUnit, 'bolt/runners/test_unit'
-    autoload :RSpec, 'bolt/runners/rspec'
+    autoload :Base, File.dirname(__FILE__) + '/bolt/runners/base'
+    autoload :Cucumber, File.dirname(__FILE__) + '/bolt/runners/cucumber'
+    autoload :TestUnit, File.dirname(__FILE__) + '/bolt/runners/test_unit'
+    autoload :LegacyTestUnit, File.dirname(__FILE__) + '/bolt/runners/legacy_test_unit'
+    autoload :RSpec, File.dirname(__FILE__) + '/bolt/runners/rspec'
   end
     
   #
@@ -98,8 +116,8 @@ module Bolt
   # Wrapper for specific notifier
   #
   module Notifiers
-    autoload :Generic, 'bolt/notifiers/generic'
-    autoload :Growl, 'bolt/notifiers/growl'
-    autoload :NotifyOsd, 'bolt/notifiers/notify_osd'
+    autoload :Generic, File.dirname(__FILE__) + '/bolt/notifiers/generic'
+    autoload :Growl, File.dirname(__FILE__) + '/bolt/notifiers/growl'
+    autoload :NotifyOsd, File.dirname(__FILE__) + '/bolt/notifiers/notify_osd'
   end
 end

data/lib/bolt/listener.rb

@@ -1,5 +1,5 @@
-require 'bolt/notifier'
-require 'bolt/runner'
+require File.dirname(__FILE__) + '/notifier'
+require File.dirname(__FILE__) + '/runner'
 #
 # Bolt::Listener
 #
@@ -10,15 +10,13 @@ module Bolt
     attr_accessor :selected, :notifier, :runner
     
     # Constructor
+    # TODO: move most of this code to Bolt.start
     def initialize
       # find appropriate listener
       listener
       
       $stdout.puts "** Using #{listener.class} " if Bolt.verbose?
       
-      # trap the INT signal 
-      add_sigint_handler
-      
       # attach a notifier
       self.notifier = Bolt::Notifier.new.selected
       
@@ -35,12 +33,6 @@ module Bolt
       # attach listener wrapper
       listener.parent = self
       
-      # display info to user
-      notifier.info 'Bolt running', "Bolt is enabled and running in #{Dir.pwd}"
-      
-      # if in Rails, start environment
-      listener.start
-      
     end
     
     # handle updated files found by specific listener 
@@ -52,21 +44,26 @@ module Bolt
       # run appropriate tests in runner
     end
 
+    def os
+      # TODO: os identification via RUBY_PLATFORM is flawed as it will return 'java' in jruby. Look for a different solution
+      os_string = RUBY_PLATFORM.downcase
+    end
+    
     # Pick a listener to launch
     def listener
       return selected if selected
       
       if Bolt['listener'] and ['generic', 'osx'].include?(Bolt['listener'])
         self.selected= Bolt::Listeners::Generic.new if Bolt['listener'] == 'generic'
-        self.selected= Bolt::Listeners::Osx.new if Bolt['listener'] == 'osx'
+        self.selected= Bolt::Listeners::Osx.start if Bolt['listener'] == 'osx'
         $stdout.puts "** Found listener setting in .bolt" if Bolt.verbose?
         return self.selected
       end
         
       $stdout.puts "** Determining listener..." if Bolt.verbose?
       
-      # TODO: os identification via RUBY_PLATFORM is flawed as it will return 'java' in jruby. Look for a different solution
-      os_string = RUBY_PLATFORM.downcase
+      os_string = os
+
       self.selected= Bolt::Listeners::Generic.new      
       self.selected= Bolt::Listeners::Osx.start if os_string.include?("darwin")
       # TODO:
@@ -74,16 +71,6 @@ module Bolt
       # self.selected= Bolt::Listeners::Linux.new if os_string.include?("linux")
       selected
     end
-    
-    # capture the INT signal
-    # TODO: Move to Bolt.add_sigint_handler
-    def add_sigint_handler
-      trap 'INT' do
-        $stdout.puts "\n** Exiting Bolt..."
-        notifier.info 'Bolt terminated', "Bolt has been terminated"
-        exit(0)
-      end
-    end
    
   end
 end

data/lib/bolt/listeners/osx.rb

@@ -8,7 +8,7 @@
 module Bolt
   module Listeners
     class Osx
-      
+
       attr_reader :last_check, :callback, :valid_extensions
 
       def initialize(valid_extensions = nil)

data/lib/bolt/notifiers/growl.rb

@@ -53,7 +53,7 @@ module Bolt
       
       def result(filename, results)
         message = results
-        if results.match('example') #rspec
+        if results and results.match('example') #rspec
           if results.match('pending')
             icon = 'pending'
           elsif results.match('0 failures')
@@ -61,9 +61,9 @@ module Bolt
           else
             icon = 'failed'
           end
-        elsif (results.match('0 failures, 0 errors')) # test::unit
+        elsif results and results.match('0 failures, 0 errors') # test::unit
           icon = 'success'
-        elsif (results.match(/([0-9]*) scenario(s*) \([0-9]+ passed\) ([0-9]*) step(s*) \([0-9]+ passed\)/)) # cucumber
+        elsif results and results.match(/([0-9]*) scenario(s*) \([0-9]+ passed\) ([0-9]*) step(s*) \([0-9]+ passed\)/) # cucumber
           icon = 'success'
         else
           icon = 'failed'

data/lib/bolt/runner.rb

@@ -19,7 +19,8 @@ module Bolt
     def runner
       return selected if selected
       
-      if Bolt['runner'] and ['test_unit', 'rspec', 'cucumber'].include?(Bolt['runner'])
+      if Bolt['runner'] and ['legacy_test_unit', 'test_unit', 'rspec', 'cucumber'].include?(Bolt['runner'])
+        self.selected= Bolt::Runners::LegacyTestUnit.new if Bolt['runner'] == 'legacy_test_unit'
         self.selected= Bolt::Runners::TestUnit.new if Bolt['runner'] == 'test_unit'
         self.selected= Bolt::Runners::RSpec.new if Bolt['runner'] == 'rspec'
         self.selected= Bolt::Runners::Cucumber.new if Bolt['runner'] == 'cucumber'

data/lib/bolt/runners/cucumber.rb

@@ -78,6 +78,8 @@ module Bolt
       def translate(file)
         self.heard = file
                 
+        puts file
+        
         case file
           when %r:^app/controllers/:
           name = file.sub('_controller.rb', '').sub('app/controllers/', '')
@@ -95,7 +97,14 @@ module Bolt
           features = self.models[name]
           when %r:.feature$:
             return [file]
+          when %r:steps.rb$:
+            if Bolt::Runners::Cucumber.mother
+              puts '=> reloading step definitions'
+              Bolt::Runners::Cucumber.mother.reload_definitions! 
+            end
+            features = [file.gsub('features/step_definitions/', '').gsub('_steps.rb', '')]
           else
+            
           #
         end
         
@@ -116,7 +125,10 @@ module Bolt
         #$".delete(file)
         #require file
 
-        Bolt::Runners::Cucumber.mother.reload_definitions! if Bolt::Runners::Cucumber.mother and self.heard.match('_steps.rb')
+        if Bolt::Runners::Cucumber.mother and self.heard.match('_steps.rb')
+          #puts '=> reloading step definitions'
+          #Bolt::Runners::Cucumber.mother.reload_definitions! 
+        end
         
         ::Cucumber::Cli::Main.execute(features)
 
@@ -129,8 +141,11 @@ module Bolt
         # send buffer to stdout
         puts result
         
+        if result.include?('You can implement step definitions')
+          result = result.split('You can implement step definitions').first
+        end
         last_three = result.split("\n")[-3..-1].join(' ')
-        last_three = last_three.gsub("\e[32m", '').gsub("\e[0m", '').gsub("\e[36m", '').gsub("\e[31m", '') # get ri of the color codes
+        last_three = last_three.gsub("\e[32m", '').gsub("\e[0m", '').gsub("\e[36m", '').gsub("\e[31m", '').gsub("\e[33m", '') # get ri of the color codes
         
         # sent result to notifier
         notifier.result(features.join(' '), last_three)
@@ -142,6 +157,8 @@ module Bolt
 end
 
 # Cucumber hacks
+# =======
+# Below you will find hacks of cucumber which allow bolt to work
 
 # Load Cucumber requirements
 require 'cucumber'
@@ -150,6 +167,7 @@ begin
 rescue LoadError
   puts '** ERROR: Could not load cucumber/rspec_neuter' if Bolt.verbose?
 end
+require 'cucumber/version'
 require 'cucumber/cli/main'
 
 module Cucumber #:nodoc:
@@ -184,4 +202,34 @@ module Cucumber #:nodoc:
       
     end
   end
+end
+
+if Cucumber::VERSION::STRING=='0.3.3'
+  # this applies only to cucumber 0.3.3
+  # it prevents cucumber from exiting when features fail
+  module Cucumber #:nodoc:
+    module Cli #:nodoc:
+      class Main #:nodoc:
+        def execute!(step_mother)
+          configuration.load_language
+          step_mother.options = configuration.options
+
+          require_files
+          enable_diffing
+        
+          features = load_plain_text_features
+
+          visitor = configuration.build_formatter_broadcaster(step_mother)
+          step_mother.visitor = visitor # Needed to support World#announce
+          visitor.visit_features(features)
+
+          failure = step_mother.steps(:failed).any? || 
+            (configuration.strict? && step_mother.steps(:undefined).any?)
+
+          # do not exit!!!!!!
+          # Kernel.exit(failure ? 1 : 0)
+        end
+      end
+    end
+  end
 end

data/lib/bolt/runners/legacy_test_unit.rb

@@ -0,0 +1,194 @@
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
+#
+# Bolt::Runners::TestUnit
+#
+# The TestUnit Runners maps the filename to the appropriate test
+#
+module Bolt
+  module Runners
+    class LegacyTestUnit
+      
+      MAPPINGS =  /(\.\/app\/|\.\/lib\/|\.\/test\/functional|\.\/test\/unit)/
+      
+      attr_accessor :notifier, :test_io
+      
+      def initialize
+        fix_test_unit_io
+      end
+      
+      def fix_test_unit_io
+        # Test::Unit stdio capture workaround, taken from Roman2K-rails-test-serving
+        self.test_io = StringIO.new
+        io = test_io
+        Test::Unit::UI::Console::TestRunner.class_eval do
+          alias_method :old_initialize, :initialize
+          def initialize(suite, output_level, io=Thread.current["test_runner_io"])
+            old_initialize(suite, output_level, io)
+          end
+        end
+        Thread.current["test_runner_io"] = io
+      end
+      
+      # handle specified file
+      def handle(file)
+        
+        # force reload of file
+        $".delete(file)
+        $".delete(File.join(Dir.pwd, file))
+        
+        # reload tests and classes
+        if file.match(/(test\/functional|test\/unit|app\/controllers|app\/models|lib\/)/)
+          puts '=================='
+          klassname = file.sub('test/unit/', '').sub('test/functional/', '').sub('app/controllers/', '').sub('app/models/', '').sub('lib/', '')
+          klass_to_be_tested = klassname.sub('.rb', '').gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+          
+
+          # remove all methods - don't worry, the reload will bring them back refreshed
+          begin
+            klass = eval(klass_to_be_tested)
+            klass.instance_methods.each { |m| 
+              begin
+                klass.send(:remove_method, m)
+              rescue
+              end
+            }
+          rescue NameError
+          end
+        end
+
+        if file.include?('app/controllers') or file.include?('app/models') or file.include?('lib/')
+          begin
+            filename = File.join(Dir.pwd, file)
+            filename << '.rb' if !filename.match('.rb')
+            load filename
+          rescue LoadError
+            notifier.error("Error in #{file}", $!)
+            return []
+          rescue ArgumentError
+            notifier.error("Error in #{file}", $!)
+            return []
+          end
+        end
+      
+        puts '=> Test::Unit running test for ' + file
+        test_files = translate(file)
+        
+        puts '==== Test::Unit running: ' + test_files.join(', ') + ' ===='
+        
+        run(test_files) if test_files != []
+        
+        puts '==== Test::Unit completed run ===='
+        
+      end
+      
+      # check whether file exists
+      def file_verified?(filename)
+        if !File.exists?(filename)
+          notifier.test_file_missing(filename)
+          puts "=> ERROR: could not find test file: #{filename}"
+          return false
+        end
+        return true
+      end
+      
+      # mapping is a copied and modified version of mislav/rspactor Inspector#translate
+      def translate(file)
+        
+        basename = File.basename(file)
+        candidates = []
+        test_filename = nil
+        case file
+          when %r:^app/controllers/:
+            test_filename = file.sub('.rb', '_test.rb').sub('app/controllers', 'test/functional')
+          when %r:^app/models/:
+            test_filename = "test/unit/#{basename.sub('.rb', '_test.rb')}"
+          when %r:^app/views/:
+            file = file.sub('app/views/', '')
+            directory = file.split('/')[0..-2].compact.join('/')
+            test_filename = "test/functional/#{directory}_controller_test.rb"
+          when %r:^test/:
+            test_filename = file
+          when %r:^lib/:
+            # map libs to units
+            test_filename = "test/unit/#{file.sub('lib/', '').sub('.rb', '_test.rb')}"
+          when 'config/routes.rb'
+            test_filename = "test/functional/#{basename.sub('.rb', '_test.rb')}"
+            #candidates << 'controllers' << 'helpers' << 'views'
+          when 'config/database.yml', 'db/schema.rb'
+            #candidates << 'models'
+          else
+            #
+        end
+        if test_filename and file_verified?(test_filename)
+          candidates << test_filename
+        end
+        if candidates == []
+          puts "=> NOTICE: could not find test file for: #{file}"
+        end
+        # puts candidates.inspect
+        candidates
+      end
+      
+      def run(files)
+        file = files.first
+        puts "** Running #{file}"
+        # make sure that you reload the test file
+        #load file
+        #contents = File.open(file).read
+        # puts contents
+        #eval contents
+        
+        # This is Rails' String#camelcase
+        klassname = file.sub('test/functional/', '').sub('test/unit/', '')
+        test_class = klassname.sub('.rb', '').gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+        
+        # create dummy wrapper modules if test is in subfolder
+        test_class.split('::').each do |part|
+          eval "module ::#{part}; end" if !part.match('Test')
+        end
+        
+        $".delete(file)
+        
+        #(defined?(ActiveRecord::Base) ? ActiveRecord::Base.instance_eval { subclasses }.each { |c| c.reset_column_information } : nil)
+        #(defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies.clear : nil)
+        
+        begin
+          require file
+        rescue LoadError
+          notifier.error("Error in #{file}", $!)
+          puts $!
+          return
+        rescue ArgumentError
+          notifier.error("Error in #{file}", $!)
+          puts $!
+          return
+        rescue SyntaxError
+          notifier.error("Error in #{file}", $!)
+          puts $!
+          return
+        end
+        
+        # TODO: change that to run multiple suites
+        #klass = Kernel.const_get(test_class) - this threw errors
+        klass = eval(test_class)
+        
+        Test::Unit::UI::Console::TestRunner.run(klass)
+      
+        # Invoke method to test that writes to stdout.
+        result = test_io.string.to_s.dup
+
+        # clear the buffer 
+        test_io.truncate(0)
+        
+        # sent result to notifier
+        notifier.result(file, result.split("\n").compact.last)
+
+        # sent result to stdio
+        puts result
+        
+      end
+      
+    end
+  end
+end

data/lib/bolt/runners/rspec.rb

@@ -69,8 +69,22 @@ module Bolt
 
         # refresh the loaded test file
         $".delete(file)
-        require file
-        
+        begin
+          require file
+        rescue LoadError
+          notifier.error("Error in #{file}", $!)
+          puts $!
+          return
+        rescue ArgumentError
+          notifier.error("Error in #{file}", $!)
+          puts $!
+          return
+        rescue SyntaxError
+          notifier.error("Error in #{file}", $!)
+          puts $!
+          return
+        end
+                
         # run the tests in the Spec::Runner
         ::Spec::Runner::CommandLine.run
         

data/spec/bolt/listener_spec.rb

@@ -0,0 +1,17 @@
+require 'spec'
+require File.dirname(__FILE__) + '/../../lib/bolt.rb'
+
+describe Bolt::Listener do
+
+  it 'should select appropriate listener' do
+    Bolt.set('listener', 'generic')
+    instance = Bolt::Listener.new
+    instance.listener.class.should == Bolt::Listeners::Generic
+    instance.stub(:os).and_return('unknown system')
+    instance.os.should == 'unknown system'
+    instance.selected = nil
+    instance.selected.should == nil
+    instance.listener.class.should == Bolt::Listeners::Generic
+  end
+  
+end

data/spec/bolt_spec.rb

@@ -0,0 +1,39 @@
+require 'spec'
+require File.dirname(__FILE__) + '/../lib/bolt'
+
+describe Bolt do
+
+  it 'should load .bolt file and access config' do
+    File.stub(:exists?).and_return(true)
+    YAML.stub(:load_file).and_return({ 'test', 'one' })
+    Bolt.read_dotfile
+    
+    Bolt['test'].should == 'one'
+    Bolt.get('test').should == 'one'
+  end
+  
+  it 'should read and write config' do
+    Bolt.set('test_two', 'two')
+    
+    Bolt['test_two'].should == 'two'
+    Bolt.get('test_two').should == 'two'
+  end
+  
+  it 'should read ARGV' do
+    Bolt.set('verbose', 'false')
+    ARGV << '-v'
+    
+    Bolt.read_argv
+    Bolt['verbose'].should == true
+  end
+  
+  it 'should response correctly to verbose?' do
+    Bolt.set('verbose', 'true')
+    Bolt.verbose?.should == true
+    Bolt.set('verbose', 'false')
+    Bolt.verbose?.should == false
+    Bolt.set('verbose', nil)
+    Bolt.verbose?.should == false
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marcinbunsch-bolt
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Marcin Bunsch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-24 00:00:00 -07:00
+date: 2009-06-26 00:00:00 -07:00
 default_executable: bolt
 dependencies: []
 
@@ -46,10 +46,13 @@ files:
 - lib/bolt/runner.rb
 - lib/bolt/runners/base.rb
 - lib/bolt/runners/cucumber.rb
+- lib/bolt/runners/legacy_test_unit.rb
 - lib/bolt/runners/rspec.rb
 - lib/bolt/runners/test_unit.rb
+- spec/bolt/listener_spec.rb
 - spec/bolt/runners/rspec_spec.rb
 - spec/bolt/runners/test_unit_spec.rb
+- spec/bolt_spec.rb
 has_rdoc: false
 homepage: http://github.com/marcinbunsch/bolt
 post_install_message: 
@@ -77,5 +80,7 @@ signing_key:
 specification_version: 3
 summary: Bolt is a merge of autotest, mislav/rspactor and rails_server_testing to produce a lightning fast, configurable and simple to set up autotest clone
 test_files: 
+- spec/bolt/listener_spec.rb
 - spec/bolt/runners/rspec_spec.rb
 - spec/bolt/runners/test_unit_spec.rb
+- spec/bolt_spec.rb