kdwatch 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77f59a0c0a41535d090f2b858a44759a830b7cddc4e760a39c75613f06d2b37f
-  data.tar.gz: 6c53346765beb3f0391991db58bda4f00debfed880b8dca8763462567bbcd435
+  metadata.gz: ec097b76b694691e1a066ec87c23ebe004f085940b5ce222e1ec8b383f7cbbd8
+  data.tar.gz: 3f3b1dff065d860cc01a8a7e6598013faa679aeb9c0206dffd17a0dd85b9a6c8
 SHA512:
-  metadata.gz: d9c2df05241e752a0d7d80e34cf8324872110a0aa4bc800bb9ef7ec1afe0ad2034b06691b56d84c14a6462c252606ef371cad1f85f021ac424046c09dcdc5182
-  data.tar.gz: 001ca06bd402115c0d63e8cd06e3558a99787f12ba97b9641c158ec8f9f8d87f99cdea3850a5121b28f53336d14c1312c13ec037ace624b97c19effba70fdea8
+  metadata.gz: f105edcc85863d728f629c9b49fae44343b67e7f98af8943a1f22202b0f7ff4f88ad347a9a69b77672539dad159ab2ba0c51f08877a1a18e429794c365b764b7
+  data.tar.gz: 17801699b473113c2b66b8aedf3ac5c15ee124d05a460a25b9023409130aed0c703dac48c831404f410eb53d9be148e64d4ca8566d52e2ddad716d8e6bc06e79

data/README.md

@@ -51,9 +51,11 @@ There can only be one kdwatch active on each host and port.  You will
 need to specify a different port (or host!) to run more than one
 kdwatch at the same time.
 
-* `-p port` to select a port number (default: 7991)
-* `-1` to `6` as a shortcut for `-p 7991` (default) to `-p 7996` (must be last
+* `-p port` to select a specific port number
+* `-1` to `6` as a shortcut for `-p 7991` to `-p 7996` (must be last
   option because of an idiosyncrasy of the optionparser library)
+* if no port number is given, `kdwatch` will hunt for a port number
+  that doesn't have a listener, starting with 7991.
 
 kdwatch has two flags to simplify handling servers that might be
 accumulating on one host/port:
@@ -64,18 +66,19 @@ accumulating on one host/port:
 So the most likely use is going to be:
 
 ```
-kdwatch -r
+kdwatch
 ```
 
-or maybe
+to start a new server on a new port number.
+
+These tend to accumulate a bit, so sometimes you'll want to replace an
+existing one (here: port number 7992):
 
 ```
 kdwatch -r2
 ```
 
-for the second draft you are editing at the same time,
-
-or, if your drafts are weirdly named or you need to select one out of
+If your drafts are weirdly named or you need to select one out of
 many
 
 ```

data/bin/kds

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+require 'socket'
+require 'uri'
+require 'open-uri'
+require 'optparse'
+
+KDWATCH_VERSION=Gem.loaded_specs["kdwatch"].version rescue "unknown-version"
+
+loport = 7991
+hiport = 7999
+match = nil
+
+op = OptionParser.new do |opts|
+  opts.banner = <<BANNER
+Usage: kds [options] [match...]
+Version: #{KDWATCH_VERSION} (from kdwatch)
+BANNER
+  opts.on("-v", "--version", "Show version and exit") do |v|
+    puts "kds, from kdwatch #{KDWATCH_VERSION}"
+    exit
+  end
+  opts.on("-h", "--help", "Show option summary and exit") do |v|
+    puts opts
+    exit
+  end
+  opts.on("-fNUM", "--from=NUM", Integer, "Search from port number") do |v|
+    loport = v
+  end
+  opts.on("-tNUM", "--to=NUM", Integer, "Search to port number") do |v|
+    hiport = v
+  end
+end
+op.parse!
+
+if ARGV.size != 0
+  match = ARGV.join(" ")
+end
+
+(loport..hiport).each do |p|
+  url = "http://127.0.0.1:#{p}"
+  URI(url).open do |f|
+    s = f.readpartial(40000)
+    sc = s.scan(/id="title".*?<|Internal server error/)
+    sc.each do |scl|
+      scl.sub!(/id="title">/, "")
+      scl.chomp!('<')
+      puts "#{url}  #{scl}"
+      if match && scl.downcase.include?(match.downcase)
+        spawn("open #{url} || xdg-open #{url} || echo @@@ Please open #{url}")
+      end
+      break
+    end
+  end rescue nil
+end

data/bin/kdwatch

@@ -6,11 +6,24 @@ ENV["KRAMDOWN_PERSISTENT"]="yes"
 
 require 'optparse'
 require 'ostruct'
+require 'socket'
 
 require_relative "../lib/kdwatch/version"
 
 KDWATCH_PORT = 7991             # currently unregistered...
 
+def socket_is_free(host, port, uri)
+  begin
+    TCPSocket.new(host, port, connect_timeout: 1)
+  rescue Errno::ECONNREFUSED => e
+    return true
+  rescue => e
+    warn "*** #{uri} -- #{e.inspect}"
+    return nil                  # break, but don't use
+  end
+  return false
+end
+
 options = OpenStruct.new
 
 op = OptionParser.new do |opts|
@@ -30,7 +43,7 @@ BANNER
   opts.on("-r", "--[no-]replace", "Replace existing server")
   opts.on("-oNAME", "--host=NAME", String, "Server host (127.0.0.1)")
   opts.on("-i", "--internet", 'Abbr. "on the Internet" (host = "::")')
-  opts.on("-pNUM", "--port=NUM", Integer, "Port number (#{KDWATCH_PORT})")
+  opts.on("-pNUM", "--port=NUM", Integer, "Port number (#{KDWATCH_PORT}...)")
   opts.on("-[1-6]", "--[1-6]", Integer, "Abbr. port number (#{KDWATCH_PORT/10}x), must be last")
 end
 begin
@@ -52,7 +65,26 @@ if short_port = options[""]
   warn "** overriding port #{options.port} with #{port}" if options.port
   options.port = port
 else
-  options.port ||= KDWATCH_PORT
+  unless options.port
+    port = KDWATCH_PORT
+    host = options.host
+    host = "[#{host}]" if host =~ /:/
+    uri = nil
+    found = false
+    100.times do
+      uri = "http://#{host}:#{port}"
+      # warn "Trying URI #{uri}"
+      found = socket_is_free(options.host, port, uri)
+      break unless found == false
+      port += 1
+    end
+    unless found
+      warn "*** Cannot find port number available to serve from!"
+      exit 1
+    end
+    warn "*** Using URI: #{uri}"
+    options.port = port
+  end
 end
 
 # p options

data/kdwatch.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
-  spec.executables   = ['kdwatch']
+  spec.executables   = ['kdwatch', 'kds']
   spec.require_paths = ["lib"]
 
   spec.add_dependency "bundler", '~> 2.2'

data/lib/kdwatch/version.rb

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

data/lib/kdwatch-app.rb

@@ -9,7 +9,7 @@ require "rack-livereload"
 require "guard"
 require "sinatra"
 require "kramdown-rfc2629"
-ENV["KDRFC_PREPEND"] = "time"
+ENV["KDRFC_PREPEND"] = "time" if system("time", "true", err: "/dev/null")
 require "kramdown-rfc/kdrfc-processor"
 require "net/http/persistent"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kdwatch
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,6 +127,7 @@ email:
 - cabo@tzi.org
 executables:
 - kdwatch
+- kds
 extensions: []
 extra_rdoc_files: []
 files:
@@ -134,6 +135,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- bin/kds
 - bin/kdwatch
 - kdwatch.gemspec
 - lib/kdwatch-app.rb
@@ -157,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: 'kdwatch: open auto-reloaded HTML for kramdown-rfc in a browser.'