specjour 0.3.0.rc1 → 0.3.0.rc2

data/History.markdown

@@ -1,7 +1,19 @@
 History
 =======
 
-## 0.3.0.rc1 / thor
+## 0.3.0.rc2 / thor
+
+* [fixed] Cucumber compatibility with 0.8.5
+
+* [fixed] The before\_fork hook did not work in the rc1 because the custom hooks
+  were loaded by the worker (after fork). We could have the manager preload the app
+  but then you'll have stale managers. Instead, custom hooks are now located in
+  the .specjour/hooks.rb file, essentially living outside of your application.
+
+* [changed] The generated rsyncd.conf now syncs the .specjour directory
+  allowing hooks to be loaded by managers and workers.
+
+## 0.3.0.rc1 / 2010-07-12
 
 * [removed] Rake tasks have been removed, use the command-line instead.
 

data/README.markdown

@@ -57,47 +57,37 @@ Specjour contains ActiveRecord hooks that clear database tables before running t
 
 ## Custom Hooks
 Specjour allows you to hook in to the test process on a per-machine and
-per-worker level through the before_fork and after_fork configuration blocks.
+per-worker level through the before\_fork and after\_fork configuration blocks.
 If the default ActiveRecord hook doesn't set up the database properly for your
-test suite, override it with a custom after_fork hook.
+test suite, override it with a custom after\_fork hook.
 
-    # config/initializers/specjour.rb
-    Rails.configuration.after_initialize do
+    # .specjour/hooks.rb
 
-      # Modify the way you use bundler
-      Specjour::Configuration.before_fork = lambda do
-        # TODO: not working as advertised
-        system('bundle install --without production')
-      end
-
-      # Modify your database setup
-      Specjour::Configuration.after_fork = lambda do
-        # custom database setup here
-      end
+    # Modify the way you use bundler
+    Specjour::Configuration.before_fork = lambda do
+      system('bundle install --without production')
+    end
 
+    # Modify your database setup
+    Specjour::Configuration.after_fork = lambda do
+      # custom database setup here
     end
 
 A preparation hook is run when `specjour prepare` is invoked. This hook allows
 you to run arbitrary code on all of the listening workers. By default, it drops
 and recreates the database on all workers.
 
-    Rails.configuration.after_initialize do
-
-      # Modify preparation
-      Specjour::Configuration.prepare = lambda do
-        # custom preparation code
-      end
+    # .specjour/hooks.rb
 
+    # Modify preparation
+    Specjour::Configuration.prepare = lambda do
+      # custom preparation code
     end
 
 ## Only listen to supported projects
-By default, a manager will listen to all projects trying to distribute specs over the network. Sometimes you'll only want a manager to respond to one specific spec suite. You can accomplish this with the `--projects` flag.
-
-    $ specjour listen --projects bizconf # only run specs for the bizconf project
-
-You could also listen to multiple projects:
+By default, a manager will listen to the project in the current directory. If you want to listen for multiple projects, use the `--projects` flag.
 
-    $ specjour listen --projects bizconf,workbeast # only run specs for the bizconf and workbeast projects
+    $ specjour listen --projects bizconf workbeast # run specs for the bizconf and workbeast projects
 
 ## Customize what gets rsync'd
 The standard rsync configuration file may be too broad for your

data/VERSION

@@ -1 +1 @@
-0.3.0.rc1
+0.3.0.rc2

data/lib/specjour/cli.rb

@@ -24,7 +24,7 @@ module Specjour
 
     default_task :dispatch
 
-    class_option :log, :aliases => "-l", :type => :boolean, :desc => "Print debug messages to $stdout"
+    class_option :log, :aliases => "-l", :type => :boolean, :desc => "Print debug messages to $stderr"
 
     desc "listen", "Advertise availability to run specs\nDefaults to current directory"
     worker_option

data/lib/specjour/cucumber/preloader.rb

@@ -5,6 +5,7 @@ class Specjour::Cucumber::Preloader
     step_mother = cli.class.step_mother
 
     step_mother.log = cli.configuration.log
+    step_mother.options = cli.configuration.options
     step_mother.load_code_files(cli.configuration.support_to_load)
     step_mother.after_configuration(cli.configuration)
     features = step_mother.load_plain_text_features(cli.configuration.feature_files)

data/lib/specjour/manager.rb

@@ -38,7 +38,7 @@ module Specjour
     def dispatch
       suspend_bonjour do
         sync
-        in_project { Configuration.before_fork.call }
+        execute_before_fork
         dispatch_workers
       end
     end
@@ -109,6 +109,13 @@ module Specjour
       system command
     end
 
+    def execute_before_fork
+      in_project do
+        Specjour.load_custom_hooks
+        Configuration.before_fork.call
+      end
+    end
+
     def suspend_bonjour(&block)
       bonjour_service.stop
       block.call

data/lib/specjour/rsync_daemon.rb

@@ -5,7 +5,7 @@ module Specjour
 
     # Corresponds to the version of specjour that changed the configuration
     # file.
-    CONFIG_VERSION = "0.2.3".freeze
+    CONFIG_VERSION = "0.3.0.rc2".freeze
     CONFIG_FILE_NAME = "rsyncd.conf"
     PID_FILE_NAME = "rsyncd.pid"
 
@@ -56,13 +56,13 @@ module Specjour
     end
 
     def check_config_version
-      File.read(config_file) =~ /\A# (\d+.\d+.\d+)/
+      File.read(config_file) =~ /\A# (\d.\d.\d[.rc\d]*)/
       if out_of_date? Regexp.last_match(1)
         $stderr.puts <<-WARN
 
 Specjour has made changes to the way #{CONFIG_FILE_NAME} is generated.
-Back up '#{config_file}'
-and re-run the dispatcher to generate the new config file.
+Back up '#{config_file}',
+remove it, and re-run the dispatcher to generate the new config file.
 
         WARN
       end
@@ -101,7 +101,7 @@ pid file = ./.specjour/#{PID_FILE_NAME}
 
 [#{project_name}]
   path = .
-  exclude = .git* .specjour doc tmp/* log script
+  exclude = .git* .specjour/rsync* doc tmp/* log script
       CONFIG
     end
   end

data/lib/specjour/worker.rb

@@ -19,6 +19,7 @@ module Specjour
       self.printer_uri = options[:printer_uri]
       set_env_variables
       Dir.chdir(project_path)
+      Specjour.load_custom_hooks
     end
 
     def printer_uri=(val)

data/lib/specjour.rb

@@ -28,7 +28,8 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :Rspec, 'specjour/rspec'
 
-  VERSION = "0.3.0.rc1".freeze
+  VERSION = "0.3.0.rc2".freeze
+  HOOKS_PATH = ".specjour/hooks.rb"
 
   def self.logger
     @logger ||= new_logger
@@ -44,6 +45,10 @@ module Specjour
     logger.level != Logger::UNKNOWN
   end
 
+  def self.load_custom_hooks
+    require HOOKS_PATH if File.exists?(HOOKS_PATH)
+  end
+
   Error = Class.new(StandardError)
   PROGRAM_NAME = $PROGRAM_NAME # keep a reference of the original program name
 

data/specjour.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{specjour}
-  s.version = "0.3.0.rc1"
+  s.version = "0.3.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sandro Turriate"]
-  s.date = %q{2010-07-12}
+  s.date = %q{2010-07-14}
   s.default_executable = %q{specjour}
   s.description = %q{Distribute your spec suite amongst your LAN via Bonjour.}
   s.email = %q{sandro.turriate@gmail.com}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: specjour
 version: !ruby/object:Gem::Version 
-  hash: 977940566
+  hash: 977940567
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
-  - rc1
-  version: 0.3.0.rc1
+  - rc2
+  version: 0.3.0.rc2
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 -04:00
+date: 2010-07-14 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency