pod-builder 2.0.0.beta.18 → 2.0.0.beta.24

data/lib/pod_builder/command/switch.rb

@@ -3,7 +3,7 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class Switch
-      def self.call(options)
+      def self.call
         Configuration.check_inited
         PodBuilder::prepare_basepath
         
@@ -17,25 +17,62 @@ module PodBuilder
         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?
+          raise "\n\nDid not find pod '#{pod}'".red if pod_name_to_switch.nil?
           
           check_not_building_subspec(pod_name_to_switch)  
 
           pod_names_to_switch.push(pod_name_to_switch)
         end
+
+        dep_pod_names_to_switch = []
+        if OPTIONS[:switch_all] == true
+          pod_names_to_switch.each do |pod|
+            podspec_path = PodBuilder::prebuiltpath("#{pod}/#{pod}.podspec")
+            unless File.exist?(podspec_path)
+              next
+            end
+
+            podspec_content = File.read(podspec_path)
+
+            regex = "p\\d\\.dependency '(.*)'"
+
+            podspec_content.each_line do |line|
+              matches = line.match(/#{regex}/)
+      
+              if matches&.size == 2
+                dep_pod_names_to_switch.push(matches[1].split("/").first)
+              end
+            end
+          end
+
+          dep_pod_names_to_switch.uniq!
+          dep_pod_names_to_switch.reverse.each do |dep_name|
+            podspec_path = PodBuilder::prebuiltpath("#{dep_name}/#{dep_name}.podspec")
+            if File.exist?(podspec_path)
+              if pod = Podfile::resolve_pod_names_from_podfile([dep_name]).first
+                pod_names_to_switch.push(pod)
+                next
+              end    
+            end
+            
+            dep_pod_names_to_switch.delete(dep_name)
+          end
+          pod_names_to_switch = pod_names_to_switch.map { |t| t.split("/").first }.uniq
+          dep_pod_names_to_switch.reject { |t| pod_names_to_switch.include?(t) } 
+        end
         
         pod_names_to_switch.each do |pod_name_to_switch|
           development_path = ""
           default_entries = Hash.new
 
-          case options[:switch_mode]
+          case OPTIONS[:switch_mode]
           when "development"
-            development_path = find_podspec(pod_name_to_switch)          
+            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!"
+              raise "\n\n'#{pod_name_to_switch}' does not seem to be prebuit!".red
             end
           when "default"
             podfile_path = PodBuilder::basepath("Podfile")
@@ -57,7 +94,15 @@ module PodBuilder
               end
             end
     
-            raise "\n\n'#{pod_name_to_switch}' not found in #{podfile_path}" if default_entries.keys.count == 0
+            raise "\n\n'#{pod_name_to_switch}' not found in #{podfile_path}".red if default_entries.keys.count == 0
+          end
+
+          if development_path.nil? 
+            if dep_pod_names_to_switch.include?(pod_name_to_switch)
+              next
+            else
+              raise "\n\nCouln't find `#{pod_name_to_switch}` sources in the following specified development pod paths:\n#{Configuration.development_pods_paths.join("\n")}\n".red
+            end
           end
 
           podfile_path = PodBuilder::project_path("Podfile")
@@ -74,10 +119,11 @@ module PodBuilder
             matches = line.gsub("\"", "'").match(/pod '(.*?)',(.*)/)
             if matches&.size == 3
               if matches[1].split("/").first == pod_name_to_switch
-                case options[:switch_mode]
+                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
+                  podspec_path = File.dirname(PodBuilder::prebuiltpath("#{pod_name_to_switch}/#{pod_name_to_switch}.podspec"))
+                  rel_path = Pathname.new(podspec_path).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}"
@@ -102,10 +148,10 @@ module PodBuilder
                     lines.append(default_line)
                     next
                   elsif
-                    raise "Line for pod '#{matches[1]}' in section '#{current_section}' not found in PodBuilder's Podfile"
+                    raise "\n\nLine for pod '#{matches[1]}' in section '#{current_section}' not found in PodBuilder's Podfile".red
                   end
                 else
-                  raise "Unsupported mode '#{options[:switch_mode]}'"
+                  raise "\n\nUnsupported mode '#{OPTIONS[:switch_mode]}'".red
                 end
               end  
             end
@@ -144,10 +190,6 @@ module PodBuilder
           end
         end
 
-        if podspec_path.nil?
-          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
             

data/lib/pod_builder/command/sync_podfile.rb

@@ -3,11 +3,11 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class SyncPodfile
-      def self.call(options)
+      def self.call
         Configuration.check_inited
         PodBuilder::prepare_basepath
         
-        install_update_repo = options.fetch(:update_repos, true)
+        install_update_repo = OPTIONS.fetch(:update_repos, true)
         installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
 
         all_buildable_items = Analyze.podfile_items(installer, analyzer)
@@ -25,6 +25,7 @@ module PodBuilder
           system("#{bundler_prefix}pod install;")
         end
         
+        puts "\n\n🎉 done!\n".green
         return 0
       end
     end

data/lib/pod_builder/command/update.rb

@@ -1,10 +1,9 @@
 require 'pod_builder/core'
-require 'cfpropertylist'
 
 module PodBuilder
   module Command
     class Update
-      def self.call(options)          
+      def self.call
         Configuration.check_inited
         PodBuilder::prepare_basepath
 
@@ -25,10 +24,10 @@ module PodBuilder
         pods_to_update.map! { |x| x.split("/").first }.uniq!
         
         unless pods_to_update.count > 0
-          puts "Frameworks in sync!\n".green
+          puts "Prebuilt items in sync!\n".green
           return 0
         end
-        if options.has_key?(:dry_run)
+        if OPTIONS.has_key?(:dry_run)
           puts "`#{pods_to_update.join("`, `")}` need to be rebuilt!\n".red
           return -2
         end
@@ -36,8 +35,8 @@ module PodBuilder
         ARGV.clear
         pods_to_update.each { |x| ARGV << x }
 
-        # options[:auto_resolve_dependencies] = true
-        return PodBuilder::Command::Build.call(options)
+        # OPTIONS[:auto_resolve_dependencies] = true
+        return PodBuilder::Command::Build.call
       end              
     end
   end

data/lib/pod_builder/command/update_lldbinit.rb

@@ -4,9 +4,12 @@ require 'digest'
 module PodBuilder
   module Command
     class UpdateLldbInit
-      def self.call(options)
+      def self.call
         Configuration.check_inited
-        
+        if Configuration.build_using_repo_paths
+          raise "\n\nlldb shenanigans not supported when 'build_using_repo_paths' is enabled".red
+        end
+
         argument_pods = ARGV.dup
         
         unless argument_pods.count > 0 
@@ -55,10 +58,9 @@ module PodBuilder
           name = File.basename(framework_path, File.extname(framework_path)) 
           executable_path = File.join(framework_path, name)
 
-          podbuilder_plist = File.join(framework_path, Configuration.framework_plist_filename)
-
-          plist = CFPropertyList::List.new(:file => podbuilder_plist)
-          data = CFPropertyList.native_types(plist.value)
+          parent_framework_path = File.expand_path(File.joing(framework_path, ".."))
+          framework_info_path = File.join(parent_framework_path, Configuration.prebuilt_info_filename)
+          data = JSON.parse(File.read(framework_info_path))
 
           original_compile_path = data["original_compile_path"]
           is_prebuilt = data.fetch("is_prebuilt", true)
@@ -125,7 +127,7 @@ module PodBuilder
         puts "Writing #{lldbinit_path}".yellow
 
         FileUtils.touch(lldbinit_path)
-        raise "\n\nDestination file should be a file" unless File.exist?(lldbinit_path)
+        raise "\n\nDestination file should be a file".red unless File.exist?(lldbinit_path)
 
         lldbinit_lines = []
         skipNext = false
@@ -138,7 +140,7 @@ module PodBuilder
             next
           elsif line != "\n"
             if line.include?("settings set target.source-map")
-              raise "\n\n#{lldbinit_destination_path} already includes a manual `settings set target.source-map`. This is unsupported and you'll have to manually remove that entry\n"
+              raise "\n\n#{lldbinit_destination_path} already includes a manual `settings set target.source-map`. This is unsupported and you'll have to manually remove that entry\n".red
             end
             lldbinit_lines.push(line)
           end

data/lib/pod_builder/configuration.rb

@@ -19,13 +19,14 @@ module PodBuilder
         "module_name": "GoogleMobileAds"
       }
     }.freeze
-    DEFAULT_SKIP_PODS = ["GoogleMaps"]
+    DEFAULT_SKIP_PODS = ["GoogleMaps", "Flipper", "FlipperKit", "Flipper-DoubleConversion", "Flipper-Folly", "Flipper-Glog", "Flipper-PeerTalk", "Flipper-RSocket", "React-cxxreact"]
     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
+    DEFAULT_BUILD_USING_REPO_PATHS = false
     
     private_constant :DEFAULT_BUILD_SETTINGS
     private_constant :DEFAULT_BUILD_SYSTEM
@@ -55,13 +56,15 @@ module PodBuilder
       attr_accessor :lfs_include_pods_folder
       attr_accessor :project_name
       attr_accessor :restore_enabled
-      attr_accessor :framework_plist_filename
+      attr_accessor :prebuilt_info_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
+      attr_accessor :build_using_repo_paths
+      attr_accessor :react_native_project
     end
     
     @allow_building_development_pods = false
@@ -69,7 +72,7 @@ module PodBuilder
     @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
+    @base_path = "PodBuilder" # 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 = []
     @skip_pods = DEFAULT_SKIP_PODS
@@ -86,7 +89,7 @@ module PodBuilder
     @lfs_include_pods_folder = false
     @project_name = ""
     @restore_enabled = true
-    @framework_plist_filename = "PodBuilder.plist"
+    @prebuilt_info_filename = "PodBuilder.json"
     @lockfile_name = "PodBuilder.lock"
     @lockfile_path = "/tmp/#{lockfile_name}"
 
@@ -95,6 +98,8 @@ module PodBuilder
 
     @supported_platforms = DEFAULT_PLATFORMS
     @build_for_apple_silicon = DEFAULT_BUILD_FOR_APPLE_SILICON
+    @build_using_repo_paths = DEFAULT_BUILD_USING_REPO_PATHS
+    @react_native_project = false
     
     def self.check_inited
       raise "\n\nNot inited, run `pod_builder init`\n".red if podbuilder_path.nil?
@@ -208,12 +213,20 @@ module PodBuilder
             Configuration.build_for_apple_silicon = value
           end
         end
+        if value = json["build_using_repo_paths"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.build_using_repo_paths = value
+          end
+        end
+        if value = json["react_native_project"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.react_native_project = value
+          end
+        end
         
         Configuration.build_settings.freeze
 
         sanity_check()
-      else
-        write
       end
       
       dev_pods_configuration_path = File.join(Configuration.base_path, Configuration.dev_pods_configuration_filename)
@@ -251,6 +264,13 @@ module PodBuilder
       config["subspecs_to_split"] = Configuration.subspecs_to_split
       config["lfs_update_gitattributes"] = Configuration.lfs_update_gitattributes
       config["lfs_include_pods_folder"] = Configuration.lfs_include_pods_folder
+      config["restore_enabled"] = Configuration.restore_enabled
+      config["allow_building_development_pods"] = Configuration.allow_building_development_pods
+      config["use_bundler"] = Configuration.use_bundler
+      config["deterministic_build"] = Configuration.deterministic_build
+      config["build_for_apple_silicon"] = Configuration.build_for_apple_silicon
+      config["build_using_repo_paths"] = Configuration.build_using_repo_paths
+      config["react_native_project"] = Configuration.react_native_project
       
       File.write(config_path, JSON.pretty_generate(config))
     end
@@ -275,6 +295,7 @@ module PodBuilder
     
     def self.podbuilder_path
       paths = Dir.glob("#{PodBuilder::home}/**/.pod_builder")
+      paths.reject! { |t| t.match(/pod-builder-.*\/Example\/#{File.basename(Configuration.base_path)}\/\.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

data/lib/pod_builder/core.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'colored'
 
 require 'pod_builder/podfile'
+require 'pod_builder/podfile_cp'
 require 'pod_builder/podfile_item'
 require 'pod_builder/analyze'
 require 'pod_builder/analyzer'
@@ -15,6 +16,13 @@ require 'pod_builder/licenses'
 require 'core_ext/string'
 
 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
@@ -30,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)
 
@@ -41,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?
@@ -55,7 +69,7 @@ module PodBuilder
       return nil
     end
 
-    path = basepath("Rome")
+    path = basepath("Prebuilt")
     if child.length > 0
       path += "/#{child}"
     end
@@ -68,7 +82,20 @@ module PodBuilder
       return nil
     end
 
-    path = "#{Configuration.build_path}/Rome"
+    path = "#{Configuration.build_path}/Prebuilt"
+    if child.length > 0
+      path += "/#{child}"
+    end
+
+    return path
+  end
+
+  def self.buildpath_dsympath(child = "")
+    if child.nil?
+      return nil
+    end
+
+    path = "#{Configuration.build_path}/dSYM"
     if child.length > 0
       path += "/#{child}"
     end
@@ -96,27 +123,36 @@ module PodBuilder
   end
 
   def self.find_xcodeproj
+    unless @@xcodeproj_path.nil?
+      return @@xcodeproj_path
+    end
     project_name = File.basename(find_xcodeworkspace, ".*")
 
     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 "xcodeproj not found!".red if xcodeprojects.count == 0
-    raise "Found multiple xcodeproj:\n#{xcodeprojects.join("\n")}".red if xcodeprojects.count > 1
+    raise "\n\nxcodeproj not found!".red if xcodeprojects.count == 0
+    raise "\n\nFound multiple xcodeproj:\n#{xcodeprojects.join("\n")}".red if xcodeprojects.count > 1
 
-    return xcodeprojects.first
+    @@xcodeproj_path = xcodeprojects.first
+    return @@xcodeproj_path
   end
 
   def self.find_xcodeworkspace
+    unless @@xcodeworkspace_path.nil?
+      return @@xcodeworkspace_path
+    end
+
     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 "xcworkspace not found!".red if xcworkspaces.count == 0
-    raise "Found multiple xcworkspaces:\n#{xcworkspaces.join("\n")}".red if xcworkspaces.count > 1
+    raise "\n\nxcworkspace not found!".red if xcworkspaces.count == 0
+    raise "\n\nFound multiple xcworkspaces:\n#{xcworkspaces.join("\n")}".red if xcworkspaces.count > 1
 
-    return xcworkspaces.first
+    @@xcodeworkspace_path = xcworkspaces.first
+    return @@xcodeworkspace_path
   end
 
   def self.prepare_basepath
@@ -143,7 +179,7 @@ module PodBuilder
 
   def self.system_swift_version
     swift_version = `swiftc --version | grep -o 'swiftlang-.*\s'`.strip()
-    raise "Unsupported swift compiler version, expecting `swiftlang` keyword in `swiftc --version`" if swift_version.length == 0
+    raise "\n\nUnsupported swift compiler version, expecting `swiftlang` keyword in `swiftc --version`".red if swift_version.length == 0
     return swift_version
   end
 
@@ -179,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