pod-builder 1.9.2 → 2.0.0.beta.19

data/lib/pod_builder/core.rb

@@ -5,6 +5,7 @@ require 'colored'
 require 'pod_builder/podfile'
 require 'pod_builder/podfile_item'
 require 'pod_builder/analyze'
+require 'pod_builder/analyzer'
 require 'pod_builder/install'
 require 'pod_builder/info'
 require 'pod_builder/configuration'
@@ -19,12 +20,18 @@ module PodBuilder
       return
     end
 
+    unless File.directory?(path)
+      FileUtils.rm(path)
+
+      return 
+    end
+
     current_dir = Dir.pwd
 
     Dir.chdir(path)
 
     h = `git rev-parse --show-toplevel`.strip()
-    raise "\n\nNo git repository found, can't delete files!\n".red if h.empty?
+    raise "\n\nNo git repository found in '#{path}', can't delete files!\n".red if h.empty? && !path.start_with?(Configuration.build_base_path)
 
     FileUtils.rm_rf(path)
 
@@ -36,8 +43,51 @@ module PodBuilder
   end
   
   def self.basepath(child = "")
+    if child.nil?
+      return nil
+    end
+
     return "#{Configuration.base_path}/#{child}".gsub("//", "/").gsub(/\/$/, '')
   end
+
+  def self.prebuiltpath(child = "")
+    if child.nil?
+      return nil
+    end
+
+    path = basepath("Rome")
+    if child.length > 0
+      path += "/#{child}"
+    end
+
+    return path
+  end
+
+  def self.buildpath_prebuiltpath(child = "")
+    if child.nil?
+      return nil
+    end
+
+    path = "#{Configuration.build_path}/Rome"
+    if child.length > 0
+      path += "/#{child}"
+    end
+
+    return path
+  end
+
+  def self.dsympath(child = "")
+    if child.nil?
+      return nil
+    end
+
+    path = basepath("dSYM")
+    if child.length > 0
+      path += "/#{child}"
+    end
+
+    return path
+  end
   
   def self.project_path(child = "")
     project = PodBuilder::find_xcodeworkspace
@@ -97,14 +147,18 @@ module PodBuilder
     return swift_version
   end
 
-  def self.add_lock_file
-    lockfile_path = File.join(home, Configuration.lock_filename)
+  def self.add_lockfile
+    lockfile_path = Configuration.lockfile_path
 
     if File.exist?(lockfile_path)
       if pid = File.read(lockfile_path)
         begin
           if Process.getpgid(pid)
+            if Configuration.deterministic_build    
+              raise "\n\nAnother PodBuilder pending task is running\n".red    
+            else
               raise "\n\nAnother PodBuilder pending task is running on this project\n".red    
+            end
           end
         rescue
         end
@@ -114,8 +168,9 @@ module PodBuilder
     File.write(lockfile_path, Process.pid, mode: "w")
   end
 
-  def self.remove_lock_file
-    lockfile_path = File.join(home, Configuration.lock_filename)
+  def self.remove_lockfile
+    lockfile_path = Configuration.lockfile_path
+
     if File.exist?(lockfile_path)
       FileUtils.rm(lockfile_path)
     end

data/lib/pod_builder/info.rb

@@ -3,67 +3,33 @@ require 'cfpropertylist'
 module PodBuilder
   class Info
     def self.generate_info
-      restore_path = PodBuilder::basepath("Podfile.restore")
-      unless File.exist?(restore_path)
-        raise "No Podfile.restore file found"
-        return false
-      end
-      
-      podspec_path = PodBuilder::basepath("PodBuilder.podspec")
-      unless File.exist?(podspec_path)
-        raise "No PodBuilder.podspec file found"
-        return false
-      end
-      
-      restore_content = File.read(restore_path)
-      
       swift_version = PodBuilder::system_swift_version
       result = {}
       name = nil
-      File.read(podspec_path).each_line do |line|
-        if (matches = line.match(/s.subspec '(.*)' do \|p\|/)) && matches.size == 2
-          name = matches[1]
-        elsif (matches = line.match(/p.vendored_frameworks = '(.*)'/)) && matches.size == 2          
-          path = matches[1].split("'").first
-          plist_path = File.join(PodBuilder::basepath(path), Configuration.framework_plist_filename)
 
