specjour 0.3.0.rc5 → 0.3.0.rc6

data/.gitignore

@@ -21,3 +21,5 @@ pkg
 ## PROJECT::SPECIFIC
 .specjour
 spec/spec.opts
+.bundle
+Gemfile.lock

data/.rvmrc

@@ -0,0 +1 @@
+rvm gemset use specjour

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/History.markdown

@@ -1,6 +1,13 @@
 History
 =======
 
+## 0.3.0.rc6 / 2010-08-07
+
+* [fixed] Ruby 1.9.2 support through minor changes and DNSSD upgrade
+* [fixed] DbScrub.drop actually invokes the db:drop rake task
+* [fixed] Prepare task ignores rspec's at_exit callback, disabling the test
+  suite from running after the prepare task completes.
+
 ## 0.3.0.rc5 / 2010-07-30
 
 * [fixed] Shared example groups now supported in Rspec2

data/README.markdown

@@ -13,6 +13,8 @@
 Running `specjour` starts a dispatcher, a manager, and multiple workers - all
 of the componenets necessary for distributing your test suite.
 
+_(Read the Rails section first if your project uses Rails)_
+
     $ cd myproject
     $ specjour
 
@@ -45,6 +47,8 @@ Each worker should run their specs in an isolated database. Modify the test data
     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.
 
@@ -68,7 +72,7 @@ test suite, override it with a custom after\_fork hook.
 
 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.
+and recreates the ActiveRecord database on all workers.
 
     # .specjour/hooks.rb
 
@@ -77,11 +81,6 @@ and recreates the database on all workers.
       # custom preparation code
     end
 
-## Only listen to supported 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 # run specs for the bizconf and workbeast projects
-
 ## 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
@@ -89,6 +88,20 @@ directory, add an exclusion to your projects 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.
+
+    $ specjour listen --projects bizconf workbeast # run specs for the bizconf and workbeast projects
+
+## 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 -p bizconf_09
+    ~/bizconf $ specjour -a bizconf_09
+
 ## Thanks
 
 * shayarnett - Cucumber support, pairing and other various patches

data/Rakefile

@@ -10,11 +10,12 @@ begin
     gem.email = "sandro.turriate@gmail.com"
     gem.homepage = "http://github.com/sandro/specjour"
     gem.authors = ["Sandro Turriate"]
-    gem.add_dependency "dnssd", "1.3.1"
-    gem.add_dependency "thor", ">=0.13.4"
+    gem.add_dependency "dnssd", "1.3.4"
+    gem.add_dependency "thor", ">=0.14.0"
     gem.add_development_dependency "rspec", "1.3.0"
     gem.add_development_dependency "rr", ">=0.10.11"
     gem.add_development_dependency "yard", ">=0.5.3"
+    gem.add_development_dependency "jeweler", ">=1.4.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.0.rc5
+0.3.0.rc6

data/lib/specjour/cli.rb

@@ -2,10 +2,6 @@ module Specjour
   require 'thor'
   class CLI < Thor
 
-    def self.printable_tasks
-      super.reject{|t| t.last =~ /INTERNAL USE/ }
-    end
-
     def self.worker_option
       method_option :workers, :aliases => "-w", :type => :numeric, :desc => "Number of concurent processes to run. Defaults to your system's available cores."
     end
@@ -62,7 +58,7 @@ module Specjour
       puts Specjour::VERSION
     end
 
-    desc "work", "INTERNAL USE ONLY"
+    desc "work", "INTERNAL USE ONLY", :hide => true
     method_option :project_path, :required => true
     method_option :printer_uri, :required => true
     method_option :number, :type => :numeric, :required => true

data/lib/specjour/db_scrub.rb

@@ -13,7 +13,7 @@ module Specjour
     extend self
 
     def drop
-      Rake::Task['db:drop']
+      Rake::Task['db:drop'].invoke
     end
 
     def scrub

data/lib/specjour/dispatcher.rb

@@ -38,15 +38,17 @@ module Specjour
     end
 
     def all_specs(tests_path = 'spec')
-      Dir.chdir(project_path) do
-        Dir[File.join(tests_path, "**/*_spec.rb")].sort
-      end if File.exists? File.join(project_path, tests_path)
+      full_path = File.join(project_path, tests_path)
+      if File.exists? full_path
+        Dir[File.join(full_path, "**/*_spec.rb")].sort
+      end
     end
 
     def all_features(tests_path = 'features')
-      Dir.chdir(project_path) do
-        Dir[File.join(tests_path, "**/*.feature")].sort
-      end if File.exists? File.join(project_path, tests_path)
+      full_path = File.join(project_path, tests_path)
+      if File.exists? full_path
+        Dir[File.join(full_path, "**/*.feature")].sort
+      end
     end
 
     def add_manager(manager)
@@ -147,6 +149,7 @@ module Specjour
 
     def resolve_reply(reply)
       DNSSD.resolve!(reply) do |resolved|
+        Specjour.logger.debug "Bonjour discovered #{resolved.target}"
         resolved_ip = ip_from_hostname(resolved.target)
         uri = URI::Generic.build :scheme => reply.service_name, :host => resolved_ip, :port => resolved.port
         fetch_manager(uri)

data/lib/specjour/rspec/distributed_formatter.rb

@@ -64,7 +64,7 @@ module Specjour::Rspec
     protected
 
     def print_and_flush(messages)
-      output.print messages.to_s
+      output.print messages.join
       output.flush
       messages.replace []
     end

data/lib/specjour/worker.rb

@@ -29,6 +29,7 @@ module Specjour
     def prepare
       load_app
       Configuration.prepare.call
+      Kernel.exit!
     end
 
     def run_tests
@@ -62,7 +63,11 @@ module Specjour
       Rspec::Preloader.load(preload_spec) if preload_spec
       Cucumber::Preloader.load(preload_feature) if preload_feature
     rescue StandardError => exception
-      $stderr.puts "Caught exception: #{exception.class} #{exception.message}\nProceeding..."
+      msg = [
+        "Caught exception: #{exception.class} #{exception.message}",
+        "Proceeding... you may need to re-run the dispatcher."
+      ]
+      $stderr.puts msg.join("\n")
     end
 
     def printer_connection

data/lib/specjour.rb

@@ -28,7 +28,7 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :Rspec, 'specjour/rspec'
 
-  VERSION = "0.3.0.rc5".freeze
+  VERSION = "0.3.0.rc6".freeze
   HOOKS_PATH = ".specjour/hooks.rb"
 
   class << self

data/spec/specjour/cli_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Specjour::CLI do
+  subject { Specjour::CLI.new }
   let(:fake_pid) { 100_000_000 }
   before do
     stub(Specjour::CPU).cores.returns(27)

data/spec/specjour/manager_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Specjour::Manager do
   describe "#available_for?" do
+    subject { Specjour::Manager.new }
     it "isn't available for all projects by default" do
       subject.available_for?(rand.to_s).should be_false
     end

data/spec/specjour_spec.rb

@@ -8,7 +8,9 @@ def boo
 end
 
 describe Specjour do
-  it "pends as an example"
+  it "pends as an example" do
+    pending
+  end
 
   it "fails as an example" do
     boo

data/specjour.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{specjour}
-  s.version = "0.3.0.rc5"
+  s.version = "0.3.0.rc6"
 
   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-30}
+  s.date = %q{2010-09-07}
   s.default_executable = %q{specjour}
   s.description = %q{Distribute your spec suite amongst your LAN via Bonjour.}
   s.email = %q{sandro.turriate@gmail.com}
@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
     ".dev",
      ".document",
      ".gitignore",
+     ".rvmrc",
+     "Gemfile",
      "History.markdown",
      "MIT_LICENSE",
      "README.markdown",
@@ -87,24 +89,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dnssd>, ["= 1.3.1"])
-      s.add_runtime_dependency(%q<thor>, [">= 0.13.4"])
+      s.add_runtime_dependency(%q<dnssd>, ["= 1.3.4"])
+      s.add_runtime_dependency(%q<thor>, [">= 0.14.0"])
       s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_development_dependency(%q<rr>, [">= 0.10.11"])
       s.add_development_dependency(%q<yard>, [">= 0.5.3"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
     else
-      s.add_dependency(%q<dnssd>, ["= 1.3.1"])
-      s.add_dependency(%q<thor>, [">= 0.13.4"])
+      s.add_dependency(%q<dnssd>, ["= 1.3.4"])
+      s.add_dependency(%q<thor>, [">= 0.14.0"])
       s.add_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_dependency(%q<rr>, [">= 0.10.11"])
       s.add_dependency(%q<yard>, [">= 0.5.3"])
+      s.add_dependency(%q<jeweler>, [">= 1.4.0"])
     end
   else
-    s.add_dependency(%q<dnssd>, ["= 1.3.1"])
-    s.add_dependency(%q<thor>, [">= 0.13.4"])
+    s.add_dependency(%q<dnssd>, ["= 1.3.4"])
+    s.add_dependency(%q<thor>, [">= 0.14.0"])
     s.add_dependency(%q<rspec>, ["= 1.3.0"])
     s.add_dependency(%q<rr>, [">= 0.10.11"])
     s.add_dependency(%q<yard>, [">= 0.5.3"])
+    s.add_dependency(%q<jeweler>, [">= 1.4.0"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: specjour
 version: !ruby/object:Gem::Version 
-  hash: 977940562
+  hash: 977940563
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
-  - rc5
-  version: 0.3.0.rc5
+  - rc6
+  version: 0.3.0.rc6
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -04:00
+date: 2010-09-07 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 19
         segments: 
         - 1
         - 3
-        - 1
-        version: 1.3.1
+        - 4
+        version: 1.3.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 39
         segments: 
         - 0
-        - 13
-        - 4
-        version: 0.13.4
+        - 14
+        - 0
+        version: 0.14.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,22 @@ dependencies:
         version: 0.5.3
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :development
+  version_requirements: *id006
 description: Distribute your spec suite amongst your LAN via Bonjour.
 email: sandro.turriate@gmail.com
 executables: 
@@ -111,6 +127,8 @@ files:
 - .dev
 - .document
 - .gitignore
+- .rvmrc
+- Gemfile
 - History.markdown
 - MIT_LICENSE
 - README.markdown