marcinbunsch-bolt 0.1.7 → 0.1.8

data/bin/bolt

@@ -3,10 +3,11 @@ require 'rubygems'
 require 'bolt'
 
 # Rails support
+# TODO test/test_helper is not good for checking for rails, try something else
 if File.exists?('test/test_helper.rb')
   require 'bolt/adapters/rails'
 end
 
       
-# start a listener
-Bolt::Listener.new
+# start ## that must be the worst comment ever
+Bolt.start

data/lib/bolt/listener.rb

@@ -11,9 +11,8 @@ module Bolt
     
     # Constructor
     def initialize
-      $stdout.puts "** Starting Bolt..."
       # find appropriate listener
-      $stdout.puts "** Using #{listener.class}... "
+      $stdout.puts "** Using #{listener.class} "
       
       # trap the INT signal 
       add_sigint_handler

data/lib/bolt/notifier.rb

@@ -10,7 +10,7 @@ module Bolt
     # Constructor
     def initialize 
       # find appropriate listener
-      $stdout.puts "** Using #{notifier.class}... \n"
+      $stdout.puts "** Using #{notifier.class} \n"
 
       # launch appropriate listener      
       # notifier.new

data/lib/bolt/runner.rb

@@ -10,17 +10,24 @@ module Bolt
     # Constructor
     def initialize 
       # find appropriate listener
-      $stdout.puts "** Using #{runner.class}... \n"
+      runner
     end
     
     # Pick a listener to launch
     def runner
       return selected if selected
-      # TODO: os identification via RUBY_PLATFORM is flawed as it will return 'java' in jruby. Look for a different solution
       
+      if 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 "** Using #{selected.class} based on 'runner' setting in .bolt file \n"
+        return self.selected
+      end
+      $stdout.puts "** Determining runner... \n"
       self.selected= Bolt::Runners::TestUnit.new
-      self.selected= Bolt::Runners::RSpec.new if File.directory?('spec')
-      selected
+      self.selected= Bolt::Runners::RSpec.new  if File.directory?('spec')
+      $stdout.puts "** Using #{selected.class} \n"
+      self.selected
     end
     
   end

data/lib/bolt/runners/rspec.rb

@@ -23,19 +23,27 @@ module Bolt
         # force reload of file
         $".delete(filename)
         $".delete(File.join(Dir.pwd, filename))
-        
-=begin
-        # FIXME: This does not work well against a real project.
-        klassname = filename.sub('app/controllers/', '').sub('app/models/', '').sub('lib/', '')
-        test_class = klassname.sub('.rb', '').gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
-        root_klass = test_class.split('::').first
+        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
 
-        # remove the top constant/class from memory
-        # this is required to rebuild classes before test run
-        # one limitation - Spec/Test cannot be reloaded or it will crash
-        Object.send(:remove_const, root_klass) unless root_klass == 'Spec' or root_klass == 'Test'
-=end
-        
         if filename.include?('app/controllers') or filename.include?('app/models') or filename.include?('lib/')
           begin
             require File.join(Dir.pwd, filename)

data/lib/bolt/runners/test_unit.rb

@@ -157,9 +157,15 @@ module Bolt
           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
         

data/lib/bolt.rb

@@ -1,5 +1,42 @@
+require 'yaml'
 # Why Bolt? Cause it's a cool name, that's why :)
 module Bolt
+  
+  # static location for settings
+  @@config = {}
+  
+  # set a config setting
+  def self.set(key, value)
+    @@config[key] = value
+  end
+  
+  # retrieve a value for a config setting
+  def self.get(key)
+    @@config[key]
+  end
+  
+  # convienience accessor
+  def self.[](key)
+    @@config[key]
+  end
+  
+  # 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'))
+    end
+  end
+  
+  def self.start
+    $stdout.puts "** Starting Bolt..."
+    
+    # read the dotfile
+    Bolt.read_dotfile
+    
+    Bolt::Listener.new
+  end
+  
   autoload :Mapper, 'bolt/mapper'
   autoload :Runner, 'bolt/runner'
   autoload :Notifier, 'bolt/notifier'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marcinbunsch-bolt
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Marcin Bunsch