cocoapods-binary-artifactory-cache 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ed7befd74c7b8a6476d1991cd43f6820423be9e9eb1eee833bc81e5e552430
-  data.tar.gz: 78769f4919e4f12bfbc242143112a0789dbc6af7877d4167599ffd1f9b1b2cf4
+  metadata.gz: c81f28251159e84f50cce2347d8dac69c76a4a31c00d8eac250cfbe6c0fcb0d9
+  data.tar.gz: 294f9d373ed0fa4f54575fc2299cc553924bfe8d0962ba83e45a8e9e3b1d3b0c
 SHA512:
-  metadata.gz: 1554ba2b5f40b672e9bf65e1ba1b8843b2df279215ff814bf9a857958e57c1bda914be6f679831435052c8d963de9cffa6ecdf16a826d40db59b6429e4905fe6
-  data.tar.gz: 97e647ad6316a599216dadb7e3515d89feeda9acb8f5e20a7175cefec1910226af13e3f3ce7beee7d1ae8edcb30b768c508213606581235e1a345312df5bca69
+  metadata.gz: 59ed833ee18b74cdb0e551fa4dd1425820ded229428d3c083f438d22c788df127b5c844be0d717bbfd0fb87ea0b853fc2726ea89f0707d4381d20aa3145aa4b1
+  data.tar.gz: c6bd5ffe529e9ac201b44db6b71bb95cfc7d0838cddbd3ec141f0c72b9a511e5d06bdda4c1428340c59a550f6be789abc005d093c50cafa0853d8c1d27e170a1

data/lib/cocoapods-binary-artifactory-cache/pod-rome/xcodebuild_command.rb

@@ -30,7 +30,7 @@ module PodPrebuild
           collect_output(target, Dir[target_products_dir_of(target, sdks[0]) + "/*"])
         end
       end
-      # fix_swiftinterface_files(targets)
+      fix_swiftinterface_files(targets)
     end
 
     private
@@ -133,17 +133,16 @@ module PodPrebuild
         escapedPod = target.product_module_name.gsub('/', '\/')
         # replace when framework and class in framework with the same name
         replaceString1 = "-e '/^import/! s/ #{escapedPod}\\./ /g'" #remove framework name in swiftinterface of it frameworkd
-        replaceString2 = "-e 's/\(#{escapedPod}\\./(/g'"
-        replaceString3 = "-e 's/\\[#{escapedPod}\\./[/g'"
-        replaceString4 = "-e 's/<#{escapedPod}\\./</g'"
-        Pod::UI.puts_indented "$ find '#{output_path(target)}/#{target.product_module_name}.xcframework' -name '*.swiftinterface' -exec sed -i -e #{replaceString1} #{replaceString2} #{replaceString3} #{replaceString4} {} \\\;"
-        `find "#{output_path(target)}/#{target.product_module_name}.xcframework" -name '*.swiftinterface' -exec sed -i -e #{replaceString1} #{replaceString2} #{replaceString3} #{replaceString4} {} \\\;`
+        replaceString2 = "-e 's/#{escapedPod}\\.#{escapedPod}\\./#{escapedPod}\\./g'"
+        replaceString3 = "-e 's/#{escapedPod}\\.//g'"
+        Pod::UI.puts_indented "$ find '#{output_path(target)}/#{target.product_module_name}.xcframework' -name '*.swiftinterface' -exec sed -i -e #{replaceString1} #{replaceString2} #{replaceString3} {} \\\;"
+        `find "#{output_path(target)}/#{target.product_module_name}.xcframework" -name '*.swiftinterface' -exec sed -i -e #{replaceString1} #{replaceString2} #{replaceString3} {} \\\;`
       end
-      #remove dublication name in other frameworks
-      allDirTargets = Dir["#{@options[:output_path]}/*"].map { |x| x.gsub("#{@options[:output_path]}/", "") }
-      replaceString = allDirTargets.uniq().map{ |x| x.gsub('/', '\/')}.map{|x| "-e 's/#{x}\\.#{x}/#{x}/g'"}.join(' ')
-      Pod::UI.puts_indented "$ find #{@options[:output_path]} -name '*.swiftinterface' -exec sed -i -e #{replaceString} {} \\\;"
-      `find #{@options[:output_path]} -name '*.swiftinterface' -exec sed -i -e #{replaceString} {} \\\;`
+      # #remove dublication name in other frameworks
+      # allDirTargets = Dir["#{@options[:output_path]}/*"].map { |x| x.gsub("#{@options[:output_path]}/", "") }
+      # replaceString = allDirTargets.uniq().map{ |x| x.gsub('/', '\/')}.map{|x| "-e 's/#{x}\\.#{x}/#{x}/g'"}.join(' ')
+      # Pod::UI.puts_indented "$ find #{@options[:output_path]} -name '*.swiftinterface' -exec sed -i -e #{replaceString} {} \\\;"
+      # `find #{@options[:output_path]} -name '*.swiftinterface' -exec sed -i -e #{replaceString} {} \\\;`
     end
 
     def create_fat_framework(target)

data/lib/command/executor/fetcher.rb

@@ -10,6 +10,7 @@ module PodPrebuild
     def initialize(options)
       super(options)
       @repo_update = options[:repo_update]
+      @unpack_mutex = Mutex.new
     end
 
     def run
@@ -43,7 +44,7 @@ module PodPrebuild
         end
       end
       cache_paths = @resolved_targets.map {|target| "/#{target.name}/#{target.version}.zip"}
-      Parallel.each(cache_paths, in_threads: 8) do |path|
+      Parallel.each(cache_paths, in_threads: 4) do |path|
         cache_path = @config.generated_frameworks_dir(in_cache: true) + path 
         if File.exists?(cache_path) == false || File.zero?(cache_path) == true
           File.open(cache_path, "wb") do |file|
@@ -80,9 +81,14 @@ module PodPrebuild
         )
       end      
       zip_paths = @resolved_targets.map {|target| @config.generated_frameworks_dir(in_cache: true) + "/#{target.name}/#{target.version}.zip"}
-      Parallel.each(zip_paths, in_threads: 8) do |path|
+      Parallel.each(zip_paths, in_threads: 4) do |path|
         if File.exists? path
-          ZipUtils.unzip(path, to_dir: @config.generated_frameworks_dir)
+          @unpack_mutex.synchronize do
+            unless ZipUtils.unzip(path, to_dir: @config.generated_frameworks_dir)
+              File.delete(path)
+              Pod::UI.puts "Remove bad archive #{path}".yellow
+            end
+          end
         end
       end
     end

data/lib/command/helper/zip.rb

@@ -17,9 +17,11 @@ module PodPrebuild
 
     def self.unzip(path, to_dir: nil)
       cmd = []
-      cmd << "unzip -nq" << path
+      cmd << "unzip -oq" << path
       cmd << "-d" << to_dir unless to_dir.nil?
       `#{cmd.join(" ")}`
+      if $? != 0 then return false
+      return true
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-artifactory-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Eugene Antropov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods