spin 0.3.0 → 0.4.1

data/bin/spin

@@ -14,6 +14,8 @@ require 'digest/md5'
 require 'benchmark'
 require 'optparse'
 
+SEPARATOR = '|'
+
 def usage
   <<-USAGE
 Usage: spin serve
@@ -94,12 +96,20 @@ def serve(force_rspec, force_testunit, time, push_results)
   puts "Pushing test results back to push processes" if push_results
 
   loop do
+
+    # Trap SIGQUIT (Ctrl+\) and re-run the last files that were pushed.
+    trap('QUIT') do
+      fork_and_run(@last_files_ran, push_results, test_framework)
+      # See WAIT below
+      Process.wait
+    end
+
     # Since `spin push` reconnects each time it has new files for us we just
     # need to accept(2) connections from it.
     conn = socket.accept
     # This should be a list of relative paths to files.
     files = conn.gets.chomp
-    files = files.split(File::PATH_SEPARATOR)
+    files = files.split(SEPARATOR)
 
     # 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
@@ -109,35 +119,9 @@ def serve(force_rspec, force_testunit, time, push_results)
     # 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}"
-
-      # 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 test_framework == :rspec
-        # We pretend the filepath came in as an argument and duplicate the
-        # behaviour of the `rspec` binary.
-        ARGV.push files
-      else
-        # We require the full path of the file here in the child process.
-        files.each { |f| require File.expand_path f }
-      end
-    end
+    fork_and_run(files, push_results, test_framework)
 
-    # We don't want the parent process handling multiple test runs at the same
+    # WAIT: We don't want the parent process handling multiple test runs at the same
     # time because then we'd need to deal with multiple test databases, and
     # that destroys the idea of being simple to use. So we wait(2) until the
     # child process has finished running the test.
@@ -157,6 +141,38 @@ def serve(force_rspec, force_testunit, time, push_results)
   end
 end
 
+def fork_and_run(files, push_results, test_framework)
+  # 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}"
+
+    # 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 test_framework == :rspec
+      # We pretend the filepath came in as an argument and duplicate the
+      # behaviour of the `rspec` binary.
+      ARGV.push files
+    else
+      # We require the full path of the file here in the child process.
+      files.each { |f| require File.expand_path f }
+    end
+
+  end
+  @last_files_ran = files
+end
+
 # ## spin push
 def push
   # The filenames that we will spin up to `spin serve` are passed in as
@@ -167,8 +183,8 @@ def push
   # care of scripts that specify files like `spin push -r file.rb`. The `-r`
   # 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) }.uniq.join(File::PATH_SEPARATOR)
+  # 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.split(':')[0].to_s) }.uniq.join(SEPARATOR)
   abort if f.empty?
   puts "Spinning up #{f}"
 

metadata

@@ -1,71 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spin
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.4.1
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Jesse Storimer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-04 00:00:00 -05:00
-default_executable: 
+date: 2011-12-13 00:00:00.000000000 Z
 dependencies: []
+description: ! 'Spin preloads your Rails environment to speed up your autotest(ish)
+  workflow.
+
 
-description: |-
-  Spin preloads your Rails environment to speed up your autotest(ish) workflow.
-  
-  By preloading your Rails environment for testing you don't load the same code over and over and over... Spin works best for an autotest(ish) workflow.
-email: 
+  By preloading your Rails environment for testing you don''t load the same code over
+  and over and over... Spin works best for an autotest(ish) workflow.'
+email:
 - jstorimer@gmail.com
-executables: 
+executables:
 - spin
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/spin
-has_rdoc: true
 homepage: http://jstorimer.github.com/spin
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Spin preloads your Rails environment to speed up your autotest(ish) workflow.
 test_files: []
-
+has_rdoc: