trmnl_preview 0.8.7 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16bcd0fdfc494a9984625f39fad67bdc5603d8506e4865a91038d4b582609aa
-  data.tar.gz: a756611a7c1b1a0e02fbeb183cb6d2f2a7bf02ecfdc37b03d3a415ad582f774a
+  metadata.gz: 04ad9007c6a3cc5b8d3c724ec349b204c977f861fc41cb637428fba48c715b89
+  data.tar.gz: ebc4873c90c6effcfc356ff13e38eb9b63d7547af14b85dc62eb84bb48145893
 SHA512:
-  metadata.gz: da3d1e0a4df32aa1c0c1a2dc6a6e189c0910f7f1199105502fa41fabce014818320136a63ec25541fb3133cd10e27e26bb3afbc43ec940d4a0aebb5bf8997689
-  data.tar.gz: f20e88c4acfe689d02a18daa36f696bd612682f7da1b2c5fe8b2fa85301f835870ec209b0457de5a9a61c9d053adf851911aac95576608f777b68b8fba1caff4
+  metadata.gz: c43c02691942bcea76563ce97d2b7e55f3327d207747a930374f750ad4edd257f8ed5b5edb94424ec008c3d0047735df33cb51399d44023a28522169613c6148
+  data.tar.gz: 125935ffec1af3606b4a1f6e0d7687137349f25f2da0da1f03e989ad598c25b34cf56f23964ab5d16f448632307b858744bd3d7547c5babda94bb8e1bb828ba7

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 
 # Changelog
 
+## 0.8.9
+
+- Fixed `trmnlp serve` binding to localhost under Podman, which left the dev server unreachable through published ports. Container detection only looked for `/.dockerenv`, which Docker writes but Podman does not, so `serve` fell back to `127.0.0.1`. It now also checks for `/run/.containerenv`, which Podman writes, so the automatic `0.0.0.0` bind works for both runtimes. (#112)
+
+## 0.8.8
+
+- Added a `--server` flag to `trmnlp login` so commands like `trmnlp push` can target a self-hosted (BYOS) server. The chosen URL is saved as `base_url`, and the `user_` API key prefix is only required for trmnl.com; BYOS servers accept their own token formats. A scheme-less `--server` value (such as `localhost:3000`) no longer crashes the host check. (#113)
+- `trmnlp list` now shows plugins with a nil `plugin_id`, which BYOS servers like LaraPaper return. (#113)
+
 ## 0.8.7
 
 - Fixed `.trmnlp.yml` `variables` overrides under the `trmnl` namespace being dropped. The assembler re-applied the pre-override namespace after the transform, clobbering user overrides like `trmnl.user.time_zone`. (#110)

data/README.md

@@ -206,7 +206,8 @@ docker run \
     --pull always \
     --publish 4567:4567 \
     --volume "$(pwd):/plugin" \
-    trmnl/trmnlp serve
+    trmnl/trmnlp serve \
+    --bind 0.0.0.0
 ```
 
 `--pull always` checks the registry on every run and pulls a newer image if one exists, so you don't have to remember to `docker pull` after each release.

data/lib/trmnlp/cli.rb

@@ -16,7 +16,11 @@ module TRMNLP
 
     def self.exit_on_failure? = true
 
-    def self.default_bind = File.exist?('/.dockerenv') ? '0.0.0.0' : '127.0.0.1'
+    # Docker writes /.dockerenv; Podman writes /run/.containerenv. Either means we're
+    # in a container, where binding to localhost makes the dev server unreachable via
+    # published ports, so we bind to all interfaces instead.
+    def self.in_container? = File.exist?('/.dockerenv') || File.exist?('/run/.containerenv')
+    def self.default_bind = in_container? ? '0.0.0.0' : '127.0.0.1'
 
     desc 'build', 'Generate static HTML files'
     method_option :png, type: :boolean, default: false, desc: 'Also render a PNG per view'
@@ -28,6 +32,7 @@ module TRMNLP
     end
 
     desc 'login', 'Authenticate with TRMNL server'
+    method_option :server, type: :string, aliases: '-s', desc: 'Server URL (default: https://trmnl.com)'
     def login
       Commands::Login.run(options)
     end

data/lib/trmnlp/commands/list.rb

@@ -16,7 +16,7 @@ module TRMNLP
         api = APIClient.new(config)
         response = api.get_plugin_settings
         plugins = (response || [])
-                  .select { |p| p['plugin_id'] == PRIVATE_PLUGIN_ID }
+                  .select { |p| p['plugin_id'].nil? || p['plugin_id'] == PRIVATE_PLUGIN_ID }
                   .sort_by { |p| (p['name'] || '').downcase }
 
         if plugins.empty?

data/lib/trmnlp/commands/login.rb

@@ -6,36 +6,46 @@ require_relative '../api_client'
 module TRMNLP
   module Commands
     class Login < Base
-      Options = Data.define(:dir, :quiet)
+      Options = Data.define(:dir, :quiet, :server)
 
       def call
-        if config.app.logged_in?
-          anonymous_key = config.app.api_key[0..10] + ('*' * (config.app.api_key.length - 11))
-          reporter.info "Currently authenticated as: #{anonymous_key}"
-          confirm = prompt('You are already authenticated. Do you want to re-authenticate? (y/N): ')
-          return unless confirm.strip.downcase == 'y'
-        end
+        config.app.base_url = options.server if options.server
+        return unless confirm_reauthentication?
 
         reporter.info "Please visit #{config.app.account_uri} to grab your API key, then paste it here."
 
         api_key = prompt('API Key: ')
         raise InvalidApiKey, 'API key cannot be empty' if api_key.empty?
-        unless api_key.start_with?('user_')
+
+        # Only trmnl.com issues user_-prefixed keys; BYOS servers use their own token formats (e.g. Sanctum).
+        if config.app.trmnl_host? && !api_key.start_with?('user_')
           raise InvalidApiKey,
                 'Invalid API key; did you copy it from the right place?'
         end
 
         config.app.api_key = api_key
+        save_credentials
+      end
+
+      private
 
+      def confirm_reauthentication?
+        return true unless config.app.logged_in?
+
+        anonymous_key = config.app.api_key[0..10] + ('*' * (config.app.api_key.length - 11))
+        reporter.info "Currently authenticated as: #{anonymous_key}"
+        confirm = prompt('You are already authenticated. Do you want to re-authenticate? (y/N): ')
+        confirm.strip.downcase == 'y'
+      end
+
+      def save_credentials
         api_client = APIClient.new(config)
-        begin
-          user_info = api_client.get_me
-          reporter.info "Authenticated as #{user_info['name']} (#{user_info['email']})"
-          config.app.save
-          reporter.info "Saved changes to #{paths.app_config}"
-        rescue StandardError => e
-          raise AuthenticationFailed, "Authentication failed; changes were not saved.\n#{e.message}"
-        end
+        user_info = api_client.get_me
+        reporter.info "Authenticated as #{user_info['name']} (#{user_info['email']})"
+        config.app.save
+        reporter.info "Saved changes to #{paths.app_config}"
+      rescue StandardError => e
+        raise AuthenticationFailed, "Authentication failed; changes were not saved.\n#{e.message}"
       end
     end
   end

data/lib/trmnlp/config/app.rb

@@ -30,8 +30,15 @@ module TRMNLP
         @config['api_key'] = key
       end
 
+      def base_url=(url)
+        @config['base_url'] = url
+      end
+
       def base_uri = URI.parse(@config['base_url'] || 'https://trmnl.com')
 
+      # Scheme-less base_urls (e.g. "localhost:3000") parse to a nil host, so guard before matching.
+      def trmnl_host? = !!base_uri.host&.end_with?('trmnl.com')
+
       def api_uri = URI.join(base_uri, '/api')
 
       def account_uri = URI.join(base_uri, '/account')

data/lib/trmnlp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TRMNLP
-  VERSION = '0.8.7'
+  VERSION = '0.8.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trmnl_preview
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.9
 platform: ruby
 authors:
 - Rockwell Schrock