rb-portless 0.3.0 → 0.3.1.dev.20260630.bb085fc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49a039bffaf418a826c61337253e8cf3f46c54b500f30936fba6e8153f96804
-  data.tar.gz: b4c6fad1e96ac1c2fd11a9366ad36273af95976e2abcdb1387d4b1b60dd1bd27
+  metadata.gz: b934378f7d59599eebee06f392753bc4d33e5dea46132ca43ff4a13c9c587367
+  data.tar.gz: 4756b624abf40832afbd71ed570548e12228a26df9740e821fc901eba5fe74ff
 SHA512:
-  metadata.gz: 7754996324bcc3c53dac67a3c2999cc2c57d25d0bc6126ac4041d6dfb2936c49ca675b63ddb1fb24d86ad5b3a49b76b76e7397ae20f32f0d637f3b3f63e4f640
-  data.tar.gz: ec5a8e7ff23b18f7766015e11627938776d88eb672fe174a3902e273af14d044f69db69a146de48284799e08de5425544837a94160cf3c2ddf6eff7faa447673
+  metadata.gz: 223dc8fc2262c78440ddb19a1ebfbf31ed05092dab9180bd7b54808d0976ab885d4d3e25f3c8890a90f8eb8fda6f733c5111283575223bb0581e146439d724b0
+  data.tar.gz: b8e2c24702cb74ea1de7b60d8db33ac1c8a504928c04bc53d516370c980733525610b0bf44d924cebfe3c6700df95eb128ef04dbeba9b67b51bdb522a189035c

data/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project are documented here. The format follows
 [Keep a Changelog](https://keepachangelog.com/), and the project adheres to
 [Semantic Versioning](https://semver.org/).
 
+## [0.3.1]
+
+### Changed (internal — no behaviour change)
+
+- **Deduped the two run paths.** `Runner` and `Multi` shared three methods
+  (`child_env`, `display_url`, `ensure_trusted`); they now live in a `RunSupport`
+  mixin. Multi-app mode picks up the actionable first-run CA-trust hints the
+  single-app path already had.
+- **Dropped dead code** — `CLI#todo`, the unread `Config#script`/`DEFAULT_SCRIPT`,
+  `State.ca_serial` (no on-disk serial; the native CA sets it on the cert), and
+  `Hosts.managed_hostnames` (no caller).
+
 ## [0.3.0]
 
 ### Fixed / hardened

data/lib/portless/cli.rb

@@ -205,11 +205,6 @@ module Portless
       i ? Integer(args[i + 1], exception: false) : nil
     end
 
-    def todo(name, desc, _args = nil)
-      warn "rb-portless #{name}: #{desc} — not yet implemented (#{Portless::VERSION})"
-      exit 1
-    end
-
     def rest(command)
       @argv.first == command ? @argv[1..] : @argv
     end

data/lib/portless/config.rb

@@ -7,9 +7,7 @@ module Portless
   # defaults. Mirrors portless's config.ts/auto.ts: name is inferred from the
   # config, the git root, or the directory; tld defaults to "localhost".
   class Config
-    DEFAULT_SCRIPT = "dev"
-
-    attr_reader :name, :tld, :script, :app_port, :tls, :apps
+    attr_reader :name, :tld, :app_port, :tls, :apps
 
     def self.load(dir = Dir.pwd)
       new(read_file(dir), dir)
@@ -19,7 +17,6 @@ module Portless
       @dir = dir
       @name = sanitize_label(data["name"] || infer_name(dir))
       @tld = (data["tld"] || Constants::DEFAULT_TLD).to_s
-      @script = data["script"] || DEFAULT_SCRIPT
       @app_port = data["appPort"] || data["app_port"]
       @tls = data.fetch("tls", true)
       # Monorepo: { "apps": { "web": "bin/rails server", "api": "node api.js" } }.

data/lib/portless/hosts.rb

@@ -24,11 +24,6 @@ module Portless
       write(strip_block(read))
     end
 
-    def managed_hostnames
-      read[/#{Regexp.escape(Constants::HOSTS_BEGIN)}\n(.*?)#{Regexp.escape(Constants::HOSTS_END)}/m, 1]
-        .to_s.scan(/^\s*127\.0\.0\.1\s+(\S+)/).flatten
-    end
-
     def build_block(hostnames)
       return "" if hostnames.empty?
       lines = hostnames.uniq.map { |h| "127.0.0.1\t#{h}" }

data/lib/portless/multi.rb

@@ -7,6 +7,8 @@ module Portless
   # supervised + torn down together. Ruby sets env per-spawn, so there's no
   # NODE_OPTIONS loader hack (cf. portless's turbo.ts).
   class Multi
+    include RunSupport
+
     App = Struct.new(:name, :hostname, :port, :url, :pid, keyword_init: true)
 
     def initialize(config: Config.load, route_store: RouteStore.new)
@@ -18,7 +20,7 @@ module Portless
     def run
       raise Error, "no apps defined — add an \"apps\" map to portless.json" if @config.apps.empty?
 
-      ensure_trusted if @config.tls
+      ensure_trusted
       proxy_port = Daemon.ensure_running(tls: @config.tls)
       @apps = @config.apps.map { |name, command| start_app(name, command, proxy_port) }
 
@@ -57,27 +59,5 @@ module Portless
       @apps.each { |app| @route_store.remove(app.hostname, owner_pid: Process.pid) }
       kill_all("TERM")
     end
-
-    def child_env(port, url)
-      {
-        "PORT" => port.to_s,
-        "HOST" => "127.0.0.1",
-        "PORTLESS_URL" => url,
-        "SSL_CERT_FILE" => (File.exist?(State.ca_cert) ? State.ca_cert : nil)
-      }.compact
-    end
-
-    def display_url(hostname, proxy_port)
-      scheme = @config.tls ? "https" : "http"
-      default = @config.tls ? Constants::HTTPS_PORT : Constants::HTTP_PORT
-      suffix = proxy_port && proxy_port != default ? ":#{proxy_port}" : ""
-      "#{scheme}://#{hostname}#{suffix}"
-    end
-
-    def ensure_trusted
-      Trust.install! if Privilege.interactive? && !Trust.trusted?
-    rescue Portless::Error
-      nil
-    end
   end
 end

data/lib/portless/run_support.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Portless
+  # Shared bits of the two run paths (single-app Runner + multi-app Multi):
+  # the child env, the display URL, and first-run CA trust. Both expect a
+  # `@config`.
+  module RunSupport
+    private
+
+    def child_env(port, url)
+      {
+        "PORT" => port.to_s,
+        "HOST" => "127.0.0.1",
+        "PORTLESS_URL" => url,
+        # Let the app's own server-side TLS verification trust our CA.
+        "SSL_CERT_FILE" => (File.exist?(State.ca_cert) ? State.ca_cert : nil)
+      }.compact
+    end
+
+    def display_url(hostname, proxy_port)
+      scheme = @config.tls ? "https" : "http"
+      default = @config.tls ? Constants::HTTPS_PORT : Constants::HTTP_PORT
+      suffix = proxy_port && proxy_port != default ? ":#{proxy_port}" : ""
+      "#{scheme}://#{hostname}#{suffix}"
+    end
+
+    # Trust the local CA on first run (HTTPS only, interactive; never blocks the
+    # run), so HTTPS works without browser warnings — like portless.
+    def ensure_trusted
+      return unless @config.tls
+      return if Trust.trusted?
+
+      unless Privilege.interactive?
+        warn "rb-portless: CA not trusted — run `rb-portless trust` (HTTPS shows warnings until then)"
+        return
+      end
+
+      warn "rb-portless: trusting the local CA (first run)…"
+      Trust.install!
+    rescue Portless::Error => e
+      warn "rb-portless: couldn't auto-trust the CA (#{e.message}) — run `rb-portless trust`"
+    end
+  end
+end

data/lib/portless/runner.rb

@@ -6,6 +6,8 @@ module Portless
   # group (forwarding signals), and deregister on exit. Rails/puma respect PORT
   # natively. Mirrors portless's runApp/spawnCommand.
   class Runner
+    include RunSupport
+
     def initialize(command:, config: Config.load, route_store: RouteStore.new, options: {})
       @command = Array(command)
       @config = config
@@ -22,7 +24,7 @@ module Portless
       hostname = @config.hostname
 
       warn "rb-portless: #{@config.tld_warning}" if @config.tld_warning
-      ensure_trusted if @config.tls
+      ensure_trusted
       proxy_port = Daemon.ensure_running(tls: @config.tls)
       @route_store.add(hostname: hostname, port: port, pid: Process.pid, force: true)
 
@@ -41,13 +43,6 @@ module Portless
 
     private
 
-    def display_url(hostname, proxy_port)
-      scheme = @config.tls ? "https" : "http"
-      default = @config.tls ? Constants::HTTPS_PORT : Constants::HTTP_PORT
-      suffix = proxy_port && proxy_port != default ? ":#{proxy_port}" : ""
-      "#{scheme}://#{hostname}#{suffix}"
-    end
-
     # ── LAN mode (--lan) ──────────────────────────────────────────────────
     # Register a `<name>.local` route, publish it over mDNS, and surface the URL
     # so phones/tablets on the Wi-Fi can reach the app.
@@ -84,24 +79,6 @@ module Portless
       Share::Tailscale.stop(@tailscale) if @tailscale
     end
 
-    # Trust the local CA on first run (like portless), so HTTPS works without
-    # browser warnings out of the box. Interactive only — macOS prompts for
-    # keychain auth; in CI/no-TTY we skip with a hint rather than hang. Never
-    # blocks the run if trusting fails.
-    def ensure_trusted
-      return if Trust.trusted?
-
-      unless Privilege.interactive?
-        warn "rb-portless: CA not trusted — run `rb-portless trust` (HTTPS shows warnings until then)"
-        return
-      end
-
-      warn "rb-portless: trusting the local CA (first run)…"
-      Trust.install!
-    rescue Portless::Error => e
-      warn "rb-portless: couldn't auto-trust the CA (#{e.message}) — run `rb-portless trust`"
-    end
-
     # Run the child in its own process group so we can signal the whole tree,
     # forwarding INT/TERM and propagating its exit status.
     def supervise(command, port, url)
@@ -123,16 +100,6 @@ module Portless
       nil
     end
 
-    def child_env(port, url)
-      {
-        "PORT" => port.to_s,
-        "HOST" => "127.0.0.1",
-        "PORTLESS_URL" => url,
-        # Let the app's own server-side TLS verification trust our CA.
-        "SSL_CERT_FILE" => (File.exist?(State.ca_cert) ? State.ca_cert : nil)
-      }.compact
-    end
-
     # Explicit command wins; bare `rb-portless` falls back to the project's dev
     # runner (bin/dev, then bin/rails server).
     def resolved_command

data/lib/portless/state.rb

@@ -29,7 +29,6 @@ module Portless
     def proxy_log = path("proxy.log")
     def ca_cert = path("ca.pem")
     def ca_key = path("ca-key.pem")
-    def ca_serial = path("ca.srl")
     def ca_trusted_marker = path("ca.trusted")
     def host_certs_dir = path("host-certs")
 

data/lib/portless/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Portless
-  VERSION = "0.3.0"
+  VERSION = "0.3.1.dev.20260630.bb085fc"
 end

data/lib/rb-portless.rb

@@ -22,6 +22,7 @@ require_relative "portless/lan_ip"
 require_relative "portless/mdns"
 require_relative "portless/share/ngrok"
 require_relative "portless/share/tailscale"
+require_relative "portless/run_support"
 require_relative "portless/runner"
 require_relative "portless/multi"
 require_relative "portless/cli"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-portless
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1.dev.20260630.bb085fc
 platform: ruby
 authors:
 - David Afonso
@@ -74,6 +74,7 @@ files:
 - lib/portless/rails.rb
 - lib/portless/rails_hosts.rb
 - lib/portless/route_store.rb
+- lib/portless/run_support.rb
 - lib/portless/runner.rb
 - lib/portless/service.rb
 - lib/portless/share/ngrok.rb