specjour 0.3.0.rc7 → 0.3.0.rc8

data/History.markdown

@@ -1,6 +1,15 @@
 History
 =======
 
+## 0.3.0.rc8 / 2010-08-13
+
+* [fixed] Custom hooks now load in Ruby 1.9.2
+* [fixed] Specjour prepare correctly recreates the db
+
+* [added] Support for loading test DB from SQL file
+  (config.active_record.schema_format = :sql)
+* [added] Rsync failures raise Specjour::Error
+
 ## 0.3.0.rc7 / 2010-08-09
 
 * [fixed] Distributing absolute paths to remote machines.

data/VERSION

@@ -1 +1 @@
-0.3.0.rc7
+0.3.0.rc8

data/bin/specjour

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 require 'specjour'
 
+$PROGRAM_NAME = File.basename(__FILE__)
 Specjour::CLI.start

data/lib/specjour/cli.rb

@@ -18,11 +18,16 @@ module Specjour
       super(original_args)
     end
 
+
     default_task :dispatch
 
     class_option :log, :aliases => "-l", :type => :boolean, :desc => "Print debug messages to $stderr"
 
-    desc "listen", "Advertise availability to run specs\nDefaults to current directory"
+
+    desc "listen", "Wait for incoming tests"
+    long_desc <<-D
+      Advertise availability to run tests for the current directory.
+    D
     worker_option
     method_option :projects, :aliases => "-p", :type => :array, :desc => "Projects supported by this listener"
     def listen
@@ -32,7 +37,7 @@ module Specjour
       Specjour::Manager.new(args).start
     end
 
-    desc "dispatch [PROJECT_PATH]", "Run specs in this project"
+    desc "dispatch [PROJECT_PATH]", "Run tests in the current directory"
     worker_option
     dispatcher_option
     def dispatch(path = Dir.pwd)
@@ -42,7 +47,11 @@ module Specjour
       Specjour::Dispatcher.new(args).start
     end
 
-    desc "prepare [PROJECT_PATH]", "Run the prepare block on all listening workers"
+    desc "prepare [PROJECT_PATH]", "Prepare all listening workers"
+    long_desc <<-D
+      Run the Specjour::Configuration.prepare block on all listening workers.
+      Defaults to dropping and schema loading the database.
+    D
     worker_option
     dispatcher_option
     def prepare(path = Dir.pwd)
@@ -53,7 +62,7 @@ module Specjour
       Specjour::Dispatcher.new(args).start
     end
 
-    desc "version", "Show the version of specjour"
+    desc "version", "Show the current version"
     def version
       puts Specjour::VERSION
     end

data/lib/specjour/db_scrub.rb

@@ -8,6 +8,7 @@ module Specjour
     else
       load 'tasks/misc.rake'
       load 'tasks/databases.rake'
+      Rake::Task["db:structure:dump"].clear
     end
 
     extend self
@@ -20,7 +21,7 @@ module Specjour
       connect_to_database
       if pending_migrations?
         puts "Migrating schema for database #{ENV['TEST_ENV_NUMBER']}..."
-        Rake::Task['db:test:load'].invoke
+        schema_load_task.invoke
       else
         purge_tables
       end
@@ -29,6 +30,7 @@ module Specjour
     protected
 
     def connect_to_database
+      ActiveRecord::Base.remove_connection
       connection
     rescue # assume the database doesn't exist
       Rake::Task['db:create'].invoke
@@ -50,6 +52,10 @@ module Specjour
       ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations.any?
     end
 
+    def schema_load_task
+      Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:load" }[ActiveRecord::Base.schema_format]]
+    end
+
     def tables_to_purge
       connection.tables - ['schema_migrations']
     end

data/lib/specjour/dispatcher.rb

@@ -77,7 +77,7 @@ module Specjour
     end
 
     def fetch_manager(uri)
-      Timeout.timeout(8) do
+      Timeout.timeout(1) do
         manager = DRbObject.new_with_uri(uri.to_s)
         if !managers.include?(manager) && manager.available_for?(project_alias)
           add_manager(manager)
@@ -86,12 +86,12 @@ module Specjour
     rescue Timeout::Error
       Specjour.logger.debug "Timeout: couldn't connect to manager at #{uri}"
     rescue DRb::DRbConnError => e
-      Specjour.logger.debug "DRb error at #{uri}: #{e.backtrace.join("\n")}"
+      Specjour.logger.debug "#{e.message}: #{e.backtrace.join("\n")}"
       retry
     end
 
     def fork_local_manager
-      puts "No remote managers found, starting a local manager..."
+      puts "No listeners found on this machine, starting one..."
       manager_options = {:worker_size => options[:worker_size], :registered_projects => [project_alias]}
       manager = Manager.start_quietly manager_options
       fetch_manager(manager.drb_uri)
@@ -107,7 +107,7 @@ module Specjour
 
     def gather_remote_managers
       browser = DNSSD::Service.new
-      Timeout.timeout(2) do
+      Timeout.timeout(1) do
         browser.browse '_druby._tcp' do |reply|
           if reply.flags.add?
             resolve_reply(reply)
@@ -123,7 +123,7 @@ module Specjour
     end
 
     def no_local_managers?
-      !managers.any? {|m| m.hostname == hostname}
+      managers.none? {|m| m.hostname == hostname}
     end
 
     def printer

data/lib/specjour/manager.rb

@@ -95,7 +95,9 @@ module Specjour
     end
 
     def sync
-      cmd "rsync -aL --delete --port=8989 #{dispatcher_uri.host}::#{project_name} #{project_path}"
+      unless cmd "rsync -aL --delete --port=8989 #{dispatcher_uri.host}::#{project_name} #{project_path}"
+        raise Error, "Rsync Failed."
+      end
     end
 
     protected

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.3.0.rc2".freeze
+    CONFIG_VERSION = "0.3.0.rc8".freeze
     CONFIG_FILE_NAME = "rsyncd.conf"
     PID_FILE_NAME = "rsyncd.pid"
 
@@ -101,7 +101,7 @@ pid file = ./.specjour/#{PID_FILE_NAME}
 
 [#{project_name}]
   path = .
-  exclude = .git* .specjour/rsync* doc tmp/* log script
+  exclude = .git* .specjour/rsync* doc tmp/* log
       CONFIG
     end
   end

data/lib/specjour/socket_helper.rb

@@ -1,5 +1,7 @@
 module Specjour
   module SocketHelper
+    Socket.do_not_reverse_lookup = true
+
     def ip_from_hostname(hostname)
       Socket.getaddrinfo(hostname, nil, Socket::AF_INET, Socket::SOCK_STREAM).first.fetch(3)
     end

data/lib/specjour.rb

@@ -28,8 +28,8 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :Rspec, 'specjour/rspec'
 
-  VERSION = "0.3.0.rc7".freeze
-  HOOKS_PATH = ".specjour/hooks.rb"
+  VERSION = "0.3.0.rc8".freeze
+  HOOKS_PATH = "./.specjour/hooks.rb"
 
   class << self
     attr_accessor :interrupted

data/specjour.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{specjour}
-  s.version = "0.3.0.rc7"
+  s.version = "0.3.0.rc8"
 
   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-09-09}
+  s.date = %q{2010-09-13}
   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,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: specjour
 version: !ruby/object:Gem::Version 
+  hash: 977940561
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
-  - rc7
-  version: 0.3.0.rc7
+  - rc8
+  version: 0.3.0.rc8
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 -04:00
+date: 2010-09-13 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +27,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 3
@@ -41,6 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 39
         segments: 
         - 0
         - 14
@@ -56,6 +59,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -71,6 +75,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 33
         segments: 
         - 0
         - 10
@@ -86,6 +91,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 5
@@ -101,6 +107,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -180,6 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -188,6 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3