guard-passenger 0.2.1 → 0.3.0

data/README.rdoc

@@ -49,11 +49,11 @@ If the ping responds with a non-5XX response, Passenger is considered as running
 Guard::Passenger accepts some options for configuration.
 
     # :standalone    boolean            run Passenger standalone                (default: true)
-    # :port          integer            using the given port                    (default: 3000)
-    # :env           string             framework environment                   (default: development)
+    # :cli           string             options to pass to passenger command    (default: '--daemonize')
+    # :notification  boolean            Notifications enabled                   (default: true)
     # :ping          boolean or string  ping localhost after Passenger restart  (default: false)
 
-    guard 'passenger', :standalone => false, :port => 3001, :env => 'production', :ping => '/foo' do
+    guard 'passenger', :standalone => false, :cli => '--daemonize --port 3001 --address my_app.local --environment production', :ping => '/foo' do
     end
 
 == Development

data/lib/guard/passenger.rb

@@ -4,25 +4,29 @@ require 'rubygems'
 
 module Guard
   class Passenger < Guard
-    
+
     autoload :Runner, 'guard/passenger/runner'
     autoload :Pinger, 'guard/passenger/pinger'
-    
-    attr_reader :port, :env, :ping
-    
+
+    attr_reader :cli_start, :cli_stop, :ping, :notification
+
     def standalone?
       @standalone
     end
-    
+
     # =================
     # = Guard methods =
     # =================
-    
+
     def initialize(watchers = [], options = {})
       super
-      @standalone = options[:standalone].nil? ? true : options[:standalone]
-      @port       = options[:port] || 3000
-      @env        = options[:env] || 'development'
+
+      warn_deprectation options
+      @standalone   = options[:standalone].nil? ? true : options[:standalone]
+      @cli_start    = init_cli(options)
+      @cli_stop     = cli_stop
+      @notification = options[:notification].nil? ? true : options[:notification]
+
       ping_opt = unless options[:touch].nil?
         UI.info "Warning: The :touch option has been replaced by the :ping option, usage is still the same."
         options[:touch]
@@ -31,37 +35,87 @@ module Guard
       end
       @ping = ping_opt.eql?(true) ? '/' : ping_opt
     end
-    
+
     # Call once when guard starts
     def start
       UI.info 'Guard::Passenger is running!'
-      standalone? ? Runner.start_passenger(port, env) : true
+      standalone? ? Runner.start_passenger(cli_start) : true
     end
-    
+
     # Call with Ctrl-C signal (when Guard quit)
     def stop
       UI.info 'Stopping Passenger...'
-      standalone? ? Runner.stop_passenger(port) : true
+      Runner.stop_passenger(cli_stop) if standalone?
+      true
     end
-    
+
     # Call with Ctrl-Z signal
     def reload
       restart_and_ping
     end
-    
+
     # Call on file(s) modifications
     def run_on_change(paths = {})
       restart_and_ping
     end
-    
+
     private
-    
-    def restart_and_ping
-      UI.info 'Restarting Passenger...'
-      restarted = Runner.restart_passenger
-      Pinger.ping('localhost', port, ping) if ping
-      restarted
-    end
-    
+
+      def init_cli options={}
+        cmd_parts = []
+        cmd_parts << (options[:cli].nil? ? '--daemonize' : options[:cli])
+        cmd_parts << "--port #{options[:port]}" if options[:port] #DEPRICATED
+        cmd_parts << "--environment #{options[:env]}" if options[:env] #DEPRICATED
+        cmd_parts.join(' ')
+      end
+
+      def cli_stop
+        cmd_parts = []
+        cmd_parts << "--port #{port}" if port != 3000
+        cmd_parts << "--pid_file #{pid_file}" if pid_file
+        cmd_parts.join(' ')
+      end
+
+      def port
+        if cli_start =~ /(?:-p|--port)/
+          cli_start.match(/(?:-p|--port) ([^ ]+)/)[1]
+        else
+          '3000'
+        end
+      end
+
+      def address
+        if cli_start =~ /(?:-a|--address)/
+          cli_start.match(/(?:-a|--address) ([^ ]+)/)[1]
+        else
+          '0.0.0.0'
+        end
+      end
+
+      def pid_file
+        if cli_start =~ /(--pid-file)/
+          cli_start.match(/--pid-file ([^ ]+)/)[1]
+        else
+          nil
+        end
+      end
+
+      def restart_and_ping
+        UI.info 'Restarting Passenger...'
+        restarted = Runner.restart_passenger
+        Pinger.ping(address, port, notification, ping) if ping
+        restarted
+      end
+
+      def warn_deprectation(options={})
+        options[:environment] = options[:env] if options[:env]
+        [:port, :environment].each do |option|
+          key, value = [option, option.to_s.gsub('_', '-')]
+          if options.key?(key)
+            UI.info "DEPRECATION WARNING: The :#{key} option is deprecated. Pass standard command line argument \"--#{value}\" to Passenger with the :cli option."
+          end
+        end
+      end
+
   end
-end
+end

data/lib/guard/passenger/pinger.rb

@@ -8,18 +8,22 @@ module Guard
         # try to ping given url (e.g. http://localhost:3000/) and display a message to inform of the result
         # failure == response status is 5xx
         # otherwise, it's a success
-        def ping(host, port, path = '/')
+        def ping(host, port, notification, path = '/')
           path = "/#{path}" unless path.match(/^\//)
           ping_in_thread = Thread.start {
             begin
               response = Net::HTTP.start(host, port) do |http|
                 http.head(path)
               end
-              if response.is_a? Net::HTTPServerError
-                Notifier.notify("Passenger is not running!", :title => "Passenger", :image => :failed)
-              else
-                Notifier.notify("Passenger is running.", :title => "Passenger", :image => :success)
+
+              if notification
+                if response.is_a? Net::HTTPServerError
+                  Notifier.notify("Passenger is not running!", :title => "Passenger", :image => :failed)
+                else
+                  Notifier.notify("Passenger is running.", :title => "Passenger", :image => :success)
+                end
               end
+
             rescue
               # do nothing
             end
@@ -29,4 +33,4 @@ module Guard
       end
     end
   end
-end
+end

data/lib/guard/passenger/runner.rb

@@ -2,24 +2,24 @@ module Guard
   class Passenger
     module Runner
       class << self
-        
+
         def restart_passenger
-           succeed = system("touch tmp/restart.txt")
-           if succeed
-             UI.info "Passenger successfully restarted."
-           else
-             UI.error "Passenger failed to restart!"
-           end
-           succeed
+          succeed = system("touch tmp/restart.txt")
+          if succeed
+            UI.info "Passenger successfully restarted."
+          else
+            UI.error "Passenger failed to restart!"
+          end
+          succeed
         end
-        
-        def start_passenger(port, environment)
+
+        def start_passenger(cli)
           if passenger_standalone_installed?
-            succeed = system("passenger start -p #{port} -d -e #{environment}")
+            succeed = system("passenger start #{cli}")
             if succeed
-              UI.info "Passenger standalone (port #{port}) started."
+              UI.info "Passenger standalone started."
             else
-              UI.error "Passenger standalone (port #{port}) failed to start!"
+              UI.error "Passenger standalone failed to start!"
             end
             succeed
           else
@@ -27,17 +27,17 @@ module Guard
             false
           end
         end
-        
-        def stop_passenger(port)
-          succeed = system("passenger stop -p #{port}")
+
+        def stop_passenger(cli)
+          succeed = system("passenger stop #{cli}")
           if succeed
-            UI.info "Passenger standalone (port #{port}) stopped."
+            UI.info "Passenger standalone stopped."
           else
-            UI.error "Passenger standalone (port #{port}) failed to stop!"
+            UI.error "Passenger standalone failed to stop!"
           end
           succeed
         end
-        
+
         def passenger_standalone_installed?
           begin
             gem "passenger", ">=3.0.0"
@@ -46,8 +46,8 @@ module Guard
           end
           true
         end
-        
+
       end
     end
   end
-end
+end

data/lib/guard/passenger/templates/Guardfile

@@ -1,4 +1,4 @@
 guard 'passenger' do
-  watch('lib/.*\.rb')
-  watch('config/.*\.rb')
+  watch(/^lib\/.*\.rb$/)
+  watch(/^config\/.*\.rb$/)
 end

data/lib/guard/passenger/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module PassengerVersion
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-passenger
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Fabio Kuhn
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +01:00
+date: 2011-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: guard-passenger
-rubygems_version: 1.4.1
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Guard gem for Passenger