docwatch-bin 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a594b9cebe2ecef012c75f8212c7259ad7d9aa274ae2c6322a6ced4299568e75
-  data.tar.gz: bae4db60bef675d53dc8984386a0b3cc93ea8d07174a30b105c03369a06ceb8d
+  metadata.gz: 3ddc0126c46e08dfd0af49f1028ee92a4bfef1b514d7a22f766d1fa7e03e7c60
+  data.tar.gz: 9fc3d2e2b6395170f909fef7feb6c18c7588d17a47f86b57d953810919855ec2
 SHA512:
-  metadata.gz: 035745675f3da094dac22de02d027f6e83e01fe2bd73155a919532cd8bfde423c5eee4fcb2ba4ba5a2066c3d2289851db41e2028a100cb89a6eaab50a2f9aba0
-  data.tar.gz: c2e1a169500cd6034373e6f37931388fbe76fc5aef5a5ccd14ff84b73d20f11a4d655e9a0eba1218124a14b7cc8f118a4228d8602a3a165f26858b6d623bc7c2
+  metadata.gz: 300eea8d4c9785b6f501b5f89cf1e0cde40a0a2e02da3f9b2634b779060f0b25d330e5c29975f48f303f090901451d9a76955a4c71e7978b0d8b89de89f7ef7c
+  data.tar.gz: 674e64b87624473666b6b900e473f2c0746f456dd5d3dc0e69e5e4346d9fa461f02580cccdc11e0b6d03184dc5fec1a4e661ad4306701e2f0a5a5f67192d70bb

data/bin/docwatch

@@ -7,6 +7,7 @@ Params = Struct.new(
     :version,
     :file_path,
     :default_styles,
+    :style,
     :output,
     keyword_init: true,
 )
@@ -26,6 +27,7 @@ class Main
             version: @opts['--version'],
             file_path: @opts['<file-path>'],
             default_styles: @opts['--default-styles'],
+            style: @opts['--style'],
             output: @opts['--output'],
         )
     end
@@ -70,7 +72,14 @@ class Main
         exit_version if params.version
         exit_invalid_file unless File.exist?(params.file_path)
 
-        renderer = Renderer.by_filetype(params.file_path, params.default_styles)
+        config = Docwatch::Config.new
+
+        if params.style && config.styles_path(profile: params.style).nil?
+            puts('Unknown or missing style profile: %s'.red % params.style)
+            exit 4
+        end
+
+        renderer = Renderer.by_filetype(params.file_path, params.default_styles, config, params.style)
         exit_unknown_renderer if renderer.nil?
 
         if params.output
@@ -122,6 +131,7 @@ usage = <<~EOF
         -o, --output FILE       Render once to file and exit
         -p, --port VALUE        Listen port [default: 8888]
                                 Set to 'random' for a random port
+        -s, --style NAME        Use named style profile
         -d, --default-styles    Use default styling
         --verbose               Be verbose
         -v, --version           Show version

data/lib/docwatch/config.rb

@@ -0,0 +1,52 @@
+module Docwatch
+    class Config
+        def initialize
+            @config_dir = ENV.fetch('XDG_CONFIG_HOME', File.expand_path('~/.config'))
+            @dir = File.join(@config_dir, 'org.crdx', 'docwatch')
+            @data = load
+        end
+
+        def styles_path(profile: nil)
+            name = profile || @data&.dig('profile')
+
+            if name
+                profile_path(name)
+            else
+                legacy_path
+            end
+        end
+
+        def profiles
+            @data&.dig('profiles') || {}
+        end
+
+        private
+
+        def profile_path(name)
+            file = profiles[name]
+            return nil unless file
+
+            path = File.join(@dir, file)
+            path if File.exist?(path)
+        end
+
+        def legacy_path
+            path = File.join(@dir, 'styles.css')
+            return path if File.exist?(path)
+
+            # Old location: $XDG_CONFIG_HOME/docwatch/styles.css
+            old = File.join(@config_dir, 'docwatch', 'styles.css')
+            old if File.exist?(old)
+        end
+
+        def load
+            path = File.join(@dir, 'config.toml')
+            return nil unless File.exist?(path)
+
+            TomlRB.parse(File.read(path))
+        rescue TomlRB::ParseError => e
+            $stderr.puts('Warning: failed to parse %s: %s' % [path, e.message])
+            nil
+        end
+    end
+end

data/lib/docwatch/renderer/markdown.rb

@@ -13,12 +13,12 @@ module Docwatch
 
         def css
             return default_css if @default_styles
+            return default_css unless @config
 
-            config_dir = ENV.fetch('XDG_CONFIG_HOME', File.expand_path('~/.config'))
-            styles_path = File.join(config_dir, 'docwatch', 'styles.css')
+            path = @config.styles_path(profile: @style)
 
-            if File.exist?(styles_path)
-                File.read(styles_path)
+            if path
+                File.read(path)
             else
                 default_css
             end

data/lib/docwatch/renderer.rb

@@ -7,16 +7,18 @@ module Docwatch
             (@@extensions[sym] ||= []) << self
         end
 
-        def self.by_filetype(file_path, default_styles)
+        def self.by_filetype(file_path, default_styles, config = nil, style = nil)
             extname = File.extname(file_path)[1..]
             return if extname.length == 0
 
-            @@extensions[extname.to_sym].first.new(file_path, default_styles)
+            @@extensions[extname.to_sym].first.new(file_path, default_styles, config, style)
         end
 
-        def initialize(file_path, default_styles)
+        def initialize(file_path, default_styles, config = nil, style = nil)
             @file_path = file_path
             @default_styles = default_styles
+            @config = config
+            @style = style
         end
 
         def js
@@ -24,18 +26,14 @@ module Docwatch
         end
 
         def to_html(static: false)
-            return <<~EOF
-                <!doctype html>
-                <html>
-                <head>
-                #{head}
-                </head>
-                <body>
-                #{body}
-                #{static ? '' : "<script>\n(function() {\n#{js}\n})()\n</script>"}
-                </body>
-                </html>
-            EOF
+            parts = ['<!doctype html>', '<html>', '<head>', head, '</head>', '<body>', body]
+
+            if !static
+                parts << "<script>\n(function() {\n#{js}\n})()\n</script>"
+            end
+
+            parts.push('</body>', '</html>')
+            parts.join("\n")
         end
 
         protected

data/lib/docwatch/version.rb

@@ -1,3 +1,3 @@
 module Docwatch
-    VERSION = '2.5.0'
+    VERSION = '2.7.0'
 end

data/lib/docwatch.rb

@@ -4,6 +4,7 @@ require 'redcarpet'
 require 'colorize'
 require 'nokogiri'
 require 'docopt'
+require 'toml-rb'
 
 require 'ostruct'
 require 'socket'
@@ -17,6 +18,7 @@ module Docwatch
     end
 end
 
+require_relative 'docwatch/config'
 require_relative 'docwatch/connection'
 require_relative 'docwatch/logger'
 require_relative 'docwatch/parser'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docwatch-bin
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.7.0
 platform: ruby
 authors:
 - crdx
@@ -93,6 +93,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: toml-rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +128,7 @@ extra_rdoc_files: []
 files:
 - bin/docwatch
 - lib/docwatch.rb
+- lib/docwatch/config.rb
 - lib/docwatch/connection.rb
 - lib/docwatch/logger.rb
 - lib/docwatch/parser.rb