guard-foreman 0.0.1 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8122ce0888dccef83983172378b2ec71791c0157
-  data.tar.gz: 23c67c7a07b7d2d13a3d2c100102ccb781edd0b0
+  metadata.gz: 40b508de306cc41dfeb333c1c413fe8230d61b1f
+  data.tar.gz: 41e889b8837f3b7fffecbf0b94466a5cc0401aad
 SHA512:
-  metadata.gz: f6fb2293540ace3c8b172def3f010c16926187b63a479319b22aeeb6c730015a3bea2514169b67a662c5c3d71bdcb063873972aafa33c731cf245d216d2dd702
-  data.tar.gz: 4634fcfe87ec1aafb88d00ac988f167426ec6450a7cac28673a9fbe7226f535bfdbc738fb0b6553e6eadb59e9de889338bc1fb0f70eae4601feaa7379a39dafa
+  metadata.gz: 0fa27b477be2bf5bd5eb8cd85df96389b9c07e39c21ab493c6c3cf516b967985e2b440e64dbb5f0def13dd7d4f6d5b8bd3d6719a11d7cf32e827a2ba87dbbf25
+  data.tar.gz: 1bcd21e8b2c9286b80d2fb2457ca0c22c24d84d2891f6e146e16d49111ecee458b138cd41545ec2d74c639e6e4a2760a97a92119cbb755d6283a590c77b0e535

data/README.md

@@ -1,5 +1,8 @@
 # Guard::Foreman
 
+This project was originally a fork of [Guard::Unicorn] [gdu], but has since
+diverged significantly.
+
 `Guard::Foreman` automatically restarts Foreman using [Guard] [gu].
 
 [gu]: https://github.com/guard/guard

data/guard-foreman.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "guard-foreman"
-  s.version     = "0.0.1"
+  s.version     = "0.0.4"
   s.authors     = ["Andrei Maxim", "Jonathan Arnett"]
   s.licenses    = ['MIT']
   s.email       = ["jonarnett90@gmail.com"]
@@ -17,4 +17,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'guard', '~> 2.6'
+  s.add_dependency 'spoon', '~> 0.0', '>= 0.0.4'
 end

data/lib/guard/foreman.rb

@@ -1,11 +1,13 @@
 require 'guard'
 require 'guard/plugin'
+require 'spoon'
 
 module Guard
   class Foreman < Plugin
 
     # Default log location (Rails in mind)
     DEFAULT_LOG_LOCATION = "log/foreman.log"
+    TITLE = "Foreman status"
 
     # Initialize a Guard.
     # @param [Array<Guard::Watcher>] watchers the Guard file watchers
@@ -27,36 +29,37 @@ module Guard
       # Stop if running
       stop if @pid
 
-      cmd = []
-      cmd << "foreman start"
-      cmd << "-c #{@concurrency}" if @concurrency
-      cmd << "-e #{@env}"         if @env
-      cmd << "-f #{@procfile}"    if @procfile
-      cmd << "-p #{@port}"        if @port
-      cmd << "-d #{@root}"        if @root
-      cmd << "> #{@log_file}"
+      cmd = "foreman start"
+      cmd += " -c #{@concurrency}" if @concurrency
+      cmd += " -e #{@env}"         if @env
+      cmd += " -f #{@procfile}"    if @procfile
+      cmd += " -p #{@port}"        if @port
+      cmd += " -d #{@root}"        if @root
+      #cmd += " > #{@log_file}"     # Disabled for now
 
-
-      @pid = ::Process.fork do
-        system "#{cmd.join " "}"
-      end
+      debug "About to run #{cmd}"
+      @pid = ::Spoon.spawnp(*cmd.split(" "))     # Spoon is a little weird
 
      info "Foreman started."
+     debug "Foreman has pid #{@pid}"
+     success "Foreman 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
-      begin
-        ::Process.kill("QUIT", @pid) if ::Process.getpgid(@pid)
-
-        # foreman 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)
+      if @pid
+        begin
+          debug "Asking Foreman to terminate... (#{@pid})"
+          ::Process.kill("TERM", @pid)
+          debug "Waiting for Foreman to stop..."
+          ::Process.waitpid(@pid)
+          @pid = nil          # Unset @pid
+        rescue Errno::ESRCH
+          # Don't do anything, the process does not exist
+          debug "Could not find Foreman process"
+        end
         info "Foreman stopped."
-      rescue Errno::ESRCH
-        # Don't do anything, the process does not exist
       end
     end
 
@@ -65,7 +68,7 @@ module Guard
     # reloading passenger/spork/bundler/...
     # @raise [:task_has_failed] when reload has failed
     def reload
-      UI.info "Restarting Foreman..."
+      info "Restarting Foreman..."
       stop
       start
     end
@@ -101,5 +104,17 @@ module Guard
     def info(msg)
       UI.info(msg)
     end
+
+    def debug(msg)
+      UI.debug(msg)
+    end
+
+    def success(msg)
+      ::Guard::Notifier.notify(msg, title: TITLE, image: :success)
+    end
+
+    def failure(msg)
+      ::Guard::Notifier.notify(msg, title: TITLE, image: :failure)
+    end
   end
 end

data/lib/guard/foreman/templates/Guardfile

@@ -7,7 +7,7 @@
 # * :procfile - an alternate Procfile to use (default is Procfile)
 # * :port - an alternate port to use (default is 5000)
 # * :root - an alternate application root
-guard :foreman, procfile: 'Procfile.dev' do
+guard :foreman do
   # Rails example - Watch controllers, models, helpers, lib, and config files
   watch( /^app\/(controllers|models|helpers)\/.+\.rb$/ )
   watch( /^lib\/.+\.rb$/ )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-foreman
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors:
 - Andrei Maxim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -25,6 +25,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: spoon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 description: Guard plug-in that allows you to restart Foreman
 email:
 - jonarnett90@gmail.com
@@ -60,10 +80,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Guard for Foreman
 test_files:
 - test/test_helper.rb
-has_rdoc: