rggen-core 0.31.0 → 0.31.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0969d51d5ab39e5bf98ff6d7cb44ae8b9b4a7a9efea6d2c0eb47a8cd9685b4c2'
-  data.tar.gz: f5e71796fd8de70124491d20b3501680968edf8f12c15f3fc6e729791f7bdfd0
+  metadata.gz: 45a9b6397155e93d65c0c171ec0ac17440baac57ec595e26029c657c1f775766
+  data.tar.gz: a8da50f308ac9eb4ca9079571b69cbb5c8c630abc59f02962e5547f63605ef98
 SHA512:
-  metadata.gz: 9c27bfff2f272e80ca16331a3071560962e80051e0c4e566ae277bff99a5097cd32ccc87519f4c37a466bacd826da60c882b3e032492439d7c282437fc4d4aeb
-  data.tar.gz: b8b2365ac6de6ec997dbb3054d91a46e5c761218460ec416dcaf126e35549f38643f94d446c3b865bdc9e0346a4d7e7ead38e0665e9b09510ef7d6083013cbd5
+  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/version.rb

@@ -2,7 +2,7 @@
 
 module RgGen
   module Core
-    VERSION = '0.31.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.31.0
+  version: 0.31.2
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-12 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.17
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
-summary: rggen-core-0.31.0
+summary: rggen-core-0.31.2
 test_files: []