tork 19.0.0 → 19.0.1

data/HISTORY.markdown

@@ -1,3 +1,26 @@
+## Version 19.0.1 (2012-10-26)
+
+Patch:
+
+  * Support testing projects that have both test/ and spec/ directories.
+
+    I assumed that users would only have either test/ or spec/ but not both.
+    Do you know what happens when a test/ is run by RSpec or vice versa? :-)
+
+    Thanks to Kyle Peyton for reporting this issue.
+
+  * Automatically load the "autorun" helpers for RSpec and MiniTest.
+
+    RSpec users are accustomed to not having `require "rspec/autorun"` in
+    their spec/spec_helper.rb file because they use the rspec(1) executable
+    to run their tests.  This commit makes things Just Work for them again.
+
+Other:
+
+  * test whether input is JSON by actually parsing it
+
+  * server: use Set instead of Array for faster lookup
+
 ## Version 19.0.0 (2012-10-17)
 
 Major:
@@ -68,7 +91,7 @@ Other:
 Other:
 
   * GH-39: upgrade listen gem version to fix a bug in OSX.
-    Thanks to "harmon" on GitHub for reporting this issue.
+    Thanks to Adam Grant for reporting this issue.
 
 ## Version 18.2.3 (2012-09-26)
 

data/LICENSE

@@ -1,24 +1,25 @@
 (the ISC license)
 
-Copyright 2010 Suraj N. Kurapati <sunaku@gmail.com>
-Copyright 2011 Brian D. Burns <burns180@gmail.com>
-Thanks to 2011 Daniel Pittman <daniel@rimspace.net>
-Thanks to 2011 Jacob Helwig <jacob@technosorcery.net>
-Thanks to 2011 Corné Verbruggen <corne@g-majeur.nl>
-Thanks to 2011 Luke Wendling <luke@lukewendling.com>
-Thanks to 2012 Jose Pablo Barrantes <xjpablobrx@gmail.com>
-Thanks to 2012 Spencer Steffen <spencer@citrusme.com>
-Thanks to 2012 Jesse Cooke <jesse@jc00ke.com>
-Thanks to 2012 Benjamin Quorning <benjamin@quorning.net>
-Thanks to 2012 Nicolas Fouché <nicolas.fouche@gmail.com>
-Thanks to 2012 Mark Hayes <mark@deployfx.com>
-Thanks to 2012 Gumaro Melendez <cloudernew@gmail.com>
-Thanks to 2012 Scott Radcliff <radcliffsc@gmail.com>
-Thanks to 2012 David Burrows <david@imergent.com>
-Thanks to 2012 Bjørn Trondsen <contact@sharagoz.com>
-Thanks to 2012 NagaChaitanya Vellanki <me@chaitanyavellanki.com>
-Thanks to 2012 Jesse Cooke <jesse@jc00ke.com>
-Thanks to 2012 Ohno Shin'ichi <shin1ohno@me.com>
+Copyright 2010 Suraj N. Kurapati <https://github.com/sunaku>
+Copyright 2011 Brian D. Burns <https://github.com/burns>
+Thanks to 2011 Daniel Pittman <https://github.com/daniel-pittman>
+Thanks to 2011 Jacob Helwig <https://github.com/jhelwig>
+Thanks to 2011 Corné Verbruggen <https://github.com/corneverbruggen>
+Thanks to 2011 Luke Wendling <https://github.com/lukewendling>
+Thanks to 2012 Jose Pablo Barrantes <https://github.com/jpablobr>
+Thanks to 2012 Spencer Steffen <https://github.com/citrus>
+Thanks to 2012 Jesse Cooke <https://github.com/jc00ke>
+Thanks to 2012 Benjamin Quorning <https://github.com/bquorning>
+Thanks to 2012 Nicolas Fouché <https://github.com/nfo>
+Thanks to 2012 Mark Hayes <https://github.com/mhayes>
+Thanks to 2012 Gumaro Melendez <https://github.com/clouder>
+Thanks to 2012 Scott Radcliff <https://github.com/ScottRadcliff>
+Thanks to 2012 David Burrows <https://github.com/dburrows>
+Thanks to 2012 Bjørn Trondsen <https://github.com/Sharagoz>
+Thanks to 2012 NagaChaitanya Vellanki <https://github.com/chaitanyav>
+Thanks to 2012 Ohno Shin'ichi <https://github.com/shin1ohno>
+Thanks to 2012 Adam Grant <https://github.com/harmon>
+Thanks to 2012 Kyle Peyton <https://github.com/weexpectedthis>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/bin/tork

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK 1 2012-10-17 19.0.0
+# TORK 1 2012-10-26 19.0.1
 
 ## NAME
 

data/bin/tork-driver

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-DRIVER 1 2012-10-17 19.0.0
+# TORK-DRIVER 1 2012-10-26 19.0.1
 
 ## NAME
 

data/bin/tork-engine

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-ENGINE 1 2012-10-17 19.0.0
+# TORK-ENGINE 1 2012-10-26 19.0.1
 
 ## NAME
 
@@ -32,7 +32,7 @@ from stdin and performs the actions described respectively.
   that have changed since the last run of *test_file* will be substituted.
   If any *line_numbers* are zero, then the entire *test_file* will be run.
 
-`["run_test_files"`, *test_files_with_optional_line_numbers*`]`
+`["run_test_files"`, *test\_files\_with\_optional\_line\_numbers*`]`
   Calls the `run_test_file` command once for each item in the given array.
 
 `["stop_running_test_files"`, *signal*`]`

data/bin/tork-herald

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-HERALD 1 2012-10-17 19.0.0
+# TORK-HERALD 1 2012-10-26 19.0.1
 
 ## NAME
 

data/bin/tork-master

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-MASTER 1 2012-10-17 19.0.0
+# TORK-MASTER 1 2012-10-26 19.0.1
 
 ## NAME
 

data/bin/tork-notify

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-NOTIFY 1 2012-10-17 19.0.0
+# TORK-NOTIFY 1 2012-10-26 19.0.1
 
 ## NAME
 

data/bin/tork-remote

@@ -59,7 +59,13 @@ begin
     # messages to remote from server
     Thread.new do
       while input = socket.gets
-        stream = input =~ Tork::Server::JSON_REGEXP ? STDOUT : STDERR
+        stream =
+          begin
+            JSON.load input
+            STDOUT
+          rescue JSON::ParserError
+            STDERR
+          end
         stream.puts input
         stream.flush
       end
@@ -72,9 +78,7 @@ begin
       socket.puts output
     end
   end
-# ECONNREFUSED is for abstract namespace UNIXSocket
-rescue Errno::ENOENT, Errno::ECONNREFUSED => error
-  warn "#{$0}: could not connect to #{program}"
-  warn "#{error}#{address.inspect}"
+rescue Errno::ENOENT => error
+  warn "#{$0}: could not connect to #{program}: #{error}"
   exit 1
 end

data/lib/tork/config/spec/master.rb

@@ -1,3 +1,4 @@
 $LOAD_PATH.unshift 'spec' unless $LOAD_PATH.include? 'spec'
 $LOAD_PATH.unshift 'lib' unless $LOAD_PATH.include? 'lib'
 require 'spec_helper' if File.exist? 'spec/spec_helper.rb'
+require 'rspec/autorun' if defined? RSpec

data/lib/tork/config/spec/worker.rb

@@ -1,3 +1,5 @@
-$tork_line_numbers.each do |line|
-  ARGV.push '--line_number', line.to_s
+if $tork_test_file.start_with? 'spec/' and $tork_line_numbers.any?
+  $tork_line_numbers.each do |line|
+    ARGV.push '--line_number', line.to_s
+  end
 end

data/lib/tork/config/test/master.rb

@@ -1,3 +1,4 @@
 $LOAD_PATH.unshift 'test' unless $LOAD_PATH.include? 'test'
 $LOAD_PATH.unshift 'lib' unless $LOAD_PATH.include? 'lib'
 require 'test_helper' if File.exist? 'test/test_helper.rb'
+require 'minitest/autorun' if defined? MiniTest

data/lib/tork/config/test/worker.rb

@@ -1,4 +1,4 @@
-unless $tork_line_numbers.empty?
+if $tork_test_file.start_with? 'test/' and $tork_line_numbers.any?
   test_file_lines = File.readlines($tork_test_file)
   test_names = $tork_line_numbers.map do |line|
     catch :found do

data/lib/tork/server.rb

@@ -1,7 +1,7 @@
 require 'socket'
-require 'thread'
 require 'json'
 require 'shellwords'
+require 'set'
 
 module Tork
 class Server
@@ -16,20 +16,20 @@ class Server
     @stdout = STDOUT.dup
     STDOUT.reopen STDERR
 
-    @clients = [STDIN]
-    @servers = []
+    @clients = Set.new.add(STDIN)
+    @servers = Set.new
   end
 
   def loop
     server = UNIXServer.open(Server.address)
-    @servers << server
+    @servers.add server
     catch :quit do
       while @clients.include? STDIN
-        IO.select(@servers + @clients).first.each do |stream|
+        IO.select((@servers + @clients).to_a).first.each do |stream|
           @client = stream
 
           if stream == server
-            @clients << stream.accept
+            @clients.add stream.accept
 
           elsif (stream.eof? rescue true)
             @clients.delete stream
@@ -51,32 +51,24 @@ class Server
 
 protected
 
-  JSON_REGEXP = /\A\s*[\[\{]/.freeze
-
-  # On failure to decode the message, warns the sender and returns nil.
+  # Returns nil if the message received was not meant for processing.
   def hear sender, message
-    if message =~ JSON_REGEXP
-      JSON.load message
-
-    # accept non-JSON "command lines" from clients
-    elsif @clients.include? sender
+    JSON.load message
+  rescue JSON::ParserError => error
+    if @clients.include? sender
+      # accept non-JSON "command lines" from clients
       Shellwords.split message
-
-    # forward tell() output from children to clients
-    elsif @servers.include? sender
+    else
+      # forward tell() output from servers to clients
       tell @clients, message, false
       nil
     end
-  rescue JSON::ParserError => error
-    tell sender, error
-    nil
   end
 
   def recv client, command
     __send__(*command)
   rescue => error
     tell client, error
-    nil
   end
 
   def send one_or_more_clients, message
@@ -108,19 +100,19 @@ protected
 
   def popen command
     child = IO.popen(command, 'r+')
-    @servers << child
+    @servers.add child
     child
   end
 
   def pclose child
-    return unless @servers.delete child
+    return unless @servers.delete? child
 
     # this should be enough to stop programs that use Tork::Server#loop
     # because their IO.select() loop terminates on the closing of STDIN
     child.close_write
 
     # but some programs like tork-herald(1) need to be killed explicitly
-    # because they do not follow this convention of exiting on STDIN close
+    # because they do not follow our convention of exiting on STDIN close
     Process.kill :SIGTERM, child.pid
     Process.waitpid child.pid
 

data/lib/tork/version.rb

@@ -1,3 +1,3 @@
 module Tork
-  VERSION = "19.0.0"
+  VERSION = "19.0.1"
 end

data/man/man1/tork-driver.1

@@ -1,4 +1,4 @@
-.TH TORK\-DRIVER 1 2012\-10\-17 19.0.0
+.TH TORK\-DRIVER 1 2012\-10\-26 19.0.1
 .SH NAME
 .PP
 tork\-driver \- drives 

data/man/man1/tork-engine.1

@@ -1,4 +1,4 @@
-.TH TORK\-ENGINE 1 2012\-10\-17 19.0.0
+.TH TORK\-ENGINE 1 2012\-10\-26 19.0.1
 .SH NAME
 .PP
 tork\-engine \- wraps 
@@ -31,7 +31,7 @@ given \fItest_file\fP.  If no \fIline_numbers\fP are given, then only those line
 that have changed since the last run of \fItest_file\fP will be substituted.
 If any \fIline_numbers\fP are zero, then the entire \fItest_file\fP will be run.
 .TP
-\fB\fC["run_test_files"\fR, \fItest\fIfiles\fPwith\fIoptional\fPline_numbers\fP\fB\fC]\fR
+\fB\fC["run_test_files"\fR, \fItest_files_with_optional_line_numbers\fP\fB\fC]\fR
 Calls the \fB\fCrun_test_file\fR command once for each item in the given array.
 .TP
 \fB\fC["stop_running_test_files"\fR, \fIsignal\fP\fB\fC]\fR

data/man/man1/tork-herald.1

@@ -1,4 +1,4 @@
-.TH TORK\-HERALD 1 2012\-10\-17 19.0.0
+.TH TORK\-HERALD 1 2012\-10\-26 19.0.1
 .SH NAME
 .PP
 tork\-herald \- reports modified files

data/man/man1/tork-master.1

@@ -1,4 +1,4 @@
-.TH TORK\-MASTER 1 2012\-10\-17 19.0.0
+.TH TORK\-MASTER 1 2012\-10\-26 19.0.1
 .SH NAME
 .PP
 tork\-master \- absorbs overhead and runs tests

data/man/man1/tork-notify.1

@@ -1,4 +1,4 @@
-.TH TORK\-NOTIFY 1 2012\-10\-17 19.0.0
+.TH TORK\-NOTIFY 1 2012\-10\-26 19.0.1
 .SH NAME
 .PP
 tork\-notify \- notifies you of test status changes

data/man/man1/tork.1

@@ -1,4 +1,4 @@
-.TH TORK 1 2012\-10\-17 19.0.0
+.TH TORK 1 2012\-10\-26 19.0.1
 .SH NAME
 .PP
 tork \- Continuous testing tool for Ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tork
 version: !ruby/object:Gem::Version
-  version: 19.0.0
+  version: 19.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binman
@@ -110,8 +110,8 @@ dependencies:
         version: 0.9.2.2
 description: Runs your tests as they change, in parallel.
 email:
-- sunaku@gmail.com
-- burns180@gmail.com
+- https://github.com/sunaku
+- https://github.com/burns
 executables:
 - tork
 - tork-driver
@@ -164,12 +164,12 @@ files:
 - lib/tork/version.rb
 - tork.gemspec
 - man/man1/tork-notify.1
-- man/man1/tork-remote.1
-- man/man1/tork-herald.1
-- man/man1/tork-engine.1
 - man/man1/tork-master.1
-- man/man1/tork-driver.1
 - man/man1/tork.1
+- man/man1/tork-engine.1
+- man/man1/tork-herald.1
+- man/man1/tork-driver.1
+- man/man1/tork-remote.1
 homepage: http://github.com/sunaku/tork
 licenses: []
 post_install_message: 
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3513287657673218143
+      hash: -245551711122952859
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3513287657673218143
+      hash: -245551711122952859
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23