guard-zeus 2.0.0.pre.alpha.pre.56 → 2.0.0.pre.alpha.pre.63

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTc1NGY5MjAxNmM5OTIyNzU3NTRlZmY5ODI1MjhjNDA4ZDViNjllZg==
+    ZDg5NzlkYzU0M2UzMDI4NmIyNDIxYTdmYjAyY2EyYzc2ZWMyNzgyNg==
   data.tar.gz: !binary |-
-    MDhhYWY0ZTQyNWQyNThjOTk4NzliMzM2NDdmOTAxMjExZDQ1NmRjOA==
+    MDg4MmQ5Y2FlZjY5ZTg5ODRlODQwN2I5OTk3M2U0NmJiOWNlYzQwZA==
 SHA512:
   metadata.gz: !binary |-
-    OWY0MTM0OTEzYjUxODY4MTFhM2IwODg1ZTk2NjQxMzI3ZGYxZmUwNjIxY2Vl
-    YWQ5NzhkNjJiOGRmOTJhMGY1MjgzZGRhNGQyMmVjNWE0MzkwNjRhZDNiZjU5
-    ZmNkNWNjZDBkNmUwN2QwMzBiOGQ0NzI3ODM0ZmE2N2IwMzliMDQ=
+    MzFhNGRkMGEyZjE0Y2E4YWRiMmU5NWJkM2E1ZDlkZmJmZTM5MTBhMTBjZGRk
+    NTFkMmZhNTAxOTkyMTAzYWIwMzQzNzBkNDJkOGNiZTk1NzQ3NWExZDgyZTUw
+    NTc4NmJiMmNjOWRjODE3NDQ1NmQ3YjI0Mjg2NDFlNWZhODk5MzU=
   data.tar.gz: !binary |-
-    ODViZjBhOGRiMTUyYzFjZjAxNDVhZTQzZGU3NmVlNTE1OGQyOTc4MzYxMWQ3
-    MjA4ZjFmZmE4NmFkZjE2YzVjMDdkOTVlZWQ0OTI3NmYwMWUwMDEwMTk1MmI3
-    NTg2MWVjYzdiMmYzNWRlOGZiNzBiYzE2NTVkZTY3NTJkOTEwOGY=
+    ODFlMWU0NjY1YzYyZjUxM2Q4Y2MzMjY2ODE4NjU1NjE0MDE5YjhhNWVkMmU3
+    YTdlYjVhZWU3MDJlOGI3ZWJmNDg1ZmEyM2EyMDBiODVmM2JmNTYzMWI2NWY5
+    MTg5MTEzNGM4YWFkNTFhYzNlNjdkYjFlOGFiNTUxYTU1MWVjMGI=

data/lib/guard/zeus/runner.rb

@@ -13,13 +13,24 @@ module Guard
         UI.info "Guard::Zeus Initialized"
       end
 
+      def kill_zeus
+        stop_zeus
+      end
+
       def launch_zeus(action)
         UI.info "#{action}ing Zeus", :reset => true
-        spawn_zeus zeus_serve_command, zeus_serve_options
-      end
 
-      def kill_zeus
-        stop_zeus
+        # check for a current .zeus.sock
+        if File.exist? sockfile
+
+          # if it's active, use it
+          return if can_connect_to_socket?
+
+          # just delete it
+          delete_sockfile
+        end
+
+        spawn_zeus zeus_serve_command, zeus_serve_options
       end
 
       def run(paths)
@@ -37,14 +48,34 @@ module Guard
 
       private
 
-      def sockfile
-          File.join(Dir.pwd, ".zeus.sock")
+      def bundler?
+        @bundler ||= options[:bundler] != false && File.exist?("#{Dir.pwd}/Gemfile")
+      end
+
+      # Return a truthy socket, or catch the thrown exception
+      # and return false
+      def can_connect_to_socket?
+        UNIXSocket.open(sockfile)
+      rescue Errno::ECONNREFUSED
+        false
+      end
+
+      def delete_sockfile
+        File.delete(sockfile)
+      end
+
+      def rspec?
+        @rspec ||= options[:rspec] != false && File.exist?("#{Dir.pwd}/spec")
       end
 
       def run_command(cmd, options = '')
         system "#{cmd} #{options}"
       end
 
+      def sockfile
+        File.join(Dir.pwd, ".zeus.sock")
+      end
+
       def spawn_zeus(cmd, options = '')
         @zeus_pid = fork do
           exec "#{cmd} #{options}"
@@ -62,10 +93,16 @@ module Guard
           end
         rescue Errno::ECHILD
         end
-        File.delete(sockfile) if File.exist? sockfile
+        
+        delete_sockfile if File.exist? sockfile
+
         UI.info "Zeus Stopped", :reset => true
       end
 
+      def test_unit?
+        @test_unit ||= options[:test_unit] != false && File.exist?("#{Dir.pwd}/test/test_helper.rb")
+      end
+
       def zeus_push_command(paths)
         cmd_parts = []
         cmd_parts << "bundle exec" if bundler?
@@ -90,18 +127,6 @@ module Guard
         opt_parts << options[:cli] unless options[:cli].nil?
         opt_parts.join(' ')
       end
-
-      def bundler?
-        @bundler ||= options[:bundler] != false && File.exist?("#{Dir.pwd}/Gemfile")
-      end
-
-      def test_unit?
-        @test_unit ||= options[:test_unit] != false && File.exist?("#{Dir.pwd}/test/test_helper.rb")
-      end
-
-      def rspec?
-        @rspec ||= options[:rspec] != false && File.exist?("#{Dir.pwd}/spec")
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-zeus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.pre.56
+  version: 2.0.0.pre.alpha.pre.63
 platform: ruby
 authors:
 - jonathangreenberg
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard