pod-builder 2.3.0 → 3.3.0

data/lib/pod_builder/command/switch.rb

@@ -13,19 +13,23 @@ module PodBuilder
           return -1
         end
 
+        pods_not_found = []
         pod_names_to_switch = []
         argument_pods.each do |pod|
           pod_name_to_switch = pod
           pod_name_to_switch = Podfile::resolve_pod_names_from_podfile([pod_name_to_switch]).first
-          raise "\n\nDid not find pod '#{pod}'".red if pod_name_to_switch.nil?
-          
-          check_not_building_subspec(pod_name_to_switch)  
 
-          pod_names_to_switch.push(pod_name_to_switch)
+          if pod_name_to_switch.nil?
+            raise "\n\n'#{pod}' not found in PodBuilder's Podfile.\n\nYou might need to explictly add:\n\n    pod '#{pod}'\n\nto #{PodBuilder::basepath("Podfile")}\n".red
+          else
+            check_not_building_subspec(pod_name_to_switch)  
+
+            pod_names_to_switch.push(pod_name_to_switch)  
+          end          
         end
 
         if OPTIONS[:resolve_parent_dependencies] == true
-          install_update_repo = OPTIONS.fetch(:update_repos, true)
+          install_update_repo = OPTIONS.fetch(:update_repos, false)
           installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
   
           all_buildable_items = Analyze.podfile_items(installer, analyzer)
@@ -55,7 +59,7 @@ module PodBuilder
 
             podspec_content = File.read(podspec_path)
 
-            regex = "p\\d\\.dependency '(.*)'"
+            regex = "p\\d\\.dependency ['|\"](.*)['|\"]"
 
             podspec_content.each_line do |line|
               matches = line.match(/#{regex}/)
@@ -107,15 +111,15 @@ module PodBuilder
                 next
               end
     
-              matches = line.gsub("\"", "'").match(/pod '(.*?)',(.*)/)
-              if matches&.size == 3
+              matches = line.gsub("\"", "'").match(/pod '(.*?)'/)
+              if matches&.size == 2
                 if matches[1].split("/").first == pod_name_to_switch
                   default_entries[current_section] = line
                 end  
               end
             end
     
-            raise "\n\n'#{pod_name_to_switch}' not found in #{podfile_path}".red if default_entries.keys.count == 0
+            raise "\n\n'#{pod_name_to_switch}' not found in PodBuilder's Podfile.\n\nYou might need to explictly add:\n\n    pod '#{pod_name_to_switch}'\n\nto #{podfile_path}\n".red if default_entries.keys.count == 0
           end
 
           if development_path.nil? 
@@ -137,8 +141,8 @@ module PodBuilder
               current_section = line.split(" ")[1]
             end
 
-            matches = line.gsub("\"", "'").match(/pod '(.*?)',(.*)/)
-            if matches&.size == 3
+            matches = line.gsub("\"", "'").match(/pod '(.*?)'/)
+            if matches&.size == 2
               if matches[1].split("/").first == pod_name_to_switch
                 case OPTIONS[:switch_mode]
                 when "prebuilt"
@@ -166,6 +170,14 @@ module PodBuilder
                     if line.include?("# pb<") && marker = line.split("# pb<").last
                       default_line = default_line.chomp("\n") + " # pb<#{marker}"
                     end
+                    if (path_match = default_line.match(/:path => '(.*?)'/)) && path_match&.size == 2
+                      original_path = path_match[1]
+                      if !is_absolute_path(original_path)
+                        updated_path = Pathname.new(PodBuilder::basepath(original_path)).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+                        default_line.gsub!(":path => '#{original_path}'", ":path => '#{updated_path}'")
+                      end
+                    end
+
                     lines.append(default_line)
                     next
                   elsif
@@ -183,14 +195,23 @@ module PodBuilder
           File.write(podfile_path, lines.join)
         end
         
-        Dir.chdir(PodBuilder::project_path)
-        bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
-        system("#{bundler_prefix}pod install;")
+        Dir.chdir(PodBuilder::project_path) do
+          bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
+          system("#{bundler_prefix}pod install;")  
+        end
+
+        Configuration.post_actions[:switch]&.execute()
+
+        puts "\n\n🎉 done!\n".green
 
         return 0
       end
       
-      private     
+      private 
+      
+      def self.is_absolute_path(path)
+        return ["~", "/"].any? { |t| path.start_with?(t) }
+      end  
 
       def self.find_podspec(podname)
         unless Configuration.development_pods_paths.count > 0
@@ -216,7 +237,7 @@ module PodBuilder
             
       def self.check_not_building_subspec(pod_to_switch)
         if pod_to_switch.include?("/")
-          raise "\n\nCan't switch subspec #{pod_to_switch} refer to podspec name.\n\nUse `pod_builder switch #{pod_to_switch.split("/").first}` instead\n\n".red
+          raise "\n\nCan't switch subspec #{pod_to_switch} refer to podspec name.\n\nUse `pod_builder switch #{pod_to_switch.split("/").first}` instead\n".red
         end
       end
     end

data/lib/pod_builder/command/sync_podfile.rb

@@ -12,17 +12,17 @@ module PodBuilder
 
         all_buildable_items = Analyze.podfile_items(installer, analyzer)
 
-        Dir.chdir(PodBuilder::project_path)
-
-        previous_podfile_content = File.read("Podfile")
-        Podfile::write_prebuilt(all_buildable_items, analyzer)        
-        updated_podfile_content = File.read("Podfile")
-
-        Licenses::write([], all_buildable_items)
-
-        if previous_podfile_content != updated_podfile_content
-          bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
-          system("#{bundler_prefix}pod install;")
+        Dir.chdir(PodBuilder::project_path) do
+          previous_podfile_content = File.read("Podfile")
+          Podfile::write_prebuilt(all_buildable_items, analyzer)        
+          updated_podfile_content = File.read("Podfile")
+  
+          Licenses::write([], all_buildable_items)
+  
+          if previous_podfile_content != updated_podfile_content
+            bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
+            system("#{bundler_prefix}pod install;")
+          end  
         end
         
         puts "\n\n🎉 done!\n".green

data/lib/pod_builder/command/update.rb

@@ -35,7 +35,6 @@ module PodBuilder
         ARGV.clear
         pods_to_update.each { |x| ARGV << x }
 
-        # OPTIONS[:resolve_parent_dependencies] = true
         return PodBuilder::Command::Build.call
       end              
     end

data/lib/pod_builder/configuration.rb

@@ -39,19 +39,10 @@ module PodBuilder
         "ENABLE_BITCODE": "NO"
       }
     }.freeze
-    DEFAULT_SKIP_PODS = ["GoogleMaps", "React-RCTFabric", "React-Core", "React-CoreModules"] # Not including React-RCTNetwork might loose some debug warnings
-
-    DEFAULT_FORCE_PREBUILD_PODS = []
-    DEFAULT_BUILD_SYSTEM = "Latest".freeze # either Latest (New build system) or Legacy (Standard build system)
-    DEFAULT_LIBRARY_EVOLUTION_SUPPORT = false
-    DEFAULT_PLATFORMS = ["iphoneos", "iphonesimulator", "appletvos", "appletvsimulator"].freeze
-    DEFAULT_BUILD_USING_REPO_PATHS = false
-    DEFAULT_BUILD_XCFRAMEWORKS = false
     
     private_constant :DEFAULT_BUILD_SETTINGS
     private_constant :DEFAULT_BUILD_SETTINGS_OVERRIDES
-    private_constant :DEFAULT_BUILD_SYSTEM
-    private_constant :DEFAULT_LIBRARY_EVOLUTION_SUPPORT
+    private_constant :DEFAULT_SPEC_OVERRIDE
     
     class <<self      
       attr_accessor :allow_building_development_pods
@@ -81,19 +72,23 @@ module PodBuilder
       attr_accessor :build_using_repo_paths
       attr_accessor :react_native_project
       attr_accessor :lldbinit_name
-      attr_accessor :build_xcframeworks
+      attr_accessor :build_xcframeworks_all
+      attr_accessor :build_xcframeworks_include
+      attr_accessor :build_xcframeworks_exclude
+      attr_accessor :post_actions
     end
-    
-    @allow_building_development_pods = false
+
     @build_settings = DEFAULT_BUILD_SETTINGS
     @build_settings_overrides = DEFAULT_BUILD_SETTINGS_OVERRIDES
-    @build_system = DEFAULT_BUILD_SYSTEM
-    @library_evolution_support = DEFAULT_LIBRARY_EVOLUTION_SUPPORT
-    @base_path = "PodBuilder" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME
     @spec_overrides = DEFAULT_SPEC_OVERRIDE
+
+    @allow_building_development_pods = false
+    @build_system = "Latest".freeze # either Latest (New build system) or Legacy (Standard build system)
+    @library_evolution_support = false
+    @base_path = "PodBuilder" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME
     @skip_licenses = []
