cocoapods-binaryhqp 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd23ae869768d260d8575fd1ef550c3d68efde0256099537f443d44c7a6b6c0
-  data.tar.gz: d9288a1d9d6b3148adadccaf1608b51cb34280093a33e3bc29bc6f23d52c7cda
+  metadata.gz: 14566192d217044c6dc8d8b93af1d0296c14f092006c9880cf8beb689802cd34
+  data.tar.gz: 6e22703f0dad2e1f8cbdff851ad26d8b1033dd530e5c98c000e10d9900b65fcc
 SHA512:
-  metadata.gz: da7673f9961783babc73636d91c44885e4821fb0fd98ede8ec8c877d59a447f2cd4f56e62f7a6cafc64c6e19b509d9a3e5a1193ec8d36bdb4b5343e8c86533bb
-  data.tar.gz: 6f2a336589e0893c47ce358efe1e88dc567094a531ed07a81fd9e987001e2740dbc65b522f41f69db1722ee180aa393cddea806da628c004512b0ad7ae8b113d
+  metadata.gz: dc6a18e6324e3d5b6a37aed9a10c2477b3037752026439de9416fda800c234407b2cf3f8d9ac13496c14ab8a9dc588072d195ac508919c284a1a0d21b7773b6b
+  data.tar.gz: 93547fff043c799c6489041300733cb676f9daf1792df574181359178254cf8696295960740fb86e04a8f0cc09099037036e768dad581e185438fe434fec0018

data/.vscode/launch.json

@@ -8,8 +8,8 @@
       "useBundler": true,
       "cwd": "${workspaceRoot}/demo", // pod 命令执行的路径
       "program": "/usr/local/bin/pod",
-      "args": ["update", "--verbose","--sources=http://gitlab.9tong.com/ios-group/HQPFoundation/hqpspecs.git"], // `pod` 命令的参数
-      // "args": ["install"]
+      // "args": ["update", "--verbose","--sources=http://gitlab.9tong.com/ios-group/HQPFoundation/hqpspecs.git"], // `pod` 命令的参数
+      "args": ["install", "--verbose"]
       }
     ]
   }

data/lib/cocoapods-binaryhqp/Main.rb

@@ -133,6 +133,8 @@ Pod::HooksManager.register('cocoapods-binaryhqp', :pre_install) do |installer_co
     # install
     lockfile = installer_context.lockfile
     binary_installer = Pod::Installer.new(prebuild_sandbox, prebuild_podfile, lockfile)
+
+    binary_installer.delete_standard_sand_box_pod(standard_sandbox)
     
     if binary_installer.have_exact_prebuild_cache? && !update
         binary_installer.install_when_cache_hit!

data/lib/cocoapods-binaryhqp/Prebuild.rb

@@ -33,7 +33,7 @@ module Pod
             unchanged_pod_names.reverse_each do |name|
                 mainfest_pod_version = local_manifest.version(name).to_s
                 already_prebuild_version = prebuilded_framework_version(name) || "未找到"
-                if already_prebuild_version != mainfest_pod_version 
+                if not compare_version(mainfest_pod_version, already_prebuild_version) 
                     Pod::UI.puts("- #{name} 已编译版本 #{already_prebuild_version}, manifest中的版本: #{mainfest_pod_version}") if config.verbose                        
                     changed_pod_names = changed_pod_names.push(name)
                     unchanged_pod_names.delete(name)
@@ -42,12 +42,25 @@ module Pod
 
             changes[:changed] = changed_pod_names
             changes[:unchanged] = unchanged_pod_names
-            Pod::UI.puts("需要重编译的framework : #{changed_pod_names.to_s}") if config.verbose
+            Pod::UI.puts("Pre 需要重编译的framework : #{changed_pod_names.to_s}") if config.verbose
             @prebuild_pods_changes = Analyzer::SpecsState.new(changes)
             # save the chagnes info for later stage
             Pod::Prebuild::Passer.prebuild_pods_changes = @prebuild_pods_changes 
             @prebuild_pods_changes
         end
+
+        # compare version 
+        #  1.2.0 == 1.2   => true
+        #  1.2.1 != 1.2.0 => false
+        def compare_version(first_version, second_version)
+            first_nums = first_version.split('.')
+            second_nums = second_version.split('.')
+
+            first_nums.pop until first_nums.last.to_i != 0
+            second_nums.pop until second_nums.last.to_i != 0
+
+            first_nums == second_nums
+        end
        
 
         public 
@@ -57,19 +70,35 @@ module Pod
             changes = lockfile.detect_changes_with_podfile(podfile)
             unchanged_pod_names = changes[:unchanged]
             changed_pod_names = changes[:changed]
+            add_pod_names = changes[:added]
+            removed_pod_names = changes[:removed]
+
+
             unchanged_pod_names.reverse_each do |name|
                 mainfest_pod_version = lockfile.version(name).to_s
                 already_prebuild_version = prebuilded_framework_version(name) || "未找到"
-                if already_prebuild_version != mainfest_pod_version 
-                    Pod::UI.puts("- #{name} 已编译版本 #{already_prebuild_version}, manifest中的版本: #{mainfest_pod_version}") if config.verbose
+                if compare_version(mainfest_pod_version, already_prebuild_version)
+                    # 已经编译了
+                    removed_pod_names.delete(name) if removed_pod_names.include?(name)
+                    add_pod_names.delete(name) if add_pod_names.include?(name)
+                    changed_pod_names.delete(name) if changed_pod_names.include?(name)
+               
+                else
+                    # 未找到相对应的版本
+                    if already_prebuild_version == "99999.99999.99999"
+                        Pod::UI.puts("- #{name}: 未找到预编译文件, manifest中的版本: #{mainfest_pod_version}") if config.verbose
+                    else 
+                        Pod::UI.puts("- #{name}:  已编译版 #{already_prebuild_version}, manifest中的版本: #{mainfest_pod_version}") if config.verbose
+                    end
                     changed_pod_names = changed_pod_names.push(name)
-                    unchanged_pod_names.delete(name)
+                    unchanged_pod_names.delete(name) if unchanged_pod_names.include?(name)
                 end
             end
-
+            changes[:removed] = removed_pod_names
+            changes[:added] = add_pod_names
             changes[:changed] = changed_pod_names
             changes[:unchanged] = unchanged_pod_names
-            Pod::UI.puts("需要重编译的framework : #{changed_pod_names.to_s}") if config.verbose
+            Pod::UI.puts("post 需要重编译的framework : #{(changed_pod_names + removed_pod_names + add_pod_names ).to_a}") if config.verbose
             @prebuild_pods_changes = Analyzer::SpecsState.new(changes)
             # save the chagnes info for later stage
             Pod::Prebuild::Passer.prebuild_pods_changes = @prebuild_pods_changes 
@@ -101,7 +130,7 @@ module Pod
         # 当前已编译的framework的版本
         def prebuilded_framework_version(name)
             path = self.sandbox.plist_path_for_target_name(name)
-            framework_version = ""
+            framework_version = "99999.99999.99999"
             if Pathname.new(path).exist?
                 plist_file = CFPropertyList::List.new(:file => path) 
                 data = CFPropertyList.native_types(plist_file.value)
@@ -115,7 +144,20 @@ module Pod
         def install_when_cache_hit!
             # just print log
             self.sandbox.exsited_framework_target_names.each do |name|
-                UI.puts "Using #{name}"
+                UI.puts "Using #{name}" if config.verbose
+            end
+        end
+
+        def delete_standard_sand_box_pod(standard_sanbox)
+            if lockfile
+                changes = lockfile.detect_changes_with_podfile(podfile)
+                need_update_pods = (changes[:added] + changes[:changed] + changes[:removed]).to_a
+    
+                need_update_pods.each do |pod_name|
+                    pod_path = Pathname.new(standard_sanbox.root.to_s + "/#{pod_name}")
+                    Pod::UI.puts("删除 #{pod_path.to_s}") 
+                    pod_path.rmtree if pod_path.exist?
+                end                
             end
         end
     
@@ -163,8 +205,8 @@ module Pod
                 end.flatten
 
                 # add the dendencies
-                dependency_targets = targets.map {|t| t.recursive_dependent_targets }.flatten.uniq || []
-                targets = (targets + dependency_targets).uniq
+                # dependency_targets = targets.map {|t| t.recursive_dependent_targets }.flatten.uniq || []
+                # targets = (targets + dependency_targets).uniq
             else
                 targets = self.pod_targets
             end

data/lib/cocoapods-binaryhqp/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinaryHqp
-    VERSION = "0.4.8"
+    VERSION = "0.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binaryhqp
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - leavez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods