cocoapods-soul-component-plugin 0.0.23 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 597ad6367a29c757573150c23a60335a6129f9b95fec90188b85e53cb8749411
-  data.tar.gz: 8ce3b18b3d10fb49f995795eba84d4b491993776ae1ae7d02b4b0914e9f6a5fd
+  metadata.gz: 881560b2fbce0d30bf498e475bc7ec8aa8128b102e4cdb5df090121dd3c24b74
+  data.tar.gz: d699ed64ec2e90a4283fb688da80fd503a98647d78ae9a07d27ca36011f4e506
 SHA512:
-  metadata.gz: 9af5affec61d0e30db9815e4ed5796154784253d9d93d8fe9d42ceccfa792f3f042d1010c5ab9379a53f93fabf5ebaa54451013144efb74fbec19cb17d341562
-  data.tar.gz: 5a6fbdbd2f06f9030e0c6e0e8815dec642bf2372d1e29548020c5153555837211ba645cdafd7703dc14e7f52d81d73a03977ca6374bf176f95408e402f592972
+  metadata.gz: 66cde3e7d8cc094b0e2c22ad3593b7e389e17595bf2ad67f3936e1164d3cc334efe649d0499330abdb8d0d90688c9609de4dca1e6fca2330a879fefe70d37d0b
+  data.tar.gz: 7c0772870d6e4218810aa0db38186ef45b469022ff09a66e57c4384faca436754f4ac375a7465788fbccc0a9581c31b620cf3d0e55d6581756614857ad2cc25a

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

@@ -6,9 +6,55 @@ require 'json'
 require 'xcodeproj'
 require 'cocoapods-downloader'
 require 'cocoapods/user_interface'
-require 'hash-deep-merge'
+# require 'hash-deep-merge'
 require_relative '../gem_version'
+class Hash
 
+  def deep_merge!(specialized_hash)
+    return internal_deep_merge!(self, specialized_hash)
+  end
+
+
+  def deep_merge(specialized_hash)
+    return internal_deep_merge!(Hash.new.replace(self), specialized_hash)
+  end
+
+
+  protected
+
+  # better, recursive, preserving method
+  # OK OK this is not the most efficient algorithm,
+  # but at last it's *perfectly clear and understandable*
+  # so fork and improve if you need 5% more speed, ok ?
+  def internal_deep_merge!(source_hash, specialized_hash)
+
+    #puts "starting deep merge..."
+
+    specialized_hash.each_pair do |rkey, rval|
+      #puts "   potential replacing entry : " + rkey.inspect
+
+      if source_hash.has_key?(rkey) then
+        #puts "   found potentially conflicting entry for #{rkey.inspect} : #{rval.inspect}, will merge :"
+        if rval.is_a?(Hash) and source_hash[rkey].is_a?(Hash) then
+          #puts "      recursing..."
+          internal_deep_merge!(source_hash[rkey], rval)
+        elsif rval == source_hash[rkey] then
+          #puts "      same value, skipping."
+        else
+          #puts "      replacing."
+          source_hash[rkey] = rval
+        end
+      else
+        #puts "   found new entry #{rkey.inspect}, adding it..."
+        source_hash[rkey] = rval
+      end
+    end
+
+    #puts "deep merge done."
+
+    return source_hash
+  end
+end
 module Pod
   module Downloader
     class Git < Base
@@ -215,7 +261,18 @@ module CocoapodsSoulComponentPlugin
             each.path = target_path
 
             if File.exist?(target_path) == false
-              options = { git: each.git, commit: each.commit, tag: each.version, branch: each.branch }
+              # 使用优先顺序 commit>branch>tag
+              c = each.commit
+              b = each.branch
+              v = each.version
+              if (c != nil)
+                v = nil
+                b = nil
+              end
+              if (b != nil)
+                v = nil
+              end
+              options = { git: each.git, commit: c, tag: v, branch: b }
               # 这行代码会自动清空branch并且设置commit
               # options = Pod::Downloader.preprocess_options(options)
               downloader = Pod::Downloader.for_target(target_path, options)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-soul-component-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.25
 platform: ruby
 authors:
 - fang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler