pindo 4.7.1 → 4.7.2

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

@@ -72,20 +72,36 @@ module Pindo
 
         def initialize(proj_fullname:nil)
             @proj_fullname = proj_fullname
-            @project_obj = Xcodeproj::Project.open(proj_fullname) 
+            @project_obj = Xcodeproj::Project.open(proj_fullname)
         end
 
         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
-            file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") }.first
-            icon_path = File.join(file_ref.real_path,"AppIcon.appiconset")
+            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|
+                    icon_path = File.join(file_ref.real_path,"AppIcon.appiconset")
+                    if File.exist?(icon_path)
+                        break
+                    else
+                        next
+                    end
+                end
+            end
+
+            if icon_path.nil? || icon_path.empty? || !File.exist?(icon_path)
+                raise Informative, "没有找到Xcode icon 目录"
+            end
+
             return icon_path
         end
 
         def install_icon_res(new_icon_dir:nil)
             icon_path = get_xcodeproj_icon_path
             begin
-                FileUtils.rm_rf(icon_path) 
+                FileUtils.rm_rf(icon_path)
                 FileUtils.mkdir_p(icon_path)
             rescue StandardError => e
             end
@@ -110,16 +126,28 @@ module Pindo
             icon_path = nil
             select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:messages_extension])  }.first
             if !select_target.nil?
-                file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") }.first
-                icon_path = File.join(file_ref.real_path,"iMessage App Icon.stickersiconset")
+                file_refs = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") } || []
+                file_refs.each do |file_ref|
+                    icon_path = File.join(file_ref.real_path,"iMessage App Icon.stickersiconset")
+                    if File.exist?(icon_path)
+                        break
+                    else
+                        next
+                    end
+                end
+
+                if icon_path.nil? || icon_path.empty? || !File.exist?(icon_path)
+                    raise Informative, "没有找到Xcode iMessage icon 目录"
+                end
             end
+
             return icon_path
         end
 
         def install_imessage_icon_res(new_icon_dir:nil)
             icon_path = get_xcodeproj_imessage_icon_path
             begin
-                FileUtils.rm_rf(icon_path) 
+                FileUtils.rm_rf(icon_path)
                 FileUtils.mkdir_p(icon_path)
             rescue StandardError => e
             end
@@ -147,7 +175,7 @@ module Pindo
             launchimg_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
-            
+
             assets_path = file_ref.real_path
             if File.exist?(File.join(assets_path, "LaunchImage.imageset"))
                 launchimg_path = File.join(assets_path, "LaunchImage.imageset")
@@ -167,9 +195,9 @@ module Pindo
             end
 
             project_origin_launchimg = Dir.glob(File.join(xcodeproj_launchimg_path, "/*.png")).max_by {|f| File.mtime(f)}
-            
+
             if project_origin_launchimg.nil? || !File.exist?(project_origin_launchimg)
-                return                
+                return
             end
 
             if File.exist?(project_origin_launchimg) && !File.exist?(launchimg_file)
@@ -177,7 +205,7 @@ module Pindo
             end
 
             begin
-                FileUtils.rm_rf(xcodeproj_launchimg_path) 
+                FileUtils.rm_rf(xcodeproj_launchimg_path)
                 FileUtils.mkdir_p(xcodeproj_launchimg_path)
             rescue StandardError => e
             end
@@ -190,7 +218,7 @@ module Pindo
             File.open(File.join(xcodeproj_launchimg_path, "Contents.json"), "w") do |f|
                 f.write(JSON.pretty_generate(launch_json))
             end
-        
+
         end
 
     end

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.7.1"
+  	VERSION = "4.7.2"
 
   	class VersionCheck
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.7.2
 platform: ruby
 authors:
 - wade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -278,6 +278,7 @@ files:
 - lib/pindo/command/deploy/updateconfig.rb
 - lib/pindo/command/deploy/uploadipa.rb
 - lib/pindo/command/dev.rb
+- lib/pindo/command/dev/applovin.rb
 - lib/pindo/command/dev/autobuild.rb
 - lib/pindo/command/dev/autoresign.rb
 - lib/pindo/command/dev/build.rb
@@ -287,7 +288,6 @@ files:
 - lib/pindo/command/dev/debug.rb
 - lib/pindo/command/dev/pgyercert.rb
 - lib/pindo/command/dev/pub.rb
-- lib/pindo/command/dev/renewcert.rb
 - lib/pindo/command/env.rb
 - lib/pindo/command/env/dreamstudio.rb
 - lib/pindo/command/env/quarkenv.rb
@@ -317,11 +317,11 @@ files:
 - lib/pindo/command/setup.rb
 - lib/pindo/command/upgrade.rb
 - lib/pindo/command/utils.rb
-- lib/pindo/command/utils/applovin.rb
 - lib/pindo/command/utils/boss.rb
 - lib/pindo/command/utils/clearcert.rb
 - lib/pindo/command/utils/device.rb
 - lib/pindo/command/utils/icon.rb
+- lib/pindo/command/utils/renewcert.rb
 - lib/pindo/command/utils/renewproj.rb
 - lib/pindo/command/utils/tgate.rb
 - lib/pindo/command/utils/xcassets.rb

data/lib/pindo/command/dev/renewcert.rb

@@ -1,142 +0,0 @@
-require 'fileutils'
-
-module Pindo
-  class Command
-    class Dev < Command
-      class Renewcert < Dev
-        
-            include Appselect
-
-            self.summary = '更新证书下所有的Provisioning Profile文件'
-    
-            self.description = <<-DESC
-                如果不存在证书,会自动生成新证书，重新生成证书下所有Provisioning Profile文件. 添加新设备或者证书过期时使用, 一般情况请勿操作！！！
-                用法：pindo dev renewcert 
-            DESC
-
-            self.arguments = [
-
-            ]
-  
-              def self.options
-              [
-
-                ['--fast', '快速更新证书，开发用bundle id只更新dev证书，发布bundle id只更新adhoc证书'],
-                ['--fixedid', '重新更新bundle id的功能，检查bundle id的功能是否更新'],
-              ].concat(super)
-            end
-
-
-            def initialize(argv)
-
-              @fast_flag = argv.flag?('fast', false)
-              @fixedid_flag = argv.flag?('fixedid', false)
-              
-              super 
-
-            end
-
-
-            def run
-
-              auto_fixed_cert
-              
-            end
-
-            def auto_fixed_cert
-
-
-                @dev_bundle_id_array = all_dev_bundleid() + all_tool_bundleid()
-                @deploy_bundle_id_array = all_release_bundleid()
-                @all_bundle_id_array = all_itc_bundleid()
-
-
-                fixed_bundleid = @fixedid_flag
-
-
-                fixed_bundleid_array = @all_bundle_id_array
-                puts fixed_bundleid_array
-
-                fixed_bundleid_array.each do |bundle_id|
-                    begin
-                      fixed_cert(bundle_id:bundle_id, fixed_bundleid:@fixedid_flag)
-                    rescue => err
-                        puts 
-                        puts 
-                        puts "Fixed #{bundle_id} cert---------Error-------!!!"
-                        puts 
-                        puts 
-                    end
-
-                end
-
-            end
-
-            def fixed_cert(bundle_id:nil, fixed_bundleid: )
-                puts "#{bundle_id}"
-
-                args_temp = []
-                args_temp << "#{bundle_id}"
-
-                Pindo::Command::Deploy::Pullconfig::run(args_temp)
-
-                if fixed_bundleid
-                    Pindo::Command::Deploy::Bundleid::run([])    
-                end
-
-                if @fast_flag
-
-                    if @dev_bundle_id_array.include?(bundle_id)
-                        args_temp = []
-                        args_temp << "--a=#{bundle_id}"
-                        args_temp << "--dev"
-                        args_temp << "--renew"
-                        Pindo::Command::Deploy::Cert::run(args_temp)
-                    end
-
-                    if @deploy_bundle_id_array.include?(bundle_id)
-                        args_temp = []
-                        args_temp << "--a=#{bundle_id}"
-                        args_temp << "--adhoc"
-                        args_temp << "--renew"
-                        Pindo::Command::Deploy::Cert::run(args_temp)
-                    end
-
-                else
-
-                    # args_temp = []
-                    # args_temp << "--a=#{bundle_id}"
-                    # args_temp << "--dev"
-                    # args_temp << "--renew"
-                    # Pindo::Command::Deploy::Cert::run(args_temp)
-
-                    args_temp = []
-                    args_temp << "--a=#{bundle_id}"
-                    args_temp << "--adhoc"
-                    args_temp << "--renew"
-                    Pindo::Command::Deploy::Cert::run(args_temp)
-                end
-            end
-
-
-            def fixed_push(bundle_id:nil, fixed_bundleid: false)
-                
-                Pindo::Command::Deploy::Pullconfig::run(args_temp)
-
-                args_temp = []
-                args_temp << "--a=#{bundle_id}"
-                args_temp << "--dev"
-                Pindo::Command::Deploy::Pem::run(args_temp)
-
-                args_temp = []
-                args_temp << "--a=#{bundle_id}"
-                args_temp << "--adhoc"
-                Pindo::Command::Deploy::Pem::run(args_temp)
-
-            end
-
-      end
-    end
-  end
-end
-