cocoapods-binary 0.2.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124b30e7d2396c946acac5d0d13be9417321c8bd9550c704b05776762d661032
-  data.tar.gz: f791fa67bb61110dfb114fd68d99c59fb08e07abe39aa449df53eb3b67a6fa43
+  metadata.gz: 726b79f4d6dda6d56259941979e11a641fa8ae096e17755b944047241e6ab651
+  data.tar.gz: 9831cc28732e70613d33764dfe8d7922dc8243c23d6cddab352ad3af77b70ddd
 SHA512:
-  metadata.gz: c8778c58520990ff47b5d8250659204ed66ef604070daec52bf03c224a1447fc176666f647dde0ebbbef1dbd8cb73c7aec25583b9ba383c9e26b8760aa3ef580
-  data.tar.gz: d9d8080c368d815cd153173e3e64d2efcfdfa1750adfe6f46b2fe4d639363428ace2d02b57bd201070d7608f5eed718c20e3eb950903f04592e579674fb54781
+  metadata.gz: 1bbf02596b0c1a8aa68eea1b5d400692b451f6c6e5327826e7a06433e53dbfe8ca6efced755016b3f0080abad283cf2bd3a9704d0f75fc0920d08f1a8c1b5fe2
+  data.tar.gz: c9293566acff041a6f5b12229e990a3b5f1dcf4d836e059bce014d6b470cfa222b047295b06ed1a4e90d74b77e26fc99b4d21a8b6af2d7ece65f139bab80ea22

data/.gitignore

@@ -1,3 +1,32 @@
 .DS_Store
 pkg
 .idea/
+
+test/Pods
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+### Xcode Patch ###
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+test/Binary.xcworkspace/contents.xcworkspacedata
+test/Binary.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+test/Podfile
+test/Podfile.lock

data/.travis.yml

@@ -0,0 +1,22 @@
+osx_image: xcode9.3
+language: objective-c
+cache:
+- cocoapods
+- bundler
+before_install:
+- gem install cocoapods
+script:
+- rake install
+- cd test
+- sh test.sh
+
+# auto deploy on tagging
+# automatically set by `travis setup rubygems`
+deploy:
+  provider: rubygems
+  api_key:
+    secure: HglQwElI8cEeKc5oXzoVbBBprgb8k7RUr0YOH1N1fhpNW7HJpJtSLzUBPC5T+Sv5RPSicaxY/oXeYE6x4E7Oadf7Gy2tmM9iwwJQh6YgZ/foh9G9obHZtTerhB4wY2cjguBXDmLqiMRiJzNTZRvoUnESBKakPbK/ODY0mHT+LDdMwZk2QsMjD3fRc5M7JRR29jr56jzVuUdy0lR4TRoc2+yIRqp2vFNtcbKdzKuYgzcdE9xzPh0FQzgiImA5uGDruyAgoNeOlGxDPZdnm7fw/epLmq8fUIZanReI30QnJeIErFwMCVeN1zVqQiWRgv8qGi8Z0ZKOzvcu7oKuaeXo5xSkTfkAc9I0LbcRd3UHCluAr9JHuERNwkn1qx5W0DdngTKrPM65ZABQxk4KUHt+5yd6Dv7lR9GrGD3teNZDga/X8u0tQIkoPIl76ZjXRh0bmCDQM/zWaTKkh7eX/YXQKgrjrEecZMeZfsLds789MK2QO17QlbHTVno+HBr0Rah6nHI0/vl1xqHthHCb/Y9SBXmLQ7+ySNXmj7YxPjpD6m8kEEUDTQQdgjS7vMInqJiSekGBImu2VQA/qZP1+WEBha5nX2ADfvsAWfUdsdQfuTbv07RnIG+3quzSl5U1UPVR9f7EsqpTtxflLJCqVdaz2ndQBO6NXAnRhA90cfAFd9s=
+  gem: cocoapods-binary
+  on:
+    tags: true
+    repo: leavez/cocoapods-binary

data/cocoapods-binary.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/EXAMPLE/cocoapods-binary'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($/).reject{|f| f.start_with? "test/"}
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']

data/lib/cocoapods-binary/Integration.rb

@@ -1,6 +1,8 @@
-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
@@ -18,21 +20,24 @@ module Pod
         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"
-
-
-                # make a relatvie symbol link
-                relative_source = source.relative_path_from(target_folder)
-                FileUtils.ln_sf(relative_source, target)
+                target_folder.mkdir
+
+                # 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
@@ -47,17 +52,18 @@ end
 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
 
@@ -82,11 +88,45 @@ module Pod
 
             # 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
@@ -119,3 +159,38 @@ module Pod
     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

data/lib/cocoapods-binary/Main.rb

@@ -1,28 +1,35 @@
 # encoding: UTF-8
-
-require_relative 'podfile_options'
+require_relative 'helper/podfile_options'
+require_relative 'tool/tool'
 
 module Pod    
     class Podfile
         module DSL
             
-            # enable bitcode for prebuilt frameworks
+            # Enable prebuiding for all pods
+            # it has a lower priority to other binary settings
+            def all_binary!
+                DSL.prebuild_all = true
+            end
+
+            # Enable bitcode for prebuilt frameworks
             def enable_bitcode_for_prebuilt_frameworks!
-                @@bitcode_enabled = true
+                DSL.bitcode_enabled = true
             end
 
             private
-            @@bitcode_enabled = false
-            def self.is_bitcode_enabled
-                @@bitcode_enabled
-            end
+            class_attr_accessor :prebuild_all
+            prebuild_all = false
+
+            class_attr_accessor :bitcode_enabled
+            bitcode_enabled = false
         end
     end
 end
 
 Pod::HooksManager.register('cocoapods-binary', :pre_install) do |installer_context|
-    
-    require_relative 'feature_switches'
+
+    require_relative 'helper/feature_switches'
     if Pod.is_prebuild_stage
         next
     end
@@ -42,7 +49,7 @@ Pod::HooksManager.register('cocoapods-binary', :pre_install) do |installer_conte
     # -- step 1: prebuild framework ---
     # Execute a sperated pod install, to generate targets for building framework,
     # then compile them to framework files.
-    require_relative 'prebuild_sandbox'
+    require_relative 'helper/prebuild_sandbox'
     require_relative 'Prebuild'
     
     Pod::UI.puts "🚀  Prebuild frameworks"
@@ -82,7 +89,7 @@ Pod::HooksManager.register('cocoapods-binary', :pre_install) do |installer_conte
     Pod::Installer.disable_install_complete_message false
     
     
-    # -- step 2: prebuild framework ---
+    # -- step 2: pod install ---
     # install
     Pod::UI.puts "\n"
     Pod::UI.puts "🤖  Pod Install"

data/lib/cocoapods-binary/Prebuild.rb

@@ -1,16 +1,13 @@
 require_relative 'rome/build_framework'
-
-module Pod    
-    class Prebuild
-        class_attr_accessor :framework_changes
-    end
-end
-
+require_relative 'helper/passer'
 
 # patch prebuild ability
 module Pod
     class Installer
 
+        
+        private
+
         def local_manifest 
             if not @local_manifest_inited
                 @local_manifest_inited = true
@@ -20,20 +17,34 @@ module Pod
             @local_manifest
         end
 
+        # @return [Analyzer::SpecsState]
+        def prebuild_pods_changes
+            return nil if local_manifest.nil?
+            if @prebuild_pods_changes.nil?
+                changes = local_manifest.detect_changes_with_podfile(podfile)
+                @prebuild_pods_changes = Analyzer::SpecsState.new(changes)
+                # save the chagnes info for later stage
+                Pod::Prebuild::Passer.prebuild_pods_changes = @prebuild_pods_changes 
+            end
+            @prebuild_pods_changes
+        end
+
         
+        public 
+
         # check if need to prebuild
         def have_exact_prebuild_cache?
             # check if need build frameworks
             return false if local_manifest == nil
             
-            changes = local_manifest.detect_changes_with_podfile(podfile)
-            Pod::Prebuild.framework_changes = changes # save the chagnes info for later stage
-            added = changes[:added] || []
-            changed = changes[:changed] || []
-            unchanged = changes[:unchanged] || []
-            deleted = changes[:removed] || []
+            changes = prebuild_pods_changes
+            added = changes.added
+            changed = changes.changed 
+            unchanged = changes.unchanged
+            deleted = changes.deleted 
             
-            unchange_framework_names = added + unchanged
+            unchange_framework_names = (added + unchanged)
+
             exsited_framework_names = sandbox.exsited_framework_names
             missing = unchanged.select do |pod_name|
                 not exsited_framework_names.include?(pod_name)
@@ -54,32 +65,33 @@ module Pod
     
 
         # Build the needed framework files
-        def prebuild_frameworks 
+        def prebuild_frameworks! 
 
-            local_manifest = self.local_manifest
+            # build options
             sandbox_path = sandbox.root
             existed_framework_folder = sandbox.generate_framework_path
-            bitcode_enabled = Pod::Podfile::DSL.is_bitcode_enabled
-
+            bitcode_enabled = Pod::Podfile::DSL.bitcode_enabled
+            targets = []
+            
             if local_manifest != nil
 
-                changes = local_manifest.detect_changes_with_podfile(podfile)
-                added = changes[:added] || []
-                changed = changes[:changed] || []
-                unchanged = changes[:unchanged] || []
-                deleted = changes[:removed] || []
+                changes = prebuild_pods_changes
+                added = changes.added
+                changed = changes.changed 
+                unchanged = changes.unchanged
+                deleted = changes.deleted 
     
                 existed_framework_folder.mkdir unless existed_framework_folder.exist?
                 exsited_framework_names = sandbox.exsited_framework_names
                 
                 # deletions
                 # remove all frameworks except ones to remain
-                unchange_framework_names = added + unchanged
+                unchange_framework_names = (added + unchanged)
                 to_delete = exsited_framework_names.select do |framework_name|
                     not unchange_framework_names.include?(framework_name)
                 end
                 to_delete.each do |framework_name|
-                    path = sandbox.framework_path_for_pod_name framework_name
+                    path = sandbox.framework_folder_path_for_pod_name(framework_name)
                     path.rmtree if path.exist?
                 end
     
@@ -88,17 +100,58 @@ module Pod
                     not exsited_framework_names.include?(pod_name)
                 end
 
-                targets = (added + changed + missing).map do |pod_name|
-                    self.pod_targets.find do |pod_target|
-                        pod_target.root_spec.name == pod_name
-                    end
+
+                root_names_to_update = (added + changed + missing)
+
+                # transform names to targets
+                name_to_target_hash = self.pod_targets.reduce({}) do |sum, target|
+                    sum[target.name] = target
+                    sum
                 end
-                Pod::Prebuild.build(sandbox_path, existed_framework_folder, targets, bitcode_enabled)
-                
+                targets = root_names_to_update.map do |root_name|
+                    name_to_target_hash[root_name]
+                end || []
+
+                # add the dendencies
+                dependency_targets = targets.map {|t| t.recursive_dependent_targets }.flatten.uniq || []
+                targets = (targets + dependency_targets).uniq
             else
-                Pod::Prebuild.build(sandbox_path, existed_framework_folder, self.pod_targets, bitcode_enabled)
+                targets = self.pod_targets
             end
 
+            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)
+            targets.each do |target|
+                next unless target.should_build?
+                output_path = sandbox.framework_folder_path_for_pod_name(target.name)
+                output_path.mkpath unless output_path.exist?
+                Pod::Prebuild.build(sandbox_path, target, output_path, bitcode_enabled)
+            end            
+            Pod::Prebuild.remove_build_dir(sandbox_path)
+
+
+            # copy vendored libraries and frameworks
+            targets.each do |target|
+                root_path = self.sandbox.pod_dir(target.name)
+                target.spec_consumers.each do |consumer|
+                    file_accessor = Sandbox::FileAccessor.new(root_path, consumer)
+                    lib_paths = file_accessor.vendored_frameworks || []
+                    lib_paths += file_accessor.vendored_libraries
+                    # @TODO dSYM files
+                    lib_paths.each do |lib_path|
+                        relative = lib_path.relative_path_from(root_path)
+                        destination = sandbox.framework_folder_path_for_pod_name(target.name) + relative
+                        destination.dirname.mkpath unless destination.dirname.exist?
+                        FileUtils.cp_r(lib_path, destination, :remove_destination => true)
+                    end
+                end
+            end
+            
             # Remove useless files
             # only keep manifest.lock and framework folder
             to_remain_files = ["Manifest.lock", File.basename(existed_framework_folder)]
