guard-unicorn 0.0.3 → 0.0.4

data/lib/guard/unicorn/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module UnicornVersion
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/guard/unicorn.rb

@@ -6,6 +6,10 @@ require 'guard/unicorn/version'
 module Guard
   class Unicorn < Guard
 
+    # Sensible defaults for Rails projects
+    DEFAULT_PID_PATH    = File.join("tmp", "pids", "unicorn.pid")
+    DEFAULT_CONFIG_PATH = File.join("config", "unicorn.rb")
+
     # Initialize a Guard.
     # @param [Array<Guard::Watcher>] watchers the Guard file watchers
     # @param [Hash] options the custom Guard options
@@ -15,10 +19,10 @@ module Guard
         watchers << Watcher.new( /^lib\/.+\.rb$/ )
       end
 
-      @run_as_daemon = options.fetch(:daemonize, false)
-
-      @pid_path    = File.join("tmp", "pids", "unicorn.pid")
-      @config_path = File.join("config", "unicorn.rb")
+      @run_as_daemon  = options.fetch(:daemonize, false)
+      @enable_bundler = options.fetch(:bundler, true) 
+      @pid_file       = options.fetch(:pid_file, DEFAULT_PID_PATH)
+      @config_file    = options.fetch(:config_file, DEFAULT_CONFIG_PATH)
 
       super
     end
@@ -26,23 +30,47 @@ module Guard
     # Call once when Guard starts. Please override initialize method to init stuff.
     # @raise [:task_has_failed] when start has failed
     def start
-      info "Starting Unicorn..."
-      start_unicorn
+      # Make sure unicorn is stopped
+      stop
+
+      cmd = [] 
+      cmd << "bundle exec" if @enable_bundler
+      cmd << "unicorn_rails"
+      cmd << "-c #{@config_file}"
+      cmd << "-D" if @run_as_daemon 
+
+      @pid = Process.fork do
+        system "#{cmd.join " "}"
+      end
+
+      success "Unicorn started."
     end
 
     # Called when `stop|quit|exit|s|q|e + enter` is pressed (when Guard quits).
     # @raise [:task_has_failed] when stop has failed
     def stop
-      info "Stopping Unicorn"
-      stop_unicorn
+      return unless pid
+
+      begin
+        Process.kill("QUIT", pid) if Process.getpgid(pid) 
+
+        # Unicorn won't always shut down right away, so we're waiting for
+        # the getpgid method to raise an Errno::ESRCH that will tell us
+        # the process is not longer active.
+        sleep 1 while Process.getpgid(pid)
+        success "Unicorn stopped."
+      rescue Errno::ESRCH
+        # Don't do anything, the process does not exist
+      end
     end
 
     # Called when `reload|r|z + enter` is pressed.
     # This method should be mainly used for "reload" (really!) actions like reloading passenger/spork/bundler/...
     # @raise [:task_has_failed] when reload has failed
     def reload
-      info "Reloading Unicorn"
-      restart_unicorn
+      Process.kill "HUP", pid
+
+      success "Unicorn reloaded"
     end
 
     # Called when just `enter` is pressed
@@ -55,55 +83,22 @@ module Guard
     # @param [Array<String>] paths the changes files or paths
     # @raise [:task_has_failed] when run_on_change has failed
     def run_on_change(paths)
-      restart_unicorn
+      reload
     end
 
     # Called on file(s) deletions that the Guard watches.
     # @param [Array<String>] paths the deleted files or paths
     # @raise [:task_has_failed] when run_on_change has failed
     def run_on_deletion(paths)
+      reload
     end
 
     private
-    def start_unicorn
-      # Make sure unicorn is stopped
-      stop_unicorn
-
-      cmd = [] 
-      cmd << "unicorn_rails"
-      cmd << "-c #{@config_path}"
-      cmd << "-D" if daemonize? 
-
-      @pid = Process.fork do
-        system "#{cmd.join " "}"
-        info "Unicorn started."
-      end
-    end
-
-    def restart_unicorn
-      Process.kill "HUP", pid
-    end
-
-    def stop_unicorn
-      return unless pid
-
-      begin
-        Process.kill("QUIT", pid) if Process.getpgid(pid) 
-
-        # Unicorn won't always shut down right away, so we're waiting for
-        # the getpgid method to raise an Errno::ESRCH that will tell us
-        # the process is not longer active.
-        sleep 1 while Process.getpgid(pid)
-      rescue Errno::ESRCH
-        # Don't do anything, the process does not exist
-      end
-    end
-
     def pid
       # Favor the pid in the pidfile, since some processes
       # might daemonize properly and fork twice.
-      if File.exists?(@pid_path)
-        @pid = File.open(@pid_path) { |f| f.gets.to_i } 
+      if File.exists?(@pid_file)
+        @pid = File.open(@pid_file) { |f| f.gets.to_i } 
       end
 
       @pid
@@ -113,8 +108,20 @@ module Guard
       UI.info(msg)
     end
 
-    def daemonize?
-      @run_as_daemon
+    def pending message
+      notify message, :image => :pending
+    end
+
+    def success message
+      notify message, :image => :success
+    end
+
+    def failed message
+      notify message, :image => :failed
+    end
+
+    def notify(message, options = {})
+      Notifier.notify(message, options)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-03 00:00:00.000000000 Z
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70253598121000 !ruby/object:Gem::Requirement
+  requirement: &70274208930740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253598121000
+  version_requirements: *70274208930740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70253598120540 !ruby/object:Gem::Requirement
+  requirement: &70274208930260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253598120540
+  version_requirements: *70274208930260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70253598119960 !ruby/object:Gem::Requirement
+  requirement: &70274208929700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253598119960
+  version_requirements: *70274208929700
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70253598119420 !ruby/object:Gem::Requirement
+  requirement: &70274208929180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253598119420
+  version_requirements: *70274208929180
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70253598118920 !ruby/object:Gem::Requirement
+  requirement: &70274208928640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253598118920
+  version_requirements: *70274208928640
 description: Guard plug-in that allows you to restart Unicorn
 email:
 - andrei@andreimaxim.ro