pod-builder 2.0.0.beta.21 → 2.0.0.beta.26

data/lib/pod_builder/core.rb

@@ -19,6 +19,10 @@ module PodBuilder
   @@xcodeproj_path = nil
   @@xcodeworkspace_path = nil
 
+  def self.git_rootpath
+    return `git rev-parse --show-toplevel`.strip()
+  end
+
   def self.safe_rm_rf(path)
     unless File.exist?(path)
       return
@@ -34,8 +38,8 @@ module PodBuilder
 
     Dir.chdir(path)
 
-    h = `git rev-parse --show-toplevel`.strip()
-    raise "\n\nNo git repository found in '#{path}', can't delete files!\n".red if h.empty? && !path.start_with?(Configuration.build_base_path)
+    rootpath = git_rootpath()
+    raise "\n\nNo git repository found in '#{path}', can't delete files!\n".red if rootpath.empty? && !path.start_with?(Configuration.build_base_path)
 
     FileUtils.rm_rf(path)
 
@@ -45,6 +49,12 @@ module PodBuilder
       Dir.chdir(basepath)
     end
   end
+
+  def self.gitignoredfiles
+    Dir.chdir(git_rootpath) do
+      return `git status --ignored -s | grep "^\!\!" | cut -c4-`.strip().split("\n")
+    end
+  end
   
   def self.basepath(child = "")
     if child.nil?
@@ -120,7 +130,7 @@ module PodBuilder
 
     xcodeprojects = Dir.glob("#{home}/**/#{project_name}.xcodeproj").select { |x| 
       folder_in_home = x.gsub(home, "")
-      !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(basepath) 
+      !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\nFound multiple xcodeproj:\n#{xcodeprojects.join("\n")}".red if xcodeprojects.count > 1
@@ -136,7 +146,7 @@ module PodBuilder
 
     xcworkspaces = Dir.glob("#{home}/**/#{Configuration.project_name}*.xcworkspace").select { |x| 
       folder_in_home = x.gsub(home, "")
-      !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(basepath) && !x.include?(".xcodeproj/")
+      !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\nFound multiple xcworkspaces:\n#{xcworkspaces.join("\n")}".red if xcworkspaces.count > 1
@@ -205,8 +215,8 @@ module PodBuilder
   private 
   
   def self.home
-    h = `git rev-parse --show-toplevel`.strip()
-    raise "\n\nNo git repository found in current folder `#{Dir.pwd}`!\n".red if h.empty?
-    return h
+    rootpath = git_rootpath
+    raise "\n\nNo git repository found in current folder `#{Dir.pwd}`!\n".red if rootpath.empty?
+    return rootpath
   end
 end

data/lib/pod_builder/install.rb

@@ -10,29 +10,29 @@ require 'highline/import'
 # - https://github.com/leavez/cocoapods-binary/issues/50
 begin
   require 'cocoapods/installer/xcode/pods_project_generator/pod_target_dependency_installer.rb'
-
+  
   class Pod::Specification
     Pod::Specification.singleton_class.send(:alias_method, :swz_from_hash, :from_hash)
     Pod::Specification.singleton_class.send(:alias_method, :swz_from_string, :from_string)
-
+    
     def self.from_string(*args)
       spec = swz_from_string(*args)
-
+      
       if overrides = PodBuilder::Configuration.spec_overrides[spec.name]
         overrides.each do |k, v|
           spec.attributes_hash[k] = v
         end
       end
-
+      
       spec
     end
   end 
-
+  
   class Pod::Target
     attr_accessor :mock_dynamic_framework
-
+    
     alias_method :swz_build_type, :build_type
-
+    
     def build_type
       if mock_dynamic_framework == true
         if defined?(Pod::BuildType) # CocoaPods 1.9 and later
@@ -47,23 +47,23 @@ begin
       end
     end
   end
-
+  
   # Starting from CocoaPods 1.10.0 and later resources are no longer copied inside the .framework
   # when building static frameworks. While this is correct when using CP normally, for redistributable
   # frameworks we require resources to be shipped along the binary
   class Pod::Installer::Xcode::PodsProjectGenerator::PodTargetInstaller
     alias_method :swz_add_files_to_build_phases, :add_files_to_build_phases
-
+    
     def add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
       target.mock_dynamic_framework = target.build_as_static_framework?
       swz_add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
       target.mock_dynamic_framework = false
     end
   end 
-
+  
   class Pod::Installer::Xcode::PodTargetDependencyInstaller
     alias_method :swz_wire_resource_bundle_targets, :wire_resource_bundle_targets
-  
+    
     def wire_resource_bundle_targets(resource_bundle_targets, native_target, pod_target)
       pod_target.mock_dynamic_framework = pod_target.build_as_static_framework?
       res = swz_wire_resource_bundle_targets(resource_bundle_targets, native_target, pod_target)
@@ -71,6 +71,31 @@ begin
       return res
     end
   end  
+
+  class Pod::Target::BuildSettings
+    class <<self
+      attr_accessor :patch_static_library_generation
+    end
+    
+    alias_method :swz_add_inherited_to_plural, :add_inherited_to_plural
+
+    def add_inherited_to_plural(hash)
+      # There's probably a better place to monkey patch this      
+      h = swz_add_inherited_to_plural(hash)
+      if Pod::Target::BuildSettings.patch_static_library_generation
+        # Static frameworks should NOT import underlying modules to simplify integration of the produced 
+        # artifacts. Without these build options you can integrate the static library the same way you 
+        # would do with a vanilla static library target in Xcode: you just copy the .a and set the Swift 
+        # import path to point to the module map file (which doesn't seem to be needed).
+        flags = h["OTHER_SWIFT_FLAGS"].dup
+        flags.gsub!("-import-underlying-module", "")
+        flags.gsub!("-Xcc -fmodule-map-file=\"${SRCROOT}/${MODULEMAP_FILE}\"", "")
+        h["OTHER_SWIFT_FLAGS"] = flags
+      end
+
+      return h
+    end
+  end
 rescue LoadError
   # CocoaPods 1.6.2 or earlier
 end
@@ -80,38 +105,38 @@ module PodBuilder
     # This method will generate prebuilt data by building from "/tmp/pod_builder/Podfile"
     def self.podfile(podfile_content, podfile_items, 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
-
+      
       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))
-
+      
       podfile_path = File.join(Configuration.build_path, "Podfile")
       File.write(podfile_path, podfile_content)
-
+      
       begin  
         lock_file = "#{Configuration.build_path}/pod_builder.lock"
         FileUtils.touch(lock_file)
-
+        
         use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
-  
+        
         install
-
+        
         copy_prebuilt_items(podfile_items)
         add_prebuilt_info_file(podfile_items)
-
+        
         licenses = license_specifiers()
-
+        
         if !OPTIONS.has_key?(:debug)
           PodBuilder::safe_rm_rf(Configuration.build_path)
         end  
-
+        
         return licenses
       rescue Exception => e
         if File.directory?("#{Configuration.build_path}/Pods/Pods.xcodeproj")
@@ -124,68 +149,70 @@ module PodBuilder
             end
           end
         end
-
+        
         raise e
       ensure        
         FileUtils.rm(lock_file) if File.exist?(lock_file)
       end
     end
-
+    
     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".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)
       if Configuration.build_using_repo_paths
         return podfile_content
       end
-
+      
       # 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 
-      # makes  the `update_lldbinit` command work.
+      # makes  the `generate_lldbinit` command work.
       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 
           FileUtils.cp_r("#{PodBuilder::basepath(podfile_item.path)}/.", destination_path)
         end
-
+        
         podfile_content.gsub!("'#{podfile_item.path}'", "'#{destination_path}'")
       end
-
+      
       return podfile_content
     end
-
+    
     def self.use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
       if OPTIONS.has_key?(:force_rebuild)
         return
       end
-
+      
       download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
-
+      
       podfile_content = File.read(podfile_path)
-
+      
+      gitignored_files = PodBuilder::gitignoredfiles
+      
       # 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)
+          if last_build_folder_hash == build_folder_hash(item, gitignored_files)
             puts "No changes detected to '#{item.root_name}', will skip rebuild".blue
             podfile_items.select { |t| t.root_name == item.root_name }.each do |replace_item|
               replace_regex = "pod '#{Regexp.quote(replace_item.name)}', .*"
@@ -196,15 +223,15 @@ module PodBuilder
           end
         end
       end
-
+      
       File.write(podfile_path, podfile_content)
     end
-
+    
     def self.install
       puts "Prebuilding items".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)
@@ -212,21 +239,24 @@ module PodBuilder
         installer.update = false
         
         install_start_time = Time.now
+
+        monkey_patch_static_library_generation()
+
         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
@@ -234,14 +264,14 @@ 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)
-
+      
       root_names = podfile_items.reject(&:is_prebuilt).map(&:root_name).uniq
       root_names.each do |prebuilt_name|        
         source_path = PodBuilder::buildpath_prebuiltpath(prebuilt_name)
@@ -252,42 +282,46 @@ module PodBuilder
         if Dir.empty?(source_path)
           next # When using prebuilt items we end up with empty folders
         end
-
+        
         PodBuilder::safe_rm_rf(PodBuilder::prebuiltpath(prebuilt_name))
         FileUtils.cp_r(source_path, PodBuilder::prebuiltpath)
       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.add_prebuilt_info_file(podfile_items)
+      gitignored_files = PodBuilder::gitignoredfiles
+      
       swift_version = PodBuilder::system_swift_version
 
+      write_prebuilt_info_filename_gitattributes
+      
       root_names = podfile_items.reject(&:is_prebuilt).map(&:root_name).uniq
       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  
-        if Dir.glob(File.join(path, "#{podfile_item.module_name}/Headers/*-Swift.h")).count > 0
+        if Dir.glob(File.join(path, "#{podfile_item.prebuilt_rel_path}/Headers/*-Swift.h")).count > 0
           data['swift_version'] = swift_version
         end
         
@@ -297,23 +331,31 @@ module PodBuilder
         data['specs'] = (specs.map(&:name) + subspec_self_deps).uniq
         data['is_static'] = podfile_item.is_static
         data['original_compile_path'] = Pathname.new(Configuration.build_path).realpath.to_s
-        data['build_folder_hash'] = build_folder_hash(podfile_item)
-
+        data['build_folder_hash'] = build_folder_hash(podfile_item, gitignored_files)
+        
         File.write(podbuilder_file, JSON.pretty_generate(data))
       end
     end
 
+    def self.write_prebuilt_info_filename_gitattributes
+      gitattributes_path = PodBuilder::basepath(".gitattributes")
+      expected_attributes = ["#{Configuration.configuration_filename} binary"].join
+      unless File.exists?(gitattributes_path) && File.read(gitattributes_path).include?(expected_attributes)
+        File.write(gitattributes_path, expected_attributes, mode: 'a')
+      end
+    end
+    
     def self.init_git(path)
       current_dir = Dir.pwd
-
+      
       Dir.chdir(path)
       system("git init")
       Dir.chdir(current_dir)
     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']  
@@ -321,19 +363,35 @@ module PodBuilder
         return nil
       end
     end
-
-    def self.build_folder_hash(podfile_item)
+    
+    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 
           item_path = PodBuilder::basepath(podfile_item.path)
         end
+        
+        rootpath = PodBuilder::git_rootpath
+        file_hashes = []
+        Dir.glob("#{item_path}/**/*", File::FNM_DOTMATCH) do |path|
+          unless File.file?(path)
+            next
+          end
+          
+          path = File.expand_path(path)
+          rel_path = path.gsub(rootpath, "")[1..]
+          unless exclude_files.include?(rel_path)
+            file_hashes.push(Digest::MD5.hexdigest(File.read(path)))
+          end
+        end
+        
+        return Digest::MD5.hexdigest(file_hashes.join)
       else
+        # Pod folder might be under .gitignore
         item_path = "#{Configuration.build_path}/Pods/#{podfile_item.root_name}"
+        return `find '#{item_path}' -type f -print0 | sort -z | xargs -0 shasum | shasum | cut -d' ' -f1`.strip()
       end
-
-      return `find '#{item_path}' -type f -print0 | sort -z | xargs -0 shasum | shasum | cut -d' ' -f1`.strip()
     end
     
     def self.podfile_path_transform(path)
@@ -343,17 +401,23 @@ 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.monkey_patch_static_library_generation()
+      podfile_path = File.join(Configuration.build_path, "Podfile")
+
+      Pod::Target::BuildSettings.patch_static_library_generation = !File.read(podfile_path).include?("use_frameworks!")
+    end
   end
 end