spin 0.4.5 → 0.4.6

data/bin/spin

@@ -13,6 +13,7 @@ require 'digest/md5'
 # environment.
 require 'benchmark'
 require 'optparse'
+require 'pathname'
 
 SEPARATOR = '|'
 
@@ -46,8 +47,18 @@ def disconnect(connection)
   connection.close
 end
 
+def rails_root
+  path = Pathname.pwd
+  until path.join('config/application.rb').file?
+    return if path.root?
+    path = path.parent
+  end
+  path
+end
+
 # ## spin serve
 def serve(force_rspec, force_testunit, time, push_results)
+  root_path = rails_root and Dir.chdir(root_path)
   file = socket_file
 
   # We delete the tmp file for the Unix socket if it already exists. The file
@@ -62,7 +73,7 @@ def serve(force_rspec, force_testunit, time, push_results)
 
   test_framework = nil
 
-  if File.exist? 'config/application.rb'
+  if root_path
     sec = Benchmark.realtime {
       # We require config/application because that file (typically) loads Rails
       # and any Bundler deps, as well as loading the initialization code for
@@ -150,6 +161,8 @@ def serve(force_rspec, force_testunit, time, push_results)
       # Don't abort if the client already disconnected
     end
   end
+ensure
+  File.delete(file) if file && File.exist?(file)
 end
 
 def fork_and_run(files, push_results, test_framework, conn)
@@ -195,18 +208,38 @@ 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.map do |file|
-    file = file.split(':').first.to_s
+  files_to_load.map! do |file|
+    args = file.split(':')
+
+    file_name = args.first.to_s
+    line_number = args.last.to_i
 
     # If the file exists then we can push it up just like it is
-    if File.exist?(file)
-      file
-    # kicker-2.5.0 now gives us file names without extensions, so we have to try adding it
-    elsif File.extname(file).empty?
-      file = [file, 'rb'].join('.')
-      file if File.exist?(file)
-    end  
-  end.compact.uniq.join(SEPARATOR)
+    file_name = if File.exist?(file_name)
+                  file_name
+                # kicker-2.5.0 now gives us file names without extensions, so we have to try adding it
+                elsif File.extname(file_name).empty?
+                  full_file_name = [file_name, 'rb'].join('.')
+                  full_file_name if File.exist?(full_file_name)
+                end
+
+    if line_number > 0
+      abort "You specified a line number. Only one file can be pushed in this case." if files_to_load.length > 1
+
+      "#{file_name}:#{line_number}"
+    else
+      file_name
+    end
+  end.compact.uniq
+
+  if root_path = rails_root
+    files_to_load.map! do |file|
+      Pathname.new(file).expand_path.relative_path_from(root_path).to_s
+    end
+    Dir.chdir root_path
+  end
+
+  f = files_to_load.join(SEPARATOR)
 
   abort if f.empty?
   puts "Spinning up #{f}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spin
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Spin preloads your Rails environment to speed up your autotest(ish)
   workflow.