cocoapods-binary-bel 0.5.1 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff8183174797ebc162d61d086a2775688c82e76bcbe894435595948854eab0a0
-  data.tar.gz: 5b5fa7f18e0a0474562456166226d518e84f63ec3ba1e2b634901e0fdf085854
+  metadata.gz: 43eafcaf495ad77650ab39ac89ec3c39f0d5b4c189c648ab5b9c10f7fb97c4fd
+  data.tar.gz: 0cf9685573422c38b7f0d02bcd216b0b7f368e648815e0a51be59ff17ae1afd6
 SHA512:
-  metadata.gz: 32c7cc708291d9500d17fda16d45bda650dc1f2d90bf806978cd8acb36de365dda764af0f11338447e2edad8d53ae618a91503f60a8619d3bed35e864d2ffad3
-  data.tar.gz: faa283aeb42a00bfc7c755f551fab66f2cac8a5a1dd8124309408cb2bb7566f08ea2de9aaa2c93f93b83c5da5abb4a3d2959120ef67c7b135831308bdca20e98
+  metadata.gz: d8b6e436a575e2cfa1a79b4044cc97386ec3b30f0049743c1d1b98041b412e4a06012b6c0e16d9ffabe0a98dd9028ac6d263fcb5715b6f9cf17207a45b0166f4
+  data.tar.gz: e124121fd3991bc78971dcb445c6e2555fbebbc39640c9ed81ef52e1d0babe4428f35516b6174561f6ece8898b7f90fe86112a514a26acc2d40ad51ef6145d77

data/README.md

@@ -25,6 +25,8 @@ It will compile the source code of pods during the pod install process, and make
 
 #### Under the hood
 
+blog:  https://juejin.cn/post/7035628418972516360
+
 ( You could leave this paragraph for further reading, and try it now. )
 
 The plugin will do a separated completed 'Pod install' in the standard pre-install hook. But we filter the pods by the flag in Podfile here. Then build frameworks with this generated project by using xcodebuild. Store the frameworks in `Pods/_Prebuild` and save the manifest.lock file for the next pod install.
@@ -33,8 +35,7 @@ Then in the flowing normal install process, we hook the integration functions to
 
 ## Installation
 
-## 编译方法
-sudo gem build cocoapods-binary-bel.gemspec && sudo gem install cocoapods-binary-bel-0.4.8.gem
+sudo gem install cocoapods-binary-bel
 
 ## Usage
 
@@ -49,10 +50,12 @@ target "HP" do
 end
 ```
 
-- Add `plugin 'cocoapods-binary'` in the head of Podfile 
+- Add `plugin 'cocoapods-binary-bel'` in the head of Podfile 
 - Add `:binary => true` as a option of one specific pod, or add `all_binary!` before all targets, which makes all pods binaries.
 - pod install, and that's all
 
+
+
 **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.
 
 #### Options
@@ -63,6 +66,8 @@ If your `Pods` folder is excluded from git, you may add `keep_source_code_for_pr
 
 If bitcode is needed, add a `enable_bitcode_for_prebuilt_frameworks!` before all targets in Podfile
 
+if you want to all  use source code, use `pod install --hsource`
+
 
 #### Known Issues
 

data/lib/cocoapods-binary-bel/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-binary-bel/Main.rb

@@ -145,8 +145,6 @@ Pod::HooksManager.register('cocoapods-binary-bel', :pre_install) do |installer_c
     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
@@ -154,6 +152,8 @@ Pod::HooksManager.register('cocoapods-binary-bel', :pre_install) do |installer_c
         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-binary-bel/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-binary-bel/command_option/command_option.rb

@@ -2,27 +2,50 @@ module Pod
     class Command
       class Install < Command
         @@use_source = false
+
+        class << self
+          alias :original_options :options
+        end
         def self.options
-          [
-            ['--hsource', 'from cocoapods-binary-bel, 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-binary-bel/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinaryBel
-    VERSION = "0.5.1"
+    VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-bel
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.4
 platform: ruby
 authors:
 - leavez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-05 00:00:00.000000000 Z
+date: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods