cocoapods-binaryhqp 0.4.8 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd23ae869768d260d8575fd1ef550c3d68efde0256099537f443d44c7a6b6c0
-  data.tar.gz: d9288a1d9d6b3148adadccaf1608b51cb34280093a33e3bc29bc6f23d52c7cda
+  metadata.gz: 3adce240c7874c49810940cf90b4f615622eeacfc52c3c13c117684c6bb8a10f
+  data.tar.gz: d5221a0a35c3fb28154066ad68afa77de704b42c170c948706b8dce2c8592c36
 SHA512:
-  metadata.gz: da7673f9961783babc73636d91c44885e4821fb0fd98ede8ec8c877d59a447f2cd4f56e62f7a6cafc64c6e19b509d9a3e5a1193ec8d36bdb4b5343e8c86533bb
-  data.tar.gz: 6f2a336589e0893c47ce358efe1e88dc567094a531ed07a81fd9e987001e2740dbc65b522f41f69db1722ee180aa393cddea806da628c004512b0ad7ae8b113d
+  metadata.gz: b8aa7d3e63f10fb203f085cec2bf730840dadc6240c3faca31d836c871c0f83378515e57ad94925ee44b73b3e5d1bf075b5d9e4e686e236f105725825efe1375
+  data.tar.gz: 4de06e2790d19f79d48814787b4393990a75a87a4a46fafcba7192585f3e151f52ad16d64862e272d6551820142a804e9dc2a01b0e4436df9fb172d0b9964ac5

data/.vscode/launch.json

@@ -8,8 +8,10 @@
       "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","--hsource", "--verbose"]// `pod` 命令的参数
+      // "args": ["install", "--verbose"]
+      // "args": ["install","--hsource", "--verbose"]
+      "args":["install", "--help"]
       }
     ]
   }

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    cocoapods-binaryhqp (0.4.7)
+    cocoapods-binaryhqp (0.4.9)
+      CFPropertyList
       cocoapods
       fourflusher
-      plist
       xcpretty
 
 GEM
@@ -87,7 +87,6 @@ GEM
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    plist (3.6.0)
     prettybacon (0.0.2)
       bacon (~> 1.2)
     public_suffix (4.0.6)

data/README.md

@@ -33,16 +33,17 @@ Then in the flowing normal install process, we hook the integration functions to
 
 ## Installation
 
-## 编译方法
-sudo gem build cocoapods-binaryhqp.gemspec && sudo gem install cocoapods-binaryhqp-0.4.7.gem
+## 安装方法 
+
+sudo gem install cocoapods-binaryhqp
+
 
 ## Usage
 
 ``` ruby
-plugin 'cocoapods-binary'
+plugin 'cocoapods-binaryhqp'
 
 use_frameworks!
-# all_binary!
 
 target "HP" do
     pod "ExpectoPatronum", :binary => true
@@ -55,6 +56,10 @@ end
 
 **Note**: cocoapods-binary require `use_frameworks!`. If your worry about the boot time and other problems introduced by dynamic framework, static framework is a good choice. Another [plugin](https://github.com/leavez/cocoapods-static-swift-framework) made by me to make all pods static frameworks is recommended.
 
+## 全部使用源码
+ - pod install --hsource
+ 
+
 #### Options
 
 If you want to disable binary for a specific pod when using `all_binary!`, place a `:binary => false` to it.

data/lib/cocoapods-binaryhqp/Integration.rb

@@ -214,9 +214,12 @@ module Pod
                 # https://github.com/leavez/cocoapods-binary/issues/29
                 if spec.attributes_hash["resource_bundles"]
                     bundle_names = spec.attributes_hash["resource_bundles"].keys
-                    spec.attributes_hash["resource_bundles"] = nil 
-                    spec.attributes_hash["resources"] ||= []
-                    spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
+                    # 只对动态库处理，静态库由mainTarget处理resource_bundles,静态库不能清空resource_bundles
+                    if not targets.first.build_as_static_framework? 
+                        spec.attributes_hash["resource_bundles"] = nil 
+                        spec.attributes_hash["resources"] ||= []
+                        spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
+                    end
                 end
 
                 # to avoid the warning of missing license

data/lib/cocoapods-binaryhqp/Main.rb

@@ -2,6 +2,7 @@
 require_relative 'helper/podfile_options'
 require_relative 'tool/tool'
 require_relative 'gem_version'
+require_relative 'command_option/command_option'
 
 module Pod    
     class Podfile
@@ -13,6 +14,10 @@ module Pod
                 DSL.prebuild_all = true
             end
 
+            def all_source!
+                DSL.framework_source_all = true
+            end
+
             # Enable bitcode for prebuilt frameworks
             def enable_bitcode_for_prebuilt_frameworks!
                 DSL.bitcode_enabled = true
@@ -60,6 +65,9 @@ module Pod
             class_attr_accessor :prebuild_all
             prebuild_all = false
 
+            class_attr_accessor :framework_source_all
+            framework_source_all = false
+
             class_attr_accessor :bitcode_enabled
             bitcode_enabled = false
 
@@ -122,6 +130,9 @@ Pod::HooksManager.register('cocoapods-binaryhqp', :pre_install) do |installer_co
     Pod::Installer.force_disable_integration true # don't integrate targets
     Pod::Config.force_disable_write_lockfile true # disbale write lock file for perbuild podfile
     Pod::Installer.disable_install_complete_message true # disable install complete message
+
+    Pod::Podfile::DSL.framework_source_all = Pod::Podfile::DSL.framework_source_all || Pod::Command::Install::all_use_source
+    Pod::UI.puts("全部使用源码") if Pod::Podfile::DSL.framework_source_all  
     
     # make another custom sandbox
     standard_sandbox = installer_context.sandbox
@@ -133,7 +144,9 @@ 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_all_standard_sandbox_pod(standard_sandbox)
+
     if binary_installer.have_exact_prebuild_cache? && !update
         binary_installer.install_when_cache_hit!
     else

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,33 @@ 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}") if config.verbose
+                    pod_path.rmtree if pod_path.exist?
+                end                
+            end
+        end
+
+        def delete_all_standard_sandbox_pod(standard_sanbox)
+            if lockfile
+                changes = lockfile.detect_changes_with_podfile(podfile)
+                need_update_pods = (changes[:added] + changes[:changed] + changes[:removed] + changes[:unchanged]).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}") if config.verbose
+                    pod_path.rmtree if pod_path.exist?
+                end                
             end
         end
     
@@ -163,8 +218,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
@@ -202,10 +257,17 @@ module Pod
                         end
                     end
                     raise "Wrong type: #{resources}" unless resources.kind_of? Array
-
+                    # resource   : ${PODS_ROOT}
+                    # resource_bundles : ${PODS_CONFIGURATION_BUILD_DIR},不做处理
                     path_objects = resources.map do |path|
+                        prebuild_real_path = (path.gsub('${PODS_ROOT}', sandbox.root.to_s) if path.start_with? '${PODS_ROOT}')|| ""
+                        real_file_path = framework_path + File.basename(path)
+                        if Pathname.new(prebuild_real_path).exist?
+                            # 静态库的resource,拷贝至framework目录下
+                            FileUtils.cp_r(prebuild_real_path, real_file_path, :remove_destination => true)
+                        end
                         object = Prebuild::Passer::ResourcePath.new
-                        object.real_file_path = framework_path + File.basename(path)
+                        object.real_file_path = real_file_path
                         object.target_file_path = path.gsub('${PODS_ROOT}', standard_sandbox_path.to_s) if path.start_with? '${PODS_ROOT}'
                         object.target_file_path = path.gsub("${PODS_CONFIGURATION_BUILD_DIR}", standard_sandbox_path.to_s) if path.start_with? "${PODS_CONFIGURATION_BUILD_DIR}"
                         object
@@ -255,10 +317,11 @@ module Pod
             useless_target_names = sandbox.exsited_framework_target_names.reject do |name| 
                 all_needed_names.include? name
             end
-            useless_target_names.each do |name|
-                path = sandbox.framework_folder_path_for_target_name(name)
-                path.rmtree if path.exist?
-            end
+            # 不删除已经编译好的framework
+            # useless_target_names.each do |name|
+            #     path = sandbox.framework_folder_path_for_target_name(name)
+            #     path.rmtree if path.exist?
+            # end
 
             if not Podfile::DSL.dont_remove_source_code 
                 # only keep manifest.lock and framework folder in _Prebuild

data/lib/cocoapods-binaryhqp/command_option/command_option.rb

@@ -0,0 +1,28 @@
+module Pod
+    class Command
+      class Install < Command
+        @@use_source = false
+        def self.options
+          [
+            ['--hsource', 'from cocoapods-binaryhqp, all frameworks use source code'],
+          ].concat(super).reject { |(name, _)| name == '--no-repo-update' }
+        end
+  
+        def initialize(argv)
+          super
+          @@use_source = argv.flag?('hsource', false)
+        end
+
+        def self.all_use_source
+            @@use_source
+        end
+
+        def self.run(argv)
+            super(argv)
+        end
+
+        
+      end
+    end
+end
+  

data/lib/cocoapods-binaryhqp/gem_version.rb

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

data/lib/cocoapods-binaryhqp/helper/feature_switches.rb

@@ -28,14 +28,18 @@ module Pod
                 end
 
                 # patched content
-                should_prebuild = Pod::Podfile::DSL.prebuild_all
+                should_prebuild = Pod::Podfile::DSL.prebuild_all || (not Pod::Podfile::DSL.framework_source_all)
                 local = false
                 
                 options = args.last
                 if options.is_a?(Hash) and options[Pod::Prebuild.keyword] != nil
-                    should_prebuild = options[Pod::Prebuild.keyword]
+                    should_prebuild = options[Pod::Prebuild.keyword] && (not Pod::Podfile::DSL.framework_source_all)
                     local = (options[:path] != nil)
                 end
+
+                if Pod::Command::Install.all_use_source
+                    should_prebuild = false
+                end
                 
                 if should_prebuild and (not local)
                     old_method.bind(self).(name, *args)

data/lib/cocoapods-binaryhqp/helper/podfile_options.rb

@@ -11,13 +11,17 @@ module Pod
 
         ## --- option for setting using prebuild framework ---
         def parse_prebuild_framework(name, requirements)
-            should_prebuild = Pod::Podfile::DSL.prebuild_all
+            should_prebuild = Pod::Podfile::DSL.prebuild_all && (not Pod::Podfile::DSL.framework_source_all)
 
             options = requirements.last
             if options.is_a?(Hash) && options[Pod::Prebuild.keyword] != nil 
-                should_prebuild = options.delete(Pod::Prebuild.keyword)
+                should_prebuild = options.delete(Pod::Prebuild.keyword) && (not Pod::Podfile::DSL.framework_source_all)
                 requirements.pop if options.empty?
             end
+
+            if Pod::Command::Install.all_use_source
+                should_prebuild = false
+            end
     
             pod_name = Specification.root_name(name)
             set_prebuild_for_pod(pod_name, should_prebuild)

data/lib/cocoapods-binaryhqp/rome/build_framework.rb

@@ -32,6 +32,8 @@ def build_for_iosish_platform(sandbox,
   # make less arch to iphone simulator for faster build
   custom_build_options_simulator += ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'] if simulator == 'iphonesimulator'
 
+  custom_build_options += ['ARCHS=arm64']
+
   is_succeed, _ = xcodebuild(sandbox, target_label, device, deployment_target, other_options + custom_build_options)
   exit 1 unless is_succeed
   is_succeed, _ = xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + custom_build_options_simulator)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binaryhqp
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.2
 platform: ruby
 authors:
 - leavez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -118,6 +118,7 @@ files:
 - lib/cocoapods-binaryhqp/Integration.rb
 - lib/cocoapods-binaryhqp/Main.rb
 - lib/cocoapods-binaryhqp/Prebuild.rb
+- lib/cocoapods-binaryhqp/command_option/command_option.rb
 - lib/cocoapods-binaryhqp/gem_version.rb
 - lib/cocoapods-binaryhqp/helper/feature_switches.rb
 - lib/cocoapods-binaryhqp/helper/names.rb