pod-builder 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c85e97d04a8167d4e639f6e4b632d8dfbb54b6e879057e203b95806ea1b3bddd
-  data.tar.gz: 37bdc97bc43c8589f537e796a1f9f577589df901772cae64c704e7701a7ed00c
+  metadata.gz: 91a5ccf7fb23793e2ecf8718184ee974243d54d9b409f461258ccda6b0b3555d
+  data.tar.gz: 9a1165d7add34652970ae37075dccfd5f0eac075c572d68e87e987c8b37e21eb
 SHA512:
-  metadata.gz: 26d4d8d4e14c0dcbc69bf530d8f19ff370c930467f6a4956283072d24268f08ce58713afb8309031e9da58855fa2e9c3c83b14af7308d83913dbe2bbde85743f
-  data.tar.gz: c3acacaaf6d5ee81b04ccb508807e1d0be2764dd7bc85fb484cf076a81c913a609bcdd3f7a520585b067aa26a247f7b9bddf451c0dbeb491d3c2f1a387ff65c5
+  metadata.gz: cb1b9dd1e39b15ccd02dd8fefccb4c2804e6fac2c1583f97fe07af411c450d88d973771dead2382fe5ce8f2582f391c944c95c9deb81f0560bedbff0fd5f0391
+  data.tar.gz: ece28a885c32def12c37543b9ebd1df476e568ee324b711500112701576b1fe28ce57c13dfe3938385d599fdbc34dfd5f607c24e5180a6606a0703708168df04

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)
+          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},#{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}>\n", "settings append target.source-map '#{t.split(",").first}' '#{t.split(",").last}'\n"] }
-        rewrite_lldinit(source_map_lines, base_path)
+        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')
@@ -137,12 +144,12 @@ module PodBuilder
           end
         end
 
-        restore_hash = podfile_restore_hash()
+        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}:#{restore_hash}>\n")
+        source_map_lines.insert(3, "# <pb_md5:#{base_path}:#{status_hash}>\n")
 
         lldbinit_lines += source_map_lines
       

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)
@@ -115,6 +136,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'] = Configuration.build_path
 
           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.3.0"
+  VERSION = "1.4.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler