marcinbunsch-bolt 0.2.3 → 0.2.4

data/.bolt

@@ -1,3 +1 @@
-runner: rspec
-listener: generic
-notifier: growl
+verbose: true

data/Rakefile

@@ -35,6 +35,18 @@ task :run do
   system('ruby -I lib bin/bolt')
 end
 
+desc 'Reinstall the gem locally'
+task :reinstall do
+  f = File.open('VERSION')
+  version = f.read.gsub("\n", '')
+  f.close
+  system("sudo gem uninstall bolt")
+  system("gem build bolt.gemspec")
+  system("sudo gem install bolt-#{version}.gem")
+  system("rm bolt-#{version}.gem")
+end
+
+
 task :default => :run
 
 require 'rake/rdoctask'

data/lib/bolt/listener.rb

@@ -12,7 +12,9 @@ module Bolt
     # Constructor
     def initialize
       # find appropriate listener
-      $stdout.puts "** Using #{listener.class} "
+      listener
+      
+      $stdout.puts "** Using #{listener.class} " if Bolt['verbose']
       
       # trap the INT signal 
       add_sigint_handler
@@ -57,11 +59,11 @@ module Bolt
       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'
-        $stdout.puts "** Found listener setting in .bolt"
+        $stdout.puts "** Found listener setting in .bolt" if Bolt['verbose']
         return self.selected
       end
         
-      $stdout.puts "** Determining listener..."
+      $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
@@ -74,6 +76,7 @@ module Bolt
     end
     
     # capture the INT signal
+    # TODO: Move to Bolt.add_sigint_handler
     def add_sigint_handler
       trap 'INT' do
         $stdout.puts "\n** Exiting Bolt..."

data/lib/bolt/listeners/generic.rb

@@ -15,7 +15,7 @@ module Bolt
       end 
       
       def start
-        puts "** #{self.class} is scanning for files... "
+        puts "** #{self.class} is scanning for files... " if Bolt['verbose']
         # build a file collection
         find_files
         puts "** #{self.class} watching #{files.size} files... "
@@ -37,7 +37,7 @@ module Bolt
             updated << filename
             # update the mtime in file registry so we it's only send once
             files[filename] = current_mtime
-            $stdout.puts ">> Spotted change in #{filename}"  
+            $stdout.puts ">> Spotted change in #{filename}" if Bolt['verbose']
           end
         end
         parent.handle(updated) if updated != []

data/lib/bolt/listeners/osx.rb

@@ -27,7 +27,7 @@ module Bolt
         begin
           require 'osx/foundation'         
         rescue LoadError
-          puts "** Could not load osx/foundation. RubyCocoa not installed? Falling back to Bolt::Listeners::Generic"
+          puts "** Could not load osx/foundation. RubyCocoa not installed? Falling back to Bolt::Listeners::Generic" if Bolt['verbose']
           return Bolt::Listeners::Generic.new
         end
         
@@ -35,7 +35,7 @@ module Bolt
           OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework'
           return self.new
         rescue NameError
-          puts "** There was an error loading Bolt::Listeners::Osx. Falling back to Bolt::Listeners::Generic"
+          puts "** There was an error loading Bolt::Listeners::Osx. Falling back to Bolt::Listeners::Generic" if Bolt['verbose']
           return Bolt::Listeners::Generic.new
         end
       end

data/lib/bolt/notifier.rb

@@ -12,7 +12,7 @@ module Bolt
       # find appropriate notifier
       notifier
       # present
-      $stdout.puts "** Using #{notifier.class} \n"      
+      $stdout.puts "** Using #{notifier.class} \n" if Bolt['verbose']
     end
 
     # Pick a listener to launch
@@ -24,11 +24,11 @@ module Bolt
         self.selected= Bolt::Notifiers::Growl.new if Bolt['notifier'] == 'growl'
         self.selected= Bolt::Notifiers::Generic.new if Bolt['notifier'] == 'generic'
         self.selected= Bolt::Notifiers::NotifyOsd.new if Bolt['notifier'] == 'notify_send'
-        $stdout.puts "** Found 'notifier' setting in .bolt"
+        $stdout.puts "** Found 'notifier' setting in .bolt" if Bolt['verbose']
         return self.selected
       end
       
-      $stdout.puts "** Determining notifier... \n"
+      $stdout.puts "** Determining notifier... \n" if Bolt['verbose']
       
       # default - growl (if growlnotify is present)
       output = %x[which growlnotify]

data/lib/bolt/runner.rb

@@ -12,20 +12,21 @@ module Bolt
       # find appropriate runner
       runner
       
-      $stdout.puts "** Using #{selected.class} \n"
+      $stdout.puts "** Using #{selected.class} \n" if Bolt['verbose']
     end
     
     # Pick a listener to launch
     def runner
       return selected if selected
       
-      if Bolt['runner'] and ['test_unit', 'rspec'].include?(Bolt['runner'])
+      if Bolt['runner'] and ['test_unit', 'rspec', 'cucumber'].include?(Bolt['runner'])
         self.selected= Bolt::Runners::TestUnit.new if Bolt['runner'] == 'test_unit'
         self.selected= Bolt::Runners::RSpec.new if Bolt['runner'] == 'rspec'
-        $stdout.puts "** Found 'runner' setting in .bolt"
+        self.selected= Bolt::Runners::Cucumber.new if Bolt['runner'] == 'cucumber'
+        $stdout.puts "** Found 'runner' setting in .bolt" if Bolt['verbose']
         return self.selected
       end
-      $stdout.puts "** Determining runner... \n"
+      $stdout.puts "** Determining runner... \n" if Bolt['verbose']
       self.selected= Bolt::Runners::TestUnit.new
       self.selected= Bolt::Runners::RSpec.new  if File.directory?('spec')
       self.selected

data/lib/bolt/runners/base.rb

@@ -0,0 +1,131 @@
+#
+# Bolt::Runners::Base
+#
+# Abstract base class for runners
+#
+module Bolt
+  module Runners
+    class Base
+      
+      # mappings define which folders hold the files that the listener should listen to
+      MAPPINGS =  /(\.\/app\/|\.\/lib\/)/
+      
+      # class map specifies the folders holding classes that can be reloaded
+      CLASS_MAP = /(app\/controllers|app\/models|lib\/)/
+      
+      # do not allow this class to be instantiated
+      def initialized
+        raise NotImplementedError
+      end 
+      # /initialized
+      
+      # handle an updated file
+      def handle(filename)
+        
+        reload filename
+        
+        puts "=> #{self.class} running test for #{filename}" if Bolt['verbose']
+        test_files = translate(filename)
+        
+        return if test_files == []
+        
+        puts "==== #{self.class} running: #{ test_files.join(', ')}  ===="
+                
+        run(test_files)
+        
+        puts "==== #{self.class} completed run ===="
+        
+      end
+      
+      # translate the filename into a test
+      def translate(filename)
+        
+      end
+      
+      # run the specified test
+      def run(test_filename)
+
+      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
+      
+      # get the classname based on file
+      def resolve_classname(filename)
+        filename.sub('.rb', '').gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+      end
+      
+      # resolve the class based on filename
+      def resolve_class(filename)
+        klassname = resolve_classname(filename)
+        begin
+          return eval(klassname)
+        rescue NameError
+          return false
+        end
+      end
+      
+      # clear the class of methods before reload
+      def clear_class(klass)
+        begin
+          klass.instance_methods.each do |m| 
+            next if m.to_s == '__id__'
+            next if m.to_s == '__send__'
+            begin
+              klass.send(:remove_method, m)
+            rescue
+            end
+          end
+        rescue NameError
+        end
+      end
+      
+      def load_file(filename)
+        # load file again to rebuild the class we just ripped apart
+        if filename.match(self.class::CLASS_MAP)
+          begin
+            require File.join(Dir.pwd, filename)
+          rescue LoadError
+            notifier.error("Error in #{filename}", $!)
+            return false
+          rescue ArgumentError
+            notifier.error("Error in #{filename}", $!)
+            return false
+          end
+        end
+      end
+      
+      # force reload of a file/class
+      def reload(filename)
+        
+        # remove the file from list of loaded files
+        $".delete(filename)
+        $".delete(File.join(Dir.pwd, filename))
+        
+        # remove methods from class (if present)
+        if filename.match(self.class::CLASS_MAP)
+          class_filename = filename.sub(self.class::CLASS_MAP, '')
+          
+          # get the class
+          klass = resolve_class(class_filename)
+
+          # remove all methods - don't worry, the reload will bring them back refreshed
+          clear_class(klass) if klass
+
+        end
+
+        load_file(filename)
+        
+      end 
+      # /reload
+      
+    end
+  end
+end

data/lib/bolt/runners/cucumber.rb

@@ -0,0 +1,142 @@
+#
+# Bolt::Runners::Cucumber
+#
+# The Cucumber Runner maps the filename to the appropriate feature
+#
+module Bolt
+  module Runners
+    class Cucumber < Bolt::Runners::Base
+      
+      # mappings define which folders hold the files that the listener should listen to
+      MAPPINGS =  /(\.\/app\/|\.\/lib\/|\.\/features\/)/
+      
+      # class map specifies the folders holding classes that can be reloaded
+      CLASS_MAP = /(app\/controllers\/|app\/models\/|lib\/)/
+      
+      attr_accessor :notifier, :test_io, :heard
+      
+      # step mother storage
+      @@mother = nil
+      
+      def self.mother=(step_mother)
+        @@mother = step_mother
+      end
+      
+      def self.mother
+        @@mother
+      end
+      
+      # mapping is a copied and modified version of mislav/rspactor Inspector#translate
+      def translate(file)
+        self.heard = file
+        if file.match('other')
+          return ['features/other.feature']
+        else
+          return ['features/posts.feature']
+        end
+        
+        basename = File.basename(file)
+        candidates = []
+        test_filename = nil
+        case file
+          when %r:^app/controllers/:
+            test_filename = file.sub('.rb', '_spec.rb').sub('app/controllers', 'spec/controllers')
+          when %r:^app/models/:
+            test_filename = "spec/models/#{basename.sub('.rb', '_spec.rb')}"
+          when %r:^app/views/:
+            file = file.sub('app/views/', '')
+            directory = file.split('/')[0..-2].compact.join('/')
+            test_filename = "spec/controllers/#{directory}_controller_spec.rb"
+          when %r:^spec/:
+            test_filename = file
+          when %r:^lib/:
+            # map libs to straight specs
+            test_filename = "spec/#{file.sub('lib/', '').sub('.rb', '_spec.rb')}"
+          when 'config/routes.rb'
+            test_filename = "spec/controllers/#{basename.sub('.rb', '_spec.rb')}"
+          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 feature file for: #{file}"
+        end
+
+        candidates
+      end
+      
+      def run(files)
+        file = files.first
+                
+        # redirect spec output to StringIO
+        io = StringIO.new
+        
+        $stdout, old = io, $stdout
+        # refresh the loaded test file
+        #$".delete(file)
+        #require file
+
+        Bolt::Runners::Cucumber.mother.reload_definitions! if Bolt::Runners::Cucumber.mother and self.heard.match('_steps.rb')
+        
+        ::Cucumber::Cli::Main.execute([file])
+
+        Bolt::Runners::Cucumber.mother.clear_steps_and_scenarios!
+        # read the buffer
+        result = io.string.to_s.dup
+
+        $stdout = old
+                
+        # send buffer to stdout
+        puts result
+        
+        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
+        
+        # sent result to notifier
+        notifier.result(file, last_three)
+        
+      end
+      
+    end
+  end
+end
+
+# Cucumber hacks
+require 'cucumber'
+require 'cucumber/rspec_neuter'
+require 'cucumber/cli/main'
+
+module Cucumber
+  module StepMother
+    
+    def reload_definitions!
+      step_definitions.clear
+      Dir['features/step_definitions/*'].map do |f| 
+        $".delete(f)
+        require "features/step_definitions/#{File.basename(f)}"
+      end
+    end
+    
+    def clear_steps_and_scenarios!
+      steps.clear
+      scenarios.clear
+    end  
+  end
+  
+  module Cli
+    class Main
+
+      def self.execute(args)
+        instance = new(args)
+        instance.execute!(@step_mother)
+        Bolt::Runners::Cucumber.mother = @step_mother
+        instance
+      end
+      
+    end
+  end
+end

data/lib/bolt/runners/rspec.rb

@@ -7,75 +7,16 @@ require 'stringio'
 #
 module Bolt
   module Runners
-    class RSpec
+    class RSpec < Bolt::Runners::Base
       
+      # mappings define which folders hold the files that the listener should listen to
       MAPPINGS =  /(\.\/app\/|\.\/lib\/|\.\/spec\/controllers|\.\/spec\/models|\.\/spec)/
       
-      attr_accessor :notifier, :test_io
-      
-      def initialize
-      end
+      # class map specifies the folders holding classes that can be reloaded
+      CLASS_MAP = /(app\/controllers\/|app\/models\/|lib\/)/
       
-      # handle specified file
-      def handle(filename)
-        puts '=> Rspec running test for ' + filename
-        
-        # force reload of file
-        $".delete(filename)
-        $".delete(File.join(Dir.pwd, filename))
-        file = filename
-        # reload tests and classes
-        if file.match(/(app\/controllers|app\/models|lib\/)/)
-          puts '=================='
-          klassname = file.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 filename.include?('app/controllers') or filename.include?('app/models') or filename.include?('lib/')
-          begin
-            require File.join(Dir.pwd, filename)
-          rescue LoadError
-            notifier.error("Error in #{filename}", $!)
-            return false
-          rescue ArgumentError
-            notifier.error("Error in #{filename}", $!)
-            return false
-          end
-        end
-        
-        test_files = translate(filename)
-        
-        return if test_files == []
-          
-        puts '==== Rspec running: ' + test_files.join(', ') + ' ===='
-        
-        run(test_files)
-        
-        puts '==== Rspec 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 spec file: #{filename}"
-          return false
-        end
-        return true
-      end
+      # accesors
+      attr_accessor :notifier, :test_io
       
       # mapping is a copied and modified version of mislav/rspactor Inspector#translate
       def translate(file)
@@ -114,6 +55,7 @@ module Bolt
         candidates
       end
       
+      # run the appropriate test
       def run(files)
         file = files.first
         

data/lib/bolt/runners/test_unit.rb

@@ -7,10 +7,14 @@ require 'test/unit/ui/console/testrunner'
 #
 module Bolt
   module Runners
-    class TestUnit
+    class TestUnit < Bolt::Runners::Base
       
+      # mappings define which folders hold the files that the listener should listen to
       MAPPINGS =  /(\.\/app\/|\.\/lib\/|\.\/test\/functional|\.\/test\/unit)/
       
+      # class map specifies the folders holding classes that can be reloaded
+      CLASS_MAP = /(test\/functional\/|test\/unit\/|app\/controllers\/|app\/models\/|lib\/)/
+      
       attr_accessor :notifier, :test_io
       
       def initialize
@@ -29,69 +33,7 @@ module Bolt
         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)
         
@@ -124,7 +66,7 @@ module Bolt
           candidates << test_filename
         end
         if candidates == []
-          puts "=> NOTICE: could not find test file for: #{file}"
+          puts "=> NOTICE: could not find test file for: #{file}" if Bolt['verbose']
         end
         # puts candidates.inspect
         candidates
@@ -133,26 +75,20 @@ module Bolt
       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 }
+        class_filename = file.sub(self.class::CLASS_MAP, '')
+        
+        # get the class
+        test_class = resolve_classname(class_filename)
         
         # create dummy wrapper modules if test is in subfolder
         test_class.split('::').each do |part|
           eval "module ::#{part}; end" if !part.match('Test')
         end
         
+        # TODO: make this reload use load_file
         $".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
@@ -174,7 +110,8 @@ module Bolt
         klass = eval(test_class)
         
         Test::Unit::UI::Console::TestRunner.run(klass)
-      
+        Test::Unit.run = false
+        
         # Invoke method to test that writes to stdout.
         result = test_io.string.to_s.dup
 

data/lib/bolt.rb

@@ -23,8 +23,16 @@ module Bolt
   # read the .bolt file for configuration
   def self.read_dotfile
     if File.exists?('.bolt')
-      $stdout.puts "** Found .bolt file"
-      @@config.merge!(YAML.load_file('.bolt'))
+      $stdout.puts "** Found .bolt file" if Bolt['verbose']
+      read = YAML.load_file('.bolt')
+      @@config.merge!(read) if read
+    end
+  end
+  
+  # read the arguments passed in cli
+  def self.read_argv
+    ARGV.each do |arg|
+      self['verbose'] = true if arg == '-v'
     end
   end
   
@@ -34,6 +42,9 @@ module Bolt
     # read the dotfile
     Bolt.read_dotfile
     
+    # read the arguments passed
+    Bolt.read_argv
+    
     Bolt::Listener.new
   end
   
@@ -69,6 +80,8 @@ 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'
   end

data/spec/bolt/runners/test_unit_spec.rb

@@ -1,6 +1,20 @@
 require 'spec'
 require 'bolt/runners/test_unit'
 
+# test fixture for testing of class clearing
+module Bolt
+  class ClassForTesting
+    def one; end
+    def two; end
+  end
+  module Nested
+    class ClassForTesting
+      def three; end
+      def four; end
+    end
+  end
+end
+
 describe Bolt::Runners::TestUnit do
   
   before(:all) do
@@ -47,4 +61,31 @@ describe Bolt::Runners::TestUnit do
     $stdout = old
   end
   
+  it 'should return no results if file is not present' do
+    Bolt::ClassForTesting.should_not be_nil
+    Bolt::Nested::ClassForTesting.should_not be_nil
+    @tester1 = Bolt::ClassForTesting.new
+    @tester1.respond_to?(:one).should be_true
+    @tester1.respond_to?(:two).should be_true
+    @tester2 = Bolt::Nested::ClassForTesting.new
+    @tester2.respond_to?(:three).should be_true
+    @tester2.respond_to?(:four).should be_true
+    @runner.clear_class(Bolt::ClassForTesting)
+    @runner.clear_class(Bolt::Nested::ClassForTesting)
+  
+    # it should applied to current instances
+    @tester1.respond_to?(:one).should be_false
+    @tester1.respond_to?(:two).should be_false
+    @tester2.respond_to?(:three).should be_false
+    @tester2.respond_to?(:four).should be_false
+    
+    # and to new instances
+    @tester1a = Bolt::ClassForTesting.new
+    @tester2a = Bolt::Nested::ClassForTesting.new
+    @tester1a.respond_to?(:one).should be_false
+    @tester1a.respond_to?(:two).should be_false
+    @tester2a.respond_to?(:three).should be_false
+    @tester2a.respond_to?(:four).should be_false
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marcinbunsch-bolt
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Marcin Bunsch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: bolt
 dependencies: []
 
@@ -44,6 +44,8 @@ files:
 - lib/bolt/notifiers/growl.rb
 - lib/bolt/notifiers/notify_osd.rb
 - lib/bolt/runner.rb
+- lib/bolt/runners/base.rb
+- lib/bolt/runners/cucumber.rb
 - lib/bolt/runners/rspec.rb
 - lib/bolt/runners/test_unit.rb
 - spec/bolt/runners/rspec_spec.rb