Integration.rb in cocoapods-binary-0.3

- old
+ new

@@ -1,9 +1,11 @@
-require_relative 'podfile_options'
-require_relative 'feature_switches'
-require_relative 'prebuild_sandbox'
+require_relative 'helper/podfile_options'
+require_relative 'helper/feature_switches'
+require_relative 'helper/prebuild_sandbox'
+require_relative 'helper/passer'
 
+
 # NOTE:
 # This file will only be loaded on normal pod install step
 # so there's no need to check is_prebuild_stage
 
 
@@ -16,25 +18,28 @@
 module Pod
     class Installer
         class PodSourceInstaller
 
             def install_for_prebuild!(standard_sanbox)
+                return if standard_sanbox.local? self.name
+
                 # make a symlink to target folder
                 prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sanbox)
-                source = prebuild_sandbox.framework_path_for_pod_name self.name
+                folder = prebuild_sandbox.framework_folder_path_for_pod_name(self.name)
 
                 target_folder = standard_sanbox.pod_dir(self.name)
-                return if standard_sanbox.local? self.name
-
                 target_folder.rmtree if target_folder.exist?
-                target_folder.mkdir unless target_folder.exist?
-                target = target_folder + "#{self.name}.framework"
+                target_folder.mkdir
 
-
-                # make a relatvie symbol link
-                relative_source = source.relative_path_from(target_folder)
-                FileUtils.ln_sf(relative_source, target)
+                # make a relatvie symbol link for all children
+                folder.children.each do |child|
+                    source = child
+                    target = target_folder + File.basename(source)
+                    
+                    relative_source = source.relative_path_from(target.parent)
+                    FileUtils.ln_sf(relative_source, target)
+                end
             end
 
         end
     end
 end
@@ -45,21 +50,22 @@
 # the code only effect the second pod install process.
 #
 module Pod
     class Installer
 
+
         # Remove the old target files if prebuild frameworks changed
         def remove_target_files_if_needed
 
-            changes = Pod::Prebuild.framework_changes
+            changes = Pod::Prebuild::Passer.prebuild_pods_changes
             updated_names = []
             if changes == nil
                 updated_names = PrebuildSandbox.from_standard_sandbox(self.sandbox).exsited_framework_names
             else
-                added = changes[:added] || []
-                changed = changes[:changed] || []
-                deleted = changes[:removed] || []
+                added = changes.added
+                changed = changes.changed 
+                deleted = changes.deleted 
                 updated_names = added + changed + deleted
             end
 
             updated_names.each do |name|
                 root_name = Specification.root_name(name)
@@ -80,15 +86,49 @@
         old_method2 = instance_method(:resolve_dependencies)
         define_method(:resolve_dependencies) do
 
             # Remove the old target files, else it will not notice file changes
             self.remove_target_files_if_needed
+
+            # call original
             old_method2.bind(self).()
 
-            self.analysis_result.specifications.each do |spec|
-                next unless self.prebuild_pod_names.include? spec.name
-                spec.attributes_hash["vendored_frameworks"] = "#{spec.name}.framework"
+
+            # check the prebuilt targets 
+            targets = self.prebuild_pod_targets
+            targets_have_different_platforms = targets.select {|t| t.pod_name != t.name }
+
+            if targets_have_different_platforms.count > 0
+                names = targets_have_different_platforms.map(&:pod_name)
+                STDERR.puts "[!] Binary doesn't support pods who integrate in 2 or more platforms simultaneously: #{names}".red
+                exit
+            end
+
+
+            specs = self.analysis_result.specifications
+            prebuilt_specs = (specs.select do |spec|
+                self.prebuild_pod_names.include? spec.root.name
+            end)
+            
+            # make sturcture to fast get target by name
+            name_to_target_hash = self.pod_targets.reduce({}) do |sum, target|
+                sum[target.name] = target
+                sum
+            end
+
+            prebuilt_specs.each do |spec|
+                # `spec` may be a subspec, so we use the root's name 
+                root_name = spec.root.name
+
+                # use the prebuilt framework
+                target = name_to_target_hash[root_name]
+                original_vendored_frameworks = spec.attributes_hash["vendored_frameworks"] || []
+                if original_vendored_frameworks.kind_of?(String)
+                    original_vendored_frameworks = [original_vendored_frameworks]
+                end
+                original_vendored_frameworks += [target.framework_name]
+                spec.attributes_hash["vendored_frameworks"] = original_vendored_frameworks
                 spec.attributes_hash["source_files"] = []
 
                 # to avoid the warning of missing license
                 spec.attributes_hash["license"] = {} 
             end
@@ -117,5 +157,40 @@
 
 
     end
 end
 
+# A fix in embeded frameworks script.
+#
+# The framework file in pod target folder is a symblink. The EmbedFrameworksScript use `readlink`
+# to read the read path. As the symlink is a relative symlink, readlink cannot handle it well. So 
+# we override the `readlink` to a fixed version.
+#
+module Pod
+    module Generator
+        class EmbedFrameworksScript
+
+            old_method = instance_method(:script)
+            define_method(:script) do
+
+                script = old_method.bind(self).()
+                patch = <<-SH.strip_heredoc
+                    #!/bin/sh
+                
+                    # ---- this is added by cocoapods-binary ---
+                    # Readlink cannot handle relative symlink well, so we override it to a new one
+                    # If the path isn't an absolute path, we add a realtive prefix.
+                    readlink () {
+                        path=`/usr/bin/readlink $1`;
+                        if [ $(echo "$path" | cut -c 1-1) = '/' ]; then
+                            echo $path;
+                        else
+                            echo "`dirname $1`/$path";
+                        fi
+                    }
+                    # --- 
+                SH
+                patch + script
+            end
+        end
+    end
+end
\ No newline at end of file