pod-builder 3.3.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0cdcd16503f8c363779e6b63a2a7c7ff66cc867a2092c65fb3a8bcb66758cfb
-  data.tar.gz: 199fc74359e90c198cac6e8c5c1ea1e172ae93ffe584ccccf5c8d324cda0f761
+  metadata.gz: a78cc17a913b3034855029cd54e3b27ab7f5e4482c370e7a53c527c902bec7f1
+  data.tar.gz: '08abdad59a5fc4a09dd86fb3d0ca36dc93ef5f3c66a47505fc0919245f8cfd14'
 SHA512:
-  metadata.gz: 42587bceee70997a3a91ab5428945e9e98094500ceafca8a7de957fb60784e9e2bc84d9f823fa7c00866c5910e651aa48ad7b200924163a1d9879df241fcd541
-  data.tar.gz: 60f520d51741fbff7d7216d018266182f4786a5b77c7eec21495d5199752edd850dbafaecd9644217d5bfb7643e41cce88d94b09c271372af2602846cd19db5a
+  metadata.gz: 98738c77905e22cfc84ac3941347ab23b9fb1a6f5bb3e9a807b85795b8378f9e4cc2d31f75d1bc338f1ab828a6264f262ef01cd0efc0e4e075a8cfea80981c15
+  data.tar.gz: a2561e7991129a01f1fddc79a23e72a87af1474528d188bc686362a6040e0e798e4f66e2e882b5a273342cbf70a035554673e39cf125f0f12302f44e1625944e

data/README.md

@@ -324,6 +324,24 @@ PodBuilder writes a plist and markdown license files of pods specified in the Po
 
 If you use bundler to pin the version of CocoaPods in your project set this to true. Default false.
 
+#### `pre_actions`
+
+Pre actions allow to execute custom scripts before a given command (`switch`, `build`) has been performed.
+
+You need to specify a `path` to the executable script which is relative to the _PodBuilder_ folder. Optionally you can also specify whether the command should or should not print the output to stdout/stderr by passing a bool to the `quiet` key (default: false).
+
+```json
+{
+    "pre_actions": { 
+                        "switch" : { "path": "pre_switch_action.rb", "quiet": true },
+                        "build" : { "path": "pre_build_action.rb", "quiet": false }
+                    }
+}
+```
+
+**Note:** The build action might be invoked more than once depending on the build strategy that PodBuilder needs to perform.
+
+
 #### `post_actions`
 
 Post actions allow to execute custom scripts after a given command (`switch`, `build`) has been performed.
@@ -339,11 +357,12 @@ You need to specify a `path` to the executable script which is relative to the _
 }
 ```
 
+**Note:** The build action might be invoked more than once depending on the build strategy that PodBuilder needs to perform.
 
 
 # Behind the scenes
 
-PodBuilder leverages CocoaPods code and [cocoapods-rome plugin](https://github.com/CocoaPods/Prebuilt) to compile pods into frameworks. Every compiled framework will be boxed (by adding it as a `vendored_framework`) as a subspec of a local podspec. When needed additional settings will be automatically ported from the original podspec, like for example xcconfig settings.
+PodBuilder leverages CocoaPods to compile pods into frameworks. Every compiled framework will be boxed (by adding it as a `vendored_framework`) as a subspec of a local podspec. When needed additional settings will be automatically ported from the original podspec, like for example custom xcconfig settings.
 
 # FAQ
 

data/lib/pod_builder/{post_actions.rb → actions.rb}

@@ -2,7 +2,7 @@ require 'pod_builder/core'
 require 'json'
 
 module PodBuilder
-  module PostActions
+  module Actions
     def self.load(hash)
       actions = {}
       if json = hash["switch"]

data/lib/pod_builder/analyze.rb

@@ -52,7 +52,10 @@ module PodBuilder
       
       supported_platforms = analyzer.instance_variable_get("@result").targets.map { |t| t.platform.safe_string_name.downcase }
       
-      return all_specs.map { |spec| PodfileItem.new(spec, all_specs, checkout_options, supported_platforms) }.sort_by(&:name)
+      target_definitions = installer.podfile.target_definitions.values
+      items = all_specs.map { |spec| PodfileItem.new(spec, all_specs, target_definitions, checkout_options, supported_platforms) }.sort_by(&:name)
+
+      return items
     end
   end
 end

data/lib/pod_builder/command/build.rb

@@ -114,10 +114,19 @@ module PodBuilder
           podfile_items = podfile_items.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
           
           podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration, install_using_frameworks, build_catalyst, podfile_items.first.build_xcframework)
+
+          PodBuilder::safe_rm_rf(Configuration.build_path)
+          FileUtils.mkdir_p(Configuration.build_path)
+
+          init_git(Configuration.build_path) # this is needed to be able to call safe_rm_rf
+
+          Configuration.pre_actions[:build]&.execute()
           
           install_result += Install.podfile(podfile_content, podfile_items, argument_pods, podfile_items.first.build_configuration)          
           
           FileUtils.rm_f(PodBuilder::basepath("Podfile.lock"))
+
+          Configuration.post_actions[:build]&.execute()
         end
 
         install_result.write_prebuilt_info_files
@@ -145,9 +154,7 @@ module PodBuilder
 
         if (restore_file_error = restore_file_error) && Configuration.restore_enabled
           puts "\n\n⚠️ Podfile.restore was found invalid and was overwritten. Error:\n #{restore_file_error}".red
-        end
-
-        Configuration.post_actions[:build]&.execute()
+        end        
 
         puts "\n\n🎉 done!\n".green
         return 0
@@ -155,6 +162,12 @@ module PodBuilder
 
       private
 
+      def self.init_git(path)
+        Dir.chdir(path) do 
+          system("git init")
+        end
+      end  
+
       def self.should_build_catalyst(installer)
         integrate_targets = installer.podfile.installation_options.integrate_targets
 

data/lib/pod_builder/command/switch.rb

@@ -1,4 +1,5 @@
 require 'pod_builder/core'
+require 'set'
 
 module PodBuilder
   module Command
@@ -13,6 +14,8 @@ module PodBuilder
           return -1
         end
 
+        Configuration.pre_actions[:switch]&.execute()
+
         pods_not_found = []
         pod_names_to_switch = []
         argument_pods.each do |pod|
@@ -85,6 +88,8 @@ module PodBuilder
           pod_names_to_switch = pod_names_to_switch.map { |t| t.split("/").first }.uniq
           dep_pod_names_to_switch.reject { |t| pod_names_to_switch.include?(t) } 
         end
+
+        inhibit_warnings = inhibit_warnings_pods()
         
         pod_names_to_switch.each do |pod_name_to_switch|
           development_path = ""
@@ -92,7 +97,7 @@ module PodBuilder
 
           case OPTIONS[:switch_mode]
           when "development"
-            development_path = find_podspec(pod_name_to_switch)               
+            development_path = find_podspec(pod_name_to_switch)              
           when "prebuilt"
             podfile_path = PodBuilder::basepath("Podfile.restore")
             content = File.read(podfile_path)
@@ -111,8 +116,7 @@ module PodBuilder
                 next
               end
     
-              matches = line.gsub("\"", "'").match(/pod '(.*?)'/)
-              if matches&.size == 2
+              if (matches = line.match(/^\s*pod ['|"](.*?)['|"](.*)/)) && matches.size == 3
                 if matches[1].split("/").first == pod_name_to_switch
                   default_entries[current_section] = line
                 end  
@@ -141,8 +145,7 @@ module PodBuilder
               current_section = line.split(" ")[1]
             end
 
-            matches = line.gsub("\"", "'").match(/pod '(.*?)'/)
-            if matches&.size == 2
+            if (matches = line.match(/^\s*pod ['|"](.*?)['|"](.*)/)) && matches.size == 3
               if matches[1].split("/").first == pod_name_to_switch
                 case OPTIONS[:switch_mode]
                 when "prebuilt"
@@ -159,6 +162,9 @@ module PodBuilder
                   indentation = line.split("pod '").first
                   rel_path = Pathname.new(development_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
                   development_line = "#{indentation}pod '#{matches[1]}', :path => '#{rel_path}'\n"
+                  if inhibit_warnings.include?(matches[1])
+                    development_line = development_line.chomp("\n") + ", :inhibit_warnings => true\n"
+                  end
                   if line.include?("# pb<") && marker = line.split("# pb<").last
                     development_line = development_line.chomp("\n") + " # pb<#{marker}"
                   end
@@ -167,6 +173,9 @@ module PodBuilder
                   next
                 when "default"
                   if default_line = default_entries[current_section]
+                    if inhibit_warnings.include?(matches[1])
+                      default_line = default_line.chomp("\n") + ", :inhibit_warnings => true\n"
+                    end  
                     if line.include?("# pb<") && marker = line.split("# pb<").last
                       default_line = default_line.chomp("\n") + " # pb<#{marker}"
                     end
@@ -180,8 +189,6 @@ module PodBuilder
 
                     lines.append(default_line)
                     next
-                  elsif
-                    raise "\n\nLine for pod '#{matches[1]}' in section '#{current_section}' not found in PodBuilder's Podfile".red
                   end
                 else
                   raise "\n\nUnsupported mode '#{OPTIONS[:switch_mode]}'".red
@@ -208,6 +215,26 @@ module PodBuilder
       end
       
       private 
+
+      def self.inhibit_warnings_pods
+        ret = Set.new
+
+        podfile_path = PodBuilder::basepath("Podfile")
+        content = File.read(podfile_path)
+
+        content.each_line do |line|
+          unless (name_match = line.match(/^\s*pod ['|"](.*?)['|"](.*)/)) && name_match.size == 3
+            next
+          end
+
+          if line.gsub(" ", "").include?(":inhibit_warnings=>true")
+            pod_name = name_match[1]
+            ret.add?(pod_name)
+          end
+        end
+
+        return ret
+      end
       
       def self.is_absolute_path(path)
         return ["~", "/"].any? { |t| path.start_with?(t) }
@@ -223,11 +250,28 @@ module PodBuilder
           if Pathname.new(path).relative?
             path = PodBuilder::basepath(path)
           end
-          podspec = Dir.glob(File.expand_path("#{path}/**/#{podname}*.podspec*"))
-          podspec.select! { |x| !x.include?("/Local Podspecs/") }
-          podspec.select! { |x| Dir.glob(File.join(File.dirname(x), "*")).count > 1 } # exclude podspec folder (which has one file per folder)
-          if podspec.count > 0
-            podspec_path = Pathname.new(podspec.first).dirname.to_s
+          podspec_paths = Dir.glob(File.expand_path("#{path}/**/#{podname}*.podspec*"))
+          podspec_paths.select! { |t| !t.include?("/Local Podspecs/") }
+          podspec_paths.select! { |t| Dir.glob(File.join(File.dirname(t), "*")).count > 1 } # exclude podspec folder (which has one file per folder)
+          if podspec_paths.count > 1
+            if match_name_path = podspec_paths.find{ |t| File.basename(t, ".*") == podname }
+              podspec_path = Pathname.new(match_name_path).dirname.to_s
+            else
+              # Try parsing podspec
+              podspec_paths.each do |path|
+                content = File.read(path).gsub("\"", "'").gsub(" ", "")
+                if content.include?("name='#{podname}'")
+                  podspec_path = path                  
+                end
+                unless podspec_path.nil?
+                  break
+                end
+              end  
+            end
+
+            break
+          elsif podspec_paths.count == 1
+            podspec_path = Pathname.new(podspec_paths.first).dirname.to_s
             break
           end
         end

data/lib/pod_builder/configuration.rb

@@ -75,6 +75,7 @@ module PodBuilder
       attr_accessor :build_xcframeworks_all
       attr_accessor :build_xcframeworks_include
       attr_accessor :build_xcframeworks_exclude
+      attr_accessor :pre_actions
       attr_accessor :post_actions
     end
 
@@ -113,6 +114,7 @@ module PodBuilder
     @build_xcframeworks_include = []
     @build_xcframeworks_exclude = []
 
+    @pre_actions = {}
     @post_actions = {}
     
     def self.check_inited
@@ -232,9 +234,14 @@ module PodBuilder
             Configuration.build_xcframeworks_exclude = value
           end
         end
+        if value = json["pre_actions"]
+          if value.is_a?(Hash)
+            Configuration.pre_actions = PodBuilder::Actions.load(value)
+          end
+        end
         if value = json["post_actions"]
           if value.is_a?(Hash)
-            Configuration.post_actions = PodBuilder::PostActions.load(value)
+            Configuration.post_actions = PodBuilder::Actions.load(value)
           end
         end
 

data/lib/pod_builder/core.rb

@@ -12,7 +12,7 @@ require 'pod_builder/info'
 require 'pod_builder/configuration'
 require 'pod_builder/podspec'
 require 'pod_builder/licenses'
-require 'pod_builder/post_actions'
+require 'pod_builder/actions'
 
 require 'core_ext/string'
 

data/lib/pod_builder/install.rb

@@ -140,12 +140,7 @@ module PodBuilder
   class Install
     # This method will generate prebuilt data by building from "/tmp/pod_builder/Podfile"
     def self.podfile(podfile_content, podfile_items, argument_pods, build_configuration)
-      puts "Preparing build Podfile".yellow
-      
-      PodBuilder::safe_rm_rf(Configuration.build_path)
-      FileUtils.mkdir_p(Configuration.build_path)
-      
-      init_git(Configuration.build_path) # this is needed to be able to call safe_rm_rf
+      puts "Preparing build Podfile".yellow      
       
       podfile_content = copy_development_pods_source_code(podfile_content, podfile_items)
       
@@ -452,13 +447,7 @@ module PodBuilder
         File.write(gitattributes_path, expected_attributes, mode: 'a')
       end
     end
-    
-    def self.init_git(path)
-      Dir.chdir(path) do 
-        system("git init")
-      end
-    end
-    
+        
     def self.build_folder_hash_in_prebuilt_info_file(podfile_item)
       prebuilt_info_path = PodBuilder::prebuiltpath(File.join(podfile_item.root_name, Configuration.prebuilt_info_filename))
       

data/lib/pod_builder/podfile.rb

@@ -591,8 +591,10 @@ module PodBuilder
         if matches&.size == 4 && !stripped_line.start_with?("#")
           path = matches[2]
 
+          file_exists = File.exist?(File.expand_path(path))
+
           is_absolute = ["~", "/"].include?(path[0])
-          unless !is_absolute
+          if is_absolute || !file_exists
             podfile_lines.push(line)
             next
           end

data/lib/pod_builder/podfile_item.rb

@@ -142,6 +142,10 @@ module PodBuilder
     # @return [Bool] True if it's a pod that doesn't provide source code (is already shipped as a prebuilt pod)
     #
     attr_accessor :is_prebuilt
+
+    # @return [Bool] True if warnings should be inhibited for the pod
+    #
+    attr_accessor :inhibit_warnings
     
     # Initialize a new instance
     #
@@ -149,7 +153,7 @@ module PodBuilder
     #
     # @param [Hash] checkout_options
     #
-    def initialize(spec, all_specs, checkout_options, supported_platforms)
+    def initialize(spec, all_specs, target_definitions, checkout_options, supported_platforms)
       @name = spec.name
       @root_name = spec.name.split("/").first
 
@@ -184,14 +188,26 @@ module PodBuilder
       @weak_frameworks = []
       @libraries = []
 
-      @frameworks += extract_array(spec, "framework")
-      @frameworks += extract_array(spec, "frameworks")
+      @frameworks += extract_array(spec.attributes_hash, "framework")
+      @frameworks += extract_array(spec.attributes_hash, "frameworks")
+      supported_platforms.each do |platform|        
+        @frameworks += extract_array(spec.attributes_hash[platform], "framework")
+        @frameworks += extract_array(spec.attributes_hash[platform], "frameworks")
+      end       
       
-      @weak_frameworks += extract_array(spec, "weak_framework")
-      @weak_frameworks += extract_array(spec, "weak_frameworks")  
+      @weak_frameworks += extract_array(spec.attributes_hash, "weak_framework")
+      @weak_frameworks += extract_array(spec.attributes_hash, "weak_frameworks")  
+      supported_platforms.each do |platform|        
+        @weak_frameworks += extract_array(spec.attributes_hash[platform], "weak_framework")
+        @weak_frameworks += extract_array(spec.attributes_hash[platform], "weak_frameworks")
+      end
 
-      @libraries += extract_array(spec, "library")
-      @libraries += extract_array(spec, "libraries")  
+      @libraries += extract_array(spec.attributes_hash, "library")
+      @libraries += extract_array(spec.attributes_hash, "libraries")  
+      supported_platforms.each do |platform|        
+        @libraries += extract_array(spec.attributes_hash[platform], "library")
+        @libraries += extract_array(spec.attributes_hash[platform], "libraries")
+      end
 
       @header_dir = spec.attributes_hash["header_dir"]
 
@@ -201,7 +217,7 @@ module PodBuilder
       @swift_version = spec.root.swift_version&.to_s
       @module_name = spec.root.module_name
 
-      @default_subspecs = extract_array(spec, "default_subspecs")
+      @default_subspecs = extract_array(spec.attributes_hash, "default_subspecs")
       if default_subspec = spec.attributes_hash["default_subspec"]
         @default_subspecs.push(default_subspec)        
       end
@@ -252,6 +268,7 @@ module PodBuilder
       @build_xcframework = build_as_xcframework
 
       @is_prebuilt = extract_is_prebuilt(spec, all_specs, checkout_options, supported_platforms)
+      @inhibit_warnings = target_definitions.any? { |t| t.inhibits_warnings_for_pod?(@name) }
     end
 
     def pod_specification(all_poditems, parent_spec = nil)
@@ -358,6 +375,10 @@ module PodBuilder
     def entry(include_version = true, include_pb_entry = true)
       e = "pod '#{@name}'"
 
+      if !is_prebuilt && inhibit_warnings
+        e += ", :inhibit_warnings => true"
+      end
+
       unless include_version
         return e
       end
@@ -466,7 +487,7 @@ module PodBuilder
       if default_subspecs != nil && default_subspecs.count > 0
         default_subspecs.each do |default_subspec_name|
           if (default_spec = all_specs.detect { |t| t.name == "#{root_name}/#{default_subspec_name}" })
-            default_item = PodfileItem.new(default_spec, all_specs, checkout_options, supported_platforms)
+            default_item = PodfileItem.new(default_spec, all_specs, [], checkout_options, supported_platforms)
             if default_item.is_prebuilt
               return true
             end
@@ -516,8 +537,12 @@ module PodBuilder
       return items.flatten.uniq.compact
     end
 
-    def extract_array(spec, key)
-      element = spec.attributes_hash.fetch(key, [])
+    def extract_array(dict, key)
+      if dict.nil?
+        return []
+      end
+
+      element = dict.fetch(key, [])
       if element.instance_of? String
         element = [element]
       end

data/lib/pod_builder/version.rb

@@ -1,4 +1,3 @@
 module PodBuilder
-  VERSION = "3.3.0"
+  VERSION = "4.1.0"
 end
-  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,6 +181,7 @@ files:
 - bin/setup
 - exe/pod_builder
 - lib/core_ext/string.rb
+- lib/pod_builder/actions.rb
 - lib/pod_builder/analyze.rb
 - lib/pod_builder/analyzer.rb
 - lib/pod_builder/command.rb
@@ -208,7 +209,6 @@ files:
 - lib/pod_builder/podfile_cp.rb
 - lib/pod_builder/podfile_item.rb
 - lib/pod_builder/podspec.rb
-- lib/pod_builder/post_actions.rb
 - lib/pod_builder/rome/post_install.rb
 - lib/pod_builder/rome/pre_install.rb
 - lib/pod_builder/templates/build_podfile.template
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Prebuild CocoaPods pods