pindo 4.8.5 → 4.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16ce8b8ae92b406194afa919044296d0f7801fc4146c4d89b27c792414694607
-  data.tar.gz: '0914b0e1e63700cef9e63d6404b7ea765a34b038777c629ebd6caa254b143b32'
+  metadata.gz: 24b5673e6e6b22077a55006939dc549e2b545537d935c6a004bed385dd936014
+  data.tar.gz: 699659aa13cff6c29fd5cbf63ba1a16707cb1ba6e8811f913094c968d4fcd09a
 SHA512:
-  metadata.gz: 681c6548cab3d378f7962d3f8d2cb67dedb7ad5bc69e5ed128075cf8e0fecf246e8c5a52f6f4fc356d7d03addcb6ff35ee2151f461716c6f9f48af638aa276c8
-  data.tar.gz: 6712a01b81509487ac6d62f80f870edd1abaf8abe874ebad8228efacd3d1e8a7aa9c2ad53268eae12a99e87563322749a4be7115602fc6a7ee273e98bd7384b3
+  metadata.gz: 1ae0851cb8497f852602e3fe26c49f6a1e69e0ba922c44833cf43abe12c186b6d1fec343ac29c3d62c1299c841dda8b0a0782caec8c952885a2fb9c1b0bd4805
+  data.tar.gz: 7ba1a294c60d4d1633e0f136a04d24712f7b01aec7c0702e890b8d7325e0261497897a67fbe55e1a9f63faaec566e70e8f98d52081c75c134bfbd3bd6953077a

data/lib/pindo/command/deploy/build.rb

@@ -119,7 +119,7 @@ module Pindo
                     proj_name = File.basename(project_fullname, ".xcodeproj")
                     project_obj = Xcodeproj::Project.open(project_fullname)
 
-                    build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
+                    project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
                     main_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
                     provisioning_profile_name = main_target.build_configurations.first.build_settings['PROVISIONING_PROFILE_SPECIFIER'].downcase.split(" ")
 
@@ -127,23 +127,49 @@ module Pindo
 
                     build_type = "app-store"
                     icloud_env = "Production"
-                    if provisioning_profile_name.include?("direct") && provisioning_profile_name.include?("macos")
-                        build_type = "developer-id"
-                        icloud_env = "Production"
-                    elsif provisioning_profile_name.include?("development") && provisioning_profile_name.include?("macos")
-                        build_type = "development"
-                        icloud_env = "Development"
-                    elsif provisioning_profile_name.include?("adhoc")
-                        build_type = "ad-hoc"
-                        icloud_env = "Development"
-                    elsif provisioning_profile_name.include?("development")
-                        build_type = "development"
-                        icloud_env = "Development"
+
+                    if !project_build_platform.nil? && project_build_platform.eql?("macosx")
+                        if provisioning_profile_name.include?("development")
+                            # Mac development包
+                            build_type = "development"
+                            icloud_env = "Development"
+                        elsif provisioning_profile_name.include?("appstore")
+                            build_type = "mac-application"
+                            icloud_env = "Production"
+                        else 
+                            build_type = "developer-id"
+                            icloud_env = "Production"
+                        end
                     else
-                        build_type = "app-store"
-                        icloud_env = "Production"
+                        if provisioning_profile_name.include?("adhoc")
+                            build_type = "ad-hoc"
+                            icloud_env = "Development"
+                        elsif provisioning_profile_name.include?("development")
+                            build_type = "development"
+                            icloud_env = "Development"
+                        else
+                            build_type = "app-store"
+                            icloud_env = "Production"
+                        end
                     end
 
+                    # if provisioning_profile_name.include?("direct") && provisioning_profile_name.include?("macos")
+                    #     build_type = "developer-id"
+                    #     icloud_env = "Production"
+                    # elsif provisioning_profile_name.include?("development") && provisioning_profile_name.include?("macos")
+                    #     build_type = "development"
+                    #     icloud_env = "Development"
+                    # elsif provisioning_profile_name.include?("adhoc")
+                    #     build_type = "ad-hoc"
+                    #     icloud_env = "Development"
+                    # elsif provisioning_profile_name.include?("development")
+                    #     build_type = "development"
+                    #     icloud_env = "Development"
+                    # else
+                    #     build_type = "app-store"
+                    #     icloud_env = "Production"
+                    # end
+
                     if build_type.eql?("app-store") || build_type.eql?("ad-hoc")
                         if File.exist?(File.join(project_path, "Unity/Data/Raw/SettingsPluginFlag.txt"))
                             raise Informative, "Unity代码包含测试模板，请重新导出Unity代码"
@@ -166,7 +192,7 @@ module Pindo
                       }
 
 
-                    if !build_platform.nil? && build_platform.eql?("macosx")
+                    if !project_build_platform.nil? && project_build_platform.eql?("macosx")
                         values[:output_name] = nil
                         values[:destination] = "generic/platform=macosx"
                     end

data/lib/pindo/command/deploy/cert.rb

@@ -58,11 +58,6 @@ module Pindo
                 @build_type = "development"
               end
 
-              @args_platform = "ios"
-              if @args_macos_flag
-                @args_platform = "macos"
-              end
-
             end
 
             def run
@@ -91,10 +86,6 @@ module Pindo
                 platform_type = "ios"
                 if @args_macos_flag
                   platform_type = "macos"
-                else
-                  if @config_json && @config_json['project_info'] && @config_json['project_info']['build_type'].include?("MacOS")
-                    platform_type = "macos"
-                  end 
                 end
 
 
@@ -134,7 +125,7 @@ module Pindo
                 if !new_project_fullname.nil? && File.exist?(new_project_fullname) && !provisioning_info_array.nil? && provisioning_info_array.size > 0
                   new_proj_name = File.basename(new_project_fullname, ".xcodeproj")
                   Funlog.instance.fancyinfo_start("正在给Xcode配置证书...")
-                  config_project_cert(new_proj_name:new_proj_name, new_project_dir:new_project_dir, cert_type:@build_type, team_id_vaule:@team_id_vaule, provisioning_info_array:provisioning_info_array)
+                  config_project_cert(new_proj_name:new_proj_name, new_project_dir:new_project_dir, cert_type:@build_type, platform_type:platform_type, team_id_vaule:@team_id_vaule, provisioning_info_array:provisioning_info_array)
                   config_infoplist_cert(new_proj_name:new_proj_name, new_project_dir:new_project_dir, icloud_id:@icloud_id, group_id:@group_id, provisioning_info_array:provisioning_info_array)
                   Funlog.instance.fancyinfo_success("Xcode配置证书完成！")
                 end
@@ -164,6 +155,10 @@ module Pindo
               force_for_new_devices_flag = false
             end
 
+            if platform_type.downcase.include?("macos") && build_type.eql?("adhoc")
+              build_type = "developer_id"
+            end
+
             values = {
               username:apple_id,
               app_identifier: bundle_id_array,

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

@@ -114,13 +114,27 @@ module Pindo
                         args_temp << "--dev"
                     end
 
+                    project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+                    if !project_fullname.nil?
+                        project_obj = Xcodeproj::Project.open(project_fullname)
+                        project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
+                        if !project_build_platform.nil? && project_build_platform.eql?("macosx")
+                            @args_macos_flag = true
+                        end
+                    end
+
+                    if @args_macos_flag
+                        args_temp << "--macos"
+                    end
+
                     Pindo::Command::Deploy::Cert::run(args_temp)
 
                     Dir.chdir(project_dir)
                     Pindo::Command::Deploy::Build::run(args_temp)
 
+
                     pindo_new_project_dir = Dir.pwd
-                    build_path = File.join(pindo_new_project_dir, "build", "*.ipa")
+                    build_path = File.join(pindo_new_project_dir, "build", "*.{ipa,app}")
                     ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
 
                     if !ipa_file_upload.nil? && !app_info_obj.nil? 

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

@@ -58,7 +58,7 @@ module Pindo
 
 
                     pindo_new_project_dir = Dir.pwd
-                    build_path = File.join(pindo_new_project_dir, "build", "*.ipa")
+                    build_path = File.join(pindo_new_project_dir, "build", "*.{ipa,app}")
                     ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
 
                     if !ipa_file_upload.nil? && !app_info_obj.nil? 

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

@@ -66,6 +66,17 @@ module Pindo
                   args_temp << "--dev"
               end
 
+
+
+              project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+              if !project_fullname.nil?
+                  project_obj = Xcodeproj::Project.open(project_fullname)
+                  project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
+                  if !project_build_platform.nil? && project_build_platform.eql?("macosx")
+                    @args_macos_flag = true
+                  end
+              end
+
               if @args_macos_flag
                 args_temp << "--macos"
               end
@@ -80,35 +91,22 @@ module Pindo
 
             def self.modify_cert_with_project(project_dir:nil, config_file:nil)
 
-
-              project_fullname = ""
-              Dir.foreach(project_dir) do |file|  
-                  if file =~ /(.*).xcodeproj/
-                      project_fullname = file
-                      break;
-                  end
-              end 
-
+              project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
               if !project_fullname.nil?
-                  proj_name = File.basename(project_fullname, ".xcodeproj")
-
-                    entitlements_plist_path = File.join(project_dir, proj_name + ".entitlements")
-                    proj_fullname = File.join(project_dir, proj_name) + ".xcodeproj"
-                    if File.exist?(proj_fullname)
-                        project_obj = Xcodeproj::Project.open(proj_fullname)
-                        project_obj.targets.each do |target|
-                            if target.product_type.to_s.eql?("com.apple.product-type.application") then
-                                temp_entitlements_file = target.build_configurations.first.build_settings['CODE_SIGN_ENTITLEMENTS']
-                                if !temp_entitlements_file.nil? && !temp_entitlements_file.empty?
-                                  entitlements_plist_path = File.join(project_dir, temp_entitlements_file)
-                                end
+
+                    entitlements_plist_path = nil
+                    project_obj = Xcodeproj::Project.open(project_fullname)
+                    project_obj.targets.each do |target|
+                        if target.product_type.to_s.eql?("com.apple.product-type.application") then
+                            temp_entitlements_file = target.build_configurations.first.build_settings['CODE_SIGN_ENTITLEMENTS']
+                            if !temp_entitlements_file.nil? && !temp_entitlements_file.empty?
+                              entitlements_plist_path = File.join(project_dir, temp_entitlements_file)
                             end
                         end
                     end
 
                     # puts entitlements_plist_path
-                    if File.exist?(entitlements_plist_path)
-
+                    if !entitlements_plist_path.nil? && File.exist?(entitlements_plist_path)
                         config_json = nil
                         if File.exist?(config_file)
                             config_json = JSON.parse(File.read(config_file))
@@ -122,7 +120,6 @@ module Pindo
                             end
                         end
 
-
                         if entitlements_plist_dict["com.apple.security.application-groups"].nil?
                             if !config_json.nil? && !config_json["app_info"]['app_group_id'].nil?
                               config_json["app_info"].delete('app_group_id')

data/lib/pindo/command/pgyer/upload.rb

@@ -86,12 +86,13 @@ module Pindo
 
                     current_project_dir = Dir.pwd
                     if @args_ipa_file.nil? || !File.exist?(@args_ipa_file)
-                        build_path = File.join(current_project_dir, "build", "*.ipa")
+                        build_path = File.join(current_project_dir, "build", "*.{ipa,app}")
                         @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
                         if @args_ipa_file.nil?
                             build_path = File.join(current_project_dir, "*.ipa")
                             @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
                         end
+
                         if !@args_ipa_file.nil?
                             answer = agree("需要上传的ipa文件是: #{@args_ipa_file} ?(Y/n)")
                             if !answer

data/lib/pindo/module/cert/certhelper.rb

@@ -66,10 +66,12 @@ module Pindo
 
       cert_git_dir = cert_type.downcase
       if platform_type.downcase.eql?("macos")
-        if !cert_type.downcase.include?("development")
-          cert_git_dir = "developer_id_application"
-        else
+        if cert_type.downcase.include?("development")
           cert_git_dir = "development"
+        elsif cert_type.downcase.eql?("appstore")
+          cert_git_dir = "distribution"
+        else
+          cert_git_dir = "developer_id_application"
         end
       else
         if !cert_type.downcase.include?("development")
@@ -133,16 +135,22 @@ module Pindo
             cert_sub_dir = cert_type.downcase
             provision_start_name = "Development"
             provision_extension_name = ".mobileprovision"
+
             if platform_type.downcase.include?("macos")
               provision_extension_name = ".provisionprofile"
+
               if cert_type.downcase.include?("development")
                 provision_start_name = "Development"
                 cert_sub_dir = cert_type.downcase
+              elsif cert_type.downcase.eql?("appstore")
+                provision_start_name = "AppStore"
+                cert_sub_dir = "appstore" 
               else
                 provision_start_name = "Direct"
                 cert_sub_dir = "developer_id"
               end
             else
+              provision_extension_name = ".mobileprovision"
               if cert_type.downcase.include?("development")
                 provision_start_name = "Development"
                 cert_sub_dir = cert_type.downcase

data/lib/pindo/module/cert/xcodecerthelper.rb

@@ -34,22 +34,30 @@ module Pindo
             provisioning_info = {}
             provisioning_info['type'] = type
             provisioning_info['bundle_id'] = bundle_id_temp
-            name_temp = Match::Utils.environment_variable_name_profile_name(app_identifier: bundle_id_temp, type: build_type, platform:platform_type)
+
+
+            match_build_type = build_type
+            if platform_type.downcase.include?("macos") && match_build_type.downcase.include?("adhoc")
+                match_build_type = "developer_id"
+            end
+
+            name_temp = Match::Utils.environment_variable_name_profile_name(app_identifier: bundle_id_temp, type: match_build_type, platform:platform_type)
             provisioning_info['profile_name'] = ENV[name_temp]
-            path_temp = Match::Utils.environment_variable_name_profile_path(app_identifier:bundle_id_temp,type: build_type, platform:platform_type)
+            path_temp = Match::Utils.environment_variable_name_profile_path(app_identifier:bundle_id_temp,type: match_build_type, platform:platform_type)
             provisioning_info['profile_path'] = ENV[path_temp]
-            signing_identity_key=Match::Utils.environment_variable_name_certificate_name(app_identifier: bundle_id_temp,type: build_type, platform:platform_type)
+            signing_identity_key=Match::Utils.environment_variable_name_certificate_name(app_identifier: bundle_id_temp,type: match_build_type, platform:platform_type)
             provisioning_info["signing_identity"] = ENV[signing_identity_key]
-            team_id_key =  Match::Utils.environment_variable_name_team_id(app_identifier: bundle_id_temp,type:build_type, platform:platform_type)
+            team_id_key =  Match::Utils.environment_variable_name_team_id(app_identifier: bundle_id_temp,type:match_build_type, platform:platform_type)
             provisioning_info["team_id"] = ENV[team_id_key]
             provisioning_info_array << provisioning_info
+            
           end
 
             
             return provisioning_info_array
         end
 
-        def config_project_cert(new_proj_name:nil, new_project_dir:nil, cert_type:nil, team_id_vaule:nil, provisioning_info_array:nil)
+        def config_project_cert(new_proj_name:nil, new_project_dir:nil, cert_type:nil, platform_type:nil, team_id_vaule:nil, provisioning_info_array:nil)
 
 
             new_proj_fullname = File.join(new_project_dir, new_proj_name) + ".xcodeproj"
@@ -58,11 +66,36 @@ module Pindo
             new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY[sdk=iphoneos*]', "Apple Distribution")
             new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY*', "Apple Distribution")
 
-            if cert_type == "development"
-                new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY[sdk=iphoneos*]', "Apple Development")
-                new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY*', "Apple Development")
+            if !platform_type.nil? && platform_type.downcase.eql?("macos")
+                # new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY[sdk=iphoneos*]', nil)
+                new_project_obj.root_object.build_configuration_list.build_configurations.each do |config|
+                    config.build_settings.delete('CODE_SIGN_IDENTITY[sdk=iphoneos*]') if config.build_settings.key?('CODE_SIGN_IDENTITY[sdk=iphoneos*]')
+                end
+
+                if cert_type.downcase.eql?("development")
+                    new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY[sdk=macosx*]', "Apple Development")
+                    new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY*', "Apple Development")
+                elsif cert_type.downcase.eql?("appstore")
+                    new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY[sdk=macosx*]', "Apple Distribution")
+                    new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY*', "Apple Distribution")
+                else
+                    new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY[sdk=macosx*]', "Developer ID Application")
+                    new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY*', "Developer ID Application")
+                end
+            else
+                new_project_obj.root_object.build_configuration_list.build_configurations.each do |config|
+                    config.build_settings.delete('CODE_SIGN_IDENTITY[sdk=macosx*]') if config.build_settings.key?('CODE_SIGN_IDENTITY[sdk=macosx*]')
+                end
+                if cert_type.downcase.eql?("development")
+                    new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY[sdk=iphoneos*]', "Apple Development")
+                    new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY*', "Apple Development")
+                else
+                    new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY[sdk=iphoneos*]', "Apple Distribution")
+                    new_project_obj.root_object.build_configuration_list.set_setting('CODE_SIGN_IDENTITY*', "Apple Distribution")
+                end
             end
 
+
             new_project_obj.root_object.attributes['TargetAttributes'] = new_project_obj.root_object.attributes['TargetAttributes'] || {}
             target_atts_obj = new_project_obj.root_object.attributes['TargetAttributes']
 
@@ -97,22 +130,64 @@ module Pindo
                         target_atts_obj[target.uuid]['DevelopmentTeam'] = team_id_vaule
                         target_atts_obj[target.uuid]['ProvisioningStyle'] = "Manual"
                         config.build_settings['DEVELOPMENT_TEAM'] = team_id_vaule
-                        config.build_settings['DEVELOPMENT_TEAM[sdk=iphoneos*]'] = team_id_vaule
                         config.build_settings['CODE_SIGN_STYLE'] = "Manual"
 
                         config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Distribution"
                         config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Distribution"
-        
-                        if cert_type == "development"
-                            config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Development"
-                            config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Development"
-                        end
 
-                        if !provisioning_info.nil?
-                            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
-                            config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = provisioning_info['profile_name']
-                            config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]'] = provisioning_info['profile_name']
+                        if !platform_type.nil? && platform_type.downcase.eql?("macos")
+
+                            config.build_settings['DEVELOPMENT_TEAM[sdk=macosx*]'] = team_id_vaule
+                            # config.build_settings['DEVELOPMENT_TEAM[sdk=iphoneos*]'] = nil
+                            # config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = nil
+                            # config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]'] = nil
+
+                            config.build_settings.delete('DEVELOPMENT_TEAM[sdk=iphoneos*]') if config.build_settings.key?('DEVELOPMENT_TEAM[sdk=iphoneos*]')
+                            config.build_settings.delete('CODE_SIGN_IDENTITY[sdk=iphoneos*]') if config.build_settings.key?('CODE_SIGN_IDENTITY[sdk=iphoneos*]')
+                            config.build_settings.delete('PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]') if config.build_settings.key?('PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]')
+                            
                             
+
+                            if cert_type.downcase.eql?("development")
+                                config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Development"
+                                config.build_settings['CODE_SIGN_IDENTITY[sdk=macosx*]'] = "Apple Development"
+                            elsif cert_type.downcase.eql?("appstore")
+                                config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Distribution"
+                                config.build_settings['CODE_SIGN_IDENTITY[sdk=macosx*]'] = "Apple Distribution"
+                            else
+                                config.build_settings['CODE_SIGN_IDENTITY'] = "Developer ID Application"
+                                config.build_settings['CODE_SIGN_IDENTITY[sdk=macosx*]'] = "Developer ID Application"
+                            end
+
+                            if !provisioning_info.nil?
+                                config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
+                                config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = provisioning_info['profile_name']
+                                config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]'] = provisioning_info['profile_name']
+                            end
+
+                        else
+                            config.build_settings['DEVELOPMENT_TEAM[sdk=iphoneos*]'] = team_id_vaule
+                            # config.build_settings['DEVELOPMENT_TEAM[sdk=macosx*]'] = ""
+                            # config.build_settings['CODE_SIGN_IDENTITY[sdk=macosx*]'] = ""
+                            # config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]'] = ""
+
+                            config.build_settings.delete('DEVELOPMENT_TEAM[sdk=macosx*]') if config.build_settings.key?('DEVELOPMENT_TEAM[sdk=macosx*]')
+                            config.build_settings.delete('CODE_SIGN_IDENTITY[sdk=macosx*]') if config.build_settings.key?('CODE_SIGN_IDENTITY[sdk=macosx*]')
+                            config.build_settings.delete('PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]') if config.build_settings.key?('PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]')
+                            
+
+                            if cert_type.downcase.eql?("development")
+                                config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Development"
+                                config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Development"
+                            else
+                                config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Distribution"
+                                config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Distribution"
+                            end
+                            if !provisioning_info.nil?
+                                config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
+                                config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = provisioning_info['profile_name']
+                                config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]'] = provisioning_info['profile_name']
+                            end
                         end
                     end
                 end
@@ -232,13 +307,16 @@ module Pindo
             if !File.exist?(cert_dest_dir)
                 FileUtils.mkdir_p(cert_dest_dir)
             end
-
+            cert_type_temp = cert_type
             cert_sub_dir = cert_type.downcase
             if platform_type.downcase.eql?("macos")
-                if !cert_type.downcase.include?("development")
-                  cert_sub_dir = "developer_id_application"
-                else
+                if cert_type.downcase.include?("development")
                   cert_sub_dir = "development"
+                elsif cert_type.downcase.eql?("appstore")
+                    cert_sub_dir = "distribution"
+                else
+                    cert_type_temp = "developer_id"
+                    cert_sub_dir = "developer_id_application"
                 end
             else
                 if !cert_type.downcase.include?("development")
@@ -263,7 +341,7 @@ module Pindo
                 raise Informative, "证书解析失败，密码错误！"
             end
 
-            FileUtils.copy(key_path, File.join(cert_dest_dir, "#{cert_type}.p12"))
+            FileUtils.copy(key_path, File.join(cert_dest_dir, "#{cert_type_temp}.p12"))
 
         end
 
@@ -312,18 +390,15 @@ module Pindo
             account_cert_set["certs"].delete_if { |x| x["cert_id"].eql?(bundle_id_signing_identity)}
             end
 
-            cert_item["cert_id"] = cert_item["cert_id"] || bundle_id_signing_identity
-            cert_item["password"] = "goodcert1"
-            cert_item["cert_file"] = "#{cert_type}.p12"
-            cert_item["cert_type"] = cert_type
-            cert_item["cert_provisioning_group"] = cert_item["cert_provisioning_group"] || []
-
-
             provision_start_name = "Development"
+            cert_type_temp = cert_type
             if platform_type.downcase.include?("macos")
               if cert_type.downcase.include?("development")
                 provision_start_name = "development"
+              elsif cert_type.downcase.eql?("appstore")
+                provision_start_name = "appstore"
               else
+                cert_type_temp = "developer_id"
                 provision_start_name = "direct"
               end
             else
@@ -336,8 +411,17 @@ module Pindo
               end
             end
 
+            cert_item["cert_id"] = cert_item["cert_id"] || bundle_id_signing_identity
+            cert_item["password"] = "goodcert1"
+            cert_item["cert_file"] = "#{cert_type_temp}.p12"
+            cert_item["cert_type"] = cert_type_temp
+            cert_item["cert_provisioning_group"] = cert_item["cert_provisioning_group"] || []
+
+
+
+
             cert_provisioning_group_item = {}
-            provisioning_group_id = [provision_start_name, platform_type, bundle_id].join("_")
+            provisioning_group_id = [cert_type_temp, platform_type, bundle_id].join("_")
 
             provisioning_group_result = cert_item["cert_provisioning_group"].select { |x| x["provisioning_group_id"].eql?(provisioning_group_id)}.first
             if provisioning_group_result.nil?
@@ -361,6 +445,7 @@ module Pindo
                 bundle_id_temp = provisioning_info['bundle_id']
                 provisioning_id = [provision_start_name, bundle_id_temp].join("_")
                 real_path = provisioning_info["profile_path"]
+
                 extname = File.extname(real_path)
                 cert_provisioning_group_item["provisioning_items"] << {
                   "bundle_id" => bundle_id_temp,

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -145,7 +145,29 @@ module Pindo
         end
 
         def start_upload(app_info_obj:nil, ipa_file_upload:nil, description:nil)
+                if !ipa_file_upload.nil? && File.extname(ipa_file_upload).eql?(".app")
+                    mac_app_path = ipa_file_upload
+                    ipa_base_dir = File.dirname(ipa_file_upload)
+                    ipa_base_name = File.basename(ipa_file_upload, File.extname(ipa_file_upload))
+                    ipa_file_upload = File.join(ipa_base_dir, ipa_base_name + ".zip")
+                    if File.exist?(ipa_file_upload)
+                        FileUtils.rm_rf(ipa_file_upload)
+                    end
+
+                    current_dir = Dir.pwd
+                    if File.exist?(ipa_base_dir)
+                        Dir.chdir(ipa_base_dir)
+                        base_name = File.basename(mac_app_path)
+                        command = "zip -qry \"#{ipa_file_upload}\" \"#{base_name}\""
+                        puts command
+                        system command
+                        Dir.chdir(current_dir)
+                    end
+                end
 
+                unless !ipa_file_upload.nil? && File.exist?(ipa_file_upload)
+                    return
+                end
                 args_ipa_file_dir = File.expand_path(File::dirname(ipa_file_upload))
                 ipa_file_upload=File.join(args_ipa_file_dir, File.basename(ipa_file_upload))
                 current_project_dir = Dir.pwd
@@ -203,7 +225,7 @@ module Pindo
                 # aws_client = AWSS3Client.new
                 aws_client = PgyerUploadClient.new
                 upload_res = aws_client.upload_file(binary_file:ipa_file_upload)
-
+                puts upload_res
                 attach_key_url = nil
                 attachFileUrls = []
 

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.8.5"
+  	VERSION = "4.8.7"
 
   	class VersionCheck
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.8.5
+  version: 4.8.7
 platform: ruby
 authors:
 - wade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-24 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide