guard-spin 0.1.0 → 0.1.1

data/lib/guard/spin/runner.rb

@@ -15,7 +15,7 @@ module Guard
 
       def launch_spin(action)
         UI.info "#{action}ing Spin", :reset => true
-        spawn_spin
+        spawn_spin spin_serve_command, spin_serve_options
       end
 
       def kill_spin
@@ -23,7 +23,7 @@ module Guard
       end
 
       def run(paths)
-        system "spin push #{paths.join(" ")}"
+        run_command spin_push_command(paths), spin_push_options
       end
 
       def run_all
@@ -36,9 +36,13 @@ module Guard
 
       private
 
-      def spawn_spin
+      def run_command(cmd, options = '')
+        system "#{cmd} #{options}"
+      end
+
+      def spawn_spin(cmd, options = '')
         @spin_pid = fork do
-          exec spin_serve_command
+          exec "#{cmd} #{options}"
         end
       end
 
@@ -46,7 +50,6 @@ module Guard
         return unless @spin_pid
 
         Process.kill(:INT, @spin_pid)
-        sleep 0.5
 
         begin
           unless Process.waitpid(@spin_pid, Process::WNOHANG)
@@ -57,26 +60,41 @@ module Guard
         UI.info "Spin Stopped", :reset => true
       end
 
+      def spin_push_command(paths)
+        cmd_parts = []
+        cmd_parts << "bundle exec" if bundler?
+        cmd_parts << "spin push"
+        cmd_parts << paths.join(' ')
+        cmd_parts.join(' ')
+      end
+
+      def spin_push_options
+        ''
+      end
+
       def spin_serve_command
         cmd_parts = []
         cmd_parts << "bundle exec" if bundler?
         cmd_parts << "spin serve"
-        
-        cmd_parts << "-Itest" if test_unit?
-
         cmd_parts.join(' ')
       end
 
+      def spin_serve_options
+        opt_parts = []
+        opt_parts << "-Itest" if test_unit?
+        opt_parts.join(' ')
+      end
+
       def bundler?
-        @bundler ||= File.exist?("#{Dir.pwd}/Gemfile") && options[:bundler] != false
+        @bundler ||= options[:bundler] != false && File.exist?("#{Dir.pwd}/Gemfile")
       end
-      
+
       def test_unit?
-        @test_unit ||= File.exist?("#{Dir.pwd}/test/test_helper.rb") && options[:test_unit] != false
+        @test_unit ||= options[:test_unit] != false && File.exist?("#{Dir.pwd}/test/test_helper.rb")
       end
 
       def rspec?
-        @rspec ||= File.exist?("#{Dir.pwd}/spec") && options[:rspec] != false
+        @rspec ||= options[:rspec] != false && File.exist?("#{Dir.pwd}/spec")
       end
     end
   end

data/lib/guard/spin/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module SpinVersion
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-spin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000 Z
+date: 2011-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &17190040760 !ruby/object:Gem::Requirement
+  requirement: &17194890340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17190040760
+  version_requirements: *17194890340
 - !ruby/object:Gem::Dependency
   name: spin
-  requirement: &17190039960 !ruby/object:Gem::Requirement
+  requirement: &17194889900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,8 +33,30 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17190039960
-description: Guard gem for Spin
+  version_requirements: *17194889900
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &17194889360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: *17194889360
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &17194887980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: *17194887980
+description: Guard::Spin automatically manage Spin server.
 email:
 - greenberg@entryway.net
 - assarata@gmail.com