kdwatch 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e2ba541b81a0758e14930c2daeeb13f8795ef86f13db41d2099ba2c863ae6a8
-  data.tar.gz: 225edec007a3005fb9e401888073d3e74fd6d92db622560685d812d0a37527ea
+  metadata.gz: 974abb5a5f84e7afb0d7bde78c81a8072b9627a90e1aa25bb26811ba02605c56
+  data.tar.gz: e4777968c970488118701adf24fd6c86efce9ae8d08ee4f999ddf2cf851e05d0
 SHA512:
-  metadata.gz: 7f61fd99900cb3e4b1951863424816438e7e426b84c3cc0e4854f4a64954f26e2ec56f13b08394d4c086fe2d9b919cd4fa66ed4486ef10daebace7d30767c0b1
-  data.tar.gz: 4c0853a737166b50b728d6ecbd29845c908fa5e1fcc4b07ea88bbd762c3b6f71b281a7429acbc07f452e3a1a6e9e18f29d7198b97e6d96edef98bbdaef8aa6ad
+  metadata.gz: c62d74513d5fdc91cd5736c2c0410f2d985d64bd4784680f387fae825ba33ab08770eef3930ceb9da21c092d2670083b372c356ac0e1940202f14376d598a99b
+  data.tar.gz: f5e5a995913f7b7bdd5ab264045062452ceaea3840cc7c3ff47780fd11b648c2f203f0a850c29896871874f4ccdeb514439c5ae73c1423f5ad951a061bfbcfa3

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Carsten Bormann
+Copyright (c) 2021, 2022 Carsten Bormann
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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
 
 ```
@@ -118,6 +121,35 @@ another laptop), and save some screen real-estate on your laptop.
 With a globally routable address, kdwatch even can be used for joint
 viewing in a team.
 
+### Finding and accessing kdwatch servers
+
+The `kds` tool can list active local (127.0.0.1) kdwatch servers and
+optionally quickly open the page for a selected kdwatch server.
+
+```
+Usage: kds [options] [match...]
+Version: n.m.l (from kdwatch)
+    -v, --version                    Show version and exit
+    -h, --help                       Show option summary and exit
+    -f, --from=NUM                   Search from port number (7991)
+    -t, --to=NUM                     Search to port number (7999)
+```
+
+```
+$ kds
+http://127.0.0.1:7991  Packed CBOR
+http://127.0.0.1:7992  Concise Problem Details For CoAP APIs
+$ kds prob
+http://127.0.0.1:7991  Packed CBOR
+http://127.0.0.1:7992  Concise Problem Details For CoAP APIs
+(...web page http://127.0.0.1:7992 opens...)
+$
+```
+
+Any match arguments are concatenated with spaces; for servers that
+offer a page with the match string in the title (case insensitive), a
+window is opened in the default browser.
+
 ## Feedback, please
 
 This has only been tested on macOS and briefly on Linux.  No idea about WSL.

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 (#{loport})") do |v|
+    loport = v
+  end
+  opts.on("-tNUM", "--to=NUM", Integer, "Search to port number (#{hiport})") 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

@@ -13,6 +13,7 @@ require_relative "../lib/kdwatch/version"
 KDWATCH_PORT = 7991             # currently unregistered...
 
 def socket_is_free(host, port, uri)
+  host = "localhost" if host == "::"
   begin
     TCPSocket.new(host, port, connect_timeout: 1)
   rescue Errno::ECONNREFUSED => e

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.5.0"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kdwatch
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-29 00:00:00.000000000 Z
+date: 2022-07-07 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