-    @skip_pods = DEFAULT_SKIP_PODS
-    @force_prebuild_pods = DEFAULT_FORCE_PREBUILD_PODS
+    @skip_pods = ["GoogleMaps", "React-RCTFabric", "React-Core", "React-CoreModules"] # Not including React-RCTNetwork might loose some debug warnings
+    @force_prebuild_pods = []
     @license_filename = "Pods-acknowledgements"
     @development_pods_paths = []
     @build_base_path = "/tmp/pod_builder".freeze
@@ -110,11 +105,15 @@ module PodBuilder
     @use_bundler = false
     @deterministic_build = false
 
-    @supported_platforms = DEFAULT_PLATFORMS
-    @build_using_repo_paths = DEFAULT_BUILD_USING_REPO_PATHS
+    @supported_platforms = ["iphoneos", "iphonesimulator", "appletvos", "appletvsimulator"].freeze
+    @build_using_repo_paths = false
     @react_native_project = false
 
-    @build_xcframeworks = DEFAULT_BUILD_XCFRAMEWORKS
+    @build_xcframeworks_all = false
+    @build_xcframeworks_include = []
+    @build_xcframeworks_exclude = []
+
+    @post_actions = {}
     
     def self.check_inited
       raise "\n\nNot inited, run `pod_builder init`\n".red if podbuilder_path.nil?
@@ -218,12 +217,27 @@ module PodBuilder
             Configuration.react_native_project = value
           end
         end
-        if value = json["build_xcframeworks"]
+        if value = json["build_xcframeworks_all"]
           if [TrueClass, FalseClass].include?(value.class)
-            Configuration.build_xcframeworks = value
+            Configuration.build_xcframeworks_all = value
           end
         end
-        
+        if value = json["build_xcframeworks_include"]
+          if value.is_a?(Array)
+            Configuration.build_xcframeworks_include = value
+          end
+        end
+        if value = json["build_xcframeworks_exclude"]
+          if value.is_a?(Array)
+            Configuration.build_xcframeworks_exclude = value
+          end
+        end
+        if value = json["post_actions"]
+          if value.is_a?(Hash)
+            Configuration.post_actions = PodBuilder::PostActions.load(value)
+          end
+        end
+
         Configuration.build_settings.freeze
 
         sanity_check()
@@ -279,6 +293,11 @@ module PodBuilder
           puts "PodBuilder.json contains '#{pod}' both in `force_prebuild_pods` and `skip_pods`. Will force prebuilding.".yellow
         end
       end
+      if Configuration.build_xcframeworks_all
+        raise "\n\nInvalid PodBuilder.json configuration: 'build_xcframeworks_all' is true and 'build_xcframeworks_include' is not empty\n".red if Configuration.build_xcframeworks_include.count > 0
+      else
+        raise "\n\nInvalid PodBuilder.json configuration: 'build_xcframeworks_all' is false and 'build_xcframeworks_exclude' is not empty\n".red if Configuration.build_xcframeworks_exclude.count > 0
+      end
     end
     
     def self.config_path

data/lib/pod_builder/core.rb

@@ -12,6 +12,7 @@ require 'pod_builder/info'
 require 'pod_builder/configuration'
 require 'pod_builder/podspec'
 require 'pod_builder/licenses'
+require 'pod_builder/post_actions'
 
 require 'core_ext/string'
 
@@ -132,7 +133,7 @@ module PodBuilder
       folder_in_home = x.gsub(home, "")
       !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(PodBuilder::basepath + "/") 
     }
-    raise "\n\nxcodeproj not found!".red if xcodeprojects.count == 0
+    raise "\n\nxcodeproj not found!\n".red if xcodeprojects.count == 0
     raise "\n\nFound multiple xcodeproj:\n#{xcodeprojects.join("\n")}".red if xcodeprojects.count > 1
 
     @@xcodeproj_path = xcodeprojects.first
@@ -148,7 +149,7 @@ module PodBuilder
       folder_in_home = x.gsub(home, "")
       !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(PodBuilder::basepath + "/") && !x.include?(".xcodeproj/")
     }
-    raise "\n\nxcworkspace not found!".red if xcworkspaces.count == 0
+    raise "\n\nxcworkspace not found!\n".red if xcworkspaces.count == 0
     raise "\n\nFound multiple xcworkspaces:\n#{xcworkspaces.join("\n")}".red if xcworkspaces.count > 1
 
     @@xcodeworkspace_path = xcworkspaces.first
@@ -179,7 +180,7 @@ module PodBuilder
 
   def self.system_swift_version
     swift_version = `swiftc --version | grep -o 'swiftlang-.*\s'`.strip()
-    raise "\n\nUnsupported swift compiler version, expecting `swiftlang` keyword in `swiftc --version`".red if swift_version.length == 0
+    raise "\n\nUnsupported swift compiler version, expecting `swiftlang` keyword in `swiftc --version`\n".red if swift_version.length == 0
     return swift_version
   end
 

data/lib/pod_builder/info.rb

@@ -60,7 +60,7 @@ module PodBuilder
         
         return { "repo": "local" }
       else
-        raise "\n\nFailed extracting version from line:\n#{line}\n\n".red
+        raise "\n\nFailed extracting version from line:\n#{line}\n".red
       end
     end
 

data/lib/pod_builder/install.rb

@@ -45,7 +45,7 @@ begin
         elsif defined?(Pod::Target::BuildType) # CocoaPods 1.7, 1.8
           Pod::Target::BuildType.new(linkage: :dynamic, packaging: :framework)
         else
-          raise "\n\nBuildType not found. Open an issue reporting your CocoaPods version".red
+          raise "\n\nBuildType not found. Open an issue reporting your CocoaPods version\n".red
         end
       else
         swz_build_type()
@@ -139,7 +139,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, build_configuration)
+    def self.podfile(podfile_content, podfile_items, argument_pods, build_configuration)
       puts "Preparing build Podfile".yellow
       
       PodBuilder::safe_rm_rf(Configuration.build_path)
@@ -160,7 +160,7 @@ module PodBuilder
         lock_file = "#{Configuration.build_path}/pod_builder.lock"
         FileUtils.touch(lock_file)
         
-        prebuilt_entries = use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
+        prebuilt_entries = use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items, argument_pods)
         
         install
         
@@ -247,7 +247,7 @@ module PodBuilder
     def self.license_specifiers
       acknowledge_file = "#{Configuration.build_path}/Pods/Target Support Files/Pods-DummyTarget/Pods-DummyTarget-acknowledgements.plist"
       unless File.exist?(acknowledge_file)
-        raise "\n\nLicense file not found".red
+        raise "\n\nLicense file not found\n".red
       end
       
       plist = CFPropertyList::List.new(:file => acknowledge_file)
@@ -280,44 +280,66 @@ module PodBuilder
       return podfile_content
     end
     
-    def self.use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
+    def self.use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items, argument_pods)
       podfile_content = File.read(podfile_path)
       
       replaced_items = []
 
-      if OPTIONS.has_key?(:force_rebuild)
-        podfile_content.gsub!("%%%prebuilt_root_paths%%%", "{}")
-      else
-        download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
+      download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
 
-        gitignored_files = PodBuilder::gitignoredfiles
+      gitignored_files = PodBuilder::gitignoredfiles
 
-        prebuilt_root_paths = Hash.new
+      prebuilt_root_paths = Hash.new
 
-        # Replace prebuilt entries in Podfile for Pods that have no changes in source code which will avoid rebuilding them
-        items = podfile_items.group_by { |t| t.root_name }.map { |k, v| v.first } # Return one podfile_item per root_name
-        items.each do |item|
-          podspec_path = item.prebuilt_podspec_path
-          if last_build_folder_hash = build_folder_hash_in_prebuilt_info_file(item)
-            if last_build_folder_hash == build_folder_hash(item, gitignored_files)
-              puts "No changes detected to '#{item.root_name}', will skip rebuild".blue
+      puts "Optimizing build".yellow
+      puts "Build strategy".blue
 
-              replaced_items.push(item)
+      prebuild_log = lambda { |item, reason|
+        if item.is_prebuilt
+          puts "#{item.root_name} is prebuilt"
+        else
+          puts "#{item.root_name} from source #{reason}".blue
+        end
+      }
 
