pindo 4.8.2 → 4.8.4

data/lib/pindo/module/xcode/xcodereshandler.rb

@@ -8,77 +8,18 @@ module Pindo
     class XcodeResHandler
 
 
-        def self.create_icon(icon_name:nil, new_icon_dir:nil, xcode_icon_json:nil)
-            xcode_icon_json["images"].each do |image_data|
-                width,height  = image_data["size"].split("x")
-                image_name = image_data["filename"]
-                iNum = image_name.split("@").last.chomp(".png").chomp("x").to_f
-                width = width.to_f * iNum
-                height = height.to_f * iNum
-
-                width = width.to_i
-                height = height.to_i
-
-                command = [
-                    'sips',
-                    '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
-                    '-z', width.to_s, height.to_s,
-                    icon_name,
-                    '--out', File.join(new_icon_dir, image_name)
-                ]
-                Executable.capture_command('sips', command, capture: :out)
-
-                # if !File.exist?(File.join(new_icon_dir, image_name))
-                #     raise  Informative, "生成icon失败!"
-                # end
-                # system("sips --matchTo '/System/Library/ColorSync/Profiles/sRGB Profile.icc' -z #{width} #{height} #{icon_name} --out #{new_icon_dir}/#{image_name}")
-            end
-            File.open(File.join(new_icon_dir, "Contents.json"), "w") do |f|
-                f.write(JSON.pretty_generate(xcode_icon_json))
-            end
-        end
-
-
-        def self.create_imessage_icon(icon_name:nil, image_icon_name:nil, new_icon_dir:nil, xcode_icon_json:nil)
-            xcode_icon_json["images"].each do |image_data|
-
-                height, width = image_data["size"].split("x")
-                image_name = image_data["filename"]
-                iNum = image_name.split("@").last.chomp(".png").chomp("x").to_f
-                width = width.to_f * iNum
-                height = height.to_f * iNum
-                width = width.to_i
-                height = height.to_i
-
-                icon_ori_name = image_icon_name
-                if width.to_s.eql?(height.to_s)
-                    icon_ori_name = icon_name
-                end
-
-                command = [
-                    'sips',
-                    '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
-                    '-z', width.to_s, height.to_s,
-                    icon_name,
-                    '--out', File.join(new_icon_dir, image_name)
-                ]
-                Executable.capture_command('sips', command, capture: :out)
-            end
-
-            File.open(File.join(new_icon_dir, "Contents.json"), "w") do |f|
-                f.write(JSON.pretty_generate(xcode_icon_json))
-            end
-        end
-
         def initialize(proj_fullname:nil)
             @proj_fullname = proj_fullname
             @project_obj = Xcodeproj::Project.open(proj_fullname)
         end
 
-        def get_xcodeproj_icon_path
+        def get_xcodeproj_icon_path()
 
             icon_path = nil
             select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
+
+            project_dir = @project_obj.project_dir
+  
             if !select_target.nil?
                 file_refs = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") } || []
                 file_refs.each do |file_ref|
@@ -90,6 +31,14 @@ module Pindo
                     end
                 end
             end
+            if icon_path.nil? || icon_path.empty? || !File.exist?(icon_path)
+                icon_path_array = Dir.glob(File.join(project_dir, "**", "AppIcon.appiconset"))
+                if icon_path_array.size > 1
+                    icon_path = icon_path_array.select{ |filename| File.directory?(filename) && filename.include?("Assets.xcassets/AppIcon.appiconset")}
+                elsif icon_path_array.size == 1
+                    icon_path = icon_path_array.first
+                end
+            end
 
             if icon_path.nil? || icon_path.empty? || !File.exist?(icon_path)
                 raise Informative, "没有找到Xcode icon 目录"
@@ -99,7 +48,7 @@ module Pindo
         end
 
         def install_icon_res(new_icon_dir:nil)
-            icon_path = get_xcodeproj_icon_path
+            icon_path = get_xcodeproj_icon_path()
             begin
                 FileUtils.rm_rf(icon_path)
                 FileUtils.mkdir_p(icon_path)
@@ -112,7 +61,7 @@ module Pindo
         end
 
         def validate_icon_res()
-            icon_path = get_xcodeproj_icon_path
+            icon_path = get_xcodeproj_icon_path()
             xcode_ios_icon_json = XcodoeResConst.xcode_ios_icon_json
             xcode_ios_icon_json["images"].each do |image_data|
                 image_name = image_data["filename"]
@@ -125,6 +74,7 @@ module Pindo
         def get_xcodeproj_imessage_icon_path
             icon_path = nil
             select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:messages_extension])  }.first
+            project_dir = @project_obj.project_dir
             if !select_target.nil?
                 file_refs = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") } || []
                 file_refs.each do |file_ref|
@@ -136,6 +86,15 @@ module Pindo
                     end
                 end
 
+                if icon_path.nil? || icon_path.empty? || !File.exist?(icon_path)
+                    icon_path_array = Dir.glob(File.join(project_dir, "**", "iMessage App Icon.stickersiconset"))
+                    if icon_path_array.size > 1
+                        icon_path = icon_path_array.select{ |filename| File.directory?(filename) && filename.include?("Assets.xcassets/iMessage App Icon.stickersiconset")}
+                    elsif icon_path_array.size == 1
+                        icon_path = icon_path_array.first
+                    end
+                end
+
                 if icon_path.nil? || icon_path.empty? || !File.exist?(icon_path)
                     raise Informative, "没有找到Xcode iMessage icon 目录"
                 end
@@ -173,50 +132,76 @@ module Pindo
         def get_xcodeproj_launchimg_path
 
             launchimg_path = nil
+            assets_path = nil
             select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
-            file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") }.first
+            project_dir = @project_obj.project_dir
+            if !select_target.nil?
+                assets_objs = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") } || []
+                if assets_objs.size > 0
+                    assets_path = assets_objs.first.real_path
+                    if File.exist?(assets_path) && File.exist?(File.join(assets_path, "LaunchImage.imageset"))
+                        launchimg_path = File.join(assets_path, "LaunchImage.imageset")
+                    elsif File.exist?(assets_path) && File.exist?(File.join(assets_path, "LaunchImage.launchimage"))
+                        launchimg_path = File.join(assets_path, "LaunchImage.launchimage")
+                    end
+                end
+            end
 
-            assets_path = file_ref.real_path
-            if File.exist?(File.join(assets_path, "LaunchImage.imageset"))
-                launchimg_path = File.join(assets_path, "LaunchImage.imageset")
-            else
-                launchimg_path = File.join(assets_path, "LaunchImage.launchimage")
+            if launchimg_path.nil? || launchimg_path.empty? || !File.exist?(launchimg_path)
+                launchimg_path_array = Dir.glob(File.join(project_dir, "**", "LaunchImage.imageset"))
+                if launchimg_path_array.size > 1
+                    launchimg_path = launchimg_path_array.select{ |filename| File.directory?(filename) && filename.include?("Assets.xcassets/LaunchImage.imageset")}
+                elsif launchimg_path_array.size == 1
+                    launchimg_path = launchimg_path_array.first
+                end
+            end
+
+            if launchimg_path.nil? || launchimg_path.empty? || !File.exist?(launchimg_path)
+                launchimg_path_array = Dir.glob(File.join(project_dir, "**", "LaunchImage.launchimage"))
+                if launchimg_path_array.size > 1
+                    launchimg_path = launchimg_path_array.select{ |filename| File.directory?(filename) && filename.include?("Assets.xcassets/LaunchImage.launchimage")}
+                elsif launchimg_path_array.size == 1
+                    launchimg_path = launchimg_path_array.first
+                end
             end
 
             return launchimg_path
         end
 
-        def install_launchimg(launchimg_file:nil)
-
+        def install_launchimg(launchimg_pub_path:nil)
 
             xcodeproj_launchimg_path = get_xcodeproj_launchimg_path
-            if xcodeproj_launchimg_path.nil? || !File.exist?(xcodeproj_launchimg_path)
-                return
-            end
-
-            project_origin_launchimg = Dir.glob(File.join(xcodeproj_launchimg_path, "/*.png")).max_by {|f| File.mtime(f)}
+            pub_launchimg_files = Dir.glob(File.join(launchimg_pub_path, "*.{png,jpg}"))
 
-            if project_origin_launchimg.nil? || !File.exist?(project_origin_launchimg)
+            if xcodeproj_launchimg_path.nil? || !File.exist?(xcodeproj_launchimg_path)
+                if !pub_launchimg_files.nil? && pub_launchimg_files.size > 0
+                    raise  Informative, "有需要替换的资源，但是未找到工程启动图目录，替换启动图失败！"
+                end
                 return
             end
 
-            if File.exist?(project_origin_launchimg) && !File.exist?(launchimg_file)
-                raise  Informative, "缺少启动文件:#{launchimg_file}"
-            end
+            # if pub_launchimg_files.nil? || pub_launchimg_files.size == 0
+            #     raise  Informative, "有需要替换的资源，但是配置中未放置替换的启动图！"
+            # end
 
-            begin
-                FileUtils.rm_rf(xcodeproj_launchimg_path)
-                FileUtils.mkdir_p(xcodeproj_launchimg_path)
-            rescue StandardError => e
+            xcodeproj_launchimg_json_file = File.join(xcodeproj_launchimg_path, "Contents.json")
+            if !File.exist?(xcodeproj_launchimg_json_file)
+                raise  Informative, "工程启动图目录缺少Contents.json，替换启动图失败！"
             end
 
-            launch_json = XcodoeResConst.xcode_ios_launchimg_json
-            file_name = launch_json["images"].select { |image| image["scale"].include?("2x") }.first["filename"]
-            xcode_launchimg_name = File.join(xcodeproj_launchimg_path, file_name)
-            FileUtils.cp(launchimg_file, xcode_launchimg_name)
-
-            File.open(File.join(xcodeproj_launchimg_path, "Contents.json"), "w") do |f|
-                f.write(JSON.pretty_generate(launch_json))
+            xcodeproj_launchimg_json = JSON.parse(File.read(xcodeproj_launchimg_json_file)) 
+            image_array = xcodeproj_launchimg_json["images"].select { |image| !image["filename"].nil? && !image["filename"].empty? }
+            
+            if pub_launchimg_files.size == image_array.size
+                if image_array.size == 1
+                    launchimg_filename = image_array.first["filename"]
+                    launchimg_full_filename = File.join(xcodeproj_launchimg_path, launchimg_filename)
+                    FileUtils.cp(pub_launchimg_files.first, launchimg_full_filename)
+                else
+                    raise  Informative, "启动图有多张，替换异常,遇到这种情况再处理！"
+                end
+            else
+                raise  Informative, "工程中启动图数目和配置仓库的图片数目不一致"
             end
 
         end

data/lib/pindo/module/xcode/xcodereshelper.rb

@@ -108,10 +108,10 @@ module Pindo
             end
         end
 
-        def self.install_launchimg(proj_dir:nil, launchimg_filename:nil)
+        def self.install_launchimg(proj_dir:nil, launchimg_pub_path:nil)
             xcodeproj_file_name = Dir.glob(File.join(proj_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
             xcodereshandler = XcodeResHandler.new(proj_fullname: xcodeproj_file_name)
-            xcodereshandler.install_launchimg(launchimg_file:launchimg_filename)
+            xcodereshandler.install_launchimg(launchimg_pub_path:launchimg_pub_path)
         end
 
     end

data/lib/pindo/options/deployoptions.rb

@@ -53,6 +53,7 @@ module Pindo
             attr_accessor :args_dev_flag
             attr_accessor :args_adhoc_flag
             attr_accessor :args_appstore_flag
+            attr_accessor :args_macos_flag
 
             attr_accessor :newconfuse_flag
             attr_accessor :oldconfuse_flag
@@ -69,6 +70,7 @@ module Pindo
                     ['--dev', 'use dev build mode'],
                     ['--adhoc', 'use adhoc build mode'],
                     ['--appstore', 'use appstore build mode'],
+                    ['--macos', 'use platform macos'],
 
                     ['--nocreate', 'no create xcode project'],
 
@@ -92,6 +94,7 @@ module Pindo
                 @args_dev_flag = argv.flag?('dev', false)
                 @args_adhoc_flag = argv.flag?('adhoc', false)
                 @args_appstore_flag = argv.flag?('appstore', false)
+                @args_macos_flag = argv.flag?('macos', false)
 
                 @newconfuse_flag = argv.flag?('newconfuse', true)
                 @oldconfuse_flag = argv.flag?('oldconfuse', false)
@@ -142,6 +145,11 @@ module Pindo
                     mode_flag = "--appstore"
                 end
                 args_temp << mode_flag
+
+                if @args_macos_flag
+                    args_temp << "--macos"
+                end
+                return args_temp
             end
 
             def get_confuse_type_args()
@@ -348,6 +356,7 @@ module Pindo
                 puts "args_dev_flag = #{@args_dev_flag}"
                 puts "args_adhoc_flag = #{@args_adhoc_flag}"
                 puts "args_appstore_flag = #{@args_appstore_flag}"
+                puts "args_macos_flag = #{@args_macos_flag}"
 
                 puts "\n***************************************************************************************"
                 puts "=======================================================================================\n\n"

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.8.2"
+  	VERSION = "4.8.4"
 
   	class VersionCheck
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.8.2
+  version: 4.8.4
 platform: ruby
 authors:
 - wade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -365,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 3
 summary: easy work