cocoapods-soul-component-plugin 0.0.21 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0026398166b4ee19062dc99510cc5be78fdc712ac38e9b6b6d04e2167e8a30a
-  data.tar.gz: d99e614daef247c22f181a484fa19ae7b280f44a9ac43b9e0c5785d1e9f5c837
+  metadata.gz: 597ad6367a29c757573150c23a60335a6129f9b95fec90188b85e53cb8749411
+  data.tar.gz: 8ce3b18b3d10fb49f995795eba84d4b491993776ae1ae7d02b4b0914e9f6a5fd
 SHA512:
-  metadata.gz: b813261f612b007d25468766591f9e3a3ba83543a6869b11631f44e08a12d42e8a4e67f2d2ef085f7be21a3b3572e9c20ff74e840c018dd972b55552cb1fa70e
-  data.tar.gz: 6b616f0f15dbc8b0926afe46b5acf90e42a0314de34104cd86413727b486d932a00ce37616122d8361a4ef019043abd617a9e77c36d10e356fe46c1b46068ab2
+  metadata.gz: 9af5affec61d0e30db9815e4ed5796154784253d9d93d8fe9d42ceccfa792f3f042d1010c5ab9379a53f93fabf5ebaa54451013144efb74fbec19cb17d341562
+  data.tar.gz: 5a6fbdbd2f06f9030e0c6e0e8815dec642bf2372d1e29548020c5153555837211ba645cdafd7703dc14e7f52d81d73a03977ca6374bf176f95408e402f592972

data/lib/cocoapods-soul-component-plugin/command/soul-component-plugin.rb

@@ -6,6 +6,7 @@ require 'json'
 require 'xcodeproj'
 require 'cocoapods-downloader'
 require 'cocoapods/user_interface'
+require 'hash-deep-merge'
 require_relative '../gem_version'
 
 module Pod
@@ -139,6 +140,7 @@ module CocoapodsSoulComponentPlugin
     project.save
   end
 
+
   def self.generateComponents
     components = []
     json = File.read(component_file_path)
@@ -149,38 +151,21 @@ module CocoapodsSoulComponentPlugin
     if File.exist?(component_user_file_path)
       json_user = File.read(component_user_file_path)
       obj_user = JSON.parse(json_user)
-      dependency_user = obj_user['dependencies']
+      obj = obj.deep_merge!(obj_user)
+      puts "混入用户配置，结果为:#{obj}"
     end
 
     if @@import_dependency.length.positive?
       import_json = JSON.parse(self.import_dependency)
-      dependency_import = import_json['dependencies']
+      obj = obj.deep_merge!(import_json)
+      puts "混入导入配置，结果为:#{obj}"
     end
 
     dependencies = obj['dependencies']
     dependencies.each do |each|
       component = Soul_Component.new(each[0], each[1]['local'], each[1]['submodule'], each[1]['version'], each[1]['git'],
                                      each[1]['branch'], each[1]['path'], each[1]['commit'])
-      if dependency_user && dependency_user[component.name]
-        component.local = dependency_user[component.name]['local'] if dependency_user[component.name]['local']
-        component.submodule = dependency_user[component.name]['submodule'] if dependency_user[component.name]['submodule']
-        component.version = dependency_user[component.name]['version']
-        component.git = dependency_user[component.name]['git'] if dependency_user[component.name]['git']
-        component.branch = dependency_user[component.name]['branch']
-        component.path = dependency_user[component.name]['path']
-        component.commit = dependency_user[component.name]['commit']
-        Pod::UI.puts "使用用户配置覆盖。参数：#{component.to_hash}".green
-      end
-      if dependency_import && dependency_import[component.name]
-        component.local = dependency_import[component.name]['local'] if dependency_import[component.name]['local']
-        component.submodule = dependency_import[component.name]['submodule'] if dependency_import[component.name]['submodule']
-        component.version = dependency_import[component.name]['version']
-        component.git = dependency_import[component.name]['git'] if dependency_import[component.name]['git']
-        component.branch = dependency_import[component.name]['branch']
-        component.path = dependency_import[component.name]['path']
-        component.commit = dependency_import[component.name]['commit']
-        Pod::UI.puts "使用导入配置覆盖。参数：#{component.to_hash}".green
-      end
+
       if @@use_source
         component.local = true
         if Pod::Downloader::Git.check_if_has_auth_clone(component.git) == false
@@ -265,6 +250,7 @@ module Pod
       alias old_run run
 
       def run
+        # Pod::UI.puts "这是测试版本".red
         Pod::UI.puts "当前版本:#{CocoapodsSoulComponentPlugin::VERSION}".green
         CocoapodsSoulComponentPlugin.pre_run if CocoapodsSoulComponentPlugin.use_components
         old_run
@@ -293,7 +279,8 @@ module Pod
       # end
 
       CocoapodsSoulComponentPlugin.components.each do |each|
-        next unless each.name == name
+        # 判断模块名是否相符，注意如果是子模块会带上SOPods的前缀
+        next unless each.name == name || each.name == 'SOPods/' + name
 
         requirements = if each.local == true
                          [{ name: each.name, path: each.path }]

data/lib/cocoapods-soul-component-plugin/gem_version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module CocoapodsSoulComponentPlugin
-  VERSION = '0.0.21'
+  VERSION = '0.0.23'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-soul-component-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.23
 platform: ruby
 authors:
 - fang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -31,7 +31,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hash-deep-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: