kdwatch 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50e6ea6a1e81ab7f17173c1251395a6fbeb1a4b4c236d1c9c6fd1731f3118ca8
-  data.tar.gz: 31235eb66b35d5c39ebd1f124e938dfcc9b3f305a020ddf05dc610b7e8832707
+  metadata.gz: 2e2ba541b81a0758e14930c2daeeb13f8795ef86f13db41d2099ba2c863ae6a8
+  data.tar.gz: 225edec007a3005fb9e401888073d3e74fd6d92db622560685d812d0a37527ea
 SHA512:
-  metadata.gz: 39e2d6062ef4adf87ce11d05c2d18e4d305de91e8212d1c204bc7bd0b8c8086f3c662e59deeaa284779f326bebdbd3c06af6ec993c4bc3ad4ad0dea0a468ee80
-  data.tar.gz: 9db4d837a11aea7413de4362bc418cb56fb2f987dc926ab722bd1b8be06850a2a2e51110e78dd75caebec5b2b7280e0b14592910f00478879b127e8724d0b070
+  metadata.gz: 7f61fd99900cb3e4b1951863424816438e7e426b84c3cc0e4854f4a64954f26e2ec56f13b08394d4c086fe2d9b919cd4fa66ed4486ef10daebace7d30767c0b1
+  data.tar.gz: 4c0853a737166b50b728d6ecbd29845c908fa5e1fcc4b07ea88bbd762c3b6f71b281a7429acbc07f452e3a1a6e9e18f29d7198b97e6d96edef98bbdaef8aa6ad

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/lib/kdwatch/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kdwatch
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: 'kdwatch: open auto-reloaded HTML for kramdown-rfc in a browser.'