nimbu 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5ca8decb3bbcaff09111f825e17dfac4f94e3703f015568ec3923369ef46383
-  data.tar.gz: 54270a24b7ae669ff6fb9e9d1d298b3b92ed022eace0d06f841fe2e0807974ad
+  metadata.gz: fcaf454345adbb424c6f94c09a304e98d8a3a76cf76ca2d9df76a9f991f867c1
+  data.tar.gz: 33ec694a0be3a929f9612629d43451389fee686a9789574356018da1ee536744
 SHA512:
-  metadata.gz: b729ae9aa81917073c5fe296c31fcf8cbd4e97090360a81c4b307995078938a13f55692e4cf204f6362e23975bcc39e016c518698c8405bae10a115fccfb4107
-  data.tar.gz: 7d396b10643c17110361d3799979e96154695af5688a0aeebce1e9472a2750b3acd3a7b03f497755f008211190826f5487ada963da1606b281b211989d8d6d32
+  metadata.gz: fe4bb037e2ea41168414108bb662618f942fb5d4507591bfe2c317725199772244434b1a5c2536f551e1d98c1fab0fa0bfb03870045f016a3e3014330805e3bb
+  data.tar.gz: a93d431f551918a465378f55b6a03e06389797bcfbad13dfedff952cc8679488707c6a19bcbb8126bf792810b63a0f7a18423ea7bf611815c297573a07e18ae7

data/lib/nimbu/command/server.rb

@@ -117,32 +117,42 @@ class Nimbu::Command::Server < Nimbu::Command::Base
       }
       server_options.merge!({:Host => options[:host]}) if options[:host]
       Rack::Handler::Thin.run Nimbu::Server::Base, server_options  do |server|
-        [:INT, :TERM].each { |sig| trap(sig) { server.respond_to?(:stop!) ? server.stop! : server.stop } }
+        [:INT, :TERM].each do |sig| 
+          trap(sig) do 
+            server.respond_to?(:stop!) ? server.stop! : server.stop
+            exit(0)
+          end
+        end
       end
     end
 
     haml_thread = Thread.new do
-      # $stdout.reopen(compiler_write)
-      # compiler_read.close
+      Process.setproctitle("#{$0} => nimbu-toolbelt haml")
       puts "Starting watcher..."
       HamlWatcher.watch
     end if @with_haml
 
-    if @with_compass
+    compass_pid = if @with_compass
+      Process.setproctitle("#{$0} => nimbu-toolbelt compass")
       puts "Starting..."
       cmd = "bundle exec nimbu server:compass"
-      compass_pid = Process.spawn(cmd, out: $stdout, err: [:child, :out])
+      Process.spawn(cmd, out: $stdout, err: [:child, :out])
     end
 
     server_thread.join
     haml_thread.join if @with_haml
 
-    [:INT, :TERM].each do |sig|
+    [:HUP, :INT, :TERM].each do |sig|
       trap(sig) do
-        puts yellow("\n== Waiting for all processes to finish...")
-        Process.kill('INT', compass_pid) if compass_pid && running?(compass_pid)
-        Process.waitall
-        puts green("== Nimbu has ended its work " + bold("(crowd applauds!)\n"))
+        should_wait = false
+
+        if compass_pid && running?(compass_pid)
+          should_wait = true
+          Process.kill('INT', compass_pid)
+        end
+
+        Process.waitall if should_wait
+        exit(0)
       end
     end
 
@@ -166,7 +176,14 @@ class Nimbu::Command::Server < Nimbu::Command::Base
       }
       server_options.merge!({:Host => options[:host]}) if options[:host]
       Rack::Handler::Thin.run Nimbu::Server::Base, **server_options  do |server|
-        [:INT, :TERM].each { |sig| trap(sig) { server.respond_to?(:stop!) ? server.stop! : server.stop } }
+        Process.setproctitle("#{$0} => nimbu-toolbelt server")
+
+        [:INT, :TERM].each do |sig| 
+          trap(sig) do 
+            server.respond_to?(:stop!) ? server.stop! : server.stop
+            exit(0)
+          end
+        end
       end
     end
 
@@ -175,7 +192,8 @@ class Nimbu::Command::Server < Nimbu::Command::Base
       haml_read.close
       puts "Starting..."
       haml_listener = HamlWatcher.watch
-      [:INT, :TERM].each do |sig|
+      Process.setproctitle("#{$0} => nimbu-toolbelt haml")
+      [:HUP, :INT, :TERM].each do |sig|
         Signal.trap(sig) do
           puts green("== Stopping HAML watcher\n")
           Thread.new { haml_listener.stop }
@@ -185,6 +203,7 @@ class Nimbu::Command::Server < Nimbu::Command::Base
     end if @with_haml
 
     compass_pid = Process.fork do
+      Process.setproctitle("#{$0} => nimbu-toolbelt compass")
       $stdout.reopen(compass_write)
       compass_read.close
       puts "Starting..."
@@ -192,7 +211,10 @@ class Nimbu::Command::Server < Nimbu::Command::Base
     end if @with_compass
 
     watch_server_pid = Process.fork do
-      trap('INT') { exit }
+      Process.setproctitle("#{$0} => nimbu-toolbelt server-watcher")
+
+      [:HUP, :INT, :TERM].each { |sig| trap(sig) { exit } }
+      
       server_write.close
       server_read.each do |line|
         print cyan("SERVER:  ") + white(line) + ""
@@ -200,7 +222,9 @@ class Nimbu::Command::Server < Nimbu::Command::Base
     end
 
     watch_haml_pid = Process.fork do
-      trap('INT') { exit }
+      Process.setproctitle("#{$0} => nimbu-toolbelt haml-watcher")
+      [:HUP, :INT, :TERM].each { |sig| trap(sig) { exit } }
+
       haml_write.close
       haml_read.each do |line|
         print magenta("HAML:    ") + white(line) + ""
@@ -208,22 +232,39 @@ class Nimbu::Command::Server < Nimbu::Command::Base
     end if @with_haml
 
     watch_compass_pid = Process.fork do
-      trap('INT') { exit }
+      Process.setproctitle("#{$0} => nimbu-toolbelt haml-compass")
+      [:HUP, :INT, :TERM].each { |sig| trap(sig) { exit } }
+
       compass_write.close
       compass_read.each do |line|
         print yellow("COMPASS: ") + white(line) + ""
       end
     end if @with_compass
 
-    [:INT, :TERM].each do |sig|
+    [:HUP, :INT, :TERM].each do |sig|
       trap(sig) do
-        puts yellow("\n== Waiting for all processes to finish...")
-        Process.kill('INT', haml_pid) if haml_pid && running?(haml_pid)
-        Process.waitall
-        puts green("== Nimbu has ended its work " + bold("(crowd applauds!)\n"))
+        should_wait = false
+        @child_pids_running.each do |pid|
+          if running?(server_pid)
+            should_wait = true
+            Process.kill('INT', pid)
+          end
+        end
+
+        Process.waitall if should_wait
+        exit(0)
       end
     end
 
+    @child_pids_running = [
+      server_pid,
+      haml_pid,
+      compass_pid,
+      watch_server_pid,
+      watch_haml_pid,
+      watch_compass_pid
+    ].compact!
+
     Process.waitall
   end
 

data/lib/nimbu/version.rb

@@ -1,3 +1,3 @@
 module Nimbu
-  VERSION = '0.13.0'.freeze
+  VERSION = '0.13.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Zenjoy BVBA