rggen-core 0.25.2 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b2cb2ac6ff0638f1b58234ece63f36d8ae6c0c9b370404d11767fcadd49f1ae
-  data.tar.gz: 8ca7963204bf42554d6c2715a0141e2a4b0fa577281f083aa3e171f9e3dee930
+  metadata.gz: fe3a65999b49b800216dea110ca47e81c71cf4fe0a65626f50526be374647713
+  data.tar.gz: 160dbda800f4fef46bbe18ef34810851082d09271eb7754b6b4508eb4f56c8fd
 SHA512:
-  metadata.gz: 0df06ca1ce1bada021e283edd6c57c39f1349d4a32cf6109e943e3f728b951a424f62928362fcf4562c3ca896853b5fd7a25d4fdeb26e4b18bcb4067f51f3454
-  data.tar.gz: a543383fed2f6e8a97bebe34710c3dbce0914ee25034c97a17df708cc21128172afd48381395077e71655a3d77e3cad84306c352eb23684ccba8a74f5544b4ef
+  metadata.gz: eae55af6cdaa6eff67f15ef508dcd32af950d72f18621d0b8769011957c9c6a72c9f3c41557d197a0c1e9fec25ecaff34364f3518cd04c12f22bdb6ee8efa6af
+  data.tar.gz: 3d030a72ade1067dbb7450ff30ef4cffc3d97430e73a4ea96f9fb310a5cb633e314f1a9b280d4c4e615b1fce2ace5f5456f2881bd76a18fa05cef60420989ada

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2021 Taichi Ishitani
+Copyright (c) 2017-2022 Taichi Ishitani
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -44,7 +44,7 @@ Feedbacks, bug reports, questions and etc. are wellcome! You can post them by us
 
 ## Copyright & License
 
-Copyright © 2017-2021 Taichi Ishitani. RgGen::Core is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2017-2022 Taichi Ishitani. RgGen::Core is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
 
 ## Code of Conduct
 

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

@@ -27,7 +27,7 @@ module RgGen
             if root_factory?
               [nil, preprocess(args)]
             else
-              [args.first, preprocess(args[1..-1])]
+              [args.first, preprocess(args[1..])]
             end
           create_component(parent, sources) do |component|
             build_component(parent, component, sources)

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

@@ -42,7 +42,7 @@ module RgGen
           factories =
             @entries
               .map(&:build_factory)
-              .map { |f| [f.layer, f] }.to_h
+              .to_h { |f| [f.layer, f] }
           factories.each_value { |f| f.component_factories factories }
           factories.values
         end

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

@@ -22,26 +22,80 @@ module RgGen
         end
       end
 
+      class PluginInfo
+        attr_reader :name
+        attr_reader :setup_path
+        attr_reader :gem_name
+        attr_reader :version
+
+        def parse(setup_path_or_name, version)
+          setup_path_or_name = setup_path_or_name.to_s.strip
+          @name, @setup_path, @gem_name, @version =
+            if setup_file_directly_given?(setup_path_or_name)
+              [nil, setup_path_or_name, *find_plugin_gem(setup_path_or_name)]
+            else
+              [
+                setup_path_or_name, get_setup_path(setup_path_or_name),
+                extract_gem_name(setup_path_or_name), version
+              ]
+            end
+          self
+        end
+
+        def to_s
+          if name && version
+            "#{name} (#{version})"
+          elsif name
+            name
+          else
+            setup_path
+          end
+        end
+
+        private
+
+        def setup_file_directly_given?(setup_path_or_name)
+          File.ext(setup_path_or_name) == 'rb' ||
+            File.basename(setup_path_or_name, '.*') == 'setup'
+        end
+
+        def find_plugin_gem(setup_path)
+          gemspec =
+            Gem::Specification
+              .each.find { |spec| match_gemspec?(spec, setup_path) }
+          gemspec && [gemspec.name, gemspec.version]
+        end
+
+        def match_gemspec?(gemspec, setup_path)
+          gemspec.full_require_paths.any?(&setup_path.method(:start_with?))
+        end
+
+        def extract_gem_name(plugin_name)
+          plugin_name.split('/', 2).first
+        end
+
+        def get_setup_path(plugin_name)
+          base, sub_directory = plugin_name.split('/', 2)
+          base = base.sub(/^rggen[-_]/, '').tr('-', '_')
+          File.join(*['rggen', base, sub_directory, 'setup'].compact)
+        end
+      end
+
       class PluginManager
         def initialize(builder)
           @builder = builder
           @plugins = []
         end
 
-        def load_plugin(setup_path_or_name)
-          setup_path_or_name = setup_path_or_name.to_s.strip
-          setup_path, root_dir =
-            if setup_file_directly_given?(setup_path_or_name)
-              [setup_path_or_name, extract_root_dir(setup_path_or_name)]
-            else
-              [get_setup_path(setup_path_or_name), nil]
-            end
-          read_setup_file(setup_path, setup_path_or_name, root_dir)
+        def load_plugin(setup_path_or_name, version = nil)
+          info = PluginInfo.new.parse(setup_path_or_name, version)
+          read_setup_file(info)
         end
 
         def load_plugins(plugins, no_default_plugins, activation = true)
           RgGen.builder(@builder)
-          merge_plugins(plugins, no_default_plugins).each(&method(:load_plugin))
+          merge_plugins(plugins, no_default_plugins)
+            .each { |plugin| load_plugin(*plugin) }
           activation && activate_plugins
         end
 
@@ -64,45 +118,11 @@ module RgGen
 
         private
 
-        def setup_file_directly_given?(setup_path_or_name)
-          File.ext(setup_path_or_name) == 'rb' ||
-            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'].compact)
-        end
-
-        def read_setup_file(setup_path, setup_path_or_name, root_dir)
-          if setup_path == DEFAULT_PLUGSINS
-            gem 'rggen', DEFAULT_PLUGSINS_VERSION
-          elsif root_dir
-            $LOAD_PATH.unshift(root_dir)
-          end
-
-          require setup_path
+        def read_setup_file(info)
+          info.gem_name && gem(info.gem_name, info.version)
+          require info.setup_path
         rescue ::LoadError
-          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)
+          raise Core::PluginError.new("cannot load such plugin: #{info}")
         end
 
         def merge_plugins(plugins, no_default_plugins)
@@ -114,7 +134,6 @@ module RgGen
         end
 
         DEFAULT_PLUGSINS = 'rggen/setup'
-        DEFAULT_PLUGSINS_VERSION = "~> #{MAJOR}.#{MINOR}.0"
 
         def default_plugins(no_default_plugins)
           load_default_plugins?(no_default_plugins) && DEFAULT_PLUGSINS || nil
@@ -129,7 +148,9 @@ module RgGen
 
         def plugins_from_env
           ENV['RGGEN_PLUGINS']
-            &.split(':')&.map(&:strip)&.reject(&:empty?)
+            &.split(':')
+            &.reject(&:blank?)
+            &.map { |entry| entry.split(',', 2) }
         end
 
         def plugin?(plugin_module)

data/lib/rggen/core/facets.rb

@@ -3,6 +3,7 @@
 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'
 require 'facets/module/lastname'

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

@@ -45,9 +45,7 @@ module RgGen
         end
 
         def load_file(file)
-          build_by_block(&instance_eval(<<~BODY, file, 1))
-            -> { #{File.binread(file)} }  # -> { File.binread(file) }
-          BODY
+          build_by_block { instance_eval(File.binread(file), file, 1) }
         end
 
         private

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

@@ -42,11 +42,9 @@ module RgGen
         end
 
         def format_sub_layer(read_data, input_data, layer, file)
-          format_sub_layer_data(read_data, layer, file)
-            &.flat_map { |sub_layer, data_array| [sub_layer].product(data_array) }
-            &.each do |(sub_layer, data)|
-              format(data, input_data.child(sub_layer), sub_layer, file)
-            end
+          format_sub_layer_data(read_data, layer, file)&.each do |(sub_layer, data)|
+            format(data, input_data.child(sub_layer), sub_layer, file)
+          end
         end
 
         def format_layer_data(_read_data, _layer, _file)

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

@@ -6,22 +6,13 @@ module RgGen
       module YAMLLoader
         private
 
-        if RUBY_VERSION >= '2.6.0'
-          def yaml_safe_load(yaml, file)
-            YAML.safe_load(
-              yaml,
-              permitted_classes: [Symbol], aliases: true, filename: file,
-              symbolize_names: true
-            )
-          end
-        else
-          def yaml_safe_load(yaml, file)
-            YAML.safe_load(yaml, [Symbol], [], true, file, symbolize_names: true)
-          end
-        end
-
         def load_yaml(file)
-          yaml_safe_load(File.binread(file), file)
+          yaml = File.binread(file)
+          YAML.safe_load(
+            yaml,
+            permitted_classes: [Symbol], aliases: true,
+            filename: file, symbolize_names: true
+          )
         end
       end
     end

data/lib/rggen/core/options.rb

@@ -109,9 +109,9 @@ module RgGen
     end
 
     Options.add_option(:plugins) do |option|
-      option.long_option '--plugin PLUGIN'
+      option.long_option '--plugin PLUGIN[:VERSION]'
       option.default { [] }
-      option.action { |value, options| options[:plugins] << value }
+      option.action { |value, options| options[:plugins] << value.split(':', 2) }
       option.description 'Load a RgGen plugin ' \
                          "(name of plugin/path to 'setup.rb' file)"
     end

data/lib/rggen/core/output_base/file_writer.rb

@@ -32,7 +32,7 @@ module RgGen
 
         def create_directory(path)
           directory = path.dirname
-          directory.directory? || directory.mkpath
+          directory.directory? || FileUtils.mkpath(directory)
         end
       end
     end

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

@@ -47,12 +47,12 @@ module RgGen
         end
 
         def format_array_sub_layer_data(read_data, layer, file)
-          read_data.each_with_object({}) do |data, sub_layer_data|
+          read_data.each_with_object([]) do |data, sub_layer_data|
             format_hash_sub_layer_data(data, layer, file, sub_layer_data)
           end
         end
 
-        def format_hash_sub_layer_data(read_data, layer, file, sub_layer_data = {})
+        def format_hash_sub_layer_data(read_data, layer, file, sub_layer_data = [])
           convert_to_hash(read_data, file)
             .slice(*SUB_LAYER_KEYS[layer])
             .each { |k, v| merge_sub_layer_data(sub_layer_data, layer, k, v) }
@@ -61,9 +61,10 @@ module RgGen
 
         def merge_sub_layer_data(sub_layer_data, layer, key, value)
           if SUB_LAYER_KEY_MAP[layer].key?(key)
-            (sub_layer_data[SUB_LAYER_KEY_MAP[layer][key]] ||= []).concat(value)
+            sub_layer_data
+              .concat([SUB_LAYER_KEY_MAP[layer][key]].product(value))
           else
-            (sub_layer_data[key] ||= []) << value
+            sub_layer_data << [key, value]
           end
         end
 

data/lib/rggen/core/version.rb

@@ -2,7 +2,7 @@
 
 module RgGen
   module Core
-    VERSION = '0.25.2'
+    VERSION = '0.26.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.25.2
+  version: 0.26.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -195,6 +195,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/rggen/rggen-core/issues
   mailing_list_uri: https://groups.google.com/d/forum/rggen
+  rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/rggen/rggen-core
   wiki_uri: https://github.com/rggen/rggen/wiki
 post_install_message: 
@@ -205,15 +206,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
-summary: rggen-core-0.25.2
+summary: rggen-core-0.26.0
 test_files: []