@@ -111,14 +164,14 @@ module Pod
             end
 
         end
-
-
+        
+        
         # patch the post install hook
         old_method2 = instance_method(:run_plugins_post_install_hooks)
         define_method(:run_plugins_post_install_hooks) do 
             old_method2.bind(self).()
             if Pod::is_prebuild_stage
-                self.prebuild_frameworks
+                self.prebuild_frameworks!
             end
         end
 

data/lib/cocoapods-binary/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-  VERSION = "0.2.2"
+  VERSION = "0.3"
 end

data/lib/cocoapods-binary/{feature_switches.rb → helper/feature_switches.rb}

@@ -1,4 +1,4 @@
-require_relative 'tool/tool'
+require_relative '../tool/tool'
 require_relative 'prebuild_sandbox'
 
 module Pod
@@ -26,10 +26,23 @@ module Pod
                     old_method.bind(self).(name, *args)
                     return
                 end
+
+                # patched content
+                should_prebuild = Pod::Podfile::DSL.prebuild_all
+                local = false
+                
                 options = args.last
-                return unless options.is_a?(Hash)
-                prebuild = options[Pod::Prebuild.keyword]
-                if prebuild
+                if options.is_a?(Hash) and options[Pod::Prebuild.keyword] != nil
+                    should_prebuild = options[Pod::Prebuild.keyword]
+                    local = (options[:path] != nil)
+                end
+                
+                if should_prebuild and (not local)
+                    if current_target_definition.platform.name == :watchos
+                        # watchos isn't supported currently
+                        Pod::UI.warn "Binary doesn't support watchos currently: #{name}. You can manually set `binary => false` for this pod to suppress this warning."
+                        return
+                    end
                     old_method.bind(self).(name, *args)
                 end
             end

data/lib/cocoapods-binary/helper/passer.rb

@@ -0,0 +1,20 @@
+require_relative '../tool/tool'
+
+module Pod    
+    class Prebuild
+
+        # Pass the data between the 2 steps
+        #
+        # At step 2, the normal pod install, it needs some info of the
+        # prebuilt step. So we store it here.
+        #
+        class Passer
+
+            # indicate the add/remove/update of prebuit pods
+            # @return [Analyzer::SpecsState] 
+            #
+            class_attr_accessor :prebuild_pods_changes
+
+        end
+    end
+end

data/lib/cocoapods-binary/helper/podfile_options.rb

@@ -0,0 +1,107 @@
+module Pod
+
+    class Prebuild
+        def self.keyword
+            :binary
+        end
+    end
+
+    class Podfile
+      class TargetDefinition
+
+        ## --- option for setting using prebuild framework ---
+        def parse_prebuild_framework(name, requirements)
+            options = requirements.last
+            return requirements unless options.is_a?(Hash)
+    
+            should_prebuild_framework = options.delete(Pod::Prebuild.keyword)
+            pod_name = Specification.root_name(name)
+            set_prebuild_for_pod(pod_name, should_prebuild_framework)
+            requirements.pop if options.empty?
+        end
+        
+        def set_prebuild_for_pod(pod_name, should_prebuild)
+            
+            if should_prebuild == true
+                # watchos isn't supported currently
+                return if self.platform.name == :watchos
+
+                @prebuild_framework_names ||= []
+                @prebuild_framework_names.push pod_name
+            else
+                @should_not_prebuild_framework_names ||= []
+                @should_not_prebuild_framework_names.push pod_name
+            end
+        end
+
+        def prebuild_framework_names
+            names = @prebuild_framework_names || []
+            if parent != nil and parent.kind_of? TargetDefinition
+                names += parent.prebuild_framework_names
+            end
+            names
+        end
+        def should_not_prebuild_framework_names
+            names = @should_not_prebuild_framework_names || []
+            if parent != nil and parent.kind_of? TargetDefinition
+                names += parent.should_not_prebuild_framework_names
+            end
+            names
+        end
+
+        # ---- patch method ----
+        # We want modify `store_pod` method, but it's hard to insert a line in the 
+        # implementation. So we patch a method called in `store_pod`.
+        old_method = instance_method(:parse_inhibit_warnings)
+
+        define_method(:parse_inhibit_warnings) do |name, requirements|
+          parse_prebuild_framework(name, requirements)
+          old_method.bind(self).(name, requirements)
+        end
+        
+      end
+    end
+end
+
+
+module Pod
+    class Installer
+
+        def prebuild_pod_targets
+
+            all = []
+
+            aggregate_targets = self.aggregate_targets.select { |a| a.platform.name != :watchos }
+            aggregate_targets.each do |aggregate_target|
+                target_definition = aggregate_target.target_definition
+                targets = aggregate_target.pod_targets || []
+
+                # filter prebuild
+                prebuild_names = target_definition.prebuild_framework_names
+                if not Podfile::DSL.prebuild_all
+                    targets = targets.select { |pod_target| prebuild_names.include?(pod_target.pod_name) } 
+                end
+                dependency_targets = targets.map {|t| t.recursive_dependent_targets }.flatten.uniq || []
+                targets = (targets + dependency_targets).uniq
+
+                # filter should not prebuild
+                explict_should_not_names = target_definition.should_not_prebuild_framework_names
+                targets = targets.reject { |pod_target| explict_should_not_names.include?(pod_target.pod_name) } 
+
+                all += targets
+            end
+
+            all = all.reject {|pod_target| sandbox.local?(pod_target.pod_name) }
+            all.uniq
+        end
+
+        # the root names who needs prebuild, including dependency pods.
+        def prebuild_pod_names 
+           @prebuild_pod_names ||= self.prebuild_pod_targets.map(&:pod_name)
+        end
+
+    end
+end
+
+
+

data/lib/cocoapods-binary/{prebuild_sandbox.rb → helper/prebuild_sandbox.rb}

@@ -12,23 +12,27 @@ module Pod
         end
         
         def generate_framework_path
-            self.root + "Frameworks"
+            self.root + "GeneratedFrameworks"
         end
 
-        def framework_path_for_pod_name(name)
-            self.generate_framework_path + "#{name}.framework"
+        def framework_folder_path_for_pod_name(name)
+            self.generate_framework_path + name
         end
 
         def exsited_framework_names
             return [] unless generate_framework_path.exist?
-            generate_framework_path.children.map do |framework_name|
-                extension = File.extname(framework_name)
-                if extension == ".framework"
-                    File.basename(framework_name, extension)
+            generate_framework_path.children().map do |framework_name|
+                if framework_name.directory?
+                    if not framework_name.children.empty?
+                        File.basename(framework_name)
+                    else
+                        nil
+                    end
                 else
                     nil
                 end
             end.reject(&:nil?)
         end
+
     end
 end

data/lib/cocoapods-binary/rome/build_framework.rb

@@ -1,6 +1,4 @@
 require 'fourflusher'
-require_relative '../feature_switches'
-
 
 CONFIGURATION = "Release"
 PLATFORMS = { 'iphonesimulator' => 'iOS',
@@ -11,7 +9,14 @@ PLATFORMS = { 'iphonesimulator' => 'iOS',
 #  @param [PodTarget] target
 #         a specific pod target
 #
-def build_for_iosish_platform(sandbox, build_dir, target, device, simulator, bitcode_enabled)
+def build_for_iosish_platform(sandbox, 
+                              build_dir, 
+                              output_path,
+                              target, 
+                              device, 
+                              simulator,
+                              bitcode_enabled)
+
   deployment_target = target.platform.deployment_target.to_s
   
   target_label = target.label
@@ -38,7 +43,8 @@ def build_for_iosish_platform(sandbox, build_dir, target, device, simulator, bit
   puts lipo_log unless File.exist?(executable_path)
 
   FileUtils.mv executable_path, device_lib, :force => true
-  FileUtils.mv device_framework_lib, build_dir, :force => true
+  output_path.mkpath unless output_path.exist?
+  FileUtils.mv device_framework_lib, output_path, :force => true
   FileUtils.rm simulator_lib if File.file?(simulator_lib)
   FileUtils.rm device_lib if File.file?(device_lib)
 end
@@ -61,61 +67,59 @@ module Pod
     # @param  [String] sandbox_root_path
     #         The sandbox root path where the targets project place
     #         
+    #         [PodTarget] target
+    #         The pod targets to build
+    #
     #         [Pathname] output_path
     #         output path for generated frameworks
     #
-    #         [Array<PodTarget>] targets
-    #         The pod targets to build
-    #
-    def self.build(sandbox_root_path, output_path, targets, bitcode_enabled = false)
+    def self.build(sandbox_root_path, target, output_path, bitcode_enabled = false)
     
-      return unless not targets.empty?
+      return unless not target == nil
     
       sandbox_root = Pathname(sandbox_root_path)
       sandbox = Pod::Sandbox.new(sandbox_root)
-    
-      build_dir = sandbox_root.parent + 'build'
-      destination = output_path
-    
-      build_dir.rmtree if build_dir.directory?
-
-
-      Pod::UI.puts "Prebuild frameworks (total #{targets.count})"
-    
-      targets.each do |target|
-        case target.platform.name
-        when :ios then build_for_iosish_platform(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', bitcode_enabled)
-        when :osx then xcodebuild(sandbox, target.label)
-        when :tvos then nil
-        when :watchos then nil
-        # when :tvos then build_for_iosish_platform(sandbox, build_dir, target, 'appletvos', 'appletvsimulator')
-        # when :watchos then build_for_iosish_platform(sandbox, build_dir, target, 'watchos', 'watchsimulator')
-        else raise "Unknown platform '#{target.platform.name}'" end
-      end
+      build_dir = self.build_dir(sandbox_root)
+
+      # -- build the framework
+      case target.platform.name
+      when :ios then build_for_iosish_platform(sandbox, build_dir, output_path, target, 'iphoneos', 'iphonesimulator', bitcode_enabled)
+      when :osx then xcodebuild(sandbox, target.label)
+      # when :tvos then build_for_iosish_platform(sandbox, build_dir, target, 'appletvos', 'appletvsimulator')
+      # when :watchos then build_for_iosish_platform(sandbox, build_dir, target, 'watchos', 'watchsimulator')
+      else raise "Unsupported platform for '#{target.name}': '#{target.platform.name}'" end
     
       raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
+
+      # # --- copy the vendored libraries and framework
+      # frameworks = build_dir.children.select{ |path| File.extname(path) == ".framework" }
+      # Pod::UI.puts "Built #{frameworks.count} #{'frameworks'.pluralize(frameworks.count)}"
     
-      # Make sure the device target overwrites anything in the simulator build, otherwise iTunesConnect
-      # can get upset about Info.plist containing references to the simulator SDK
-      frameworks = build_dir.children.select{ |path| File.extname(path) == ".framework" }
-      Pod::UI.puts "Built #{frameworks.count} #{'frameworks'.pluralize(frameworks.count)}"
+      # pod_target = target
+      # consumer = pod_target.root_spec.consumer(pod_target.platform.name)
+      # file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(pod_target.pod_name), consumer)
+      # frameworks += file_accessor.vendored_libraries
+      # frameworks += file_accessor.vendored_frameworks
+
+      # frameworks.uniq!
     
-      targets.each do |pod_target|
-          consumer = pod_target.root_spec.consumer(pod_target.platform.name)
-          file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(pod_target.pod_name), consumer)
-          frameworks += file_accessor.vendored_libraries
-          frameworks += file_accessor.vendored_frameworks
-      end
-      frameworks.uniq!
+      # frameworks.each do |framework|
+      #   FileUtils.mkdir_p destination
+      #   FileUtils.cp_r framework, destination, :remove_destination => true
+      # end
+      # build_dir.rmtree if build_dir.directory?
+    end
     
-      Pod::UI.puts "Copying #{frameworks.count} #{'frameworks'.pluralize(frameworks.count)} " \
-        "to `#{destination.relative_path_from Pathname.pwd}`"
+    def self.remove_build_dir(sandbox_root)
+      path = build_dir(sandbox_root)
+      path.rmtree if path.exist?
+    end
+
+    private 
     
-      frameworks.each do |framework|
-        FileUtils.mkdir_p destination
-        FileUtils.cp_r framework, destination, :remove_destination => true
-      end
-      build_dir.rmtree if build_dir.directory?
+    def self.build_dir(sandbox_root)
+      # don't know why xcode chose this folder
+      sandbox_root.parent + 'build' 
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: '0.3'
 platform: ruby
 authors:
 - leavez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -80,6 +80,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -89,10 +90,11 @@ files:
 - lib/cocoapods-binary/Integration.rb
 - lib/cocoapods-binary/Main.rb
 - lib/cocoapods-binary/Prebuild.rb
-- lib/cocoapods-binary/feature_switches.rb
 - lib/cocoapods-binary/gem_version.rb
-- lib/cocoapods-binary/podfile_options.rb
-- lib/cocoapods-binary/prebuild_sandbox.rb
+- lib/cocoapods-binary/helper/feature_switches.rb
+- lib/cocoapods-binary/helper/passer.rb
+- lib/cocoapods-binary/helper/podfile_options.rb
+- lib/cocoapods-binary/helper/prebuild_sandbox.rb
 - lib/cocoapods-binary/rome/build_framework.rb
 - lib/cocoapods-binary/tool/tool.rb
 - lib/cocoapods_plugin.rb

data/lib/cocoapods-binary/podfile_options.rb

@@ -1,71 +0,0 @@
-module Pod
-
-    class Prebuild
-        def self.keyword
-            :binary
-        end
-    end
-
-    class Podfile
-      class TargetDefinition
-
-        ## --- option for setting using prebuild framework ---
-        def parse_prebuild_framework(name, requirements)
-            options = requirements.last
-            return requirements unless options.is_a?(Hash)
-    
-            should_prebuild_framework = options.delete(Pod::Prebuild.keyword)
-            pod_name = Specification.root_name(name)
-            set_prebuild_for_pod(pod_name, should_prebuild_framework)
-            requirements.pop if options.empty?
-        end
-        
-        def set_prebuild_for_pod(pod_name, should_prebuild)
-            return unless should_prebuild == true
-            @prebuild_framework_names ||= []
-            @prebuild_framework_names.push pod_name
-        end
-
-        def prebuild_framework_names
-            @prebuild_framework_names || []
-        end
-
-        # ---- patch method ----
-        # We want modify `store_pod` method, but it's hard to insert a line in the 
-        # implementation. So we patch a method called in `store_pod`.
-        old_method = instance_method(:parse_inhibit_warnings)
-
-        define_method(:parse_inhibit_warnings) do |name, requirements|
-          parse_prebuild_framework(name, requirements)
-          old_method.bind(self).(name, requirements)
-        end
-        
-      end
-    end
-end
-
-
-module Pod
-    class Installer
-        def prebuild_pod_names 
-            @prebuild_pod_names ||= self.podfile.target_definition_list.map(&:prebuild_framework_names).flatten.uniq
-        end
-    end
-end
-
-module Pod
-    class AggregateTarget
-
-        def have_prebuild_pod_targets?
-            prebuild_framework_names = self.target_definition.prebuild_framework_names
-            return (prebuild_framework_names != nil and !prebuild_framework_names.empty?)
-        end
-
-        def prebuild_pod_targets
-            prebuild_framework_names = self.target_definition.prebuild_framework_names
-            pod_targets = self.pod_targets.select { |pod_target| prebuild_framework_names.include?(pod_target.pod_name) }
-            return pod_targets
-        end
-    end
-end
-