rggen-core 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0969d51d5ab39e5bf98ff6d7cb44ae8b9b4a7a9efea6d2c0eb47a8cd9685b4c2'
-  data.tar.gz: f5e71796fd8de70124491d20b3501680968edf8f12c15f3fc6e729791f7bdfd0
+  metadata.gz: dcbb14dd216582b7b503d8375561dba39eefd175b5b4805a413cd300de7a567a
+  data.tar.gz: ad41cb0b010b50ea9b92589ee5c83b90a797b9c6757f612b789ac64924ecc1ab
 SHA512:
-  metadata.gz: 9c27bfff2f272e80ca16331a3071560962e80051e0c4e566ae277bff99a5097cd32ccc87519f4c37a466bacd826da60c882b3e032492439d7c282437fc4d4aeb
-  data.tar.gz: b8b2365ac6de6ec997dbb3054d91a46e5c761218460ec416dcaf126e35549f38643f94d446c3b865bdc9e0346a4d7e7ead38e0665e9b09510ef7d6083013cbd5
+  metadata.gz: f349b6601893afd5d7ca66e841cb0c0476d8ce29ac53a30a1cc47e1d65fc532ed64b9da36d2790542e064a9d93c8a69b9113529f1aaa1414d09c63655c8719f4
+  data.tar.gz: a4815c7d1b0c1123a9c6438bb110ed760d2f054728b5e81b24eedf2d6f1e948e1ee5b05810b6506833343a6686bd13508abbf79129c69329b3ae7916a602e09a

data/README.md

@@ -2,7 +2,6 @@
 [![CI](https://github.com/rggen/rggen-core/workflows/CI/badge.svg)](https://github.com/rggen/rggen-core/actions?query=workflow%3ACI)
 [![Maintainability](https://api.codeclimate.com/v1/badges/53c8e6654c2b5ecb9142/maintainability)](https://codeclimate.com/github/rggen/rggen-core/maintainability)
 [![codecov](https://codecov.io/gh/rggen/rggen-core/branch/master/graph/badge.svg)](https://codecov.io/gh/rggen/rggen-core)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=rggen_rggen-core&metric=alert_status)](https://sonarcloud.io/dashboard?id=rggen_rggen-core)
 [![Gitter](https://badges.gitter.im/rggen/rggen.svg)](https://gitter.im/rggen/rggen?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 # RgGen::Core

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

@@ -50,7 +50,11 @@ module RgGen
           :define_feature,
           :define_simple_feature,
           :define_list_feature,
-          :define_list_item_feature
+          :define_list_item_feature,
+          :modify_feature,
+          :modify_simple_feature,
+          :modify_list_feature,
+          :modify_list_item_feature
         ].each do |method_name|
           define_method(method_name) do |layer, *args, &body|
             @layers[layer].__send__(__method__, *args, &body)

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

@@ -39,10 +39,11 @@ module RgGen
         end
 
         def build_factories
-          factories =
-            @entries
-              .map(&:build_factory)
-              .to_h { |f| [f.layer, f] }
+          factories = @entries.to_h do |entry|
+            entry
+              .build_factory
+              .then { |f| [f.layer, f] }
+          end
           factories.each_value { |f| f.component_factories factories }
           factories.values
         end

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

@@ -12,6 +12,10 @@ module RgGen
         attr_reader :registry
         attr_reader :name
 
+        def modify(&body)
+          eval_body(&body)
+        end
+
         def match_entry_type?(entry_type)
           entry_type == entry_type_name
         end
@@ -31,6 +35,10 @@ module RgGen
           end
         end
 
+        def eval_body(&body)
+          block_given? && Docile.dsl_eval(self, @name, &body)
+        end
+
         def target_features(_tergets)
         end
 

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

@@ -24,10 +24,23 @@ module RgGen
         end
 
         def define_list_item_feature(list_name, feature_name, context = nil, &body)
-          entry = @feature_entries[list_name]
-          entry&.match_entry_type?(:list) ||
-            (raise BuilderError.new("unknown list feature: #{list_name}"))
-          entry.define_feature(feature_name, context, &body)
+          list_item_entry(list_name).define_feature(feature_name, context, &body)
+        end
+
+        def modify_feature(name, &body)
+          modify_entry(:general, name, &body)
+        end
+
+        def modify_simple_feature(name, &body)
+          modify_entry(:simple, name, &body)
+        end
+
+        def modify_list_feature(list_name, &body)
+          modify_entry(:list, list_name, &body)
+        end
+
+        def modify_list_item_feature(list_name, feature_name, &body)
+          list_item_entry(list_name).modify_feature(feature_name, &body)
         end
 
         def enable(list_name = nil, feature_names)
@@ -95,6 +108,20 @@ module RgGen
           @feature_entries[name] = entry
         end
 
+        def modify_entry(type, name, &body)
+          entry = @feature_entries[name]
+          entry&.match_entry_type?(type) ||
+            (raise BuilderError.new("unknown feature: #{name}"))
+          entry.modify(&body)
+        end
+
+        def list_item_entry(list_name)
+          entry = @feature_entries[list_name]
+          entry&.match_entry_type?(:list) ||
+            (raise BuilderError.new("unknown feature: #{list_name}"))
+          entry
+        end
+
         def enabled_list_features(list_name)
           return [] unless enabled_list?(list_name)
           features = @feature_entries[list_name].features

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

@@ -10,7 +10,7 @@ module RgGen
           @feature = Class.new(base_feature)
           @factory = Class.new(base_factory)
           attach_shared_context(context, @feature, @factory, self)
-          block_given? && Docile.dsl_eval(self, @name, &body)
+          eval_body(&body)
         end
 
         def define_factory(&body)

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

@@ -5,30 +5,27 @@ module RgGen
     module Builder
       class Layer
         class Proxy
-          def initialize
-            block_given? && yield(self)
+          def initialize(list_name, feature_name)
+            @list_name = list_name
+            @feature_name = feature_name
           end
 
-          attr_setter :body
-          attr_setter :method_name
-          attr_setter :list_name
-          attr_setter :feature_name
+          attr_reader :list_name
+          attr_reader :feature_name
 
           def register_execution(registry, &body)
             @executions ||= []
             @executions << { registry: registry, body: body }
           end
 
-          def execute(layer)
+          def execute(layer, method_name, &body)
             Docile.dsl_eval(layer, &body)
-            @executions&.each { |execution| call_execution(layer, execution) }
-          end
-
-          private
+            return unless @executions
 
-          def call_execution(layer, execution)
             args = [list_name, feature_name, layer.shared_context].compact
-            execution[:registry].__send__(method_name, *args, &execution[:body])
+            @executions.each do |execution|
+              execution[:registry].__send__(method_name, *args, &execution[:body])
+            end
           end
         end
 
@@ -53,44 +50,55 @@ module RgGen
           current_shared_context(false)
         end
 
+        def component_defined?(component_name)
+          @feature_registries.key?(component_name)
+        end
+
         def define_feature(feature_names, &body)
           Array(feature_names).each do |feature_name|
-            do_proxy_call do |proxy|
-              proxy.body(body)
-              proxy.method_name(__method__)
-              proxy.feature_name(feature_name)
-            end
+            do_proxy_call(__method__, nil, feature_name, &body)
+          end
+        end
+
+        def modify_feature(feature_names, &body)
+          Array(feature_names).each do |feature_name|
+            do_proxy_call(__method__, nil, feature_name, &body)
           end
         end
 
         def define_simple_feature(feature_names, &body)
           Array(feature_names).each do |feature_name|
-            do_proxy_call do |proxy|
-              proxy.body(body)
-              proxy.method_name(__method__)
-              proxy.feature_name(feature_name)
-            end
+            do_proxy_call(__method__, nil, feature_name, &body)
+          end
+        end
+
+        def modify_simple_feature(feature_names, &body)
+          Array(feature_names).each do |feature_name|
+            do_proxy_call(__method__, nil, feature_name, &body)
           end
         end
 
         def define_list_feature(list_names, &body)
           Array(list_names).each do |list_name|
-            do_proxy_call do |proxy|
-              proxy.body(body)
-              proxy.method_name(__method__)
-              proxy.list_name(list_name)
-            end
+            do_proxy_call(__method__, list_name, nil, &body)
+          end
+        end
+
+        def modify_list_feature(list_names, &body)
+          Array(list_names).each do |list_name|
+            do_proxy_call(__method__, list_name, nil, &body)
           end
         end
 
         def define_list_item_feature(list_name, feature_names, &body)
           Array(feature_names).each do |feature_name|
-            do_proxy_call do |proxy|
-              proxy.body(body)
-              proxy.method_name(__method__)
-              proxy.list_name(list_name)
-              proxy.feature_name(feature_name)
-            end
+            do_proxy_call(__method__, list_name, feature_name, &body)
+          end
+        end
+
+        def modify_list_item_feature(list_name, feature_names, &body)
+          Array(feature_names).each do |feature_name|
+            do_proxy_call(__method__, list_name, feature_name, &body)
           end
         end
 
@@ -122,9 +130,9 @@ module RgGen
           end
         end
 
-        def do_proxy_call(&block)
-          @proxy = Proxy.new(&block)
-          @proxy.execute(self)
+        def do_proxy_call(method_name, list_name, feature_name, &body)
+          @proxy = Proxy.new(list_name, feature_name)
+          @proxy.execute(self, method_name, &body)
           remove_instance_variable(:@proxy)
         end
 

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

@@ -15,7 +15,7 @@ module RgGen
           @base_feature = Class.new(base_feature)
           @factory = Class.new(base_factory)
           attach_shared_context(context, @base_feature, @factory, self)
-          block_given? && Docile.dsl_eval(self, @name, &body)
+          eval_body(&body)
         end
 
         def define_factory(&body)
@@ -31,8 +31,7 @@ module RgGen
         alias_method :base_feature, :define_base_feature
 
         def define_feature(feature_name, context = nil, &body)
-          @features[feature_name] ||= Class.new(@base_feature)
-          feature = @features[feature_name]
+          feature = @features[feature_name] = Class.new(@base_feature)
           if context
             feature.method_defined?(:shared_context) &&
               (raise BuilderError.new('shared context has already been set'))
@@ -43,6 +42,12 @@ module RgGen
 
         alias_method :feature, :define_feature
 
+        def modify_feature(feature_name, &body)
+          @features.key?(feature_name) ||
+            (raise BuilderError.new("unknown feature: #{feature_name}"))
+          body && @features[feature_name].class_exec(feature_name, &body)
+        end
+
         def define_default_feature(&body)
           @default_feature ||= Class.new(@base_feature)
           body && @default_feature.class_exec(&body)

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

@@ -18,8 +18,8 @@ module RgGen
 
         def parse(path_or_name, version)
           @name, @path, @gemname, @version =
-            if plugin_path?(path_or_name)
-              [nil, path_or_name, *find_gemspec_by_path(path_or_name)]
+            if path_or_name == DEFAULT_PLUGSINS || plugin_path?(path_or_name)
+              [nil, path_or_name]
             else
               [
                 path_or_name, get_plugin_path(path_or_name),
@@ -41,17 +41,7 @@ module RgGen
         private
 
         def plugin_path?(path_or_name)
-          path_or_name == DEFAULT_PLUGSINS || File.ext(path_or_name) == 'rb'
-        end
-
-        def find_gemspec_by_path(path)
-          Gem::Specification
-            .each.find { |spec| match_gemspec_path?(spec, path) }
-            .then { |spec| spec && [spec.name, spec.version] }
-        end
-
-        def match_gemspec_path?(gemspec, path)
-          gemspec.full_require_paths.any?(&path.method(:start_with?))
+          File.ext(path_or_name) == 'rb'
         end
 
         def get_plugin_path(name)
@@ -93,9 +83,11 @@ module RgGen
         end
 
         def activate_plugin_by_name(plugin_name)
-          target_plugin = @plugins.find { |plugin| plugin.name == plugin_name }
-          target_plugin&.activate(@builder)
-          target_plugin&.activate_additionally(@builder)
+          @plugins.find { |plugin| plugin.name == plugin_name }
+            &.then do |plugin|
+              plugin.activate(@builder)
+              plugin.activate_additionally(@builder)
+            end
         end
 
         def version_info
@@ -105,12 +97,46 @@ module RgGen
         private
 
         def read_plugin_file(info)
-          info.gemname && gem(info.gemname, info.version)
+          activate_plugin_gem(info)
           require info.path
         rescue ::LoadError
           raise Core::PluginError.new("cannot load such plugin: #{info}")
         end
 
+        def activate_plugin_gem(info)
+          if (gemspec = find_gemspec(info))
+            gem gemspec.name, gemspec.version
+          elsif info.gemname
+            gem info.gemname, info.version
+          end
+        end
+
+        def find_gemspec(info)
+          if info.path == DEFAULT_PLUGSINS
+            find_default_plugins_gemspec
+          elsif info.gemname
+            find_gemspec_by_name(info.gemname, info.version)
+          else
+            find_gemspec_by_path(info.path)
+          end
+        end
+
+        def find_default_plugins_gemspec
+          find_gemspec_by_name('rggen', "~> #{MAJOR}.#{MINOR}.0")
+        end
+
+        def find_gemspec_by_name(name, version)
+          Gem::Specification
+            .find_all_by_name(name, version)
+            .find { |s| !s.has_conflicts? }
+        end
+
+        def find_gemspec_by_path(path)
+          Gem::Specification
+            .each
+            .find { |spec| spec.full_require_paths.any?(&path.method(:start_with?)) }
+        end
+
         def merge_plugins(plugins, no_default_plugins)
           [
             *default_plugins(no_default_plugins),
@@ -126,8 +152,7 @@ module RgGen
         def load_default_plugins?(no_default_plugins)
           return false if no_default_plugins
           return false if ENV.key?('RGGEN_NO_DEFAULT_PLUGINS')
-          return false if Gem.find_files(DEFAULT_PLUGSINS).empty?
-          true
+          !find_default_plugins_gemspec.nil?
         end
 
         def plugins_from_env

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

@@ -5,7 +5,7 @@ module RgGen
     module Builder
       class SimpleFeatureEntry < FeatureEntryBase
         def setup(base_feature, factory, context, &body)
-          @feature = define_feature(base_feature, context, &body)
+          define_feature(base_feature, context, &body)
           @factory = factory
         end
 
@@ -16,15 +16,18 @@ module RgGen
         end
 
         def define_feature(base, context, &body)
-          feature = Class.new(base)
-          attach_shared_context(context, feature)
-          block_given? && feature.class_exec(@name, &body)
-          feature
+          @feature = Class.new(base)
+          attach_shared_context(context, @feature)
+          eval_body(&body)
         end
 
         def target_feature
           @feature
         end
+
+        def eval_body(&body)
+          block_given? && @feature.class_exec(@name, &body)
+        end
       end
     end
   end

data/lib/rggen/core/dsl.rb

@@ -18,6 +18,10 @@ module RgGen
         :define_simple_feature,
         :define_list_feature,
         :define_list_item_feature,
+        :modify_feature,
+        :modify_simple_feature,
+        :modify_list_feature,
+        :modify_list_item_feature,
         :define_value_extractor,
         :enable,
         :enable_all,

data/lib/rggen/core/facets.rb

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

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

@@ -9,8 +9,8 @@ module RgGen
         include ConversionUtility
 
         class << self
-          def property(name, **options, &body)
-            Property.define(self, name, **options, &body)
+          def property(name, ...)
+            Property.define(self, name, ...)
             properties.include?(name) || properties << name
           end
 
@@ -49,8 +49,8 @@ module RgGen
             builders.nil?
           end
 
-          def input_pattern(pattern_or_patterns, **options, &converter)
-            @input_matcher = InputMatcher.new(pattern_or_patterns, **options, &converter)
+          def input_pattern(pattern_or_patterns, ...)
+            @input_matcher = InputMatcher.new(pattern_or_patterns, ...)
           end
 
           attr_reader :input_matcher

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

@@ -87,8 +87,8 @@ module RgGen
           caller_location.path.include?('docile')
         end
 
-        def create_child_data(layer, *args, &block)
-          child_data_class.new(layer, @valid_value_lists, *args, &block)
+        def create_child_data(layer, ...)
+          child_data_class.new(layer, @valid_value_lists, ...)
         end
 
         def child_data_class

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

@@ -52,7 +52,7 @@ module RgGen
             /(?<=[[:punct:]&&[^_]])[[:blank:]]+(?=\w)/
           ).freeze
 
-        COMPRESS_BLANK_PATTERN = /[[:blank:]]+/.freeze
+        COMPRESS_BLANK_PATTERN = /[[:blank:]]+/
 
         def delete_blanks(rhs)
           rhs

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

@@ -23,16 +23,16 @@ module RgGen
 
         def define(feature)
           feature.class_exec(self) do |property|
-            define_method(property.name) do |*args, **keywords, &block|
-              property.evaluate(self, *args, **keywords, &block)
+            define_method(property.name) do |*args, **kwargs, &block|
+              property.evaluate(self, *args, **kwargs, &block)
             end
           end
         end
 
-        def evaluate(feature, *args, **keywords, &block)
+        def evaluate(feature, ...)
           feature.verify(@options[:verify]) if @options.key?(:verify)
           if proxy_property?
-            proxy_property(feature, *args, **keywords, &block)
+            proxy_property(feature, ...)
           else
             default_property(feature)
           end
@@ -55,7 +55,7 @@ module RgGen
           ].any?
         end
 
-        def proxy_property(feature, *args, **keywords, &block)
+        def proxy_property(feature, ...)
           receiver, method =
             if @costom_property
               [@costom_property.bind(feature), :call]
@@ -64,7 +64,7 @@ module RgGen
             else
               [feature, @options[:forward_to]]
             end
-          receiver.__send__(method, *args, **keywords, &block)
+          receiver.__send__(method, ...)
         end
 
         def default_property(feature)

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

@@ -49,10 +49,8 @@ module RgGen
         end
 
         class Visitor < ::Psych::Visitors::ToRuby
-          if ::Psych::VERSION >= '3.2.0'
-            def initialize(scalar_scanner, class_loader)
-              super(scalar_scanner, class_loader, symbolize_names: true)
-            end
+          def initialize(scalar_scanner, class_loader)
+            super(scalar_scanner, class_loader, symbolize_names: true)
           end
 
           def accept(node)
@@ -79,7 +77,6 @@ module RgGen
         def load_yaml(file)
           parse_yaml(File.binread(file), file)
             .then { |result| to_ruby(result) }
-            .then { |result| symbolize_names(result) }
         end
 
         def parse_yaml(yaml, file)
@@ -93,20 +90,6 @@ module RgGen
           ss = ::Psych::ScalarScanner.new(cl)
           Visitor.new(ss, cl).accept(result)
         end
-
-        def symbolize_names(result)
-          return result if ::Psych::VERSION >= '3.2.0'
-
-          if result.match_class?(Hash)
-            result
-              .transform_keys!(&:to_sym)
-              .transform_values!(&method(:symbolize_names))
-          elsif result.match_class?(Array)
-            result.map! { |value| symbolize_names(value) }
-          end
-
-          result
-        end
       end
     end
   end

data/lib/rggen/core/utility/regexp_patterns.rb

@@ -12,17 +12,17 @@ module RgGen
 
         private
 
-        VARIABLE_NAME_PATTERN = /[a-z_]\w*/i.freeze
+        VARIABLE_NAME_PATTERN = /[a-z_]\w*/i
 
         def variable_name
           VARIABLE_NAME_PATTERN
         end
 
-        BINARY_PATTERN = /[+-]?0b[01](?:_?[01])*/i.freeze
+        BINARY_PATTERN = /[+-]?0b[01](?:_?[01])*/i
 
-        DECIMAL_PATTERN = /[+-]?(?:[1-9]_?(?:\d_?)*)?\d/.freeze
+        DECIMAL_PATTERN = /[+-]?(?:[1-9]_?(?:\d_?)*)?\d/
 
-        HEXADECIMAL_PATTERN = /[+-]?0x\h(?:_?\h)*/i.freeze
+        HEXADECIMAL_PATTERN = /[+-]?0x\h(?:_?\h)*/i
 
         INTEGER_PATTERN =
           Regexp.union(
@@ -33,13 +33,13 @@ module RgGen
           INTEGER_PATTERN
         end
 
-        TRUTHY_PATTERN = /true|on|yes/i.freeze
+        TRUTHY_PATTERN = /true|on|yes/i
 
         def truthy_pattern
           TRUTHY_PATTERN
         end
 
-        FALSEY_PATTERN = /false|off|no/i.freeze
+        FALSEY_PATTERN = /false|off|no/i
 
         def falsey_pattern
           FALSEY_PATTERN

data/lib/rggen/core/version.rb

@@ -2,7 +2,7 @@
 
 module RgGen
   module Core
-    VERSION = '0.31.0'
+    VERSION = '0.32.0'
     MAJOR, MINOR, PATCH = VERSION.split('.').map(&:to_i)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-core
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -72,20 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Core library of RgGen tool.
 email:
 - rggen@googlegroups.com
@@ -215,15 +201,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
-summary: rggen-core-0.31.0
+summary: rggen-core-0.32.0
 test_files: []