pod-builder 5.1.5 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4933e55a3964f7ac116ee774b3ba1b5e576f58e3ac75c47154c9ec9dc5b3796
-  data.tar.gz: 8123dd9ddda019f7bb1701e36400d369e44728df85315f40c2ddffaf4a9a6d1f
+  metadata.gz: 2a195ea19893b53adf9bffdd392dfc0c71b96448ba87f9431e91350f5aaf928a
+  data.tar.gz: 2ab6e876ef84047c0c813025eef5681643ddc64fe3a79b96e2e732732646a945
 SHA512:
-  metadata.gz: 247d0d6e6ee175425d37cb98fe73b899deaaae483d1fbc1f39f26182ff5bb9667ff6ace2605ae558fd3eea3eca9969e4eb83e171ed6ce0e20b702c65d995fa4d
-  data.tar.gz: 61020f110c8c329de3bc5c2c67442ecbc6fd826186ebe6552db6c56c5ec3c00e992e0a0320bfc813185f631c096b48b4f0259b28b26b827b56e7ca705a734184
+  metadata.gz: 2a8cb5a1d34c4991308160ec49483eefa0f731b3af7894429d41580da2b20b49ca0c8513e1a9ba8ee293f67ff316f83e93b273bf57754b4107294283bc7e1499
+  data.tar.gz: 640ec2216ddf0d6e880e14589b4bed129a86203b05a291f242dd12ed1ccde4a7e7d98a68b00e3a6eb7ddc46abdf830f8f1ee450597f16d6d3c1a1732286b6e42

data/lib/pod_builder/info.rb

@@ -1,4 +1,4 @@
-require 'json'
+require "json"
 
 module PodBuilder
   class Info
@@ -7,57 +7,57 @@ module PodBuilder
       result = {}
       name = nil
 
-      Dir.glob(PodBuilder::prebuiltpath("**/#{Configuration.prebuilt_info_filename}")).each do |json_path|         
+      Dir.glob(PodBuilder::prebuiltpath("**/#{Configuration.prebuilt_info_filename}")).each do |json_path|
         name, prebuilt_info = prebuilt_info(json_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_from_entry(line)
       if (matches = line&.match(/pod '(.*)', '=(.*)'/)) && matches.size == 3
         pod_name = matches[1]
         tag = matches[2]
-        
+
         return { "tag": tag }
       elsif (matches = line&.match(/pod '(.*)', :git => '(.*)', :commit => '(.*)'/)) && matches.size == 4
         pod_name = matches[1]
         repo = matches[2]
         hash = matches[3]
-        
+
         return { "repo": repo, "hash": hash }
       elsif (matches = line&.match(/pod '(.*)', :git => '(.*)', :branch => '(.*)'/)) && matches.size == 4
         pod_name = matches[1]
         repo = matches[2]
         branch = matches[3]
-        
+
         return { "repo": repo, "branch": branch }
       elsif (matches = line&.match(/pod '(.*)', :git => '(.*)', :tag => '(.*)'/)) && matches.size == 4
         pod_name = matches[1]
         repo = matches[2]
         tag = matches[3]
-        
+
         return { "repo": repo, "tag": tag }
       elsif (matches = line&.match(/pod '(.*)', :path => '(.*)'/)) && matches.size == 3
         pod_name = matches[1]
-        
+
         return { "repo": "local" }
       elsif (matches = line&.match(/pod '(.*)', :podspec => '(.*)'/)) && matches.size == 3
         pod_name = matches[1]
-        
+
         return { "repo": "local" }
       else
         raise "\n\nFailed extracting version from line:\n#{line}\n".red
@@ -70,21 +70,22 @@ module PodBuilder
       end
 
       data = JSON.load(File.read(path))
-            
+
       result = {}
       if swift_version = data["swift_version"]
-        result.merge!({ "swift_version": swift_version})
+        result.merge!({ "swift_version": swift_version })
       end
-      
+
       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!({ "pb_version": (data["pb_version"] || "0.0.0") })
       result.merge!({ "original_compile_path": (data["original_compile_path"] || "") })
-      
+
       return pod_name, result
-    end    
+    end
   end
-end
+end

data/lib/pod_builder/install.rb

@@ -70,7 +70,7 @@ module PodBuilder
 
         copy_prebuilt_items(podfile_items - prebuilt_entries)
 
-        prebuilt_info = prebuilt_info(podfile_items)
+        prebuilt_info = prebuilt_info(podfile_items, argument_pods)
         licenses = license_specifiers()
 
         if !OPTIONS.has_key?(:debug)
@@ -99,7 +99,7 @@ module PodBuilder
       end
     end
 
-    def self.prebuilt_info(podfile_items)
+    def self.prebuilt_info(podfile_items, argument_pods)
       gitignored_files = PodBuilder::gitignoredfiles
 
       swift_version = PodBuilder::system_swift_version
@@ -138,6 +138,9 @@ module PodBuilder
         if hash = build_folder_hash(podfile_item, gitignored_files)
           data["build_folder_hash"] = hash
         end
+        if argument_pods.include?(podfile_item.root_name)
+          data["pb_version"] = PodBuilder::VERSION
+        end
 
         ret.merge!({ podbuilder_file => data })
       end

data/lib/pod_builder/podfile.rb

@@ -111,12 +111,12 @@ module PodBuilder
             to = "./" + Pathname.new(to).relative_path_from(Pathname.new(git_rootpath)).to_s
 
             if from.start_with?("/tmp")
-              other_swift_flags_override += " -coverage-prefix-map \"/private#{from}\"=\"#{to}\""
-              other_c_flags_override += " -fcoverage-prefix-map=\"/private#{from}\"=\"#{to}\""
+              other_swift_flags_override += " -coverage-prefix-map \"/private#{from}/\"=\"#{to}/\""
+              other_c_flags_override += " -fcoverage-prefix-map=\"/private#{from}/\"=\"#{to}/\""
+            else
+              other_swift_flags_override += " -coverage-prefix-map \"#{from}/\"=\"#{to}/\""
+              other_c_flags_override += " -fcoverage-prefix-map=\"#{from}/\"=\"#{to}/\""
             end
-
-            other_swift_flags_override += " -coverage-prefix-map \"#{from}\"=\"#{to}\""
-            other_c_flags_override += " -fcoverage-prefix-map=\"#{from}\"=\"#{to}\""
           end
         end
 

data/lib/pod_builder/version.rb

@@ -1,3 +1,3 @@
 module PodBuilder
-  VERSION = "5.1.5"
+  VERSION = "5.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 5.1.5
+  version: 5.2.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler