yarrow 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b44d99f6d8696237f4e571ab6f6301fe337c93c6ff218e735acd1c0ed3fbe29
-  data.tar.gz: 12419fb4e83374e8ff79700fa8a6b14cfcf3ed5a44cd94adc91f8885a3e7f9fe
+  metadata.gz: ff50d9afd65a1ab1f8fd668c7db4acc0ceacabc095bccd65b384c2b47f8e7eb0
+  data.tar.gz: cb0f022b2163753231e701b98e1da2da2ee963b61cd635031f4128b7ce6034be
 SHA512:
-  metadata.gz: af1fdac9c1ac87957f098dd5fe1e3e22d7ac9b78756838226a596a8262bcd438c185cad81dfa3b5ae5f3f071d9c203afdea5e668a79d9b80096a140e310aef3b
-  data.tar.gz: e237d7964723ad433fab071ef36026979f5a5d2010fc11ce3b787566b8f4c12232b47c8b5dadb0043e93db1d5cd8679b99ec71db303269d244c1e8687b0204aa
+  metadata.gz: 93f4705d0556fee8b22ea19ca0a42a272a85ec52b7ced0ab408072147b27789173465c5ea0bcb4f95787da01499499f16d57971b325de5af3bb2d0a1b1f8ccf4
+  data.tar.gz: 59df4131a12acd9bd7ea051c1e308d17b99cd391e63e07b5582340f8bcd7e2be1216b98a32e2b4a86d8b88278dd11505d7d0b689997d249ca30057222ca4cc4e

data/lib/yarrow/config.rb

@@ -37,6 +37,7 @@ module Yarrow
       :port,
       :host,
       :handler,
+      :docroot,
       :middleware,
       :root_dir
     )

data/lib/yarrow/configuration.rb

@@ -69,5 +69,8 @@ module Yarrow
   ##
   # Raised when a required config section or property is missing.
   class ConfigurationError < StandardError
+    def self.missing_section(name)
+      new("Missing config section #{name.to_sym}")
+    end
   end
 end

data/lib/yarrow/console_runner.rb

@@ -31,27 +31,27 @@ module Yarrow
 
     def run_application
       print_header
-      
+
       begin
         process_arguments
-      
+
         if has_option?(:version)
           return SUCCESS
         end
-      
+
         if has_option?(:help)
           print_help
           return SUCCESS
         end
-        
+
         process_configuration
-        
+
         run_input_process
-        
+
         run_output_process
-        
+
         print_footer
-        
+
         SUCCESS
       rescue Exception => e
         print_error e
@@ -81,20 +81,20 @@ module Yarrow
 
     def process_configuration
       # load_configuration(Dir.pwd)
-      
+
       # @targets.each do |input_path|
       #   @config.deep_merge! load_configuration(input_path)
       # end
-      
+
       if has_option?(:config)
         path = @options[:config]
         @config.deep_merge! Configuration.load(path)
       end
-      
+
       @config.options = @options.to_hash
 
       # normalize_theme_path
-      
+
       # theme = @config.options.theme
       # @config.append load_configuration(theme)
     end
@@ -113,9 +113,9 @@ module Yarrow
       else
         value = true
       end
-      
+
       name = option.gsub("-", "")
-      
+
       if option[0..1] == "--"
         if ENABLED_OPTIONS.has_value?(name.to_sym)
           @options[name.to_sym] = value
@@ -127,7 +127,7 @@ module Yarrow
           return
         end
       end
-      
+
       raise "Unrecognized option: #{raw_option}"
     end
 
@@ -142,7 +142,7 @@ module Yarrow
     def run_input_process
       # noop
     end
-    
+
     def run_output_process
       # noop
     end
@@ -161,7 +161,7 @@ module Yarrow
 
     def print_help
       help = <<HELP
-  See http://yarrowdoc.org for more information.
+  See http://yarrow.maetl.net for more information.
 
   Usage:
 

data/lib/yarrow/defaults.yml

@@ -22,7 +22,7 @@ server:
   auto_index: true
   default_index: index.html
   default_type: text/plain
-  port: 4000
+  port: 5005
   host: localhost
   handler: webrick
   middleware:

data/lib/yarrow/server.rb

@@ -6,9 +6,13 @@ module Yarrow
   class Server
     attr_reader :config
 
+    def self.default
+      new(Yarrow::Configuration.load_defaults)
+    end
+
     def initialize(instance_config)
       if instance_config.server.nil?
-        raise ConfigurationError.new("Missing server entry")
+        raise ConfigurationError.missing_section(:server)
       end
 
       @config = instance_config
@@ -57,6 +61,7 @@ module Yarrow
       app.use(DirectoryIndex, root: docroot, index: default_index)
 
       app_args = [docroot, {}].tap { |args| args.push(default_type) if default_type }
+
       static_app = Rack::File.new(*app_args)
 
       if live_reload?
@@ -89,7 +94,7 @@ module Yarrow
 
       trap(:INT) do
         handler.shutdown if handler.respond_to?(:shutdown)
-        reactor.stop
+        reactor.stop if live_reload?
       end
 
       handler.run(app, run_options)
@@ -97,7 +102,10 @@ module Yarrow
 
     private
 
-    ##
+    # Host directory of the mounted web server.
+    #
+    # Fallback to `config.output_dir`.
+    #
     # @return [String]
     def docroot
       config.output_dir

data/lib/yarrow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Yarrow
   APP_NAME = 'Yarrow'
-  VERSION = '0.6.4'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yarrow
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Mark Rickerby
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mementus
@@ -243,7 +243,7 @@ homepage: http://rubygemspec.org/gems/yarrow
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Documentation generator based on a fluent data model.
 test_files: []