cocoapods-binaryhqp 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3adce240c7874c49810940cf90b4f615622eeacfc52c3c13c117684c6bb8a10f
-  data.tar.gz: d5221a0a35c3fb28154066ad68afa77de704b42c170c948706b8dce2c8592c36
+  metadata.gz: 565caa20391d4ee0ad9cd3620069122545da6ad40faaf74907d1d2d3284cf2bf
+  data.tar.gz: bea179595b39bca57caee759a3de746fdfc4da037881f9cca9f8e08eb776a8f0
 SHA512:
-  metadata.gz: b8aa7d3e63f10fb203f085cec2bf730840dadc6240c3faca31d836c871c0f83378515e57ad94925ee44b73b3e5d1bf075b5d9e4e686e236f105725825efe1375
-  data.tar.gz: 4de06e2790d19f79d48814787b4393990a75a87a4a46fafcba7192585f3e151f52ad16d64862e272d6551820142a804e9dc2a01b0e4436df9fb172d0b9964ac5
+  metadata.gz: d5313617b1242d2e669e8cc11f8dc8dce6706f2736a01b676fbefec2d54b0ff2f41304819c3e33ef0941c4c7f600b37c424ce723fe16071eeebd9c657c97c826
+  data.tar.gz: a4b55835877d6b415b68ce5178c449846093ee40384351cb68f139bd6a7ffadba0e7e2175340ece7c9b00c7569287de4f5386cd5b79f904c75872fb37ec7a567

data/.vscode/launch.json

@@ -8,10 +8,10 @@
       "useBundler": true,
       "cwd": "${workspaceRoot}/demo", // pod 命令执行的路径
       "program": "/usr/local/bin/pod",
-      // "args": ["update","--hsource", "--verbose"]// `pod` 命令的参数
-      // "args": ["install", "--verbose"]
+      // "args": ["update", "--verbose"]// `pod` 命令的参数
+      "args": ["install", "--verbose"]
       // "args": ["install","--hsource", "--verbose"]
-      "args":["install", "--help"]
+      // "args":["install", "--help"]
       }
     ]
   }

data/lib/cocoapods-binaryhqp/Prebuild.rb

@@ -146,6 +146,11 @@ module Pod
             self.sandbox.exsited_framework_target_names.each do |name|
                 UI.puts "Using #{name}" if config.verbose
             end
+
+            self.resolve_dependencies
+            #处理资源文件
+            self.handle_static_framework_resouces
+            
         end
 
         def delete_standard_sand_box_pod(standard_sanbox)
@@ -173,6 +178,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 +268,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,44 +281,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
-                    # 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 = 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
+            # 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|

data/lib/cocoapods-binaryhqp/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-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.2"
+    VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binaryhqp
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - leavez