-          # fix name if it's a subspec
-          if (subspec_items = name.split("_")) && (subspec = subspec_items.last) && subspec_items.count > 1
-            if path.include?("/#{subspec}")
-              name = name.sub(/_#{subspec}$/, "/#{subspec}")
-            end
-          end
-                    
-          base = PodBuilder::basepath.gsub(PodBuilder::home + "/", "")
-          framework_path = File.join(base, matches[1].split("'").first)
-          result[name] = { framework_path: framework_path }
+      Dir.glob(PodBuilder::prebuiltpath("**/*.framework")).each do |path|
+        plist_path = File.join(path, Configuration.framework_plist_filename)
 
-          specs = restore_podspecs(name.split("/").first, restore_content)
-          unless specs.count > 0
-            raise "pod `#{name}` not found in restore file"
-          end
-
-          restore_line = restore_line(name, restore_content)
-          version = version_info(restore_line)
-          is_static = is_static(restore_line)
-          result[name].merge!({ "restore_info": { "version": version, "specs": specs, "is_static": is_static }})
-          if swift_version = swift_version(restore_line)
-            result[name][:restore_info].merge!({ "swift_version": swift_version })
-          end
-          
-          prebuilt_info = prebuilt_info(plist_path)
-          if prebuilt_info.count > 0 
-            result[name].merge!({ "prebuilt_info": prebuilt_info })
-          end
-        end
+        name, prebuilt_info = prebuilt_info(plist_path)
+        result[name] = prebuilt_info
       end
 
       return result
     end
     
     private
+
+    def self.pod_name_from_entry(line)
+      if (matches = line&.match(/pod '(.*?)'/)) && matches.size == 2
+        pod_name = matches[1]
+        
+        return pod_name
+      end
+
+      return "unknown_podname"
+    end
     
-    def self.version_info(line)
+    def self.version_info_from_entry(line)
       if (matches = line&.match(/pod '(.*)', '=(.*)'/)) && matches.size == 3
         pod_name = matches[1]
         tag = matches[2]
@@ -87,31 +53,15 @@ module PodBuilder
         tag = matches[3]
         
         return { "repo": repo, "tag": tag }
+      elsif (matches = line&.match(/pod '(.*)', :path => '(.*)'/)) && matches.size == 3
+        pod_name = matches[1]
+        
+        return { "repo": "local" }
       else
         raise "Failed extracting version from line:\n#{line}\n\n"
       end
     end
 
-    def self.swift_version(line)
-      return podbuilder_tag("sv", line)
-    end
-
-    def self.is_static(line)
-      if str_tag = podbuilder_tag("is", line)
-        return str_tag == "true"
-      end
-
-      return nil
-    end
-
-    def self.podbuilder_tag(name, line)
-      if (matches = line&.match(/#{name}<(.*?)?>/)) && matches.size == 2
-        return matches[1]
-      end
-
-      return nil
-    end
-    
     def self.prebuilt_info(path)
       unless File.exist?(path)
         return {}
@@ -125,32 +75,16 @@ module PodBuilder
         result.merge!({ "swift_version": swift_version})
       end
       
-      pod_version = version_info(data["entry"])
+      pod_version = version_info_from_entry(data["entry"])
+      pod_name = pod_name_from_entry(data["entry"])
+
       
       result.merge!({ "version": pod_version })
       result.merge!({ "specs": (data["specs"] || []) })
       result.merge!({ "is_static": (data["is_static"] || false) })
       result.merge!({ "original_compile_path": (data["original_compile_path"] || "") })
       
-      return result
-    end
-
-    def self.restore_podspecs(root_name, restore_content)
-      specs = []
-      restore_content.each_line do |line|
-        if (matches = line.match(/pod '(#{root_name})(\/.*?)?'/)) && matches.size == 3
-          specs.push(matches[1] + (matches[2] || ""))
-        end
-      end
-
-      return specs.uniq
-    end
-
-    def self.restore_line(name, restore_content)
-      unless (matches = restore_content.match(/pod '#{name}(\/.*)?'.*/)) && matches.size == 2
-        raise "pod `#{name}` not found in restore file"
-      end
-      return matches[0]
-    end
+      return pod_name, result
+    end    
   end
 end

data/lib/pod_builder/install.rb

@@ -1,41 +1,6 @@
 require 'cfpropertylist'
-
-# We swizzle the analyzer to inject spec overrides. This might no longer be needed
-# given that we're swizzling the Pod::Downloader as well
-class Pod::Specification::Linter::Analyzer
-  alias_method :swz_analyze, :analyze
-
-  def analyze(*args)
-    spec = consumer.spec
-    if overrides = PodBuilder::Configuration.spec_overrides[spec.name]
-      overrides.each do |k, v|
-        spec.attributes_hash[k] = v
-      end
-    end
-
-    return swz_analyze
-  end
-end
-
-Pod::Downloader.singleton_class.send(:alias_method, :swz_download, :download)
-module Pod::Downloader
-  def self.download(
-    request,
-    target,
-    can_cache: true,
-    cache_path: Pod::Config.instance.cache_root + 'Pods'
-  )
-    result = swz_download(request, target)
-
-    if overrides = PodBuilder::Configuration.spec_overrides[result.spec.name]
-      overrides.each do |k, v|
-        result.spec.attributes_hash[k] = v
-      end
-    end
-    
-    result
-  end
-end
+require 'digest'
+require 'colored'
 
 # The Pod::Target and Pod::Installer::Xcode::PodTargetDependencyInstaller swizzles patch
 # the following issues: 
@@ -44,6 +9,23 @@ end
 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
 
@@ -64,6 +46,19 @@ begin
     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
   
@@ -81,6 +76,8 @@ end
 module PodBuilder
   class Install
     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)
 
@@ -96,9 +93,9 @@ module PodBuilder
         end
 
         # It is important that CocoaPods compiles the files under Configuration.build_path in order that DWARF
-        # debug info reference to this path. Doing otherwise breaks the assumptions that make the `update_lldbinit`
+        # debug info reference to this path. Doing otherwise breaks the assumptions that makes the `update_lldbinit`
         # command work
-        podfile_content.gsub!(podfile_item.path, destination_path)
+        podfile_content.gsub!("'#{podfile_item.path}'", "'#{destination_path}'")
         
         license_files = Dir.glob("#{destination_path}/**/*acknowledgements.plist").each { |f| File.delete(f) }
       end
@@ -113,39 +110,89 @@ module PodBuilder
       begin  
         lock_file = "#{Configuration.build_path}/pod_builder.lock"
         FileUtils.touch(lock_file)
+
+        framework_build_hashes = Hash.new
+        if !OPTIONS.has_key?(:force_rebuild)
+          download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
+
+          # 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|
+            framework_path = File.join(PodBuilder::prebuiltpath, "#{item.module_name}.framework")
+            podspec_path = File.join(PodBuilder::prebuiltpath, "#{item.root_name}.podspec")
+            if (last_build_folder_hash = build_folder_hash_in_framework_plist_info(framework_path)) && File.exist?(podspec_path)
+              if last_build_folder_hash == build_folder_hash(item)
+                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)}', .*"
+                  replace_line_found = podfile_content =~ /#{replace_regex}/i
+                  raise "Failed finding pod entry for '#{replace_item.name}'" unless replace_line_found
+                  podfile_content.gsub!(/#{replace_regex}/, replace_item.prebuilt_entry(true, true))
+                end
+              end
+            end
+          end
+
+          File.write(podfile_path, podfile_content)          
+        end  
   
         install
 
         add_framework_plist_info(podfile_items)
-        cleanup_frameworks(podfile_items)
+        cleanup_frameworks(podfile_items)        
         copy_frameworks(podfile_items)
         copy_libraries(podfile_items)
-        if build_configuration != "debug"
-          copy_dsyms(podfile_items)
-        end
+        copy_dsyms(podfile_items)
       rescue Exception => e
         raise e
       ensure
         FileUtils.rm(lock_file)
+
+        if !OPTIONS.has_key?(:debug)
+          PodBuilder::safe_rm_rf(Configuration.build_path)
+        end  
       end
     end
 
     private 
 
     def self.install
+      puts "Building frameworks".yellow
+
       CLAide::Command::PluginManager.load_plugins("cocoapods")
 
-      current_dir = Dir.pwd
-      
-      Dir.chdir(Configuration.build_path)
+      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! 
+        install_time = Time.now - install_start_time
 
-      config = Pod::Config.new()
-      installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
-      installer.repo_update = false
-      installer.update = false
-      installer.install!  
+        puts "Build completed in #{install_time.to_i} seconds".blue
+      end
+    end
 
-      Dir.chdir(current_dir)
+    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
+        installer.update = false
+        installer.prepare
+        installer.resolve_dependencies
+        installer.download_dependencies
+
+        Pod::UserInterface::config.silent = false
+      end
     end
 
     def self.rel_path(path, podfile_items)
@@ -160,12 +207,12 @@ module PodBuilder
 
     def self.add_framework_plist_info(podfile_items)
       swift_version = PodBuilder::system_swift_version
-      Dir.glob("#{Configuration.build_path}/Rome/*.framework") do |framework_path|
+      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.framework")) do |framework_path|
         filename_ext = File.basename(framework_path)
         filename = File.basename(framework_path, ".*")
 
         specs = podfile_items.select { |x| x.module_name == filename }
-        specs += podfile_items.select { |x| x.vendored_items.map { |x| File.basename(x) }.include?(filename_ext) }
+        specs += podfile_items.select { |x| x.vendored_frameworks.map { |x| File.basename(x) }.include?(filename_ext) }
         if podfile_item = specs.first
           podbuilder_file = File.join(framework_path, Configuration.framework_plist_filename)
           entry = podfile_item.entry(true, false)
@@ -182,6 +229,7 @@ module PodBuilder
           plist_data['specs'] = (specs.map(&:name) + subspec_self_deps).uniq
           plist_data['is_static'] = podfile_item.is_static
           plist_data['original_compile_path'] = Pathname.new(Configuration.build_path).realpath.to_s
+          plist_data['build_folder_hash'] = build_folder_hash(podfile_item)
 
           plist.value = CFPropertyList.guess(plist_data)
           plist.save(podbuilder_file, CFPropertyList::List::FORMAT_BINARY)
@@ -192,28 +240,29 @@ module PodBuilder
     end
 
     def self.cleanup_frameworks(podfile_items)
-      Dir.glob("#{Configuration.build_path}/Rome/*.framework") do |framework_path|
+      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.framework")) do |framework_path|
         framework_rel_path = rel_path(framework_path, podfile_items)
         dsym_path = framework_rel_path + ".dSYM"
 
-        PodBuilder::safe_rm_rf(PodBuilder::basepath("Rome/#{framework_rel_path}"))
-        PodBuilder::safe_rm_rf(PodBuilder::basepath("dSYM/iphoneos/#{dsym_path}"))
-        PodBuilder::safe_rm_rf(PodBuilder::basepath("dSYM/iphonesimulator/#{dsym_path}"))
+        PodBuilder::safe_rm_rf(PodBuilder::prebuiltpath(framework_rel_path))
+        Configuration.supported_platforms.each do |platform|
+          PodBuilder::safe_rm_rf(PodBuilder::dsympath("#{platform}/#{dsym_path}"))
+        end
       end
     end
 
     def self.copy_frameworks(podfile_items)
-      Dir.glob("#{Configuration.build_path}/Rome/*.framework") do |framework_path|
+      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.framework")) do |framework_path|
         framework_rel_path = rel_path(framework_path, podfile_items)
 
-        destination_path = PodBuilder::basepath("Rome/#{framework_rel_path}")
+        destination_path = PodBuilder::prebuiltpath(framework_rel_path)
         FileUtils.mkdir_p(File.dirname(destination_path))
         FileUtils.cp_r(framework_path, destination_path)
       end
     end
 
     def self.copy_libraries(podfile_items)
-      Dir.glob("#{Configuration.build_path}/Rome/*.a") do |library_path|
+      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.a")) do |library_path|
         library_name = File.basename(library_path)
 
         # Find vendored libraries in the build folder:
@@ -226,11 +275,7 @@ module PodBuilder
             next
           end
           
-          podfile_item.vendored_items.each do |vendored_item|
-            unless vendored_item.end_with?(".a")
-              next
-            end
-            
+          podfile_item.vendored_libraries.each do |vendored_item|
             if result = Dir.glob("#{search_base}**/#{vendored_item}").first
               result_path = result.gsub(search_base, "")
               module_name = result_path.split("/").first
@@ -239,7 +284,7 @@ module PodBuilder
                                 
                 result_path = result_path.split("/").drop(1).join("/")
 
-                destination_path = PodBuilder::basepath("Rome/#{library_rel_path}/#{result_path}")
+                destination_path = PodBuilder::prebuiltpath("#{library_rel_path}/#{result_path}")
                 FileUtils.mkdir_p(File.dirname(destination_path))
                 FileUtils.cp_r(library_path, destination_path, :remove_destination => true)
               end
@@ -247,7 +292,7 @@ module PodBuilder
           end
 
           # A pod might depend upon a static library that is shipped with a prebuilt framework
-          # which is not added to the Rome folder and the PodBuilder.podspec
+          # which is not added to the Rome folder and podspecs
           # 
           # An example is Google-Mobile-Ads-SDK which adds
           # - vendored framework: GooleMobileAds.framework 
@@ -261,7 +306,7 @@ module PodBuilder
                                 
               result_path = result_path.split("/").drop(1).join("/")
 
-              destination_path = PodBuilder::basepath("Rome/#{library_rel_path}/#{result_path}")
+              destination_path = PodBuilder::prebuiltpath("#{library_rel_path}/#{result_path}")
               FileUtils.mkdir_p(File.dirname(destination_path))
               FileUtils.cp_r(library_path, destination_path)        
             end
@@ -271,20 +316,14 @@ module PodBuilder
     end
 
     def self.copy_dsyms(podfile_items)
-      Dir.glob("#{Configuration.build_path}/dSYM/*iphoneos/**/*.dSYM") do |dsym_path|
-        framework_rel_path = rel_path(dsym_path.gsub(File.extname(dsym_path), ""), podfile_items)
-        
-        destination_path = PodBuilder::basepath("dSYM/iphoneos/#{File.dirname(framework_rel_path)}") 
-        FileUtils.mkdir_p(destination_path)
-        FileUtils.cp_r(dsym_path, destination_path)
-      end
-
-      Dir.glob("#{Configuration.build_path}/dSYM/*iphonesimulator/**/*.dSYM") do |dsym_path|
-        framework_rel_path = rel_path(dsym_path.gsub(File.extname(dsym_path), ""), podfile_items)
-
-        destination_path = PodBuilder::basepath("dSYM/iphonesimulator/#{File.dirname(framework_rel_path)}") 
-        FileUtils.mkdir_p(destination_path)
-        FileUtils.cp_r(dsym_path, destination_path)
+      Configuration.supported_platforms.each do |platform|
+        Dir.glob("#{Configuration.build_path}/dSYM/#{platform}/**/*.dSYM") do |dsym_path|
+          framework_rel_path = rel_path(dsym_path.gsub(File.extname(dsym_path), ""), podfile_items)
+          
+          destination_path = PodBuilder::dsympath("#{platform}/#{File.dirname(framework_rel_path)}") 
+          FileUtils.mkdir_p(destination_path)
+          FileUtils.cp_r(dsym_path, destination_path)
+        end  
       end
     end
 
@@ -295,5 +334,32 @@ module PodBuilder
       system("git init")
       Dir.chdir(current_dir)
     end
+
+    def self.build_folder_hash_in_framework_plist_info(framework_path)
+      podbuilder_file = File.join(framework_path, Configuration.framework_plist_filename)
+
+      unless File.exist?(podbuilder_file)
+        return nil
+      end
+
+      plist = CFPropertyList::List.new(:file => podbuilder_file)
+      data = CFPropertyList.native_types(plist.value)
+
+      return data['build_folder_hash']
+    end
+
+    def self.build_folder_hash(podfile_item)
+      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
+      else
+        item_path = "#{Configuration.build_path}/Pods/#{podfile_item.root_name}"
+      end
+
+      return `find '#{item_path}' -type f -print0 | sort -z | xargs -0 sha1sum | sha1sum | cut -d' ' -f1`.strip()
+    end
   end
 end