cocoapods-binary 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 68b6e39958a64ccfaf68bcf58f5cf85610102f04
-  data.tar.gz: 84301375e1c5b4ed7f8d68436bf34f6a74137084
+SHA256:
+  metadata.gz: 7b59508b448e37d01ed739d543e081ef5e29ac379a8864a06ba90f4ffeec1092
+  data.tar.gz: ba6d98f85c6ed5e725186b3a8425d26b11637d0c8a868102ddd6525282954ca2
 SHA512:
-  metadata.gz: 6f7d2a697838a6de2ee1a3f0086fea28abcf32d477ef44646f149fc4476da0c219f56cc0e144799b781ce002f7ebf641f92733f33ddb272fc6c7629f66138572
-  data.tar.gz: b3b3e7c23ecb186c409d0d50f1a82188881c870a40a055aacf0542a54351a126b5dd0c774af4244c2572fe6309e9542d980107e655ac6da6b49bacbae6b513fa
+  metadata.gz: 99999f08eca4b68e4d1b5fbad63a943402adfe1c15aaae23ff4f60a9971972a876baa01fa51d4922ca8e7ef243baf6cc290af3029ef17dd70f6a3373cb412673
+  data.tar.gz: 9e75f9cf7e4eb114b93ed45c07c3f7ecf4d96800be9dd51fad65fdaeb04635d293575675e3b768b64df1c2492c43af6e97e802a5ee1364d93008f57f316ae177

data/cocoapods-binary.gemspec

@@ -13,13 +13,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/leavez/cocoapods-binary'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/).reject{|f| f.start_with? "test/"}
+  spec.files         = `git ls-files`.split($/).reject{|f| f.start_with?("test/") || f.start_with?('demo/')}
   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']
 
   spec.add_dependency "cocoapods", ">= 1.5.0", "< 2.0"
   spec.add_dependency "fourflusher", "~> 2.0"
+  spec.add_dependency "xcpretty", "~> 0.3.0"
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/cocoapods-binary/Integration.rb

@@ -2,6 +2,7 @@ require_relative 'helper/podfile_options'
 require_relative 'helper/feature_switches'
 require_relative 'helper/prebuild_sandbox'
 require_relative 'helper/passer'
+require_relative 'helper/target_checker'
 
 
 # NOTE:
@@ -32,6 +33,7 @@ module Pod
 
                 # make a relatvie symbol link for all children
                 def walk(path, &action)
+                    return unless path.exist?
                     path.children.each do |child|
                         result = action.call(child, &action)
                         if child.directory?
@@ -128,18 +130,12 @@ module Pod
             # call original
             old_method2.bind(self).()
 
+            # check the pods
+            # Although we have did it in prebuild stage, it's not sufficient.
+            # Same pod may appear in another target in form of source code.
+            Prebuild.check_one_pod_should_have_only_one_target(self.prebuild_pod_targets)
 
-            # 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

data/lib/cocoapods-binary/Main.rb

@@ -24,6 +24,37 @@ module Pod
                 DSL.dont_remove_source_code = true
             end
 
+            # Add custom xcodebuild option to the prebuilding action
+            #
+            # You may use this for your special demands. For example: the default archs in dSYMs 
+            # of prebuilt frameworks is 'arm64 armv7 x86_64', and no 'i386' for 32bit simulator.
+            # It may generate a warning when building for a 32bit simulator. You may add following
+            # to your podfile
+            # 
+            #  ` set_custom_xcodebuild_options_for_prebuilt_frameworks :simulator => "ARCHS=$(ARCHS_STANDARD)" `
+            #
+            # Another example to disable the generating of dSYM file:
+            #
+            #  ` set_custom_xcodebuild_options_for_prebuilt_frameworks "DEBUG_INFORMATION_FORMAT=dwarf"`
+            # 
+            #
+            # @param [String or Hash] options
+            #
+            #   If is a String, it will apply for device and simulator. Use it just like in the commandline.
+            #   If is a Hash, it should be like this: { :device => "XXXXX", :simulator => "XXXXX" }
+            #
+            def set_custom_xcodebuild_options_for_prebuilt_frameworks(options)
+                if options.kind_of? Hash
+                    DSL.custom_build_options = [ options[:device] ] unless options[:device].nil?
+                    DSL.custom_build_options_simulator = [ options[:simulator] ] unless options[:simulator].nil?
+                elsif options.kind_of? String
+                    DSL.custom_build_options = [options]
+                    DSL.custom_build_options_simulator = [options]
+                else
+                    raise "Wrong type."
+                end
+            end
+
             private
             class_attr_accessor :prebuild_all
             prebuild_all = false
@@ -33,6 +64,11 @@ module Pod
 
             class_attr_accessor :dont_remove_source_code
             dont_remove_source_code = false
+
+            class_attr_accessor :custom_build_options
+            class_attr_accessor :custom_build_options_simulator
+            self.custom_build_options = []
+            self.custom_build_options_simulator = []
         end
     end
 end

data/lib/cocoapods-binary/Prebuild.rb

@@ -1,5 +1,7 @@
 require_relative 'rome/build_framework'
 require_relative 'helper/passer'
+require_relative 'helper/target_checker'
+
 
 # patch prebuild ability
 module Pod
@@ -67,6 +69,10 @@ module Pod
         # Build the needed framework files
         def prebuild_frameworks! 
 
+            # check
+            # give a early warning, instead of after compiling all the pods
+            Prebuild.check_one_pod_should_have_only_one_target(self.pod_targets)
+
             # build options
             sandbox_path = sandbox.root
             existed_framework_folder = sandbox.generate_framework_path
@@ -98,7 +104,9 @@ module Pod
                     sum
                 end
                 targets = root_names_to_update.map do |root_name|
-                    name_to_target_hash[root_name]
+                    t = name_to_target_hash[root_name]
+                    raise "There's no target named (#{root_name}) in Pod.xcodeproj.\n #{name_to_target_hash.keys}" if t.nil?
+                    t
                 end || []
 
                 # add the dendencies
@@ -111,16 +119,18 @@ 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)
             targets.each do |target|
-                next unless target.should_build?
+                if !target.should_build?
+                    UI.puts "Prebuilding #{target.label}"
+                    next
+                end
 
                 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)
+                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?

data/lib/cocoapods-binary/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-    VERSION = "0.4.3"
+    VERSION = "0.4.4"
 end

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

@@ -0,0 +1,49 @@
+
+module Pod
+  class Prebuild
+
+    # Check the targets, for the current limitation of the plugin
+    #
+    # @param [Array<PodTarget>] prebuilt_targets
+    def self.check_one_pod_should_have_only_one_target(prebuilt_targets)
+
+      targets_have_different_platforms = prebuilt_targets.select {|t| t.pod_name != t.name }
+
+      if targets_have_different_platforms.count > 0
+        names = targets_have_different_platforms.map(&:pod_name)
+        raw_names = targets_have_different_platforms.map(&:name)
+        message = "Oops, you came across a limitation of cocoapods-binary.
+
+The plugin requires that one pod should have ONLY ONE target in the 'Pod.xcodeproj'. There are mainly 2 situations \
+causing this problem:
+
+1. One pod integrates in 2 or more different platforms' targets. e.g.
+    ```
+    target 'iphoneApp' do
+      pod 'A', :binary => true
+    end
+    target 'watchApp' do
+      pod 'A'
+    end
+    ```
+
+2. Use different subspecs in multiple targets. e.g.
+    ```
+    target 'iphoneApp' do
+      pod 'A/core'
+      pod 'A/network'
+    end
+    target 'iphoneAppTest' do
+      pod 'A/core'
+    end
+    ```
+
+Related pods: #{names}, target names: #{raw_names}
+        "
+        raise Informative, message
+      end
+    end
+
+
+  end
+end

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

@@ -1,4 +1,5 @@
 require 'fourflusher'
+require 'xcpretty'
 
 CONFIGURATION = "Release"
 PLATFORMS = { 'iphonesimulator' => 'iOS',
@@ -15,7 +16,10 @@ def build_for_iosish_platform(sandbox,
                               target, 
                               device, 
                               simulator,
-                              bitcode_enabled)
+                              bitcode_enabled,
+                              custom_build_options = [], # Array<String>
+                              custom_build_options_simulator = [] # Array<String>
+                              )
 
   deployment_target = target.platform.deployment_target.to_s
   
@@ -26,47 +30,77 @@ def build_for_iosish_platform(sandbox,
   if bitcode_enabled
     other_options += ['BITCODE_GENERATION_MODE=bitcode']
   end
-  xcodebuild(sandbox, target_label, device, deployment_target, other_options)
-  xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'])
+
+  is_succeed, _ = xcodebuild(sandbox, target_label, device, deployment_target, other_options + custom_build_options)
+  exit 1 unless is_succeed
+  is_succeed, _ = xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'] + custom_build_options_simulator)
+  exit 1 unless is_succeed
 
   # paths
   root_name = target.pod_name
   module_name = target.product_module_name
-  device_framwork_path = "#{build_dir}/#{CONFIGURATION}-#{device}/#{root_name}/#{module_name}.framework"
-  simulator_framwork_path = "#{build_dir}/#{CONFIGURATION}-#{simulator}/#{root_name}/#{module_name}.framework"
+  device_framework_path = "#{build_dir}/#{CONFIGURATION}-#{device}/#{root_name}/#{module_name}.framework"
+  simulator_framework_path = "#{build_dir}/#{CONFIGURATION}-#{simulator}/#{root_name}/#{module_name}.framework"
 
-  device_binary = device_framwork_path + "/#{module_name}"
-  simulator_binary = simulator_framwork_path + "/#{module_name}"
+  device_binary = device_framework_path + "/#{module_name}"
+  simulator_binary = simulator_framework_path + "/#{module_name}"
   return unless File.file?(device_binary) && File.file?(simulator_binary)
   
   # the device_lib path is the final output file path
-  # combine the bianries
+  # combine the binaries
   tmp_lipoed_binary_path = "#{build_dir}/#{root_name}"
   lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_binary} #{simulator_binary}`
   puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
   FileUtils.mv tmp_lipoed_binary_path, device_binary, :force => true
   
   # collect the swiftmodule file for various archs.
-  device_swiftmodule_path = device_framwork_path + "/Modules/#{module_name}.swiftmodule"
-  simulator_swiftmodule_path = simulator_framwork_path + "/Modules/#{module_name}.swiftmodule"
+  device_swiftmodule_path = device_framework_path + "/Modules/#{module_name}.swiftmodule"
+  simulator_swiftmodule_path = simulator_framework_path + "/Modules/#{module_name}.swiftmodule"
   if File.exist?(device_swiftmodule_path)
     FileUtils.cp_r simulator_swiftmodule_path + "/.", device_swiftmodule_path
   end
 
+  # combine the generated swift headers
+  # (In xcode 10.2, the generated swift headers vary for each archs)
+  # https://github.com/leavez/cocoapods-binary/issues/58
+  simulator_generated_swift_header_path = simulator_framework_path + "/Headers/#{module_name}-Swift.h"
+  device_generated_swift_header_path = device_framework_path + "/Headers/#{module_name}-Swift.h"
+  if File.exist? simulator_generated_swift_header_path
+    device_header = File.read(device_generated_swift_header_path)
+    simulator_header = File.read(simulator_generated_swift_header_path)
+    # https://github.com/Carthage/Carthage/issues/2718#issuecomment-473870461
+    combined_header_content = %Q{
+#if TARGET_OS_SIMULATOR // merged by cocoapods-binary
+
+#{simulator_header}
+
+#else // merged by cocoapods-binary
+
+#{device_header}
+
+#endif // merged by cocoapods-binary
+}
+    File.write(device_generated_swift_header_path, combined_header_content.strip)
+  end
+
   # handle the dSYM files
-  device_dsym = "#{device_framwork_path}.dSYM"
+  device_dsym = "#{device_framework_path}.dSYM"
   if File.exist? device_dsym
     # lipo the simulator dsym
-    tmp_lipoed_binary_path = "#{output_path}/#{module_name}.draft"
-    lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_dsym}/Contents/Resources/DWARF/#{module_name} #{simulator_framwork_path}.dSYM/Contents/Resources/DWARF/#{module_name}`
-    puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
-    FileUtils.mv tmp_lipoed_binary_path, "#{device_framwork_path}.dSYM/Contents/Resources/DWARF/#{module_name}", :force => true
+    simulator_dsym = "#{simulator_framework_path}.dSYM"
+    if File.exist? simulator_dsym
+      tmp_lipoed_binary_path = "#{output_path}/#{module_name}.draft"
+      lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_dsym}/Contents/Resources/DWARF/#{module_name} #{simulator_dsym}/Contents/Resources/DWARF/#{module_name}`
+      puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
+      FileUtils.mv tmp_lipoed_binary_path, "#{device_framework_path}.dSYM/Contents/Resources/DWARF/#{module_name}", :force => true
+    end
+    # move
     FileUtils.mv device_dsym, output_path, :force => true
   end
 
   # output
   output_path.mkpath unless output_path.exist?
-  FileUtils.mv device_framwork_path, output_path, :force => true
+  FileUtils.mv device_framework_path, output_path, :force => true
 
 end
 
@@ -75,7 +109,23 @@ def xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, other_optio
   platform = PLATFORMS[sdk]
   args += Fourflusher::SimControl.new.destination(:oldest, platform, deployment_target) unless platform.nil?
   args += other_options
-  Pod::Executable.execute_command 'xcodebuild', args, true
+  log = `xcodebuild #{args.join(" ")} 2>&1`
+  exit_code = $?.exitstatus  # Process::Status
+  is_succeed = (exit_code == 0)
+
+  if !is_succeed
+    begin
+      # 64 represent command invalid. http://www.manpagez.com/man/3/sysexits/
+      raise "shouldn't be handle by xcpretty" if exit_code == 64 
+      printer = XCPretty::Printer.new({:formatter => XCPretty::Simple, :colorize => 'auto'})
+      log.each_line do |line|
+        printer.pretty_print(line)
+      end
+    rescue
+      puts log
+    end
+  end
+  [is_succeed, log]
 end
 
 
@@ -94,7 +144,7 @@ module Pod
     #         [Pathname] output_path
     #         output path for generated frameworks
     #
-    def self.build(sandbox_root_path, target, output_path, bitcode_enabled = false)
+    def self.build(sandbox_root_path, target, output_path, bitcode_enabled = false, custom_build_options=[], custom_build_options_simulator=[])
     
       return unless not target == nil
     
@@ -104,8 +154,8 @@ module Pod
 
       # -- 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 :ios then build_for_iosish_platform(sandbox, build_dir, output_path, target, 'iphoneos', 'iphonesimulator', bitcode_enabled, custom_build_options, custom_build_options_simulator)
+      when :osx then xcodebuild(sandbox, target.label, 'macosx', nil, custom_build_options)
       # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - leavez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: xcpretty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +110,7 @@ files:
 - lib/cocoapods-binary/helper/passer.rb
 - lib/cocoapods-binary/helper/podfile_options.rb
 - lib/cocoapods-binary/helper/prebuild_sandbox.rb
+- lib/cocoapods-binary/helper/target_checker.rb
 - lib/cocoapods-binary/rome/build_framework.rb
 - lib/cocoapods-binary/tool/tool.rb
 - lib/cocoapods_plugin.rb
@@ -120,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A CocoaPods plugin to integrate pods in form of prebuilt frameworks, not