fastlane-plugin-rearchive 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaaa414623759395560b9da0d24a575fd59678d3327b12ed85d68dbe73bd2fa3
-  data.tar.gz: c50be7ac069ee08357a829cf507583a2477022e8af405ff1b38f43d6a7c0ffc2
+  metadata.gz: 07b36f4705fba17177e7fcfe57534453d40939f36f1ca13e9450b3ad64a8bede
+  data.tar.gz: 331f2ddaec7d48f6da97b352acbf98d499754e6635c01d62c90ab81c14802da0
 SHA512:
-  metadata.gz: 996314def095d3347e27e4649435b80fff572e69ca34e227a34394dc031d96e3d2ea052b5be11d161280f2ac5216765e3ea38d3ecbe2f8f0532b7d4e2718168d
-  data.tar.gz: 695e6151afae12e91c696caab88a33ca8ca7ccf8ecc2c94744cb17b42bd9f56c0691def6fb80daccb92f1a63aa51a9d74717ce0682c668c9cc9c38a1f40e0cb1
+  metadata.gz: 040d78db5848930903337beae05e89604ba90c964c26b0d5e12560ccd45fb4b66af6f3b196b4659f8096956c259535a0dc75bfeb7c92fa9f02c13226ae385ecd
+  data.tar.gz: b76b6f0d6a86895cc23470ab6f5b848711d81bf24f1616bca7adb31f0b10336aad610283fbef94b9133a11bac8f0bac487078643cd587e6e26acd698d6fdf5d6

data/lib/fastlane/plugin/rearchive/actions/iconset_action.rb

@@ -32,9 +32,11 @@ module Fastlane
               archive.delete(archive.app_path(path))
             end
           end
-          plist_buddy.exec("Delete #{icon_files_key}")
-        rescue RuntimeError => _e
+        rescue RuntimeError => e
+          FastlaneCore::UI.message(e)
           next
+        end.each do |(icon_files_key, _)|
+          plist_buddy.exec("Delete #{icon_files_key}")
         end
         JSON.parse(File.read(iconset_manifest_path))["images"].select do |image|
           image["filename"]
@@ -54,34 +56,34 @@ module Fastlane
           idiom_suffix = idiom == "iphone" ? "" : "~#{idiom}"
           icons_plist_key = ":CFBundleIcons#{idiom_suffix}:CFBundlePrimaryIcon:CFBundleIconFiles"
           plist_buddy.exec("Add #{icons_plist_key} array")
-          icons.each do |i|
-            relative_path = archive.app_path((i[:target]).to_s)
+          icons.each do |icon|
+            relative_path = archive.app_path((icon[:target]).to_s)
             local_path = archive.local_path(relative_path)
-            system("cp #{i[:source].shellescape} #{local_path.shellescape}", exception: true)
+            system("cp #{icon[:source].shellescape} #{local_path.shellescape}", exception: true)
             archive.replace(relative_path)
-          end
-          icons.map { |i| i[:name] }.uniq.each_with_index do |key, index|
-            plist_buddy.exec("Add #{icons_plist_key}:#{index} string #{key}")
+          end.map do |icon|
+            icon[:name]
+          end.uniq.each do |key|
+            plist_buddy.exec("Add #{icons_plist_key}: string #{key}")
           end
         end
         Dir.mktmpdir do |dir|
           Dir.chdir(dir) do
             IO.popen(%W[
-              #{IO.popen("xcode-select -p", &:read).chomp}/usr/bin/actool
-              --output-format=human-readable-text
+              /usr/bin/actool
+              --output-format human-readable-text
               --notices
               --warnings
-              --output-partial-info-plist=assetcatalog_generated_info.plist
-              --app-icon=#{File.basename(iconset_path, ".appiconset")}
+              --output-partial-info-plist assetcatalog_generated_info.plist
+              --app-icon #{File.basename(iconset_path, ".appiconset")}
               --compress-pngs
-              --enable-on-demand-resources=YES
-              --sticker-pack-identifier-prefix=#{plist_buddy.exec("Print CFBundleIdentifier")}.sticker-pack.
-              --development-region=English
-              --target-device=iphone
-              --target-device=ipad
-              --minimum-deployment-target=#{plist_buddy.exec("Print MinimumOSVersion")}
-              --platform=iphoneos
-              --product-type=com.apple.product-type.application
+              --enable-on-demand-resources YES
+              --sticker-pack-identifier-prefix #{plist_buddy.exec("Print CFBundleIdentifier")}.sticker-pack.
+              --target-device iphone
+              --target-device ipad
+              --minimum-deployment-target #{plist_buddy.exec("Print MinimumOSVersion")}
+              --platform iphoneos
+              --product-type com.apple.product-type.application
               --compile
               .
               #{File.dirname(iconset_path)}

data/lib/fastlane/plugin/rearchive/actions/replace_file_action.rb

@@ -40,7 +40,7 @@ module Fastlane
                                   optional: false,
                                       type: String),
 
-          FastlaneCore::ConfigItem.new(key: :replace_files,
+          FastlaneCore::ConfigItem.new(key: :files,
                                description: "Files that should be replaced",
                                   optional: false,
                                       type: Hash)

data/lib/fastlane/plugin/rearchive/helper/archives/xc_archive.rb

@@ -41,7 +41,7 @@ module Fastlane
 
       def self.extract_app_path(archive_path)
         plist_buddy = PlistBuddy.new("#{archive_path}/Info.plist")
-        plist_buddy.exec("Print :ApplicationProperties:ApplicationPath").strip
+        plist_buddy.exec("Print :ApplicationProperties:ApplicationPath")
       end
     end
   end

data/lib/fastlane/plugin/rearchive/helper/plist_buddy.rb

@@ -9,7 +9,7 @@ module Fastlane
 
       def exec(command)
         FastlaneCore::UI.verbose("/usr/libexec/PlistBuddy -c \"#{command}\" \"#{@plist_path}\"")
-        result = IO.popen("/usr/libexec/PlistBuddy -c \"#{command}\" \"#{@plist_path}\"", &:read).chomp
+        result = IO.popen("/usr/libexec/PlistBuddy -c \"#{command}\" \"#{@plist_path}\"", &:read).gsub(/\A\s*"?|"?\s*\z/m, "")
 
         if $?.exitstatus.nonzero?
           FastlaneCore::UI.important("PlistBuddy command failed: #{result}")
@@ -26,11 +26,20 @@ module Fastlane
 
         result_lines = result.lines.map(&:chop)
 
-        raise "value is not an array: #{result_lines}" unless result_lines.first == "Array {"
+        case RUBY_PLATFORM
+        when "x86_64-linux", "aarch64-linux-gnu"
+          raise "value is not an array (#{RUBY_PLATFORM}): #{result_lines}" unless result_lines.first == "("
 
-        array_values = result_lines.drop(1).take(result_lines.size - 2)
+          result_lines.drop(1).take(result_lines.size - 2).map do |line|
+            line[1..line.size].sub(/,$/, "")
+          end
+        else
+          raise "value is not an array (#{RUBY_PLATFORM}): #{result_lines}" unless result_lines.first == "Array {"
 
-        return array_values.map { |line| line[4..line.size] }
+          result_lines.drop(1).take(result_lines.size - 2).map do |line|
+            line[4..line.size]
+          end
+        end
       end
 
       def parse_dict_keys(entry)
@@ -38,14 +47,20 @@ module Fastlane
 
         result_lines = entry.lines.map(&:chop)
 
-        raise "value is not an dict: #{result_lines}" unless result_lines.first == "Dict {"
+        case RUBY_PLATFORM
+        when "x86_64-linux", "aarch64-linux-gnu"
+          raise "value is not an dict (#{RUBY_PLATFORM}): #{result_lines}" unless result_lines.first == "{"
 
-        keys = result_lines
-               .map { |l| l.match(/^\s{4}([^\s}]+)/) }
-               .select { |l| l }
-               .map { |l| l[1] }
+          result_lines.map do |line|
+            line.match(/(?<=^\t)[^\s}]+/)
+          end
+        else
+          raise "value is not an dict (#{RUBY_PLATFORM}): #{result_lines}" unless result_lines.first == "Dict {"
 
-        return keys
+          result_lines.map do |line|
+            line.match(/(?<=^\s{4})[^\s}]+/)
+          end
+        end.compact.map(&:to_s)
       end
     end
   end

data/lib/fastlane/plugin/rearchive/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Rearchive
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-rearchive
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - naoigcat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2023-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler