guard-passenger 0.4.0 → 0.5.0

data/lib/guard/passenger.rb

@@ -8,12 +8,16 @@ module Guard
     autoload :Runner, 'guard/passenger/runner'
     autoload :Pinger, 'guard/passenger/pinger'
 
-    attr_reader :cli_start, :cli_stop, :ping, :notification, :sudo
+    attr_reader :cli_start, :cli_stop, :ping, :notification, :sudo, :running
 
     def standalone?
       @standalone
     end
 
+    def running?
+      @running
+    end
+
     # =================
     # = Guard methods =
     # =================
@@ -21,19 +25,12 @@ module Guard
     def initialize(watchers = [], options = {})
       super
 
-      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]
-      else
-        options[:ping]
-      end
-      @ping = ping_opt.eql?(true) ? '/' : ping_opt
+      @ping = options[:ping].eql?(true) ? '/' : options[:ping]
 
       @sudo = options[:sudo] || ''
       @sudo = @sudo.eql?(true) ? 'sudo' : @sudo
@@ -42,12 +39,16 @@ module Guard
     # Call once when guard starts
     def start
       UI.info 'Guard::Passenger is running!'
-      standalone? ? Runner.start_passenger(cli_start, @sudo) : true
+      if standalone?
+        running = Runner.start_passenger(cli_start, @sudo)
+      else
+        true
+      end
     end
 
     # Call with Ctrl-C signal (when Guard quit)
     def stop
-      if standalone?
+      if standalone? && running?
         UI.info 'Stopping Passenger...'
         Runner.stop_passenger(cli_stop, @sudo)
       end
@@ -60,7 +61,7 @@ module Guard
     end
 
     # Call on file(s) modifications
-    def run_on_change(paths = {})
+    def run_on_changes(paths = {})
       restart_and_ping
     end
 
@@ -69,8 +70,6 @@ module Guard
       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
 
@@ -112,15 +111,5 @@ module Guard
         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

data/lib/guard/passenger/runner.rb

@@ -9,6 +9,7 @@ module Guard
             UI.info "Passenger successfully restarted."
           else
             UI.error "Passenger failed to restart!"
+            throw :task_has_failed
           end
           succeed
         end
@@ -20,10 +21,12 @@ module Guard
               UI.info "Passenger standalone started."
             else
               UI.error "Passenger standalone failed to start!"
+              throw :task_has_failed
             end
             succeed
           else
             UI.error "Passenger standalone is not installed. You need at least Passenger version >= 3.0.0.\nPlease run 'gem install passenger' or add it to your Gemfile."
+            throw :task_has_failed
             false
           end
         end
@@ -34,6 +37,7 @@ module Guard
             UI.info "Passenger standalone stopped."
           else
             UI.error "Passenger standalone failed to stop!"
+            throw :task_has_failed
           end
           succeed
         end

data/lib/guard/passenger/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module PassengerVersion
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,112 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: guard-passenger
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Fabio Kuhn
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: guard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70327437921720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0.beta
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70327437921720
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70327437921260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 0
-        - 7
-        version: 1.0.7
+      - !ruby/object:Gem::Version
+        version: 1.1.3
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70327437921260
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70327437920800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
+      - !ruby/object:Gem::Version
+        version: 2.10.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70327437920800
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70327437920340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 1
-        - 8
-        version: 0.1.8
+      - !ruby/object:Gem::Version
+        version: 0.7.3
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: guard-bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70327437920340
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: &70327437919880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
-        version: 0.1.1
+      - !ruby/object:Gem::Version
+        version: 0.1.3
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70327437919880
 description: Guard::Passenger automatically restarts Passenger when needed.
-email: 
+email:
 - mordaroso@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/guard/passenger/pinger.rb
 - lib/guard/passenger/runner.rb
 - lib/guard/passenger/templates/Guardfile
@@ -116,38 +82,26 @@ files:
 - README.rdoc
 homepage: http://rubygems.org/gems/guard-passenger
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: guard-passenger
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Guard gem for Passenger
 test_files: []
-