kdwatch 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a9da0314481e385e7c7809d744245974f7f03c1ec545d010dccf1e11ad798a1
-  data.tar.gz: efb937cffffac1f963b2768e712c720a502e6fc596e256c457fa5636de5238fd
+  metadata.gz: 6a512a725cd5620b46a4e07dbb7cf04169d33c26d449bee7b12f565bdf17a6c5
+  data.tar.gz: e635c44eaa9f4a3413666113ca399020249feb12ae19a63f544f1716ab3c3956
 SHA512:
-  metadata.gz: 591eeb97f79a48774586fb4f213aebd00b0e9e2604e4cc2644e30d69a2cca6e1869b58907f68b6098e3db734cb253a01178879b7239229e3fb0d3d361a9137d2
-  data.tar.gz: 5889974b1b930571d73b96fc1b6f3b423f5a0449859bc14aef429a2c1a05264e4b36a5082ff3b1a8c68fdb1b7fc47b160f1a702fff956e4ee139e666bbb4daec
+  metadata.gz: 6695bad925d18d8be9fe52b7f0c32581310a49c3b0f580e569a997d8ffeb2630aadc06549c6b6494aa523516feec0b05b579fa29495fc66f03aaf2346c67e71f
+  data.tar.gz: 2d5739a44678c2035798575ac4fca4dfb583594fc8aba94f14fd7cabc4e9cba3eb133ffeb8c869415548b0c0baf28b5edca78ae9854d799b640f80c2580d1aac

data/README.md

@@ -85,10 +85,6 @@ many
 kdwatch -r5 weird-draft.md
 ```
 
-(Glitches are to be expected if you *start* more than one server out of
-the same directory at the same instant; TODO; for now, wait 10 seconds
-before starting another from the same directory.)
-
 ### 7991, haven't I heard that number before?
 
 The default port number was chosen after [RFC 7991], the initial (no

data/bin/kds

@@ -3,12 +3,14 @@ require 'socket'
 require 'uri'
 require 'open-uri'
 require 'optparse'
+require 'optparse/uri'
 
 KDWATCH_VERSION=Gem.loaded_specs["kdwatch"].version rescue "unknown-version"
 
 loport = 7991
 hiport = 7999
 match = nil
+uri = URI.parse("http://127.0.0.1")
 
 op = OptionParser.new do |opts|
   opts.banner = <<BANNER
@@ -23,11 +25,20 @@ BANNER
     puts opts
     exit
   end
+  opts.on("-uURI", "--uri=URI", URI, "Use base URI (#{uri})") do |v|
+    uri = v
+    unless uri.host           # questionable convenience feature
+      uri.host = uri.path #.sub(/\A([A-Za-z0-9:]+)\z/) {"[#{$1}]"}
+      uri.path = ""
+    end
+    uri.scheme ||= "http"
+  end
   opts.on("-fNUM", "--from=NUM", Integer, "Search from port number (#{loport})") do |v|
     loport = v
   end
   opts.on("-tNUM", "--to=NUM", Integer, "Search to port number (#{hiport})") do |v|
     hiport = v
+    hiport += 8000 if hiport < loport # questionable convenience feature
   end
 end
 op.parse!
@@ -37,7 +48,8 @@ if ARGV.size != 0
 end
 
 (loport..hiport).each do |p|
-  url = "http://127.0.0.1:#{p}"
+  uri.port = p
+  url = uri.to_s
   URI(url).open do |f|
     s = f.readpartial(40000)
     sc = s.scan(/id="title".*?<|Internal server error/)

data/lib/kdwatch/version.rb

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

data/lib/kdwatch-app.rb

@@ -71,8 +71,6 @@ end
 GF
 guardfile.close
 gfpath = guardfile.path
-# gfpath = "#{path}.guardfile"
-# File.rename(path, gfpath)
 
 rd, _wr = IO.pipe
 spawn("guard -G #{gfpath}", in: rd, close_others: true)
@@ -83,6 +81,22 @@ host = "localhost" if host == "::" # work around macOS peculiarity
 host = "[#{host}]" if host =~ /:/
 
 url = "http://#{host}:#{port}"
-
-spawn("sleep 5; open #{url} || xdg-open #{url} || echo @@@ Please open #{url}")
-
+command = "open #{url} || xdg-open #{url} || echo @@@ Please open #{url}"
+
+if Process.respond_to?(:fork) && fork do
+     begin
+       # warn "** Making connection to #{host} #{port}"
+       TCPSocket.new host, port
+       # warn "** Successful connection to #{host} #{port}"
+     rescue => _e
+       # warn "** #{e.detailed_message}"
+       sleep 0.5
+       retry
+     end
+     exec(command)
+     warn "** exec didn't work"
+     exit!
+   end
+else
+  spawn("sleep 3; #{command}")
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kdwatch
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-09 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: 'kdwatch: open auto-reloaded HTML for kramdown-rfc in a browser.'