spin 0.1.2 → 0.1.4

data/bin/spin

@@ -13,15 +13,14 @@ require 'digest/md5'
 # So we can tell users how much time they're saving by preloading their
 # environment.
 require 'benchmark'
+require 'optparse'
 
-def usage(stream = $stderr)
-  stream.puts <<-USAGE
+def usage
+  <<-USAGE
 Usage: spin serve
-       spin push <file>...
+       spin push <file> <file>...
 Spin preloads your Rails environment to speed up your autotest(ish) workflow.
   USAGE
-
-  exit 1
 end
 
 def socket_file
@@ -29,12 +28,8 @@ def socket_file
   [Dir.tmpdir, key].join('/')
 end
 
-def require_relative?
-  @require_relative ||= respond_to?(:require_relative)
-end
-
 # ## spin serve
-def serve
+def serve(force_rspec = false)
   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
@@ -66,30 +61,31 @@ def serve
   end
 
   loop do
-    # Since `spin push` reconnects each time it has a new file for us we just
+    # 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 relative path to a file.
-    file = conn.gets.chomp
+    # This should be a list of relative paths to files.
+    files = conn.gets.chomp
+    files = files.split(File::PATH_SEPARATOR)
 
     # 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
       puts
-      puts "Loading #{file}"
+      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 defined?(RSpec)
+      if defined?(RSpec) || force_rspec
         # We pretend the filepath came in as an argument and duplicate the 
         # behaviour of the `rspec` binary.
-        ARGV.push file
+        ARGV.push files
         require 'rspec/autorun'
       else
         # We require the full path of the file here in the child process.
-        require File.expand_path file
+        files.each { |f| require File.expand_path f }
       end
     end
 
@@ -113,18 +109,44 @@ def push
   # We reject anything in ARGV that isn't a file that exists. This takes
   # care of scripts that specify files like `spin push -r file.rb`. The `-r`
   # bit will just be ignored.
-  files_to_load.select { |f| File.exist?(f) }.each do |f|
-    puts "Spinning up #{f}"
-    # We put the filename on the socket for the server to read and then load.
-    socket.puts f
-  end
+  #
+  # 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)
+  puts "Spinning up #{f}"
+  # We put the filenames on the socket for the server to read and then load.
+  socket.puts f
 rescue Errno::ECONNREFUSED
   abort "Connection was refused. Have you started up `spin serve` yet?"
 end
 
+force_rspec = false
+options = OptionParser.new do |opts|
+  opts.banner = usage
+  opts.separator ""
+  opts.separator "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))
+  end
+
+  opts.on('--rspec', 'Force the selected test framework to RSpec') do |v|
+    force_rspec = v
+  end
+
+  opts.on('-e', 'Stub to keep kicker happy')
+
+  opts.on('-h', '--help') do
+    $stderr.puts opts
+    exit 1
+  end
+end
+options.parse!
+
 subcommand = ARGV.shift
 case subcommand
-when 'serve' then serve
+when 'serve' then serve(force_rspec)
 when 'push' then push
-else usage
+else
+  $stderr.puts options
+  exit 1
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spin
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jesse Storimer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 -04:00
+date: 2011-11-02 00:00:00 -04:00
 default_executable: 
 dependencies: []