kdwatch 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc8f8c23c6efa56df70b322eb61dc16b913fdf1a93640d3de4da1feeadfba752
-  data.tar.gz: ab67e9ebabd65974a86d65f89a0ffc20af380a1806a13501fa6ecefb07076663
+  metadata.gz: eaba18036cbe879e4f88d5b74513ad4a5d36abb843234c83c35e688aaaf36e03
+  data.tar.gz: ea272b95fef2f02ec9513539dee9f4f5126b4e65c3c6a97b0603d94fa7cd37e2
 SHA512:
-  metadata.gz: c072cf5ae36599a794e6af8520f2fb0d4cb31d87441cec63c9e9137198bea04f4169b553a173787b1073759f04e27603f162b20ca8b0df745f24b2be4b1aa033
-  data.tar.gz: '012684f1584c8f9ddb902a52369510b137840d9a29bac34732cc1939821d6ae96f6598bd57eb925515f9715936935351aa123fd4c9f619c63976b99274e174fc'
+  metadata.gz: 603817fcb75e8b474a4f6bc7d58408c4d8fcc55f7cbd50d1cd6a48f8d21a8b2672f2b221697b9948412e2bf4825dd9925ae10f9a4be6a6360e7c5e54c94c9471
+  data.tar.gz: 4237a7b045723de06320999301e0c388d879d6f5016b12c7170702b7b24981e302848eb76aad46513cde1a0d37792811165710c865a9cb597064dca17a54eed5

data/bin/kdwatch

@@ -3,15 +3,55 @@ ENV["LANG"]="en_US.utf-8"
 ENV["LC_CTYPE"]="en_US.utf-8"
 ENV["KRAMDOWN_PERSISTENT"]="yes"
 
+KDWATCH_PORT = 7991             # currently unregistered...
+
+## -r: Kill any previous kdwatch and continue ("restart")
+## -e: Kill any previous kdwatch and exit
+if ARGV[0] == "-e" || ARGV[0] == "-r"
+  require 'open3'
+
+  status = 1
+  flag = ARGV.shift
+
+  stdout_str, stderr_str, s = Open3.capture3("lsof -ti :#{KDWATCH_PORT} -s TCP:LISTEN")
+  pids = if s.success? && stdout_str =~ /\A[0-9\s]*\z/ && stderr_str
+           stdout_str.split
+         else
+           text = stdout_str + stderr_str
+           warn "** lsof, status #{s}, says: #{text}" if text != "" || s.exitstatus != 1
+           []
+         end
+  if pids == []
+    warn "** Nothing listening on kdwatch port" unless flag == "-r"
+  elsif pids.size != 1
+    warn "** More than one process listening on kdwatch port, nothing done"
+  else
+    begin
+      status = Process.kill(2, Integer(pids[0])) - 1 # should be 1 for 1 kill, exit 0 then
+    rescue Errno => e
+      warn "** #{pids[0]}: #{e.inspect}"
+    end
+  end
+  exit(status) if flag == "-e"
+end
+
+## Find an .mkd or a draft-*.md (excluding README.md and such)
 if ARGV == []
-   ARGV.replace Dir["draft-*.md"]
+   ARGV.replace Dir.glob(["draft-*.md", "*.mkd"])
    warn_replace = 1
 end
 
 if ARGV.size != 1
-   warn "** Usage: #$0 [draft-foo.md]"
-   warn "**   More than one draft file found #{ARGV.inspect}"   if warn_replace
-   warn "**   Please select one for watching."   if warn_replace
+   warn "** Usage: #$0 [-r] [draft-foo.md]"
+   warn "**        #$0 -e"
+   if warn_replace
+     if ARGV.size > 1
+       warn "**   More than one draft file found #{ARGV.inspect}"
+       warn "**   Please select one for watching."
+     else
+       warn "**   No draft file draft-*.md or *.mkd found."
+     end
+   end
    exit 1
 end
 
@@ -24,4 +64,4 @@ require 'kdwatch-app.rb'
 run Sinatra::Application
 HERE
 
-exec("rackup -E production -s thin -p 7991 .config.ru")
+exec("rackup -E production -s thin -p #{KDWATCH_PORT} .config.ru")

data/lib/kdwatch-app.rb

@@ -45,7 +45,7 @@ end
 GF
 
 rd, _wr = IO.pipe
-spawn("guard -G .Guardfile", in: rd)
+spawn("guard -G .Guardfile", in: rd, close_others: true)
 
 # wrong: puts settings.port
 

data/lib/kdwatch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kdwatch
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kdwatch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-03 00:00:00.000000000 Z
+date: 2021-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler