rggen-core 0.22.0 → 0.25.1

data/lib/rggen/core/builder/list_feature_entry.rb

@@ -15,11 +15,11 @@ module RgGen
         attr_reader :registry
         attr_reader :name
 
-        def setup(base_feature, base_factory, context, body)
+        def setup(base_feature, base_factory, context, &body)
           @base_feature = Class.new(base_feature)
           @factory = Class.new(base_factory)
           context && attach_shared_context(context)
-          body && Docile.dsl_eval(self, @name, &body)
+          block_given? && Docile.dsl_eval(self, @name, &body)
         end
 
         def match_entry_type?(entry_type)
@@ -49,9 +49,8 @@ module RgGen
           @features[feature_name] ||= Class.new(@base_feature)
           feature = @features[feature_name]
           if context
-            feature.method_defined?(:shared_context) && (
-              raise BuilderError.new('shared context has already been set')
-            )
+            feature.method_defined?(:shared_context) &&
+              (raise BuilderError.new('shared context has already been set'))
             feature.attach_context(context)
           end
           body && feature.class_exec(feature_name, &body)
@@ -87,10 +86,7 @@ module RgGen
         end
 
         def target_features(enabled_features)
-          enabled_features
-            .select { |n| @features.key?(n) }
-            .map { |n| [n, @features[n]] }
-            .to_h
+          @features.slice(*enabled_features)
         end
       end
     end

data/lib/rggen/core/builder/loader_registry.rb

@@ -19,8 +19,7 @@ module RgGen
         end
 
         def define_value_extractor(layers, value, &body)
-          @extractors <<
-            create_extractor(layers, value, &body)
+          @extractors << create_extractor(layers, value, &body)
         end
 
         def ignore_value(layers, value)

data/lib/rggen/core/builder/plugin_manager.rb

@@ -3,46 +3,22 @@
 module RgGen
   module Core
     module Builder
-      class Plugin
-        DEFAULT_PLUGIN_VERSION = '0.0.0'
-
+      class PluginRegistry
         def initialize(plugin_module, &block)
           @plugin_module = plugin_module
           @block = block
-          plugin_name # check if plugin name is given
         end
 
         def default_setup(builder)
-          @plugin_module.respond_to?(:default_setup) &&
-            @plugin_module.default_setup(builder)
+          @plugin_module.plugin_spec.activate(builder)
         end
 
         def optional_setup(builder)
           @block && @plugin_module.instance_exec(builder, &@block)
         end
 
-        def plugin_name
-          if @plugin_module.const_defined?(:PLUGIN_NAME)
-            @plugin_module.const_get(:PLUGIN_NAME)
-          elsif @plugin_module.respond_to?(:plugin_name)
-            @plugin_module.plugin_name
-          else
-            raise Core::PluginError.new('no plugin name is given')
-          end
-        end
-
-        def version
-          if @plugin_module.const_defined?(:VERSION)
-            @plugin_module.const_get(:VERSION)
-          elsif @plugin_module.respond_to?(:version)
-            @plugin_module.version
-          else
-            DEFAULT_PLUGIN_VERSION
-          end
-        end
-
         def version_info
-          "#{plugin_name} #{version}"
+          @plugin_module.plugin_spec.version_info
         end
       end
 
@@ -54,24 +30,25 @@ module RgGen
 
         def load_plugin(setup_path_or_name)
           setup_path_or_name = setup_path_or_name.to_s.strip
-          setup_path =
+          setup_path, root_dir =
             if setup_file_directly_given?(setup_path_or_name)
-              setup_path_or_name
+              [setup_path_or_name, extract_root_dir(setup_path_or_name)]
             else
-              get_setup_path(setup_path_or_name)
+              [get_setup_path(setup_path_or_name), nil]
             end
-          read_setup_file(setup_path, setup_path_or_name)
+          read_setup_file(setup_path, setup_path_or_name, root_dir)
         end
 
         def load_plugins(plugins, no_default_plugins, activation = true)
           RgGen.builder(@builder)
-          merge_plugins(plugins, no_default_plugins)
-            .each { |plugin| load_plugin(*plugin) }
+          merge_plugins(plugins, no_default_plugins).each(&method(:load_plugin))
           activation && activate_plugins
         end
 
-        def setup(plugin_module, &block)
-          @plugins << Plugin.new(plugin_module, &block)
+        def register_plugin(plugin_module, &block)
+          plugin?(plugin_module) ||
+            (raise Core::PluginError.new('no plugin spec is given'))
+          @plugins << PluginRegistry.new(plugin_module, &block)
         end
 
         def activate_plugins(**options)
@@ -92,21 +69,35 @@ module RgGen
             File.basename(setup_path_or_name, '.*') == 'setup'
         end
 
+        def extract_root_dir(setup_path)
+          Pathname
+            .new(setup_path)
+            .ascend.find(&method(:rggen_dir?))
+            &.parent
+            &.to_s
+        end
+
+        def rggen_dir?(path)
+          path.each_filename.to_a[-2..-1] == ['lib', 'rggen']
+        end
+
         def get_setup_path(name)
           base, sub_directory = name.split('/', 2)
           base = base.sub(/^rggen[-_]/, '').tr('-', '_')
-          File.join(*[
-            'rggen', base, sub_directory || '', 'setup'
-          ].reject(&:empty?))
+          File.join(*['rggen', base, sub_directory, 'setup'].compact)
         end
 
-        def read_setup_file(setup_path, setup_path_or_name)
+        def read_setup_file(setup_path, setup_path_or_name, root_dir)
+          root_dir && $LOAD_PATH.unshift(root_dir)
           require setup_path
         rescue ::LoadError
-          raise Core::PluginError.new([
-            "cannot load such plugin: #{setup_path_or_name}",
-            setup_path_or_name != setup_path && " (#{setup_path})" || ''
-          ].join)
+          message =
+            if setup_path_or_name == setup_path
+              "cannot load such plugin: #{setup_path_or_name}"
+            else
+              "cannot load such plugin: #{setup_path_or_name} (#{setup_path})"
+            end
+          raise Core::PluginError.new(message)
         end
 
         def merge_plugins(plugins, no_default_plugins)
@@ -134,6 +125,10 @@ module RgGen
           ENV['RGGEN_PLUGINS']
             &.split(':')&.map(&:strip)&.reject(&:empty?)
         end
+
+        def plugin?(plugin_module)
+          plugin_module.respond_to?(:plugin_spec) && plugin_module.plugin_spec
+        end
       end
     end
   end

data/lib/rggen/core/builder/plugin_spec.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module RgGen
+  module Core
+    module Builder
+      class PluginSpec
+        def initialize(name, plugin_module)
+          @name = name
+          @plugin_module = plugin_module
+          @component_registrations = []
+          @loader_registrations = []
+          @files = []
+        end
+
+        def version(value = nil)
+          @version = value if value
+          version_value
+        end
+
+        def version_info
+          "#{@name} #{version}"
+        end
+
+        def register_component(component, layers = nil, &body)
+          @component_registrations << [component, layers, body]
+        end
+
+        def register_loader(component, loader_type, loader)
+          @loader_registrations << [component, loader_type, loader]
+        end
+
+        def register_loaders(component, loader_type, loaders)
+          Array(loaders)
+            .each { |loader| register_loader(component, loader_type, loader) }
+        end
+
+        def register_files(files)
+          root = File.dirname(caller_locations(1, 1).first.path)
+          files.each { |file| @files << File.join(root, file) }
+        end
+
+        alias_method :files, :register_files
+
+        def activate(builder)
+          activate_components(builder)
+          activate_loaders(builder)
+          load_files
+        end
+
+        private
+
+        DEFAULT_VERSION = '0.0.0'
+
+        def version_value
+          @version || const_version || DEFAULT_VERSION
+        end
+
+        def const_version
+          @plugin_module.const_defined?(:VERSION) &&
+            @plugin_module.const_get(:VERSION)
+        end
+
+        def activate_components(builder)
+          @component_registrations.each do |component, layers, body|
+            builder
+              .output_component_registry(component)
+              .register_component(layers, &body)
+          end
+        end
+
+        def activate_loaders(builder)
+          @loader_registrations.each do |component, loader_type, loader|
+            builder.register_loader(component, loader_type, loader)
+          end
+        end
+
+        def load_files
+          @files.each(&method(:require))
+        end
+      end
+    end
+  end
+end

data/lib/rggen/core/builder/simple_feature_entry.rb

@@ -12,8 +12,8 @@ module RgGen
         attr_reader :registry
         attr_reader :name
 
-        def setup(base_feature, factory, context, body)
-          @feature = define_feature(base_feature, context, body)
+        def setup(base_feature, factory, context, &body)
+          @feature = define_feature(base_feature, context, &body)
           @factory = factory
         end
 
@@ -27,10 +27,10 @@ module RgGen
 
         private
 
-        def define_feature(base, context, body)
+        def define_feature(base, context, &body)
           feature = Class.new(base)
           context && feature.attach_context(context)
-          body && feature.class_exec(@name, &body)
+          block_given? && feature.class_exec(@name, &body)
           feature
         end
       end

data/lib/rggen/core/configuration.rb

@@ -5,14 +5,15 @@ module RgGen
     module Configuration
       def self.setup(builder)
         builder.input_component_registry(:configuration) do
-          register_component do
+          register_global_component do
             component Component, ComponentFactory
             feature Feature, FeatureFactory
           end
 
           register_loader :ruby, RubyLoader
-          register_loader :yaml, YAMLLoader
           register_loader :json, JSONLoader
+          register_loader :toml, TOMLLoader
+          register_loader :yaml, YAMLLoader
         end
       end
     end

data/lib/rggen/core/configuration/toml_loader.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RgGen
+  module Core
+    module Configuration
+      class TOMLLoader < Loader
+        include HashLoader
+        include InputBase::TOMLLoader
+
+        support_types [:toml]
+
+        def read_file(file)
+          load_toml(file)
+        end
+      end
+    end
+  end
+end

data/lib/rggen/core/core_extensions/object.rb

@@ -2,10 +2,10 @@
 
 class Object
   def export_instance_variable(variable, to)
-    return unless instance_variable_defined?(variable)
-    v = instance_variable_get(variable)
-    v = yield(v) if block_given?
-    to.instance_variable_set(variable, v)
+    instance_variable_defined?(variable) &&
+      instance_variable_get(variable)
+        .yield_self { |v| block_given? ? yield(v) : v }
+        .yield_self { |v| to.instance_variable_set(variable, v) }
   end
 
   def singleton_exec(*args, &block)

data/lib/rggen/core/dsl.rb

@@ -20,7 +20,7 @@ module RgGen
         :disable_all,
         :disable,
         :delete,
-        :setup,
+        :register_plugin,
         :load_plugin
       ].each do |method_name|
         def_delegator :'RgGen.builder', method_name

data/lib/rggen/core/exceptions.rb

@@ -3,17 +3,19 @@
 module RgGen
   module Core
     class RgGenError < StandardError
-      def initialize(message, additional_info = nil)
+      def initialize(message, location_info = nil, verbose_info = nil)
         super(message)
         @error_message = message
-        @additional_info = additional_info
+        @location_info = location_info
+        @verbose_info = verbose_info
       end
 
       attr_reader :error_message
-      attr_reader :additional_info
+      attr_reader :location_info
+      attr_reader :verbose_info
 
       def to_s
-        additional_info ? "#{super} -- #{additional_info}" : super
+        location_info && "#{super} -- #{location_info}" || super
       end
     end
 

data/lib/rggen/core/facets.rb

@@ -2,7 +2,7 @@
 
 require 'facets/array/merge'
 require 'facets/file/ext'
-require 'facets/hash/at'
+require 'facets/hash/except' if RUBY_VERSION < '3.0.0'
 require 'facets/pathname/to_path'
 require 'facets/module/attr_setter'
 require 'facets/module/lastname'

data/lib/rggen/core/input_base/component.rb

@@ -9,10 +9,22 @@ module RgGen
           define_proxy_calls(feature, feature.properties)
         end
 
+        def document_only
+          @document_only = true
+        end
+
+        def document_only?
+          instance_variable_defined?(:@document_only) && @document_only
+        end
+
         def properties
           features.flat_map(&:properties)
         end
 
+        def post_build
+          features.each(&:post_build)
+        end
+
         def verify(scope)
           features.each { |feature| feature.verify(scope) }
           children.each { |child| child.verify(scope) } if scope == :all

data/lib/rggen/core/input_base/component_factory.rb

@@ -79,6 +79,7 @@ module RgGen
         def post_build(component)
           exist_no_children?(component) &&
             raise_no_children_error(component)
+          component.post_build
           component.verify(:component)
         end
 

data/lib/rggen/core/input_base/feature.rb

@@ -34,6 +34,13 @@ module RgGen
 
           attr_reader :builders
 
+          def post_build(&block)
+            @post_builders ||= []
+            @post_builders << block
+          end
+
+          attr_reader :post_builders
+
           def active_feature?
             !passive_feature?
           end
@@ -68,6 +75,7 @@ module RgGen
             export_instance_variable(:@properties, subclass, &:dup)
             export_instance_variable(:@ignore_empty_value, subclass)
             export_instance_variable(:@builders, subclass, &:dup)
+            export_instance_variable(:@post_builders, subclass, &:dup)
             export_instance_variable(:@input_matcher, subclass)
             export_instance_variable(:@printables, subclass, &:dup)
             export_verifiers(subclass) if @verifiers
@@ -95,6 +103,12 @@ module RgGen
           self.class.builders && do_build(args)
         end
 
+        def post_build
+          self.class.post_builders&.each do |post_builder|
+            instance_exec(&post_builder)
+          end
+        end
+
         def verify(scope)
           verified?(scope) || do_verify(scope)
         end
@@ -102,7 +116,7 @@ module RgGen
         def printables
           helper
             .printables
-            &.map { |name, body| [name, printable(name, body)] }
+            &.map { |name, body| [name, printable(name, &body)] }
         end
 
         def printable?
@@ -119,10 +133,10 @@ module RgGen
 
         def do_build(args)
           @position = args.last.position
-          args = [*args[0..-2], args.last.value]
-          match_automatically? && match_pattern(args.last)
+          value = args.last.value
+          match_automatically? && match_pattern(value)
           Array(self.class.builders)
-            .each { |builder| instance_exec(*args, &builder) }
+            .each { |builder| instance_exec(*args[0..-2], value, &builder) }
         end
 
         attr_reader :position
@@ -149,13 +163,13 @@ module RgGen
         end
 
         def do_verify(scope)
-          Array(self.class.verifiers&.at(scope))
-            .each { |verifier| verifier.verify(self) }
+          self.class.verifiers&.[](scope)
+            &.each { |verifier| verifier.verify(self) }
           (@verified ||= {})[scope] = true
         end
 
-        def printable(name, body)
-          body ? instance_exec(&body) : __send__(name)
+        def printable(name, &body)
+          block_given? ? instance_exec(&body) : __send__(name)
         end
       end
     end