cocoapods-binaryhqp 0.5.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41a7a422607d24a0693df14db38d1ce0fa9db2063693eb4d134dd08372eb2aff
-  data.tar.gz: 230ef35f4cbde58d0a22f23982eb91271e8f18e793792f15f5a865511ed964dd
+  metadata.gz: 6b2590d684da0288a98be729d7b148fff1f7691bbcfa5143dc7b1c8c5d2e6349
+  data.tar.gz: 28c3ec9dfbc3fb050528817913e9fefbf7edd03fb5346840654d0971a5362c96
 SHA512:
-  metadata.gz: 0b976845e07ef81b004f2e3b8b798cf2784fbad540e29bd335127b6b47ddef9b35c0f6eb76970cf86e2ee52e7a0433d7f51926c38f9002435648830e86b4ab01
-  data.tar.gz: 3ec892b95c5f4d510f14d21afda29990603747b5efd5b49d87388cad77de5f0481c90c3f38725c7be240033e8ea8dc5911b5aa730bb487c77ce862e6195f0402
+  metadata.gz: afe7d2c2c22fe9103efe1ea68bda2957ec65db9de37f9bb741971243357266dabfd1a09feefe4cb816a5090e8049283283773a74551d66382ec1a54965b61c3b
+  data.tar.gz: 050e1562ea4f15f780a2b6ddae72633a0870dc12413fbc0c9f5561bc38914655e5592c05c4e54b183871078d36cc3fa36618a445fec1a062e1b7b17a3c192a88

data/.vscode/launch.json

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

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

@@ -145,7 +145,7 @@ Pod::HooksManager.register('cocoapods-binaryhqp', :pre_install) do |installer_co
     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!
@@ -154,6 +154,8 @@ Pod::HooksManager.register('cocoapods-binaryhqp', :pre_install) do |installer_co
         binary_installer.repo_update = repo_update
         binary_installer.install!
     end
+
+    binary_installer.delete_all_standard_sandbox_pod(standard_sandbox)
     
     
     # reset the environment

data/lib/cocoapods-binaryhqp/Prebuild.rb

@@ -146,6 +146,14 @@ module Pod
             self.sandbox.exsited_framework_target_names.each do |name|
                 UI.puts "Using #{name}" if config.verbose
             end
+
+            self.sandbox
+             #处理静态库resources 资源文件
+            self.resolve_dependencies
+            self.download_dependencies
+           
+            self.handle_static_framework_resouces
+            
         end
 
         def delete_standard_sand_box_pod(standard_sanbox)
@@ -173,6 +181,43 @@ module Pod
                 end                
             end
         end
+        # 处理静态库资源
+        def handle_static_framework_resouces
+            all_static_framework_targets = pod_targets.reject{|pod_target| not pod_target.static_framework? or pod_target.resource_paths.empty? }
+            all_static_framework_targets.each do |target|        
+                output_path = sandbox.framework_folder_path_for_target_name(target.name)
+                if target.static_framework? and !target.resource_paths.empty?
+                    framework_path = output_path + target.framework_name
+                    standard_sandbox_path = sandbox.standard_sanbox_path
+                    resources = begin
+                        if Pod::VERSION.start_with? "1.5"
+                            target.resource_paths
+                        else
+                            # resource_paths is Hash{String=>Array<String>} on 1.6 and above
+                            # (use AFNetworking to generate a demo data)
+                            # https://github.com/leavez/cocoapods-binary/issues/50
+                            target.resource_paths.values.flatten
+                        end
+                    end
+                    raise "Wrong type: #{resources}" unless resources.kind_of? Array
+
+                    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? and not Pathname.new(real_file_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 = 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
+                    end
+                    Prebuild::Passer.resources_to_copy_for_static_framework[target.name] = path_objects
+                end
+            end
+        end
     
 
         # Build the needed framework files
@@ -226,7 +271,6 @@ module Pod
 
             targets = targets.reject {|pod_target| sandbox.local?(pod_target.pod_name) }
 
-            
             # build!
             Pod::UI.puts "Prebuild frameworks (total #{targets.count})"
             Pod::Prebuild.remove_build_dir(sandbox_path)
@@ -240,37 +284,13 @@ module Pod
                 output_path.rmtree if output_path.exist?
                 output_path.mkpath unless output_path.exist?
                 Pod::Prebuild.build(sandbox_path, target, output_path, bitcode_enabled,  Podfile::DSL.custom_build_options,  Podfile::DSL.custom_build_options_simulator)
-
-                # save the resource paths for later installing
-                if target.static_framework? and !target.resource_paths.empty?
-                    framework_path = output_path + target.framework_name
-                    standard_sandbox_path = sandbox.standard_sanbox_path
-
-                    resources = begin
-                        if Pod::VERSION.start_with? "1.5"
-                            target.resource_paths
-                        else
-                            # resource_paths is Hash{String=>Array<String>} on 1.6 and above
-                            # (use AFNetworking to generate a demo data)
-                            # https://github.com/leavez/cocoapods-binary/issues/50
-                            target.resource_paths.values.flatten
-                        end
-                    end
-                    raise "Wrong type: #{resources}" unless resources.kind_of? Array
-
-                    path_objects = resources.map do |path|
-                        object = Prebuild::Passer::ResourcePath.new
-                        object.real_file_path = framework_path + File.basename(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
-                    end
-                    Prebuild::Passer.resources_to_copy_for_static_framework[target.name] = path_objects
-                end
-
-            end            
+            end
+            # check static_framework resources
+            self.handle_static_framework_resouces
             Pod::Prebuild.remove_build_dir(sandbox_path)
 
+      
+
 
             # copy vendored libraries and frameworks
             targets.each do |target|
@@ -323,6 +343,7 @@ module Pod
                     filename = File.basename(file)
                     not to_remain_files.include?(filename)
                 end
+
                 to_delete_files.each do |path|
                     path.rmtree if path.exist?
                 end

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

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

data/lib/cocoapods-binaryhqp/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinaryHqp
-    VERSION = "0.5.0"
+    VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binaryhqp
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.4
 platform: ruby
 authors:
 - leavez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods