guard-passenger 0.0.6 → 0.1.0

data/README.rdoc

@@ -1,8 +1,6 @@
 = Guard::Passenger
 
-Passenger guard allows to automatically & intelligently restart passenger when needed.
-This is particularly useful if you use passenger in development.
-
+Guard::Passenger is the useful development server solution. The guard automatically starts passenger and intelligently restarts the server when needed.
 
 == Install
 
@@ -26,7 +24,7 @@ Please read {guard usage doc}[http://github.com/guard/guard#readme]
 
 == Guardfile
 
-Passenger guard can be really be adapated to all kind of rack project with passenger.
+Passenger guard can be really be adapted to all kind of rack project with passenger.
 Please read {guard doc}[http://github.com/guard/guard#readme] for more info about Guardfile DSL.
 
 === Standard rails app
@@ -50,11 +48,12 @@ By default passenger standalone is deactivated and port is set to 3000.
 
 Guard::Passenger accepts some options for configuration.
 
-    # :standalone    boolean     run passenger standalone  (default: false)
-    # :port          integer     using the given port      (default: 3000)
-    # :env           string      framework environment     (default: development)
+    # :standalone    boolean     run passenger standalone                     (default: true)
+    # :port          integer     using the given port                         (default: 3000)
+    # :env           string      framework environment                        (default: development)
+    # :touch         string      path to check if restart was successful      (default: /)            (false = off)
 
-    guard 'passenger', :standalone => true, :port => 3001, :env => 'production' do
+    guard 'passenger', :standalone => false, :port => 3001, :env => 'production', :touch => '/users/all' do
     end
 
 == Development

data/lib/guard/passenger.rb

@@ -6,8 +6,9 @@ module Guard
   class Passenger < Guard
 
     autoload :Runner, 'guard/passenger/runner'
+    autoload :Toucher, 'guard/passenger/toucher'
 
-    attr_reader :port, :env
+    attr_reader :port, :env, :touch
 
     def standalone?
       @standalone
@@ -19,9 +20,10 @@ module Guard
 
     def initialize(watchers = [], options = {})
       super
-      @standalone = options[:standalone].nil? ? false : options[:standalone]
+      @standalone = options[:standalone].nil? ? true : options[:standalone]
       @port = options[:port].nil? ? 3000 : options[:port]
       @env = options[:env].nil? ? 'development' : options[:env]
+      @touch = options[:touch].nil? ? '/' : options[:touch]
     end
 
     # Call once when guard starts
@@ -45,7 +47,7 @@ module Guard
 
     # Call with Ctrl-Z signal
     def reload
-      Runner.restart_passenger
+      restart_and_touch
     end
 
     # Call with Ctrl-/ signal
@@ -55,7 +57,26 @@ module Guard
 
     # Call on file(s) modifications
     def run_on_change(paths)
-      Runner.restart_passenger
+      restart_and_touch
     end
+
+    private
+      def restart_and_touch
+        if Runner.restart_passenger & touch_url
+          UI.info 'Successfully restarted passenger'
+          true
+        else
+          UI.error 'Restarting passenger failed'
+          false
+        end
+      end
+
+      def touch_url
+        if touch
+          Toucher.touch('localhost', port, touch)
+        else
+          true
+        end
+      end
   end
 end

data/lib/guard/passenger/runner.rb

@@ -4,14 +4,7 @@ module Guard
       class << self
 
         def restart_passenger
-          result = system 'touch tmp/restart.txt'
-          if result
-            UI.info 'Successfully restarted passenger'
-          else
-            UI.error 'Restarting passenger failed'
-          end
-
-          result
+           system 'touch tmp/restart.txt'
         end
 
         def start_passenger(port, environment)

data/lib/guard/passenger/toucher.rb

@@ -0,0 +1,23 @@
+require 'net/http'
+
+module Guard
+  class Passenger
+    module Toucher
+      class << self
+
+        # try recieve header from given url (e.g. http://localhost:3000/) and return false if response status is 500
+        def touch(host, port, path)
+          begin
+            response = nil;
+            Net::HTTP.start(host, port) do |http|
+              response = http.head(path)
+            end
+            response['status'].to_i != 500
+          rescue
+            false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/guard/passenger/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module PassengerVersion
-    VERSION = '0.0.6'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-passenger
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 6
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors: 
 - Fabio Kuhn
@@ -62,6 +62,7 @@ extra_rdoc_files: []
 files: 
 - lib/guard/passenger/runner.rb
 - lib/guard/passenger/templates/Guardfile
+- lib/guard/passenger/toucher.rb
 - lib/guard/passenger/version.rb
 - lib/guard/passenger.rb
 - LICENSE