-              podfile_items.select { |t| t.root_name == item.root_name }.each do |replace_item|
-                replace_regex = "pod '#{Regexp.quote(replace_item.name)}', .*"
-                replace_line_found = podfile_content =~ /#{replace_regex}/i
-                raise "\n\nFailed finding pod entry for '#{replace_item.name}'".red unless replace_line_found
-                podfile_content.gsub!(/#{replace_regex}/, replace_item.prebuilt_entry(true, true))
+      # Replace prebuilt entries in Podfile for Pods that have no changes in source code which will avoid rebuilding them
+      items = podfile_items.group_by { |t| t.root_name }.map { |k, v| v.first }.sort_by { |t| t.root_name } # Return one podfile_item per root_name
+      if OPTIONS.has_key?(:force_rebuild)
+        rebuild_pods = items.select { |t| argument_pods.include?(t.root_name) }
 
-                prebuilt_root_paths[replace_item.root_name] = PodBuilder::prebuiltpath
-              end
-            end
-          end
+        rebuild_pods.each do |item|
+          prebuild_log.call(item, "")
         end
 
-        podfile_content.gsub!("%%%prebuilt_root_paths%%%", prebuilt_root_paths.to_s)
+        items -= rebuild_pods
       end
+      
+      items.each do |item|
+        podspec_path = item.prebuilt_podspec_path
+        unless last_build_folder_hash = build_folder_hash_in_prebuilt_info_file(item)
+          prebuild_log.call(item, "(folder hash missing)")
+          next
+        end
+        
+        if last_build_folder_hash == build_folder_hash(item, gitignored_files)
+          puts "#{item.root_name} reuse PodBuilder cache"
+
+          replaced_items.push(item)
+
+          podfile_items.select { |t| t.root_name == item.root_name }.each do |replace_item|
+            replace_regex = "pod '#{Regexp.quote(replace_item.name)}', .*"
+            replace_line_found = podfile_content =~ /#{replace_regex}/i
+            raise "\n\nFailed finding pod entry for '#{replace_item.name}'\n".red unless replace_line_found
+            podfile_content.gsub!(/#{replace_regex}/, replace_item.prebuilt_entry(true, true))
+
+            prebuilt_root_paths[replace_item.root_name] = PodBuilder::prebuiltpath
+          end
+        else
+          prebuild_log.call(item, "(folder hash mismatch)")
+        end
+      end
+
+      podfile_content.gsub!("%%%prebuilt_root_paths%%%", prebuilt_root_paths.to_s)
 
       File.write(podfile_path, podfile_content)
 
@@ -379,6 +401,7 @@ module PodBuilder
       pod_names.each do |pod_name|   
         root_name = pod_name.split("/").first
 
+        # Remove existing files
         items_to_delete = Dir.glob("#{PodBuilder::prebuiltpath(root_name)}/**/*")
         items_to_delete.each { |t| PodBuilder::safe_rm_rf(t) }
       end
@@ -393,6 +416,21 @@ module PodBuilder
           next
         end
 
+        if podfile_item = podfile_items.detect { |t| t.root_name == pod_name }
+          if Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/*.swiftinterface").count > 0
+            # We can safely remove .swiftmodule if .swiftinterface exists
+            swiftmodule_files = Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/*.swiftmodule")
+            swiftmodule_files.each { |t| PodBuilder::safe_rm_rf(t) }
+          end
+        end
+
+        # Cleanup unneeded files (see https://github.com/bazelbuild/rules_apple/pull/1113)
+        ignore_files = Dir.glob(["#{source_path}/**/Modules/**/*.swiftmodule/*.swiftdoc", "#{source_path}/**/Modules/**/*.swiftmodule/**/*.swiftsourceinfo"])
+        ignore_files.each { |t| PodBuilder::safe_rm_rf(t) }
+
+        project_folder = Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/Project")
+        project_folder.select { |t| File.directory?(t) && Dir.empty?(t) }.each { |t| PodBuilder::safe_rm_rf(t) }
+
         unless Dir.glob("#{source_path}/**/*").select { |t| File.file?(t) }.empty?
           destination_folder = PodBuilder::prebuiltpath(root_name)
           FileUtils.mkdir_p(destination_folder)
@@ -416,11 +454,9 @@ module PodBuilder
     end
     
     def self.init_git(path)
-      current_dir = Dir.pwd
-      
-      Dir.chdir(path)
-      system("git init")
-      Dir.chdir(current_dir)
+      Dir.chdir(path) do 
+        system("git init")
+      end
     end
     
     def self.build_folder_hash_in_prebuilt_info_file(podfile_item)
@@ -448,15 +484,16 @@ module PodBuilder
           unless File.file?(path)
             next
           end
-          
+
           path = File.expand_path(path)
           rel_path = path.gsub(rootpath, "")[1..]
-          unless exclude_files.include?(rel_path)
+
+          unless exclude_files.any? { |t| rel_path.start_with?(t) }
             file_hashes.push(Digest::MD5.hexdigest(File.read(path)))
           end
         end
         
-        return Digest::MD5.hexdigest(file_hashes.join)
+        return Digest::MD5.hexdigest(file_hashes.sort.join)
       else
         # Pod folder might be under .gitignore
         item_path = "#{Configuration.build_path}/Pods/#{podfile_item.root_name}"