pod-builder 1.9.2 → 2.0.0.beta.19

data/lib/pod_builder/command/clear_lldbinit.rb

@@ -16,7 +16,7 @@ module PodBuilder
         end
             
         lldbinit_path = File.expand_path(argument_pods[0])
-        lldbinit_content = File.exists?(lldbinit_path) ? File.read(lldbinit_path) : ""
+        lldbinit_content = File.exist?(lldbinit_path) ? File.read(lldbinit_path) : ""
 
         lldbinit_lines = []
         skipNext = false

data/lib/pod_builder/command/deintegrate.rb

@@ -39,7 +39,8 @@ module PodBuilder
         PodBuilder::safe_rm_rf(Configuration.base_path)
 
         Dir.chdir(PodBuilder::project_path)
-        system("pod install;")  
+        bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
+        system("#{bundler_prefix}pod install;")
 
         license_base = PodBuilder::project_path(Configuration.license_filename)
         FileUtils.rm_f("#{license_base}.plist")

data/lib/pod_builder/command/generate_lfs.rb

@@ -13,8 +13,8 @@ module PodBuilder
         gitattributes_excludes = ["*.h", "*.hh", "*.m", "*.mm", "*.i", "*.c", "*.cc", "*.cxx", "*.cpp", "*.def", "*.inc", "*.inl", "*.swift", "*.modulemap", "*.strings", "*.png", "*.jpg", "*.gif", "*.html", "*.htm", "*.js", "*.json", "*.xml", "*.txt", "*.md", "*.rb", "*.sh", "*.py", "*.plist", "*.resolved", ".*", "README*", "LICENSE*"]
 
         gitattributes_includes_frameworks = ["**/* filter=lfs diff=lfs merge=lfs !text"]
-        write_attributes(PodBuilder::basepath("Rome"), gitattributes_includes_frameworks, gitattributes_excludes)
-        write_attributes(PodBuilder::basepath("dSYM"), gitattributes_includes_frameworks, gitattributes_excludes)
+        write_attributes(PodBuilder::prebuiltpath, gitattributes_includes_frameworks, gitattributes_excludes)
+        write_attributes(PodBuilder::dsympath, gitattributes_includes_frameworks, gitattributes_excludes)
 
         if Configuration.lfs_include_pods_folder
           gitattributes_includes_pods = ["**/*.framework/**/* filter=lfs diff=lfs merge=lfs !text"]

data/lib/pod_builder/command/install_sources.rb

@@ -12,7 +12,7 @@ module PodBuilder
         framework_items = Analyze.podfile_items(installer, analyzer).select { |x| !x.is_prebuilt }
         podspec_names = framework_items.map(&:podspec_name)
 
-        base_path = PodBuilder::basepath("Rome")
+        base_path = PodBuilder::prebuiltpath
         framework_files = Dir.glob("#{base_path}/**/*.framework")
         
         framework_files.each do |path|

data/lib/pod_builder/command/switch.rb

@@ -12,108 +12,130 @@ module PodBuilder
         unless argument_pods.count > 0 
           return -1
         end
-        unless argument_pods.count == 1
-          raise "\n\nSpecify a single pod to switch\n\n".red 
-        end
-        
-        pod_name_to_switch = argument_pods.first
-        
-        check_not_building_subspec(pod_name_to_switch)
 
-        installer, analyzer = Analyze.installer_at(PodBuilder::basepath, false)
-        all_buildable_items = Analyze.podfile_items(installer, analyzer)
-
-        raise "\n\nPod `#{pod_name_to_switch}` wasn't found in Podfile" unless all_buildable_items.map(&:root_name).include?(pod_name_to_switch)
-        
-        unless options.has_key?(:switch_mode)
-          podfile_item = all_buildable_items.detect { |x| x.root_name == pod_name_to_switch }
-          options[:switch_mode] = request_switch_mode(pod_name_to_switch, podfile_item)
+        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}'" if pod_name_to_switch.nil?
+          
+          check_not_building_subspec(pod_name_to_switch)  
 
-          if options[:switch_mode].nil?
-            return 0
-          end
-        end
-
-        if options[:switch_mode] == "prebuilt"
-          check_prebuilded(pod_name_to_switch)
+          pod_names_to_switch.push(pod_name_to_switch)
         end
-
-        podfile_path = PodBuilder::project_path("Podfile")
-        podfile_content = File.read(podfile_path)
-
-        pod_lines = []
-        podfile_content.each_line do |line|
-          if pod_name = Podfile.pod_definition_in(line, false)
-            if pod_name.start_with?("PodBuilder/")
-              pod_name = pod_name.split("PodBuilder/").last.gsub("_", "/")
-            end
-
-            unless pod_name.split("/").first == pod_name_to_switch
-              pod_lines.push(line)
-              next
-            end
-
-            if pod_name.include?("/")
-              podfile_items = all_buildable_items.select { |x| x.name == pod_name }
-            else
-              podfile_items = all_buildable_items.select { |x| x.root_name == pod_name }
+        
+        pod_names_to_switch.each do |pod_name_to_switch|
+          development_path = ""
+          default_entries = Hash.new
+
+          case options[:switch_mode]
+          when "development"
+            development_path = find_podspec(pod_name_to_switch)          
+          when "prebuilt"
+            podfile_path = PodBuilder::basepath("Podfile.restore")
+            content = File.read(podfile_path)
+            if !content.include?("pod '#{pod_name_to_switch}")
+              raise "\n\n'#{pod_name_to_switch}' does not seem to be prebuit!"
             end
-
-            unless podfile_items.count > 0
-              raise "\n\nPod `#{pod_name_to_switch}` wasn't found in Podfile\n".red
+          when "default"
+            podfile_path = PodBuilder::basepath("Podfile")
+            content = File.read(podfile_path)
+              
+            current_section = ""
+            content.each_line do |line|
+              stripped_line = line.strip
+              if stripped_line.start_with?("def ") || stripped_line.start_with?("target ")
+                current_section = line.split(" ")[1]
+                next
+              end
+    
+              matches = line.gsub("\"", "'").match(/pod '(.*?)',(.*)/)
+              if matches&.size == 3
+                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}" if default_entries.keys.count == 0
+          end
 
-            matches = line.match(/(#\s*pb<)(.*?)(>)/)
-            if matches&.size == 4
-              default_pod_name = matches[2]
-            else
-              puts "⚠️ Did not found pb<> entry, assigning default pod name #{pod_name}"
-              default_pod_name = pod_name
+          podfile_path = PodBuilder::project_path("Podfile")
+          content = File.read(podfile_path)
+          
+          lines = []
+          current_section = ""
+          content.each_line do |line|
+            stripped_line = line.strip
+            if stripped_line.start_with?("def ") || stripped_line.start_with?("target ")
+              current_section = line.split(" ")[1]
             end
 
-            unless podfile_item = all_buildable_items.detect { |x| x.name == default_pod_name }
-              raise "\n\nPod `#{default_pod_name}` wasn't found in Podfile\n".red
+            matches = line.gsub("\"", "'").match(/pod '(.*?)',(.*)/)
+            if matches&.size == 3
+              if matches[1].split("/").first == pod_name_to_switch
+                case options[:switch_mode]
+                when "prebuilt"
+                  indentation = line.split("pod '").first
+                  rel_path = Pathname.new(PodBuilder::prebuiltpath).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+                  prebuilt_line = "#{indentation}pod '#{matches[1]}', :path => '#{rel_path}'\n"
+                  if line.include?("# pb<") && marker = line.split("# pb<").last
+                    prebuilt_line = prebuilt_line.chomp("\n") + " # pb<#{marker}"
+                  end
+                  lines.append(prebuilt_line)
+                  next
+                when "development"
+                  indentation = line.split("pod '").first
+                  rel_path = Pathname.new(development_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+                  development_line = "#{indentation}pod '#{matches[1]}', :path => '#{rel_path}'\n"
+                  if line.include?("# pb<") && marker = line.split("# pb<").last
+                    development_line = development_line.chomp("\n") + " # pb<#{marker}"
+                  end
+
+                  lines.append(development_line)
+                  next
+                when "default"
+                  if default_line = default_entries[current_section]
+                    if line.include?("# pb<") && marker = line.split("# pb<").last
+                      default_line = default_line.chomp("\n") + " # pb<#{marker}"
+                    end
+                    lines.append(default_line)
+                    next
+                  elsif
+                    raise "Line for pod '#{matches[1]}' in section '#{current_section}' not found in PodBuilder's Podfile"
+                  end
+                else
+                  raise "Unsupported mode '#{options[:switch_mode]}'"
+                end
+              end  
             end
-            podfile_item = podfile_item.dup
 
-            indentation = line.detect_indentation
-
-            case options[:switch_mode]
-            when "prebuilt"
-              line = indentation + podfile_item.prebuilt_entry + "\n"
-            when "development"
-              podfile_item.path = find_podspec(podfile_item)
-              podfile_item.is_external = true
-
-              line = indentation + podfile_item.entry + "\n"
-            when "default"
-              line = indentation + podfile_item.entry + "\n"
-            else
-              break
-            end
+            lines.append(line)
           end
 
-          pod_lines.push(line)
+          File.write(podfile_path, lines.join)
         end
         
-        File.write(podfile_path, pod_lines.join)
-        
         Dir.chdir(PodBuilder::project_path)
-        system("pod install")
+        bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
+        system("#{bundler_prefix}pod install;")
 
         return 0
       end
       
       private     
 
-      def self.find_podspec(podfile_item)
+      def self.find_podspec(podname)
         unless Configuration.development_pods_paths.count > 0
           raise "\n\nPlease add the development pods path(s) in #{Configuration.dev_pods_configuration_filename} as per documentation\n".red
         end
 
         podspec_path = nil
         Configuration.development_pods_paths.each do |path|
-          podspec = Dir.glob(File.expand_path("#{path}/**/#{podfile_item.root_name}*.podspec*"))
+          if Pathname.new(path).relative?
+            path = PodBuilder::basepath(path)
+          end
+          podspec = Dir.glob(File.expand_path("#{path}/**/#{podname}*.podspec*"))
           podspec.select! { |x| !x.include?("/Local Podspecs/") }
           podspec.select! { |x| Dir.glob(File.join(File.dirname(x), "*")).count > 1 } # exclude podspec folder (which has one file per folder)
           if podspec.count > 0
@@ -123,39 +145,17 @@ module PodBuilder
         end
 
         if podspec_path.nil?
-          raise "\n\nCouln't find `#{podfile_item.root_name}` sources in the following specified development pod paths: #{Configuration.development_pods_paths.join("\n")}\n".red
+          raise "\n\nCouln't find `#{podname}` sources in the following specified development pod paths:\n#{Configuration.development_pods_paths.join("\n")}\n".red
         end
 
         return podspec_path
       end
-      
-      def self.request_switch_mode(pod_name, podfile_item)
-        matches = podfile_item.entry.match(/(pod '.*?',)(.*)('.*')/)
-        unless matches&.size == 4
-          raise "\n\nFailed matching pod name\n".red
-        end
-
-        default_entry = matches[3].strip
-
-        modes = ["prebuilt", "development", "default"]
-        mode_indx = ask("\n\nSwitch #{pod_name} to:\n1) Prebuilt\n2) Development pod\n3) Default (#{default_entry})\n\n") { |x| x.limit = 1, x.validate = /[1-3]/ }
-        
-        return modes[mode_indx.to_i - 1]
-      end
-      
+            
       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
         end
       end
-
-      private
-
-      def self.check_prebuilded(pod_name)
-        if !Podspec.include?(pod_name)
-          raise "\n\n#{pod_name} is not prebuilt.\n\nRun 'pod_builder build #{pod_name}'\n".red
-        end
-      end
     end
   end    
 end

data/lib/pod_builder/command/sync_podfile.rb

@@ -21,7 +21,8 @@ module PodBuilder
         Licenses::write([], all_buildable_items)
 
         if previous_podfile_content != updated_podfile_content
-          system("pod install")
+          bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
+          system("#{bundler_prefix}pod install;")
         end
         
         return 0

data/lib/pod_builder/command/update.rb

@@ -36,7 +36,7 @@ module PodBuilder
         ARGV.clear
         pods_to_update.each { |x| ARGV << x }
 
-        options[:auto_resolve_dependencies] = true
+        # options[:auto_resolve_dependencies] = true
         return PodBuilder::Command::Build.call(options)
       end              
     end

data/lib/pod_builder/command/update_lldbinit.rb

@@ -22,7 +22,7 @@ module PodBuilder
         app_podfile_content = File.read(PodBuilder::project_path("Podfile"))
 
         lldbinit_path = File.expand_path(argument_pods[0])
-        lldbinit_content = File.exists?(lldbinit_path) ? File.read(lldbinit_path) : ""
+        lldbinit_content = File.exist?(lldbinit_path) ? File.read(lldbinit_path) : ""
         status_hash = podfiles_status_hash(app_podfile_content, podfile_restore_content)
         if lldbinit_content.include?("# <pb_md5:#{base_path}:#{status_hash}")
           puts "\n\n🎉 already in sync!\n".green
@@ -125,7 +125,7 @@ module PodBuilder
         puts "Writing #{lldbinit_path}".yellow
 
         FileUtils.touch(lldbinit_path)
-        raise "\n\nDestination file should be a file" unless File.exists?(lldbinit_path)
+        raise "\n\nDestination file should be a file" unless File.exist?(lldbinit_path)
 
         lldbinit_lines = []
         skipNext = false

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
@@ -221,6 +275,7 @@ module PodBuilder
     
     def self.podbuilder_path
       paths = Dir.glob("#{PodBuilder::home}/**/.pod_builder")
+      paths.reject! { |t| t.match(/pod-builder-.*\/Example\/Frameworks\/\.pod_builder$/i) }
       raise "\n\nToo many .pod_builder found `#{paths.join("\n")}`\n".red if paths.count > 1
       
       return paths.count > 0 ? File.dirname(paths.first) : nil