kdwatch 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 974abb5a5f84e7afb0d7bde78c81a8072b9627a90e1aa25bb26811ba02605c56
-  data.tar.gz: e4777968c970488118701adf24fd6c86efce9ae8d08ee4f999ddf2cf851e05d0
+  metadata.gz: 6566f3e18e0382e8884beeca9cacc476052a969ca2fdb2b2444776cf5cbd841c
+  data.tar.gz: ec6c75ac9f53726c514263bc288862d3406d601e71e7cdc0a263a3a83eac04a9
 SHA512:
-  metadata.gz: c62d74513d5fdc91cd5736c2c0410f2d985d64bd4784680f387fae825ba33ab08770eef3930ceb9da21c092d2670083b372c356ac0e1940202f14376d598a99b
-  data.tar.gz: f5e5a995913f7b7bdd5ab264045062452ceaea3840cc7c3ff47780fd11b648c2f203f0a850c29896871874f4ccdeb514439c5ae73c1423f5ad951a061bfbcfa3
+  metadata.gz: eb70454412b047f97acb4906b471dcd87e8a56908ed976f7f2094e34422284f38032eea6d1b97a1653cb5d15965400935c9e271a503e52f2077ae2fec61a9e60
+  data.tar.gz: ea35944c3d007676c43c009f06a4deb506fbfaebf9ab71521e6f048818fcccaf89967d31076d710f5b1fb09fd4866412f8e4ce9c8e2a1e516a7c48d16292fca9

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/kdwatch

@@ -7,6 +7,7 @@ ENV["KRAMDOWN_PERSISTENT"]="yes"
 require 'optparse'
 require 'ostruct'
 require 'socket'
+require 'tempfile'
 
 require_relative "../lib/kdwatch/version"
 
@@ -153,11 +154,19 @@ ENV["KDWATCH_PORT"] = options.port.to_s
 live_reload_port = options.port + 51234 # move up into ephemeral space
 ENV["KDWATCH_LRPORT"] = live_reload_port.to_s
 
-File.write(".config.ru", <<HERE)
+tf = Tempfile.new('kdwatch-config-ru-')
+path = tf.path
+rupath = "#{path}.ru"
+
+tf.write(<<HERE)
 require 'rack-livereload'
 use Rack::LiveReload, min_delay: 500, source: :vendored, no_swf: true, port: #{live_reload_port}, live_reload_port: #{live_reload_port}
 require 'kdwatch-app.rb'
 run Sinatra::Application
+File.delete("#{rupath}")
 HERE
 
-exec("rackup -E production -s thin -o #{options.host} -p #{options.port} .config.ru")
+tf.close
+File.rename(path, rupath)
+
+exec("rackup -E production -s thin -o #{options.host} -p #{options.port} #{rupath}")

data/lib/kdwatch/version.rb

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

data/lib/kdwatch-app.rb

@@ -1,5 +1,6 @@
 require_relative "kdwatch/version"
 require 'bundler'
+require 'tempfile'
 
 # Bundler.require
 require "bundler"
@@ -62,14 +63,17 @@ get "/rfc-local.css" do
   # insert local css here
 end
 
-File.write(".Guardfile", <<GF)
+guardfile = Tempfile.new("kdwatch-guard-")
+guardfile.write(<<GF)
 guard :livereload, :port => #{ENV["KDWATCH_LRPORT"]} do
   watch("#{sfn}")
 end
 GF
+guardfile.close
+gfpath = guardfile.path
 
 rd, _wr = IO.pipe
-spawn("guard -G .Guardfile", in: rd, close_others: true)
+spawn("guard -G #{gfpath}", in: rd, close_others: true)
 
 # wrong: puts settings.port
 
@@ -77,7 +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.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2023-03-08 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.6
 signing_key:
 specification_version: 4
 summary: 'kdwatch: open auto-reloaded HTML for kramdown-rfc in a browser.'