cocoapods-soul-component-plugin 0.0.20 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8150cf4de51ae2f04db9b7b144f1dcdd76f3235b5b9d8f3b283647f99414e0ee
-  data.tar.gz: c6e52f9ee80b1bd0e14211a8a000cde0ef41050288f9a2af2b99a183205b486d
+  metadata.gz: 71b4e02d05524e1a078dce713c608783056e4e2be2a415c9b4a8b0fe527a2f9d
+  data.tar.gz: 1de96adb1816262d2fcf66556b50eed15b139be9426ebbfbec21e3de08b7ccdd
 SHA512:
-  metadata.gz: 275197bfa5a1845155f3bb1bc9347e0279a84b804c19900d7d87e915e547ae3d574e8c918e4cd2dd421f04102f7c75e4644b9c9fc095a0944f4d38eaed8837dd
-  data.tar.gz: c3e5386e58a20fc8a20d5e075af0c4cf5ee36b0970743f7aa55b194a6a948efd45cf66a9f224b4d6adf33113074e5a8604206ff23ea8cc340c602bf7e21d8155
+  metadata.gz: 8d18dbeea26f8ed11e6b1c46c65247c7b71fd40fba6573e72be5ce9cd64915bb8220a7e1c85d036fb5ab71a58c23a48ec20d2f89465f9007c7b8f5fd4205a7d0
+  data.tar.gz: c2d10fd835bc1f53441b7c8aaacea41221c38ff04712b1210d60f0bcae938c4c97fd3560bca5c99cd0c73f51876acbbc765ffd766aface1128c08fa1ca65eb0b

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
@@ -213,7 +198,6 @@ module CocoapodsSoulComponentPlugin
 
     @@components.each do |each|
       if each.path.nil?
-        if each.submodule == false
           if each.local == true
             local_path = each.name
 
@@ -241,9 +225,6 @@ module CocoapodsSoulComponentPlugin
               Pod::UI.puts "本地依赖 #{each.name} 已存在，不进行变更，如需更新请删除重新 install。位置：#{target_path}".yellow
             end
           end
-        elsif each.local == true
-          each.path = "SOPods/#{each.name}"
-        end
       end
     end
   end
@@ -269,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
@@ -297,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.20'
+  VERSION = '0.0.22'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-soul-component-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.22
 platform: ruby
 authors:
 - fang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-30 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:
@@ -69,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A longer description of cocoapods-soul-component-plugin.