ADD: 修复pod source参数bug、兼容podspec resources为字符串

Author: pengdong

Demo/Demo.xcodeproj/xcuserdata/pengdong.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>Demo.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 </dict>

Demo/Podfile

@@ -22,11 +22,8 @@ use_static_binary!
 # use_dynamic_binary!
 
 target 'Demo' do
-  # Comment the next line if you don't want to use dynamic frameworks
-
-  # Pods for Demo
-
-  pod 'AFNetworking'
-  pod 'Masonry', :ppbuild => false
+  pod 'AFNetworking', '3.2.1'
+#  pod 'AFNetworking'
+#  pod 'Masonry', :ppbuild => false
 
 end

Demo/Podfile.lock

@@ -1,34 +1,30 @@
 PODS:
-  - AFNetworking (4.0.1):
-    - AFNetworking/NSURLSession (= 4.0.1)
-    - AFNetworking/Reachability (= 4.0.1)
-    - AFNetworking/Security (= 4.0.1)
-    - AFNetworking/Serialization (= 4.0.1)
-    - AFNetworking/UIKit (= 4.0.1)
-  - AFNetworking/NSURLSession (4.0.1):
+  - AFNetworking (3.2.1):
+    - AFNetworking/NSURLSession (= 3.2.1)
+    - AFNetworking/Reachability (= 3.2.1)
+    - AFNetworking/Security (= 3.2.1)
+    - AFNetworking/Serialization (= 3.2.1)
+    - AFNetworking/UIKit (= 3.2.1)
+  - AFNetworking/NSURLSession (3.2.1):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/Reachability (4.0.1)
-  - AFNetworking/Security (4.0.1)
-  - AFNetworking/Serialization (4.0.1)
-  - AFNetworking/UIKit (4.0.1):
+  - AFNetworking/Reachability (3.2.1)
+  - AFNetworking/Security (3.2.1)
+  - AFNetworking/Serialization (3.2.1)
+  - AFNetworking/UIKit (3.2.1):
     - AFNetworking/NSURLSession
-  - Masonry (1.1.0)
 
 DEPENDENCIES:
-  - AFNetworking
-  - Masonry
+  - AFNetworking (= 3.2.1)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://git.ixiaochuan.cn/Mirrors_cocoapods/xc_cocoapods.git:
     - AFNetworking
-    - Masonry
 
 SPEC CHECKSUMS:
-  AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
-  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
+  AFNetworking: cb604b1c2bded0871f5f61f5d53653739e841d6b
 
-PODFILE CHECKSUM: bcdeab21d0b8b7dd12140fc31442c193cde50a37
+PODFILE CHECKSUM: 8167c091e28bfb3c408d4ace126a0c2219701c4a
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.12.0

lib/cocoapods-ppbuild/Integration.rb

@@ -290,14 +290,30 @@ def empty_source_files(spec)
 
                     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"}
+                        spec.attributes_hash["resource_bundles"] = nil
+                        resources_list = spec.attributes_hash["resources"]
+                        if resources_list.class == Array
+                            spec.attributes_hash["resources"] ||= []
+                            spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
+                        elsif resources_list.class == String 
+                            spec.attributes_hash["resources"] = Array(resources_list)
+                            spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
+                        else
+                            spec.attributes_hash["resources"] = bundle_names.map{|n| n+".bundle"}
+                        end
                     elsif spec.attributes_hash['ios'] && spec.attributes_hash['ios']["resource_bundles"]
                         bundle_names = spec.attributes_hash['ios']["resource_bundles"].keys
                         spec.attributes_hash['ios']["resource_bundles"] = nil 
-                        spec.attributes_hash['ios']["resources"] ||= []
-                        spec.attributes_hash['ios']["resources"] += bundle_names.map{|n| n+".bundle"}
+                        resources_list = spec.attributes_hash['ios']["resources"]
+                        if resources_list.class == Array
+                            spec.attributes_hash['ios']["resources"] ||= []
+                            spec.attributes_hash['ios']["resources"] += bundle_names.map{|n| n+".bundle"}
+                        elsif resources_list.class == String 
+                            spec.attributes_hash['ios']["resources"] = Array(resources_list)
+                            spec.attributes_hash['ios']["resources"] += bundle_names.map{|n| n+".bundle"}
+                        else
+                            spec.attributes_hash['ios']["resources"] = bundle_names.map{|n| n+".bundle"}
+                        end
                     end
 
                     # to avoid the warning of missing license

lib/cocoapods-ppbuild/Prebuild.rb

@@ -226,8 +226,8 @@ def prebuild_frameworks!
 
         # hook run_plugins_post_install_hooks 方法
         install_hooks_method = instance_method(:run_plugins_post_install_hooks)
-        define_method(:run_plugins_post_install_hooks) do 
-            install_hooks_method.bind(self).()
+        define_method(:run_plugins_post_install_hooks) do |*args|
+            install_hooks_method.bind(self).(*args)
             if Pod::is_prebuild_stage
                 self.prebuild_frameworks!
             end

lib/cocoapods-ppbuild/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPpbuild
-  VERSION = "1.0.6"
+  VERSION = "1.0.9"
 end

lib/cocoapods-ppbuild/helper/prebuild_sandbox.rb

@@ -119,17 +119,34 @@ module Pod
     class Sandbox
         # hook 清除pod方法，得到删除的pod，通知主pod更新
         clean_method = instance_method(:clean_pod)
-        define_method(:clean_pod) do |pod_name|
+        define_method(:clean_pod) do |pod_name, *args|
             if Pod::is_prebuild_stage
                 if Pod::Prebuild::Passer.prebuild_pod_targets_changes.nil?
                     Pod::Prebuild::Passer.prebuild_pod_targets_changes = [pod_name]
                 else
                     Pod::Prebuild::Passer.prebuild_pod_targets_changes = (Pod::Prebuild::Passer.prebuild_pod_targets_changes + [pod_name]).uniq
                 end
             end
-            clean_method.bind(self).(pod_name)
+            clean_method.bind(self).(pod_name, *args)
         end
     end
 end
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+