pod-builder 1.2.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b4894a8c845877301fe37cba6682aeccb75893da27d05ab6ad3263654b6007d
-  data.tar.gz: 2b6995d8db5b4a13a7a6227abfa242806d186fd5397faea75b3403807112f9da
+  metadata.gz: 1ed1f8c8e0a7da95f84809e493f7cb3fb7ed6d024f1b17f57e73b54e27e661f2
+  data.tar.gz: e210f06322e54da06ed82fc1ecea03b8dcc9ab5ae50c44beedb34df667ddb4d2
 SHA512:
-  metadata.gz: 89e914bb125884e5a976a872275b96134fc35243e4364ae4e8f24da5ebb7c4be031542ccde07d282fccf066e60c0ea3e007800f0c1832421d337c5b7a9f14b51
-  data.tar.gz: c2def531344ba74be17941317521f250260ba81413d86b164181cb3cf13b1a7088743afdf7b09de97da8690aabef50236b2c88c380b6e78cb719fb02ada05632
+  metadata.gz: '08086526e3001eced878eb22656a82b06527a247f3bc8f93d30eb9a9a5962dc8e565fc3b8cca0f5bd08aa41316500450aa49970b0773b1aa0242af90afcc6d62'
+  data.tar.gz: f876724cb3b9b99357e5162265c780f8e752e2287af452104910b576d9f35d1b822597f9fdf01a50d144ad0665374b78ad510082cbb167368074a0c922abfa08

data/README.md

@@ -100,6 +100,10 @@ When using PodBuilder you loose ability to directly access to the source code of
 
 In some situations you may already have source code for your prebuilt frameworks (e.g. committed in your repo). In this case there is no need to use the `install_sources`, you can run this command passing the folder that contains the source code that you used to generate the prebuilt frameworks. This will update the `~/.lldbinit-Xcode` file which will restore the ability to use the debugger and step into the code of your prebuilt dependencies.
 
+#### `clear_lldbinit` command
+
+Run this command to remove PodBuilder's `~/.lldbinit-Xcode` customizations.
+
 #### `switch` command
 
 Once you prebuild a framework you can change the way it is integrated in your project.

data/exe/pod_builder

@@ -40,6 +40,7 @@ Command:
     + restore_all                    Rebuild all pods declared in the Restore-Podfile
     + install_sources                Install sources of pods to debug into prebuilt frameworks
     + update_lldbinit                Update ~/.lldbinit-Xcode setting target.source-map to debug prebuilt frameworks
+    + clear_lldbinit                 Clear ~/.lldbinit-Xcode setting with PodBuilder's customizations
     + switch                         Switch between prebuilt/development/standard pod in the Application-Podfile
     + clean                          Remove prebuild frameworks, dSYMs and source files added by `install_sources` command that are no longer in the PodBuilder-Podfile
     + sync_podfile                   Update your Application-Podfile with all pods declared in the PodBuilder-Podfile
@@ -254,7 +255,7 @@ Usage:
         opts.banner = "
 Usage:
         
-    $ pod_builder install_sources PATH
+    $ pod_builder update_lldbinit PATH
 
       Update ~/.lldbinit-Xcode setting target.source-map in order to be able to step into 
       and debug framework's code.
@@ -268,6 +269,21 @@ Usage:
       ]
     },
 
+    "clear_lldbinit" => {         
+      :opts => OptionParser.new do |opts|
+        opts.banner = "
+Usage:
+        
+    $ pod_builder clear_lldbinit
+
+      Clear ~/.lldbinit-Xcode setting target.source-map PodBuilder's customizations
+"         
+      end,
+      :call => [        
+        PodBuilder::Command::ClearLldbInit
+      ]
+    },
+
     "switch" => {      
       :opts => OptionParser.new do |opts|
         opts.banner = "

data/lib/pod_builder/command/clear_lldbinit.rb

@@ -0,0 +1,32 @@
+require 'pod_builder/core'
+require 'digest'
+
+module PodBuilder
+  module Command
+    class ClearLldbInit
+      def self.call(options)
+        lldbinit_path = File.expand_path('~/.lldbinit-Xcode')
+        lldbinit_content = File.exists?(lldbinit_path) ? File.read(lldbinit_path) : ""
+
+        lldbinit_lines = []
+        skipNext = false
+        File.read(lldbinit_path).each_line do |line|
+          if line.include?("# <pb")
+            skipNext = true
+            next
+          elsif skipNext
+            skipNext = false
+            next
+          elsif line != "\n"
+            lldbinit_lines.push(line)
+          end
+        end
+      
+        File.write(lldbinit_path, lldbinit_lines.join())
+
+        puts "\n\n🎉 done!\n".green
+        return 0
+      end
+    end
+  end
+end

data/lib/pod_builder/command/update_lldbinit.rb

@@ -18,32 +18,35 @@ module PodBuilder
             
         base_path = PodBuilder::basepath("")
 
+        podfile_restore_content = File.read(PodBuilder::basepath("Podfile.restore"))
+        app_podfile_content = File.read(PodBuilder::project_path("Podfile"))
+
         lldbinit_path = File.expand_path('~/.lldbinit-Xcode')
         lldbinit_content = File.exists?(lldbinit_path) ? File.read(lldbinit_path) : ""
-        restore_hash = podfile_restore_hash()
-        if lldbinit_content.include?("# <pb_md5:#{base_path}:#{restore_hash}")
+        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
           return 0
         end
 
-        path = argument_pods[0]
+        source_path = argument_pods[0]
         
-        is_absolute = ["~", "/"].include?(path[0])
+        is_absolute = ["~", "/"].include?(source_path[0])
         if !is_absolute
-          path = Pathname.new(File.join(base_path, path))
+          source_path = Pathname.new(File.join(base_path, source_path))
         end
         
-        path = File.expand_path(path)
+        source_path = File.expand_path(source_path)
         
         framework_paths = Dir.glob("#{base_path}/**/*.framework")
         
         unless framework_paths.count > 0
-          raise "\n\nNo prebuilt frameworks found in `#{path}`\n\n".red 
+          raise "\n\nNo prebuilt frameworks found in `#{framework_paths}`\n\n".red 
         end
 
         puts "Extracting debug information".yellow
 
-        podspec_paths = Dir.glob("#{path}/**/*.podspec") + Dir.glob("#{path}/**/*.podspec.json")
+        podspec_paths = Dir.glob("#{source_path}/**/*.podspec") + Dir.glob("#{source_path}/**/*.podspec.json")
         podspec_contents = podspec_paths.map { |t| File.read(t).gsub(/\s+/, "").gsub("\"", "'") }
         
         replace_paths = []
@@ -51,49 +54,50 @@ module PodBuilder
         framework_paths.each do |framework_path|
           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)
+
+          original_compile_path = data["original_compile_path"]
+          is_prebuilt = data.fetch("is_prebuilt", true)
+
+          if original_compile_path.nil?
+            puts "\n\n#{framework_path} was compiled with an older version of PodBuilder, please rebuild it to update `~/.lldbinit-Xcode`"
+            next
+          end
           
-          dwarf_dump_lib = `dwarfdump --debug-info #{executable_path} | grep '#{Configuration.build_base_path}' | head -n 1`.strip()          
-          
-          if (matches = dwarf_dump_lib.match(/#{Configuration.build_base_path}(.*)\/Pods/)) && matches.size == 2
-            original_compile_path = "#{Configuration.build_base_path}#{matches[1]}/Pods/#{name}"
-            
-            if podspec_path = find_podspec_path_for(name, podspec_paths, podspec_contents)
-              replace_paths.push("#{original_compile_path},#{File.dirname(podspec_path)}")
+          if is_prebuilt
+            next
+          end
+
+          if podspec_path = find_podspec_path_for(name, podspec_paths, podspec_contents)
+            if !is_development_pod(podspec_path, app_podfile_content)
+              replace_paths.push("#{original_compile_path}/Pods/#{name},#{File.dirname(podspec_path)}")
             else
-              puts "Failed to find podspec for #{name}".blue
-            end 
+              puts "#{name} is in development pod, skipping"
+            end
           else
-            # Look for path in dSYM
-            dsym_paths = Dir.glob("#{base_path}/**/iphonesimulator/#{name}.framework.dSYM")
-            dsym_paths.each do |dsym_path|
-              name = File.basename(dsym_path, ".framework.dSYM") 
-              dsym_dwarf_path = File.join(dsym_path, "Contents/Resources/DWARF")
-              dsym_dwarf_path = File.join(dsym_dwarf_path, name)
-              
-              dwarf_dump_lib = `dwarfdump --debug-info #{dsym_dwarf_path} | grep '#{Configuration.build_base_path}' | head -n 1`.strip()
-              
-              if (matches = dwarf_dump_lib.match(/#{Configuration.build_base_path}(.*)\/Pods/)) && matches.size == 2
-                original_compile_path = "#{Configuration.build_base_path}#{matches[1]}/Pods/#{name}"
-
-                if podspec_path = find_podspec_path_for(name, podspec_paths, podspec_contents)
-                  replace_paths.push("#{original_compile_path},#{File.dirname(podspec_path)}")
-                else
-                  puts "Failed to find podspec for #{name}".blue
-                end                
-              end
-            end    
-          end
+            puts "Failed to find podspec for #{name}, skipping".blue
+          end   
         end
         
         replace_paths.uniq!
 
-        source_map_lines = replace_paths.flat_map { |t| ["# <pb:#{base_path}>", "settings append target.source-map '#{t.split(",").first}' '#{t.split(",").last}'"] }
-        rewrite_lldinit(source_map_lines, base_path)
+        source_map_lines = replace_paths.flat_map { |t| ["# <pb:#{base_path}>\n", "settings append target.source-map '#{t.split(",").first}' '#{t.split(",").last}'\n"] }
+        rewrite_lldinit(source_map_lines, base_path, app_podfile_content, podfile_restore_content)
         
         puts "\n\n🎉 done!\n".green
         return 0
       end
 
+      def self.is_development_pod(podspec_path, app_podfile_content)
+        development_path = Pathname.new(podspec_path).relative_path_from(Pathname.new(PodBuilder::project_path)).parent.to_s
+
+        return app_podfile_content.include?(":path => '#{development_path}'")
+      end
+
       def self.find_podspec_path_for(name, podspec_paths, podspec_contents)
         if (path = podspec_paths.detect { |t| File.basename(t, ".podspec") == name.gsub("_", "-") })
           return path
@@ -110,11 +114,14 @@ module PodBuilder
         end
       end
 
-      def self.podfile_restore_hash()
-        Digest::MD5.hexdigest(File.read(PodBuilder::basepath("Podfile.restore")))
+      def self.podfiles_status_hash(app_podfile_content, podfile_restore_content)
+        # Change to either Podfile.restore (which presumely mean new prebuilds done)
+        # or app's Podfile (which my occurr when pods are switched to development pod)
+        # should force a regeneration of the status identifier
+        Digest::MD5.hexdigest(podfile_restore_content + app_podfile_content)
       end
 
-      def self.rewrite_lldinit(source_map_lines, base_path)
+      def self.rewrite_lldinit(source_map_lines, base_path, app_podfile_content, podfile_restore_content)
         puts "Writing ~/.lldbinit-Xcode".yellow
 
         lldbinit_path = File.expand_path('~/.lldbinit-Xcode')
@@ -123,7 +130,7 @@ module PodBuilder
         lldbinit_lines = []
         skipNext = false
         File.read(lldbinit_path).each_line do |line|
-          if line.include?("# <pb:#{base_path}>")
+          if line.include?("# <pb:#{base_path}>") || line.include?("# <pb>")
             skipNext = true
             next
           elsif skipNext
@@ -137,13 +144,16 @@ module PodBuilder
           end
         end
 
-        restore_hash = podfile_restore_hash()
-        source_map_lines.insert(0, "# <pb_md5:#{base_path}:#{restore_hash}>")
-        source_map_lines.insert(0, "# <pb:#{base_path}>")
+        status_hash = podfiles_status_hash(app_podfile_content, podfile_restore_content)
+
+        source_map_lines.insert(0, "# <pb>\n")
+        source_map_lines.insert(1, "settings clear target.source-map\n")
+        source_map_lines.insert(2, "# <pb:#{base_path}>\n")
+        source_map_lines.insert(3, "# <pb_md5:#{base_path}:#{status_hash}>\n")
 
         lldbinit_lines += source_map_lines
       
-        File.write(lldbinit_path, lldbinit_lines.join("\n"))
+        File.write(lldbinit_path, lldbinit_lines.join())
       end
     end
   end

data/lib/pod_builder/command.rb

@@ -13,3 +13,4 @@ require 'pod_builder/command/generate_lfs'
 require 'pod_builder/command/sync_podfile'
 require 'pod_builder/command/info'
 require 'pod_builder/command/update_lldbinit'
+require 'pod_builder/command/clear_lldbinit'

data/lib/pod_builder/info.rb

@@ -130,6 +130,7 @@ module PodBuilder
       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

data/lib/pod_builder/install.rb

@@ -17,6 +17,27 @@ class Pod::Specification::Linter::Analyzer
   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
+
 module PodBuilder
   class Install
     def self.podfile(podfile_content, podfile_items, build_configuration)
@@ -33,6 +54,11 @@ module PodBuilder
         else 
           FileUtils.cp_r("#{PodBuilder::basepath(podfile_item.path)}/.", destination_path)
         end
+
+        # It is important that CocoaPods compiles the files under Configuration.build_path in order that DWARF
+        # debug symbols reference to those paths. Doing otherwise breaks the assumptions that make the update_lldbinit
+        # command work
+        podfile_content.gsub!(podfile_item.path, destination_path)
         
         license_files = Dir.glob("#{destination_path}/**/*acknowledgements.plist").each { |f| File.delete(f) }
       end
@@ -115,6 +141,7 @@ module PodBuilder
           subspec_self_deps = subspecs_deps.select { |x| x.start_with?("#{podfile_item.root_name}/") }
           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.value = CFPropertyList.guess(plist_data)
           plist.save(podbuilder_file, CFPropertyList::List::FORMAT_BINARY)

data/lib/pod_builder/podfile.rb

@@ -75,7 +75,7 @@ module PodBuilder
     end
 
     def self.write_restorable(updated_pods, podfile_items, analyzer)
-      unless Configuration.restore_enabled
+      unless Configuration.restore_enabled && (podfile_items.count + updated_pods.count) > 0
         return
       end
       

data/lib/pod_builder/podspec.rb

@@ -34,6 +34,10 @@ module PodBuilder
     private_constant :PodspecItem
     
     def self.generate(all_buildable_items, analyzer)  
+      unless all_buildable_items.count > 0
+        return
+      end
+      
       puts "Generating PodBuilder's local podspec".yellow
                   
       podspec_items = podspec_items_from(all_buildable_items)

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "1.2.1"
+  VERSION = "1.5.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -243,6 +243,7 @@ files:
 - lib/pod_builder/command/build.rb
 - lib/pod_builder/command/build_all.rb
 - lib/pod_builder/command/clean.rb
+- lib/pod_builder/command/clear_lldbinit.rb
 - lib/pod_builder/command/deintegrate.rb
 - lib/pod_builder/command/generate_lfs.rb
 - lib/pod_builder/command/generate_podspec.rb