pod-builder 5.1.1 → 5.1.2

data/lib/pod_builder/install.rb

@@ -1,7 +1,7 @@
-require 'digest'
-require 'colored'
-require 'highline/import'
-require 'pod_builder/core'
+require "digest"
+require "colored"
+require "highline/import"
+require "pod_builder/core"
 
 module PodBuilder
   class InstallResult
@@ -18,7 +18,7 @@ module PodBuilder
       @prebuilt_info = prebuilt_info
     end
 
-    def +(obj) 
+    def +(obj)
       merged_licenses = @licenses.dup + obj.licenses
       merged_prebuilt_info = @prebuilt_info.dup
 
@@ -32,7 +32,7 @@ module PodBuilder
 
       merged_prebuilt_info = obj.prebuilt_info.merge(merged_prebuilt_info)
 
-      return InstallResult.new(merged_licenses, merged_prebuilt_info) 
+      return InstallResult.new(merged_licenses, merged_prebuilt_info)
     end
 
     def write_prebuilt_info_files
@@ -45,10 +45,10 @@ 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      
-      
+      puts "Preparing build Podfile".yellow
+
       podfile_content = copy_development_pods_source_code(podfile_content, podfile_items)
-      
+
       podfile_content = Podfile.update_path_entries(podfile_content, Install.method(:podfile_path_transform))
       podfile_content = Podfile.update_project_entries(podfile_content, Install.method(:podfile_path_transform))
       podfile_content = Podfile.update_require_entries(podfile_content, Install.method(:podfile_path_transform))
@@ -56,79 +56,79 @@ module PodBuilder
       if Configuration.react_native_project
         podfile_content = Podfile.prepare_react_native_compilation_workarounds(podfile_content)
       end
-      
+
       podfile_path = File.join(Configuration.build_path, "Podfile")
       File.write(podfile_path, podfile_content)
-      
-      begin  
+
+      begin
         lock_file = "#{Configuration.build_path}/pod_builder.lock"
         FileUtils.touch(lock_file)
-        
+
         prebuilt_entries = use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items, argument_pods)
-        
+
         install
-        
-        copy_prebuilt_items(podfile_items - prebuilt_entries)   
+
+        copy_prebuilt_items(podfile_items - prebuilt_entries)
 
         prebuilt_info = prebuilt_info(podfile_items)
         licenses = license_specifiers()
-        
+
         if !OPTIONS.has_key?(:debug)
           PodBuilder::safe_rm_rf(Configuration.build_path)
-        end  
-        
+        end
+
         return InstallResult.new(licenses, prebuilt_info)
       rescue Exception => e
         if File.directory?("#{Configuration.build_path}/Pods/Pods.xcodeproj")
           activate_pod_scheme()
 
           if ENV["DEBUGGING"]
-            system("xed #{Configuration.build_path}/Pods")  
+            system("xed #{Configuration.build_path}/Pods")
           elsif !OPTIONS.has_key?(:no_stdin_available)
             confirm = ask("\n\nOh no! Something went wrong during prebuild phase! Do you want to open the prebuild project to debug the error, you will need to add and run the Pods-Dummy scheme? [Y/N] ".red) { |yn| yn.limit = 1, yn.validate = /[yn]/i }
 
-            if confirm.downcase == 'y'
-              system("xed #{Configuration.build_path}/Pods")  
+            if confirm.downcase == "y"
+              system("xed #{Configuration.build_path}/Pods")
             end
           end
         end
-        
+
         raise e
-      ensure        
+      ensure
         FileUtils.rm(lock_file) if File.exist?(lock_file)
       end
     end
 
     def self.prebuilt_info(podfile_items)
       gitignored_files = PodBuilder::gitignoredfiles
-      
+
       swift_version = PodBuilder::system_swift_version
-      
+
       ret = Hash.new
       root_names = podfile_items.reject(&:is_prebuilt).map(&:root_name).uniq
-      root_names.each do |prebuilt_name| 
+      root_names.each do |prebuilt_name|
         path = PodBuilder::prebuiltpath(prebuilt_name)
-        
+
         unless File.directory?(path)
           puts "Prebuilt items for #{prebuilt_name} not found".blue
           next
         end
-        
+
         unless podfile_item = podfile_items.detect { |t| t.name == prebuilt_name } || podfile_items.detect { |t| t.root_name == prebuilt_name }
           puts "Prebuilt items for #{prebuilt_name} not found #2".blue
           next
         end
-        
+
         podbuilder_file = File.join(path, Configuration.prebuilt_info_filename)
         entry = podfile_item.entry(true, false)
-        
+
         data = {}
         data["entry"] = entry
-        data["is_prebuilt"] = podfile_item.is_prebuilt  
+        data["is_prebuilt"] = podfile_item.is_prebuilt
         if Dir.glob(File.join(path, "#{podfile_item.prebuilt_rel_path}/Headers/*-Swift.h")).count > 0
           data["swift_version"] = swift_version
         end
-        
+
         specs = podfile_items.select { |x| x.root_name == podfile_item.root_name }
         subspecs_deps = specs.map(&:dependency_names).flatten
         subspec_self_deps = subspecs_deps.select { |x| x.start_with?("#{prebuilt_name}/") }
@@ -138,54 +138,54 @@ module PodBuilder
         if hash = build_folder_hash(podfile_item, gitignored_files)
           data["build_folder_hash"] = hash
         end
-        
+
         ret.merge!({ podbuilder_file => data })
       end
 
       return ret
     end
-    
-    private 
-    
+
+    private
+
     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\n".red
       end
-      
+
       plist = CFPropertyList::List.new(:file => acknowledge_file)
       data = CFPropertyList.native_types(plist.value)
-      
+
       return data["PreferenceSpecifiers"] || []
     end
-    
-    def self.copy_development_pods_source_code(podfile_content, podfile_items)      
+
+    def self.copy_development_pods_source_code(podfile_content, podfile_items)
       # Development pods are normally built/integrated without moving files from their original paths.
-      # It is important that CocoaPods compiles the files under Configuration.build_path in order that 
-      # DWARF debug info reference to this constant path. Doing otherwise breaks the assumptions that 
+      # It is important that CocoaPods compiles the files under Configuration.build_path in order that
+      # DWARF debug info reference to this constant path. Doing otherwise breaks the assumptions that
       # makes  the `generate_lldbinit` command work.
-      development_pods = podfile_items.select { |x| x.is_development_pod }      
+      development_pods = podfile_items.select { |x| x.is_development_pod }
       development_pods.each do |podfile_item|
         destination_path = "#{Configuration.build_path}/Pods/#{podfile_item.name}"
         FileUtils.mkdir_p(destination_path)
-        
+
         if Pathname.new(podfile_item.path).absolute?
           FileUtils.cp_r("#{podfile_item.path}/.", destination_path)
-        else 
+        else
           FileUtils.cp_r("#{PodBuilder::basepath(podfile_item.path)}/.", destination_path)
         end
-        
+
         unless Configuration.build_using_repo_paths
           podfile_content.gsub!("'#{podfile_item.path}'", "'#{destination_path}'")
         end
       end
-      
+
       return podfile_content
     end
-    
+
     def self.use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items, argument_pods)
       podfile_content = File.read(podfile_path)
-      
+
       replaced_items = []
 
       download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
@@ -216,14 +216,14 @@ module PodBuilder
 
         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"
 
@@ -248,35 +248,35 @@ module PodBuilder
 
       return replaced_items
     end
-    
+
     def self.install
       puts "Preparing build".yellow
-      
+
       CLAide::Command::PluginManager.load_plugins("cocoapods")
-      
+
       Dir.chdir(Configuration.build_path) do
         config = Pod::Config.new()
         installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
         installer.repo_update = false
         installer.update = false
-        
+
         install_start_time = Time.now
 
-        installer.install! 
+        installer.install!
         install_time = Time.now - install_start_time
-        
+
         puts "Build completed in #{install_time.to_i} seconds".blue
       end
     end
-    
+
     def self.download
       puts "Downloading Pods source code".yellow
-      
+
       CLAide::Command::PluginManager.load_plugins("cocoapods")
-      
+
       Dir.chdir(Configuration.build_path) do
         Pod::UserInterface::config.silent = true
-        
+
         config = Pod::Config.new()
         installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
         installer.repo_update = false
@@ -284,11 +284,11 @@ module PodBuilder
         installer.prepare
         installer.resolve_dependencies
         installer.download_dependencies
-        
+
         Pod::UserInterface::config.silent = false
       end
     end
-    
+
     def self.copy_prebuilt_items(podfile_items)
       FileUtils.mkdir_p(PodBuilder::prebuiltpath)
 
