specjour 0.1.11 → 0.1.12

data/README.markdown

@@ -1,8 +1,8 @@
 # Specjour
 _Distribute your spec suite amongst your LAN via Bonjour._
 
-1. Start a dispatcher in your project directory.
-2. Spin up a manager on each remote machine.
+1. Spin up a manager on each machine that can run your specs.
+2. Start a dispatcher in your project directory.
 3. Say farewell to your long coffee breaks.
 
 ## Requirements
@@ -14,7 +14,7 @@ _Distribute your spec suite amongst your LAN via Bonjour._
     gem install specjour
 
 ## Start a manager
-Running `specjour` on the command-line will start a manager which advertises that it's ready to run tests. By default, the manager will only use one worker to run the tests. If you had 4 cores however, you could use `specjour --workers 4` to run 4 sets of tests at once.
+Running `specjour` on the command-line will start a manager which advertises that it's ready to run specs. By default, the manager will only use one worker to run yours specs. If you had 4 cores however, you could use `specjour --workers 4` to run 4 sets of specs at once.
 
     $ specjour
 
@@ -23,8 +23,8 @@ Require specjour's rake tasks in your project's `Rakefile`.
 
     require 'specjour/tasks/specjour'
 
-## Distribute the tests
-Run the rake task to distribute the tests among the managers you started.
+## Distribute the specs
+Run the rake task to distribute the specs among the managers you started.
 
     $ rake specjour
 
@@ -38,7 +38,16 @@ Each worker should run their specs in an isolated database. Modify the test data
     test:
       database: blog_test<%=ENV['TEST_ENV_NUMBER']%>
 
-Each worker will attempt to clear its database tables before running any specs via `DELETE FROM <table_name>;`. Additionally, test databases will be created if they don't exist (i.e. blog_test8 for the 8th worker) and will be migrated when necessary.
+Each worker will attempt to clear its database tables before running any specs via `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 will load your schema when it has fallen behind.
+
+## 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` flags.
+
+    $ specjour --projects bizconf # only run specs for the bizconf project
+
+You could also listen to multiple projects:
+
+    $ specjour --projects bizconf,workbeast # only run specs for the bizconf and workbeast projects
 
 ## Note on Patches/Pull Requests
 

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/bin/specjour

@@ -7,7 +7,7 @@ options = {:worker_size => 1, :batch_size => 1}
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: specjour [options]"
 
-  opts.on('-w', '--workers [WORKERS]', Numeric, "Number of WORKERS to spin up, defaults to #{options[:worker_size]}") do |n|
+  opts.on('-w', '--workers WORKERS', Numeric, "Number of WORKERS to spin up, defaults to #{options[:worker_size]}") do |n|
     options[:worker_size] = n
   end
 
@@ -15,8 +15,8 @@ optparse = OptionParser.new do |opts|
     options[:batch_size] = n
   end
 
-  opts.on('-d', '--dispatcher HOSTNAME', "Only run specs from the dispatcher running on this host, i.e. farnsworth.local") do |name|
-    options[:registered_dispatcher] = name
+  opts.on('-p', '--projects PROJECTS', Array, "Only run specs for these comma delimited project names, i.e. workbeast,taigan") do |project_names|
+    options[:registered_projects] = project_names
   end
 
   opts.on('--do-work OPTIONS', Array, 'INTERNAL USE ONLY') do |args|
@@ -36,6 +36,8 @@ end
 
 optparse.parse!
 
+abort(%(ERROR: I don't understand the following flags: "#{ARGV.join(', ')}")) if ARGV.any?
+
 if options[:worker_args]
   options[:worker_args] << options[:batch_size]
   Specjour::Worker.new(*options[:worker_args]).run

data/lib/specjour/connection.rb

@@ -5,25 +5,36 @@ module Specjour
     include Protocol
     extend Forwardable
 
-    attr_reader :uri, :connection
+    attr_reader :uri
+    attr_writer :socket
     attr_accessor :reconnection_attempts
 
-    def_delegators :connection, :flush, :closed?, :close, :gets, :each
+    def_delegators :socket, :flush, :closed?, :close, :gets, :each
+
+    def self.wrap(established_connection)
+      host, port = established_connection.peeraddr.values_at(2,1)
+      connection = new URI::Generic.build(:host => host, :port => port)
+      connection.socket = established_connection
+      connection
+    end
 
     def initialize(uri)
       @uri = uri
       @reconnection_attempts = 0
-      connect
     end
 
     def connect
-      @connection = TCPSocket.open(uri.host, uri.port)
+      @socket = TCPSocket.open(uri.host, uri.port)
     rescue SystemCallError => error
       Kernel.puts "Could not connect to #{uri.to_s}\n#{error.inspect}"
     end
 
+    def socket
+      @socket ||= connect
+    end
+
     def print(arg)
-      connection.print dump_object(arg)
+      socket.print dump_object(arg)
     rescue SystemCallError => error
       Kernel.p error
       reconnect
@@ -34,8 +45,15 @@ module Specjour
       print(arg << "\n")
     end
 
+    def send_message(method_name, *args)
+      print([method_name, *args])
+      flush
+    end
+
+    protected
+
     def reconnect
-      connection.close
+      socket.close
       if reconnection_attempts < MAX_RECONNECTS
         connect
         self.reconnection_attempts += 1
@@ -43,10 +61,5 @@ module Specjour
         raise Error, "Lost connection #{MAX_RECONNECTS} times"
       end
     end
-
-    def send_message(method_name, *args)
-      print([method_name, *args])
-      flush
-    end
   end
 end

data/lib/specjour/dispatcher.rb

@@ -24,7 +24,7 @@ module Specjour
 
     def all_specs
       @all_specs ||= Dir.chdir(project_path) do
-        Dir["spec/**/**/*_spec.rb"].partition {|f| f =~ /integration/}.flatten
+        Dir["spec/**/**/*_spec.rb"].sort
       end
     end
 
@@ -41,7 +41,7 @@ module Specjour
 
     def fetch_manager(uri)
       manager = DRbObject.new_with_uri(uri.to_s)
-      if !managers.include?(manager) && manager.available_for?(hostname)
+      if !managers.include?(manager) && manager.available_for?(project_name)
         set_up_manager(manager, uri)
         managers << manager
         self.worker_size += manager.worker_size
@@ -65,6 +65,7 @@ module Specjour
       end
       puts "Managers found: #{managers.size}"
       abort unless managers.size > 0
+      puts "Workers found: #{worker_size}"
       printer.worker_size = worker_size
     end
 

data/lib/specjour/manager.rb

@@ -4,17 +4,17 @@ module Specjour
     include DRbUndumped
 
     attr_accessor :project_name, :specs_to_run, :dispatcher_uri
-    attr_reader :worker_size, :batch_size, :registered_dispatcher, :bonjour_service, :worker_pids
+    attr_reader :worker_size, :batch_size, :registered_projects, :bonjour_service, :worker_pids
 
     def initialize(options = {})
       @worker_size = options[:worker_size]
       @batch_size = options[:batch_size]
-      @registered_dispatcher = options[:registered_dispatcher]
+      @registered_projects = options[:registered_projects]
       @worker_pids = []
     end
 
-    def available_for?(hostname)
-      registered_dispatcher ? registered_dispatcher == hostname : true
+    def available_for?(project_name)
+      registered_projects ? registered_projects.include?(project_name) : true
    end
 
     def bundle_install

data/lib/specjour/printer.rb

@@ -18,7 +18,7 @@ module Specjour
     end
 
     def serve(client)
-      client.extend Protocol
+      client = Connection.wrap client
       client.each(TERMINATOR) do |data|
         process load_object(data), client
       end

data/lib/specjour/protocol.rb

@@ -10,18 +10,5 @@ module Specjour
     def load_object(data)
       Marshal.load(data.sub(TERMINATOR_REGEXP, ''))
     end
-
-    def print(arg)
-      super dump_object(arg)
-    end
-
-    def puts(arg)
-      print(arg << "\n")
-    end
-
-    def send_message(method_name, *args)
-      print([method_name, *args])
-      flush
-    end
   end
 end

data/lib/specjour/worker.rb

@@ -10,10 +10,8 @@ module Specjour
       @number = number.to_i
       @batch_size = batch_size.to_i
       self.printer_uri = printer_uri
-      printer
       GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
       DistributedFormatter.batch_size = batch_size
-      Dir.chdir(project_path)
       set_env_variables
     end
 
@@ -24,6 +22,7 @@ module Specjour
     def run
       printer.send_message(:ready)
       run_time = 0
+      Dir.chdir(project_path)
       while !printer.closed? && data = printer.gets(TERMINATOR)
         spec = load_object(data)
         if spec
@@ -50,7 +49,7 @@ module Specjour
     end
 
     def run_spec(spec)
-      Kernel.puts "Running #{spec}"
+      puts "Running #{spec}"
       options = Spec::Runner::OptionParser.parse(
         ['--format=Specjour::DistributedFormatter', spec],
         $stderr,
@@ -58,7 +57,6 @@ module Specjour
       )
       Spec::Runner.use options
       options.run_examples
-      Spec::Runner.options.instance_variable_set(:@examples_run, true)
     end
 
     def set_env_variables

data/lib/specjour.rb

@@ -21,6 +21,6 @@ module Specjour
   autoload :RsyncDaemon, 'specjour/rsync_daemon'
   autoload :Worker, 'specjour/worker'
 
-  VERSION = "0.1.11".freeze
+  VERSION = "0.1.12".freeze
   class Error < StandardError; end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Sandro Turriate