rggen-core 0.30.0 → 0.31.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 977e436971681e3425cdb967c6a86d7debeb89fac6ab33db6e7ab1d831102b8f
-  data.tar.gz: 9d49db2290dfdc7b5c7dfc4a0369a2428ed9606f6487cad4c956c7144d46319f
+  metadata.gz: 45a9b6397155e93d65c0c171ec0ac17440baac57ec595e26029c657c1f775766
+  data.tar.gz: a8da50f308ac9eb4ca9079571b69cbb5c8c630abc59f02962e5547f63605ef98
 SHA512:
-  metadata.gz: 999522157b4878363182b31f22a3a12c73c6908409b043c972df3885e9908df66b7093b27bfbe90da30b5dfcebffdcbcdc2ccb1b11da87ebed244f071c991134
-  data.tar.gz: 61149e6066502b04f73f525304745b7e555355c141944fb3e03a1043a6ab6761cd0637ffa90ca22c7d3e330d65020831031f525fa4a189b54c9834b78eccc551
+  metadata.gz: 8d6e431128bdeb4977c546a2911147666aa47f922e396bf2a575efafb569213511bb789ba39d3fbbb89e9fc24838f144fa91ff727118bb5ecaf57a96a3a45a51
+  data.tar.gz: afdbe15fec9f8b40ab17054113769b4d4cc3889942da24dc6eeb10aa147bd3e82e39cd69817b09c161ab1ed19b439472562db6d0d58729563756de0a49a9aa71

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/configuration/component_factory.rb

@@ -6,7 +6,7 @@ module RgGen
       class ComponentFactory < InputBase::ComponentFactory
         private
 
-        def create_input_data(&block)
+        def create_input_data(*_args, &block)
           InputData.new(valid_value_lists, &block)
         end
       end

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

@@ -24,14 +24,15 @@ module RgGen
 
         def preprocess(args)
           if root_factory?
-            [*args[0..-2], load_files(args.last)]
+            [*args[0..-2], load_files(args)]
           else
             args
           end
         end
 
-        def load_files(files)
-          create_input_data do |input_data|
+        def load_files(args)
+          files = args.last
+          create_input_data(*args[0..-2]) do |input_data|
             files.each { |file| load_file(file, input_data) }
           end
         end
@@ -50,7 +51,7 @@ module RgGen
             .transform_values(&->(f) { f.valid_value_list })
         end
 
-        def create_input_data(&block)
+        def create_input_data(*_args, &block)
         end
 
         def create_features(component, *sources)

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

@@ -4,7 +4,7 @@ module RgGen
   module Core
     module InputBase
       class InputData
-        def initialize(layer, valid_value_lists)
+        def initialize(layer, valid_value_lists, *_args)
           @layer = layer
           @valid_value_lists = valid_value_lists
           @values = Hash.new(NAValue)
@@ -87,8 +87,8 @@ module RgGen
           caller_location.path.include?('docile')
         end
 
-        def create_child_data(layer, &block)
-          child_data_class.new(layer, @valid_value_lists, &block)
+        def create_child_data(layer, *args, &block)
+          child_data_class.new(layer, @valid_value_lists, *args, &block)
         end
 
         def child_data_class

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

@@ -12,8 +12,8 @@ module RgGen
           configuration
         end
 
-        def create_input_data(&block)
-          InputData.new(:root, valid_value_lists, &block)
+        def create_input_data(configuration, &block)
+          InputData.new(:root, valid_value_lists, configuration, &block)
         end
 
         def find_child_factory(_configuration, register_map)

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

@@ -38,9 +38,18 @@ module RgGen
           bit_field: BitField
         }.freeze
 
-        def initialize(layer, valid_value_list)
+        def initialize(layer, valid_value_list, configuration)
           extend(LAYER_EXTENSIONS[layer])
-          super
+          @configuration = configuration
+          super(layer, valid_value_list)
+        end
+
+        attr_reader :configuration
+
+        private
+
+        def create_child_data(layer, &block)
+          super(layer, @configuration, &block)
         end
       end
     end

data/lib/rggen/core/version.rb

@@ -2,7 +2,7 @@
 
 module RgGen
   module Core
-    VERSION = '0.30.0'
+    VERSION = '0.31.2'
     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.30.0
+  version: 0.31.2
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -222,8 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
-summary: rggen-core-0.30.0
+summary: rggen-core-0.31.2
 test_files: []