specjour 0.5.2 → 0.5.4

data/History.markdown

@@ -1,6 +1,20 @@
 History
 =======
 
+0.5.4 / 2012-05-29
+---------------------------
+* [fixed] Not running specs without 'spec/' argument
+
+[Full Changelog](https://github.com/sandro/specjour/compare/v0.5.3...v0.5.4)
+
+0.5.3 / 2012-04-12 - yanked
+---------------------------
+* [fixed] Writing to a nil socket; timeout too small (josephlord)
+* [fixed] Eagerly loading Rspec (jgdavey)
+* [fixed] Load path incorrectly matching specjour (jgdavey)
+
+[Full Changelog](https://github.com/sandro/specjour/compare/v0.5.2...v0.5.3)
+
 0.5.2 / 2012-02-21
 ---------------------------
 * [fixed] Binary path used by Loader
@@ -25,7 +39,7 @@ History
 * [removed] RSpec < 2.8 compatibility
 * [added] Memory utilizing forks. No longer forking and execing means workers
   start running tests faster.
-* [added] Configuration.after_load hook; runs after loading the environment
+* [added] Configuration.after\_load hook; runs after loading the environment
 * [added] Configurable rsync port
 * [added] Specs distributed by example, not file! Means better
   distribution/fast spec suites.

data/README.markdown

@@ -2,61 +2,56 @@
 
 ## FUCK SETI. Run specs with your spare CPU cycles.
 
-1. Spin up a manager on each machine that can run your specs.
-2. Start a dispatcher in your project directory.
+## Instructions
+
+1. Start a listener on every machine in the network. `# specjour listen`
+2. Start a dispatcher. `# specjour`
 3. Say farewell to your long coffee breaks.
 
 ## Installation
     gem install specjour
 
-## Give it a try
-Running `specjour` starts a dispatcher, a manager, and multiple workers - all
-of the componenets necessary for distributing your test suite.
+### Rails
+Each worker needs an isolated database. Modify the test database name in your
+`config/database.yml` to include the following environment variable (Influenced
+by [parallel\_tests](http://github.com/grosser/parallel_tests)):
+
+    test:
+      database: project_name_test<%=ENV['TEST_ENV_NUMBER']%>
 
-_(Read the Rails section first if your project uses Rails)_
+## Give it a try
+Run `specjour` to start a dispatcher, manager, and multiple workers in the same
+terminal window.
 
     $ cd myproject
     $ specjour
 
 ## Start a manager
-Running `specjour listen` will start a manager which advertises that it's ready
-to run specs. By default, the manager runs tests for the project in the
-current directory and uses your system cores to determine the number of workers
-to start. If your system has two cores, two workers will run tests.
+If you wish to share your computing power with the rest of the computers in your network, run `specjour listen` to start a long running process. The next time you, or any of your co-workers run `specjour`, they'll find your machine.
 
     $ specjour listen
 
 ## Distribute the tests
-Dispatch the tests among the managers you started. Specjour checks the 'spec' and
-'features' directories for tests.
+Dispatch the tests among the managers in the network. Specjour checks the
+'spec' and 'features' directories for tests to send to the listening
+managers.
 
     $ specjour
 
-## Distribute a subset of tests
-The first parameter to the specjour command is a test directory. It defalts to
+## Supplementary
+
+### Distribute a subset of tests
+The first parameter of the specjour command is a test directory. It defalts to
 the current directory and searches for 'spec' and 'features' paths therein.
 
     $ specjour spec # all rspec tests
     $ specjour spec/models # only model tests
-    $ specjour features # only features
-    $ specjour ~/my_other_project/features
-
-## Rails
-Each worker should run their specs in an isolated database. Modify the test database name in your `config/database.yml` to include the following environment variable (Influenced by [parallel\_tests](http://github.com/grosser/parallel_tests)):
-
-    test:
-      database: blog_test<%=ENV['TEST_ENV_NUMBER']%>
-
-Running `specjour prepare` will set up the database for each worker.
-
-### ActiveRecord Hooks
-Specjour contains ActiveRecord hooks that clear database tables before running tests using `DELETE FROM <table_name>;`. Additionally, test databases will be created if they don't exist (i.e. `CREATE DATABASE blog_test8` for the 8th worker) and your schema will be loaded when the database is out of date.
+    $ specjour features # all features
 
-## Custom Hooks
+### 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.
-If the default ActiveRecord hook doesn't set up the database properly for your
-test suite, override it with a custom after\_fork hook.
+If the default hooks don't work for your project, they can be overridden.
 
     # .specjour/hooks.rb
 
@@ -71,8 +66,8 @@ test suite, override it with a custom after\_fork hook.
     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 ActiveRecord database on all workers.
+you to run arbitrary code on all of the listening workers. By default, it
+recreates the database on all workers.
 
     # .specjour/hooks.rb
 
@@ -81,28 +76,28 @@ and recreates the ActiveRecord database on all workers.
       # custom preparation code
     end
 
-## Customize what gets rsync'd
+### Customize what gets rsync'd
 The standard rsync configuration file may be too broad for your
 project. If you find you're rsyncing gigs of extraneous data from your public
-directory, add an exclusion to your projects rsyncd.conf file.
+directory, add an exclusion to your project's rsyncd.conf file.
 
     $ vi workbeast/.specjour/rsyncd.conf
 
-## Listen for 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.
+### Listen for multiple projects
+By default, a manager will listen to the project in the current directory. If you want to run tests for multiple projects, use the `--projects` flag.
 
-    $ specjour listen --projects bizconf workbeast # run specs for the bizconf and workbeast projects
+    $ specjour listen --projects bizconf workbeast # run tests for the bizconf and workbeast projects
 
-## Give your project an alias
+### Give your project an alias
 By default, the dispatcher looks for managers matching the project's directory name. If you have multiple teams working on different branches of the same project you may want to isolate each specjour cluster. Give your project an alias and only listen for that alias.
 
-    ~/bizconf $ specjour listen -p bizconf_08
-    ~/bizconf $ specjour -a bizconf_08
+    ~/bizconf $ specjour listen --projects bizconf_08
+    ~/bizconf $ specjour --alias bizconf_08
 
-    ~/bizconf $ specjour listen -p bizconf_09
-    ~/bizconf $ specjour -a bizconf_09
+    ~/bizconf $ specjour listen --projects bizconf_09
+    ~/bizconf $ specjour --alias bizconf_09
 
-## Working with git
+### Working with git
 Commit the .specjour directory but ignore the performance file. The performance
 file constantly changes, there's no need to commit it. Specjour uses it in an
 attempt to optimize the run order; ensuring each machine gets at least one
@@ -115,7 +110,6 @@ long-running test.
 
 * RSpec 2
 * Cucumber 0.9+
-* Rails 2
 * Rails 3
 
 ## Hacking on Specjour
@@ -124,8 +118,6 @@ If you want to hack on specjour, here is how to test your changes:
     source .dev
     rake # run the test suite sanely
     specjour # run the test suite with specjour
-    cd sample
-    specjour # run the cucumber test suite with specjour
 
 Then if all is good, go to another app and test your changes on your test suite:
 
@@ -140,7 +132,7 @@ Then if all is good, go to another app and test your changes on your test suite:
 * voxdolo - Endless support, alpha testing, various patches
 * l4rk and leshill - Removed Jeweler, added support for RSpec 2 and Cucumber 0.9+
 * testjour - Ripped off your name
-* parallel\_tests - Made my test suite twice as fast
+* parallel\_tests - Inspiration
 
 ## Note on Patches/Pull Requests
 

data/lib/specjour.rb

@@ -29,7 +29,7 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :RSpec, 'specjour/rspec'
 
-  VERSION ||= "0.5.2"
+  VERSION ||= "0.5.4"
   HOOKS_PATH ||= "./.specjour/hooks.rb"
   PROGRAM_NAME ||= $PROGRAM_NAME # keep a reference of the original program name
 

data/lib/specjour/connection.rb

@@ -74,7 +74,7 @@ module Specjour
     end
 
     def timeout(&block)
-      Timeout.timeout(0.1, &block)
+      Timeout.timeout(1.0, &block)
     rescue Timeout::Error
     end
 

data/lib/specjour/loader.rb

@@ -87,10 +87,18 @@ module Specjour
     end
 
     def register_tests_with_printer
-      tests = filtered_examples | feature_files
+      tests = rspec_examples | feature_files
       connection.send_message :tests=, tests
     end
 
+    def rspec_examples
+      if spec_files.any?
+        filtered_examples
+      else
+        []
+      end
+    end
+
     def filtered_examples
       ::RSpec.world.example_groups.map do |g|
         g.descendants.map do |gs|

data/lib/specjour/manager.rb

@@ -62,7 +62,7 @@ module Specjour
         exec_cmd << " --test-paths #{test_paths.join(" ")}" if test_paths.any?
         exec_cmd << " --log" if Specjour.log?
         exec_cmd << " --quiet" if quiet?
-        load_path = $LOAD_PATH.detect {|l| l =~ %r(specjour.*/lib$)}
+        load_path = $LOAD_PATH.detect {|l| l =~ %r(specjour[^/]*/lib$)}
         bin_path = File.expand_path(File.join(load_path, "../bin"))
         Kernel.exec({"RUBYLIB" => load_path}, "#{bin_path}/specjour #{exec_cmd}")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specjour
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
-  requirement: &2156640700 !ruby/object:Gem::Requirement
+  requirement: &2152331220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156640700
+  version_requirements: *2152331220
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2156640200 !ruby/object:Gem::Requirement
+  requirement: &2152330580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156640200
+  version_requirements: *2152330580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156639660 !ruby/object:Gem::Requirement
+  requirement: &2152329980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2156639660
+  version_requirements: *2152329980
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2156639180 !ruby/object:Gem::Requirement
+  requirement: &2152329340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *2156639180
+  version_requirements: *2152329340
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156638680 !ruby/object:Gem::Requirement
+  requirement: &2152328620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *2156638680
+  version_requirements: *2152328620
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156638160 !ruby/object:Gem::Requirement
+  requirement: &2152327920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2156638160
+  version_requirements: *2152327920
 description: ! "    Specjour splits your RSpec suite across multiple machines, and
   multiple\n    cores per machine, to run super-parallel-fast!  Also works with Cucumber.\n"
 email: sandro.turriate@gmail.com
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Distribute your spec suite amongst your LAN via Bonjour.