pod-builder 1.9.4 → 2.0.0.beta.18

data/lib/pod_builder/configuration.rb

@@ -22,10 +22,14 @@ module PodBuilder
     DEFAULT_SKIP_PODS = ["GoogleMaps"]
     DEFAULT_FORCE_PREBUILD_PODS = ["Firebase", "GoogleTagManager"]
     DEFAULT_BUILD_SYSTEM = "Legacy".freeze # either Latest (New build system) or Legacy (Standard build system)
+    DEFAULT_LIBRARY_EVOLUTION_SUPPORT = false
     MIN_LFS_SIZE_KB = 256.freeze
+    DEFAULT_PLATFORMS = ["iphoneos", "iphonesimulator", "appletvos", "appletvsimulator"].freeze
+    DEFAULT_BUILD_FOR_APPLE_SILICON = false
     
     private_constant :DEFAULT_BUILD_SETTINGS
     private_constant :DEFAULT_BUILD_SYSTEM
+    private_constant :DEFAULT_LIBRARY_EVOLUTION_SUPPORT
     private_constant :MIN_LFS_SIZE_KB
     
     class <<self      
@@ -33,6 +37,7 @@ module PodBuilder
       attr_accessor :build_settings
       attr_accessor :build_settings_overrides
       attr_accessor :build_system
+      attr_accessor :library_evolution_support
       attr_accessor :base_path
       attr_accessor :spec_overrides      
       attr_accessor :skip_licenses
@@ -51,13 +56,19 @@ module PodBuilder
       attr_accessor :project_name
       attr_accessor :restore_enabled
       attr_accessor :framework_plist_filename
-      attr_accessor :lock_filename
+      attr_accessor :lockfile_name
+      attr_accessor :lockfile_path
+      attr_accessor :use_bundler
+      attr_accessor :deterministic_build
+      attr_accessor :supported_platforms
+      attr_accessor :build_for_apple_silicon
     end
     
     @allow_building_development_pods = false
     @build_settings = DEFAULT_BUILD_SETTINGS
     @build_settings_overrides = {}
     @build_system = DEFAULT_BUILD_SYSTEM
+    @library_evolution_support = DEFAULT_LIBRARY_EVOLUTION_SUPPORT
     @base_path = "Frameworks" # 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
     @skip_licenses = []
@@ -66,8 +77,8 @@ module PodBuilder
     @license_filename = "Pods-acknowledgements"
     @subspecs_to_split = []
     @development_pods_paths = []
-    @build_base_path = "/tmp/pod_builder_".freeze
-    @build_path = "#{build_base_path}#{(Time.now.to_f * 1000).to_i}".freeze
+    @build_base_path = "/tmp/pod_builder".freeze
+    @build_path = build_base_path
     @configuration_filename = "PodBuilder.json".freeze
     @dev_pods_configuration_filename = "PodBuilderDevPodsPaths.json".freeze
     @lfs_min_file_size = MIN_LFS_SIZE_KB
@@ -76,7 +87,14 @@ module PodBuilder
     @project_name = ""
     @restore_enabled = true
     @framework_plist_filename = "PodBuilder.plist"
-    @lock_filename = "PodBuilder.lock"
+    @lockfile_name = "PodBuilder.lock"
+    @lockfile_path = "/tmp/#{lockfile_name}"
+
+    @use_bundler = false
+    @deterministic_build = false
+
+    @supported_platforms = DEFAULT_PLATFORMS
+    @build_for_apple_silicon = DEFAULT_BUILD_FOR_APPLE_SILICON
     
     def self.check_inited
       raise "\n\nNot inited, run `pod_builder init`\n".red if podbuilder_path.nil?
@@ -106,17 +124,17 @@ module PodBuilder
           end
         end
         if value = json["skip_licenses"]
-          if value.is_a?(Array) && value.count > 0
+          if value.is_a?(Array)
             Configuration.skip_licenses = value
           end
         end
         if value = json["skip_pods"]
-          if value.is_a?(Array) && value.count > 0
+          if value.is_a?(Array)
             Configuration.skip_pods = value
           end
         end
         if value = json["force_prebuild_pods"]
-          if value.is_a?(Array) && value.count > 0
+          if value.is_a?(Array)
             Configuration.force_prebuild_pods = value
           end
         end
@@ -135,6 +153,11 @@ module PodBuilder
             Configuration.build_system = value
           end
         end
+        if value = json["library_evolution_support"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.library_evolution_support = value
+          end
+        end
         if value = json["license_filename"]
           if value.is_a?(String) && value.length > 0
             Configuration.license_filename = value
@@ -170,8 +193,25 @@ module PodBuilder
             Configuration.allow_building_development_pods = value
           end
         end
+        if value = json["use_bundler"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.use_bundler = value
+          end
+        end
+        if value = json["deterministic_build"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.deterministic_build = value
+          end
+        end
+        if value = json["build_for_apple_silicon"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.build_for_apple_silicon = value
+          end
+        end
         
         Configuration.build_settings.freeze
+
+        sanity_check()
       else
         write
       end
@@ -188,6 +228,11 @@ module PodBuilder
         Configuration.development_pods_paths = json || []
         Configuration.development_pods_paths.freeze
       end
+
+      if !deterministic_build
+        build_path = "#{build_base_path}#{(Time.now.to_f * 1000).to_i}"
+        lockfile_path = File.join(PodBuilder::home, lockfile_name)
+      end
     end
     
     def self.write
@@ -201,6 +246,7 @@ module PodBuilder
       config["build_settings"] = Configuration.build_settings
       config["build_settings_overrides"] = Configuration.build_settings_overrides
       config["build_system"] = Configuration.build_system
+      config["library_evolution_support"] = Configuration.library_evolution_support
       config["license_filename"] = Configuration.license_filename
       config["subspecs_to_split"] = Configuration.subspecs_to_split
       config["lfs_update_gitattributes"] = Configuration.lfs_update_gitattributes
@@ -210,6 +256,14 @@ module PodBuilder
     end
     
     private 
+
+    def self.sanity_check
+      Configuration.skip_pods.each do |pod|
+        if Configuration.force_prebuild_pods.include?(pod)
+          puts "PodBuilder.json contains '#{pod}' both in `force_prebuild_pods` and `skip_pods`. Will force prebuilding.".yellow
+        end
+      end
+    end
     
     def self.config_path
       unless path = podbuilder_path

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