@@ -297,9 +297,9 @@ module PodBuilder
       non_prebuilt_items.reject! { |item|
         [item.module_name, item.root_name]
           .map { |t| PodBuilder::buildpath_prebuiltpath(t) }
-          .select { |t| File.directory?(t) }  
+          .select { |t| File.directory?(t) }
           .all? { |t| Dir.empty?(t) } # When using prebuilt items we end up with empty folders
-      } 
+      }
 
       non_prebuilt_items.each do |item|
         # Remove existing files
@@ -316,16 +316,18 @@ module PodBuilder
           next
         end
 
-        if podfile_item = podfile_items.detect { |t| t.root_name == item.root_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) }
+        unless Configuration.keep_swiftmodules
+          if podfile_item = podfile_items.detect { |t| t.root_name == item.root_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
         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 = Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/*.{swiftdoc,swiftsourceinfo,private.swiftinterface}")
         ignore_files.each { |t| PodBuilder::safe_rm_rf(t) }
 
         project_folder = Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/Project")
@@ -334,36 +336,36 @@ module PodBuilder
         unless Dir.glob("#{source_path}/**/*").select { |t| File.file?(t) }.empty?
           destination_folder = PodBuilder::prebuiltpath(item.root_name)
           FileUtils.mkdir_p(destination_folder)
-          FileUtils.cp_r("#{source_path}/.", destination_folder)  
+          FileUtils.cp_r("#{source_path}/.", destination_folder)
         end
       end
-      
+
       # Folder won't exist if no dSYM were generated (all static libs)
       if File.directory?(PodBuilder::buildpath_dsympath)
         FileUtils.mkdir_p(PodBuilder::dsympath)
         FileUtils.cp_r(PodBuilder::buildpath_dsympath, PodBuilder::basepath)
       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))
-      
+
       if File.exist?(prebuilt_info_path)
         data = JSON.parse(File.read(prebuilt_info_path))
-        return data['build_folder_hash']  
+        return data["build_folder_hash"]
       else
         return nil
       end
     end
-    
+
     def self.build_folder_hash(podfile_item, exclude_files)
       if podfile_item.is_development_pod
         if Pathname.new(podfile_item.path).absolute?
           item_path = podfile_item.path
-        else 
+        else
           item_path = PodBuilder::basepath(podfile_item.path)
         end
-        
+
         rootpath = PodBuilder::git_rootpath
         file_hashes = []
         Dir.glob("#{item_path}/**/*", File::FNM_DOTMATCH) do |path|
@@ -378,7 +380,7 @@ module PodBuilder
             file_hashes.push(Digest::MD5.hexdigest(File.read(path)))
           end
         end
-        
+
         return Digest::MD5.hexdigest(file_hashes.sort.join)
       else
         # Pod folder might be under .gitignore
@@ -390,7 +392,7 @@ module PodBuilder
         end
       end
     end
-    
+
     def self.podfile_path_transform(path)
       if Configuration.build_using_repo_paths
         return File.expand_path(PodBuilder::basepath(path))
@@ -398,18 +400,18 @@ module PodBuilder
         use_absolute_paths = true
         podfile_path = File.join(Configuration.build_path, "Podfile")
         original_basepath = PodBuilder::basepath
-        
+
         podfile_base_path = Pathname.new(File.dirname(podfile_path))
-        
+
         original_path = Pathname.new(File.join(original_basepath, path))
         replace_path = original_path.relative_path_from(podfile_base_path)
         if use_absolute_paths
           replace_path = replace_path.expand_path(podfile_base_path)
         end
-        
+
         return replace_path
       end
-    end 
+    end
 
     def self.activate_pod_scheme
       if scheme_file = Dir.glob("#{Configuration.build_path}/Pods/**/xcschememanagement.plist").first
@@ -421,18 +423,18 @@ module PodBuilder
         end
 
         plist.value = CFPropertyList.guess(data)
-        plist.save(scheme_file, CFPropertyList::List::FORMAT_BINARY)  
+        plist.save(scheme_file, CFPropertyList::List::FORMAT_BINARY)
       end
     end
   end
 end
 
 # CocoaPods seems to hard code the development language to english
-# By monkey patching the project save we make sure that the to manually rewrite the 
+# By monkey patching the project save we make sure that the to manually rewrite the
 # development language if it has been manually specified in PodBuilder's configuration
 class Xcodeproj::Project
   alias_method :swz_save, :save
-  
+
   def save(save_path = nil)
     if development_language = PodBuilder::Configuration.development_language
       root_object.development_region = development_language
@@ -440,4 +442,4 @@ class Xcodeproj::Project
 
     swz_save(save_path)
   end
-end 
+end