nimbu 0.13.0 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5ca8decb3bbcaff09111f825e17dfac4f94e3703f015568ec3923369ef46383
-  data.tar.gz: 54270a24b7ae669ff6fb9e9d1d298b3b92ed022eace0d06f841fe2e0807974ad
+  metadata.gz: acf58907df8ef86e997d2694f21ecc4239fa45e9530a4f3b108518939c218ed5
+  data.tar.gz: d4e92c37600d974a88f7add9d705981d3a44ac58c36d5294fedaf8839859bb6e
 SHA512:
-  metadata.gz: b729ae9aa81917073c5fe296c31fcf8cbd4e97090360a81c4b307995078938a13f55692e4cf204f6362e23975bcc39e016c518698c8405bae10a115fccfb4107
-  data.tar.gz: 7d396b10643c17110361d3799979e96154695af5688a0aeebce1e9472a2750b3acd3a7b03f497755f008211190826f5487ada963da1606b281b211989d8d6d32
+  metadata.gz: 53b91cb9662cf50224bf77273c4ddd44006bede74661cebeacb4327e3611df69fb7c765873d1f371cf8ffb2d262f83b5b91958bf113be6e6d8e9e357cbd9405c
+  data.tar.gz: c88ec2b024acdc576b5a3185d4b24c0200140d41d2b768a6c06bd4fb37f470792f0859bbc4529267e207df352f262ba79c7ed21f21adaa816e751021eb959ff1

data/lib/nimbu/auth.rb

@@ -87,7 +87,7 @@ class Nimbu::Auth
     end
 
     def configuration_file
-      "#{Dir.pwd}/nimbu.yml"
+      "#{Nimbu.cli_options[:dir] || Dir.pwd}/nimbu.yml"
     end
 
     def delete_configuration

data/lib/nimbu/command/server.rb

@@ -17,6 +17,7 @@ class Nimbu::Command::Server < Nimbu::Command::Base
   # --webpack RES            # comma separated list of webpack resources (relative to /javascripts)
   # --webpackurl URL         # proxy requests for webpack resources to the given URL prefix (default: http://localhost:8080)
   # --nocookies              # disable session refresh cookie check
+  # --dir DIR                # root of your project (default: current directory)
   #
   def index
     require 'rubygems'
@@ -26,6 +27,9 @@ class Nimbu::Command::Server < Nimbu::Command::Base
     require 'filewatcher'
     require 'pathname'
     require 'lolcat'
+    require 'socket'
+
+    Nimbu.cli_options[:dir] = options[:dir] if options[:dir]
 
     # Check if config file is present?
     if !Nimbu::Auth.read_configuration
@@ -81,17 +85,6 @@ class Nimbu::Command::Server < Nimbu::Command::Base
     end
   end
 
-  def bare
-    puts "Starting server..."
-    server_options = {
-      :Port               => options[:port] || 4567,
-      :DocumentRoot       => Dir.pwd
-    }
-    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 } }
-    end
-  end
-
   def haml
     require 'haml'
     puts "Starting..."
@@ -107,42 +100,75 @@ class Nimbu::Command::Server < Nimbu::Command::Base
 
   protected
 
+  def ipv6_supported?
+    begin
+      socket = Socket.new(Socket::AF_INET6, Socket::SOCK_STREAM)
+      socket.close
+      true
+    rescue Errno::EAFNOSUPPORT
+      false
+    end
+  end
+
+  def project_root
+    Nimbu.cli_options[:dir] || Dir.pwd
+  end
+
+  def default_host
+    if ipv6_supported?
+      "::"
+    else
+      "127.0.0.1"
+    end
+  end
+
   def run_on_windows!
     server_thread = Thread.new do
     Thread.current[:stdout] = StringIO.new
       puts "Starting server..."
       server_options = {
         :Port               => options[:port] || 4567,
-        :DocumentRoot       => Dir.pwd
+        :DocumentRoot       => project_root,
+        :Host               => default_host
       }
       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
 
@@ -162,11 +188,19 @@ class Nimbu::Command::Server < Nimbu::Command::Base
       puts "Starting server..."
       server_options = {
         :Port               => options[:port] || 4567,
-        :DocumentRoot       => Dir.pwd
+        :DocumentRoot       => options[:dir] || Dir.pwd,
+        :Host               => default_host,
       }
       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 +209,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 +220,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 +228,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 +239,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 +249,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
 
@@ -268,7 +326,7 @@ class HamlWatcher
 
     def watch
       refresh
-      current_dir = File.join(Dir.pwd, 'haml/')
+      current_dir = File.join(Nimbu.cli_options[:dir] || Dir.pwd, 'haml/')
       puts ">>> Haml is polling for changes. Press Ctrl-C to Stop."
       Filewatcher.new('haml/**/*.haml', every: true).watch do |filename, event|
         begin

data/lib/nimbu/server/base.rb

@@ -22,7 +22,7 @@ module Nimbu
 
       set :method_override, true
       set :static, true                             # set up static file routing
-      set :public_folder, Dir.pwd # set up the static dir (with images/js/css inside)
+      set :public_folder, Nimbu.cli_options[:dir] || Dir.pwd # set up the static dir (with images/js/css inside)
 
       set :views,  File.expand_path('../views', __FILE__) # set up the views dir
       set :haml, { format: :html5 }                    # if you use haml
@@ -229,8 +229,8 @@ module Nimbu
       end
 
       def load_files(type)
-        glob = Dir["#{Dir.pwd}/#{type}/**/*.liquid","#{Dir.pwd}/#{type}/**/*.liquid.haml"]
-        directory = "#{Dir.pwd}/#{type}/"
+        glob = Dir["#{project_root}/#{type}/**/*.liquid","#{project_root}/#{type}/**/*.liquid.haml"]
+        directory = "#{project_root}/#{type}/"
         glob.each do |file|
           name = file.gsub(/#{directory}/i,"")
           code = IO.read(file).force_encoding('UTF-8')
@@ -247,6 +247,10 @@ module Nimbu
         request.path =~ /^\/downloads\// && request.query_string =~ /key=/
       end
 
+      def project_root
+        Nimbu.cli_options[:dir] || Dir.pwd
+      end
+
     end
   end
 end

data/lib/nimbu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.2
 platform: ruby
 authors:
 - Zenjoy BVBA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -353,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Client library and CLI to design websites on the Nimbu platform.