spin 0.1.5 → 0.2.0

data/bin/spin

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-#
 # Spin will speed up your autotest(ish) workflow for Rails.
 
 # Spin preloads your Rails environment for testing, so you don't load the same code over and over and over... Spin works best with an autotest(ish) workflow.
@@ -28,8 +27,25 @@ def socket_file
   [Dir.tmpdir, key].join('/')
 end
 
+def determine_test_framework(force_rspec, force_testunit)
+  if force_rspec
+    :rspec
+  elsif force_testunit
+    :testunit
+  elsif defined?(RSpec)
+    :rspec
+  else
+    :testunit
+  end
+end
+
+def disconnect(connection)
+  connection.print "\0"
+  connection.close
+end
+
 # ## spin serve
-def serve(force_rspec = false, time = false)
+def serve(force_rspec, force_testunit, time, push_results)
   file = socket_file
   # We delete the tmp file for the Unix socket if it already exists. The file
   # is scoped to the `pwd`, so if it already exists then it must be from an
@@ -60,6 +76,8 @@ def serve(force_rspec = false, time = false)
     warn "Could not find config/application.rb. Are you running this from the root of a Rails project?"
   end
 
+  puts "Pushing test results back to push processes" if push_results
+
   loop do
     # Since `spin push` reconnects each time it has new files for us we just
     # need to accept(2) connections from it.
@@ -71,18 +89,34 @@ def serve(force_rspec = false, time = false)
     # If spin is started with the time flag we will track total execution so
     # you can easily compare it with time rspec spec for example
     start = Time.now if time
+    
+    # If we're not sending results back to the push process, we can disconnect
+    # it immediately.
+    disconnect(conn) unless push_results
 
     # We fork(2) before loading the file so that our pristine preloaded
     # environment is untouched. The child process will load whatever code it
     # needs to, then it exits and we're back to the baseline preloaded app.
     fork do
+      # To push the test results to the push process instead of having them
+      # displayed by the server, we reopen $stdout/$stderr to the open 
+      # connection.
+      if push_results
+        $stdout.reopen(conn)
+        $stderr.reopen(conn)
+      end
+
       puts
       puts "Loading #{files.inspect}"
 
+      # Determine the test framework to use using the passed-in 'force' options
+      # or else default to checking for defined constants.
+      test_framework = determine_test_framework(force_rspec, force_testunit)
+
       # Unfortunately rspec's interface isn't as simple as just requiring the
       # test file that you want to run (suddenly test/unit seems like the less
       # crazy one!).
-      if defined?(RSpec) || force_rspec
+      if test_framework == :rspec
         # We pretend the filepath came in as an argument and duplicate the
         # behaviour of the `rspec` binary.
         ARGV.push files
@@ -102,6 +136,14 @@ def serve(force_rspec = false, time = false)
     # If we are tracking time we will output it here after everything has
     # finished running
     puts "Total execution time was #{Time.now - start} seconds" if start
+    
+    # Tests have now run. If we were pushing results to a push process, we can
+    # now disconnect it.
+    begin
+      disconnect(conn) if push_results
+    rescue Errno::EPIPE
+      # Don't abort if the client already disconnected
+    end
   end
 end
 
@@ -116,7 +158,7 @@ def push
   # bit will just be ignored.
   #
   # We build a string like `file1.rb:file2.rb` and pass it up to the server.
-  f = files_to_load.select { |f| File.exist?(f) }.join(File::PATH_SEPARATOR)
+  f = files_to_load.select { |f| File.exist?(f) }.uniq.join(File::PATH_SEPARATOR)
   abort if f.empty?
   puts "Spinning up #{f}"
 
@@ -125,16 +167,23 @@ def push
   socket = UNIXSocket.open(socket_file)
   # We put the filenames on the socket for the server to read and then load.
   socket.puts f
+
+  while line = socket.gets
+    break if line == "\0"
+    print line
+  end
 rescue Errno::ECONNREFUSED
   abort "Connection was refused. Have you started up `spin serve` yet?"
 end
 
 force_rspec = false
+force_testunit = false
 time = false
+push_results = false
 options = OptionParser.new do |opts|
   opts.banner = usage
   opts.separator ""
-  opts.separator "Options:"
+  opts.separator "Server Options:"
 
   opts.on("-I", "--load-path=DIR#{File::PATH_SEPARATOR}DIR", "Appends directory to $LOAD_PATH") do |dirs|
     $LOAD_PATH.concat(dirs.split(File::PATH_SEPARATOR))
@@ -144,12 +193,20 @@ options = OptionParser.new do |opts|
     force_rspec = v
   end
 
-  opts.on('-e', 'Stub to keep kicker happy')
+  opts.on('--test-unit', 'Force the selected test framework to Test::Unit') do |v|
+    force_testunit = v
+  end
 
-  opts.on('-t', '--time') do |v|
+  opts.on('-t', '--time', 'See total execution time for each test run') do |v|
     time = true
   end
 
+  opts.on('--push-results', 'Push test results to the push process') do |v|
+    push_results = v
+  end
+
+  opts.separator "General Options:"
+  opts.on('-e', 'Stub to keep kicker happy')
   opts.on('-h', '--help') do
     $stderr.puts opts
     exit 1
@@ -159,7 +216,7 @@ options.parse!
 
 subcommand = ARGV.shift
 case subcommand
-when 'serve' then serve(force_rspec, time)
+when 'serve' then serve(force_rspec, force_testunit, time, push_results)
 when 'push' then push
 else
   $stderr.puts options

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spin
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jesse Storimer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-15 00:00:00 -05:00
+date: 2011-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: []