pindo 4.8.6 → 4.8.8

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

@@ -0,0 +1,189 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'  
+require 'fileutils'
+require 'pindo/base/executable'
+
+module Pindo
+    class Command
+        class Ios < Command
+            class Debug < Ios
+        
+                include Appselect
+                # 命令的简要说明 - 打包iOS工程并发布到蒲公英
+                self.summary = '打包iOS工程并发布到蒲公英'
+    
+                # 命令的详细说明,包含用法示例
+                self.description = <<-DESC
+                    编译iOS Debug包并支持上传到测试平台。
+                    
+                    支持功能:
+
+                        * 编译Debug包
+
+                        * 上传到测试平台  
+
+                        * 发送测试通知
+
+                    使用示例:
+
+                        $ pindo ios debug                    # 编译Debug包
+
+                        $ pindo ios debug --upload           # 编译并上传
+
+                        $ pindo ios debug --send             # 编译上传并发送通知
+
+                        $ pindo ios debug --proj=myapp       # 指定项目名称
+                DESC
+
+                # 命令的参数列表
+                self.arguments = [
+                    # 暂无参数
+                ]
+
+                # 命令的选项列表
+                def self.options
+                    [
+                        # 指定上传到蒲公英的项目
+                        ['--proj',   '指定上传到测试平台的项目名称'],
+                        # 上传编译包
+                        ['--upload', '上传编译后的ipa到测试平台'],
+                        # 发送通知
+                        ['--send',   '上传成功后发送测试通知']
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    @args_deploy_flag = argv.flag?('deploy', false)
+                    @args_adhoc_flag = argv.flag?('adhoc', false)  
+                    @args_upload_flag = argv.flag?('upload', false)  
+                    @args_send_flag = argv.flag?('send', false)  
+                    @args_proj_name = argv.option('proj')
+
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
+                    super
+                    @additional_args = argv.remainder!
+                end
+
+                def validate!
+                    
+                    super
+                end
+
+                def run
+                    
+                    mainapp_bundleid= nil
+                    if @args_deploy_flag
+                        mainapp_bundleid = get_selected_deploy_bundleid()
+                    else
+                        mainapp_bundleid = get_selected_dev_bundleid()
+                    end
+
+                    app_info_obj = nil
+                    if @args_upload_flag 
+                        proj_name = @args_proj_name
+                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+                    end
+
+                    args_temp = []
+                    args_temp << mainapp_bundleid
+                    Pindo::Command::Deploy::Pullconfig::run(args_temp)
+
+                    project_dir = Dir.pwd
+                    Dir.chdir(project_dir)
+                    config_json_file = File.join(project_dir,"config.json")
+                    Cert::modify_cert_with_project(project_dir:project_dir, config_file:config_json_file)
+
+                    if File.exist?(File.join(project_dir, "Podfile"))
+                        
+                        args_temp = []
+                        args_temp << config_json_file
+                        Pindo::Command::Lib::Update::run([])
+
+                        begin
+                            if File.exist?(File.join(project_dir, "Podfile.lock"))
+                                FileUtils.rm_rf(File.join(project_dir, "Podfile.lock"))    
+                            end
+                            if File.exist?(File.join(project_dir,"Pods"))
+                                FileUtils.rm_rf(File.join(project_dir, "Pods"))    
+                            end
+                            puts "正在执行pod deintegrate..."
+                            system 'pod deintegrate'
+                            puts "正在执行pod install..."
+                            system 'pod install'
+                        rescue => error
+                            puts(error.to_s)
+                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
+                        end
+
+                        Dir.chdir(project_dir)
+                        pod_lock_file = File.join(project_dir, "Podfile.lock")
+                        if !File.exist?(pod_lock_file)
+                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
+                        end
+
+                    end
+                    
+
+                    args_temp = []
+                    if @args_adhoc_flag
+                        args_temp << "--adhoc"
+                    else
+                        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,app}")
+                    ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+
+                    if !ipa_file_upload.nil? && !app_info_obj.nil? 
+                        description = nil
+                        if File.exist?(File.join(pindo_new_project_dir, ".release_info"))
+                            description = File.read(File.join(pindo_new_project_dir, ".release_info"))
+                        else
+                            if File.exist?(File.join(pindo_new_project_dir, ".git"))
+                                description = git!(%W(-C #{pindo_new_project_dir} show -s --format=%h::%s)).strip
+                            end
+                        end
+                        result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:description)
+                        if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
+                            msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:result_data["data"])
+                            PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+                            if @args_send_flag
+                                PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                            end
+                        end
+                    end
+                    
+                    system "open #{project_dir}"
+
+                end
+
+            end
+        end
+    end
+end
+  

data/lib/pindo/command/ios.rb

@@ -0,0 +1,18 @@
+
+require 'pindo/command/ios/cert'
+require 'pindo/command/ios/build'
+require 'pindo/command/ios/debug'
+require 'pindo/command/ios/adhoc'
+require 'pindo/command/ios/autoresign'
+require 'pindo/command/ios/applovin'
+
+module Pindo
+  class Command
+    
+    class Ios < Command
+      self.abstract_command = true
+      self.summary = 'iOS相关命令'
+    end
+
+  end
+end

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

@@ -67,8 +67,12 @@ module Pindo
                         msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:version_item_obj)
 
                         PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+
                         if @args_send_flag
-                            PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                            # PgyerHelper.share_instace.send_apptest_msg(appId:app_info_obj["appId"], appVersionId:version_item_obj["id"], chatEnv: "PreFavTest", receiveType:"chat")
+                            # PgyerHelper.share_instace.send_apptest_msg(appId:app_info_obj["appId"], appVersionId:version_item_obj["id"], chatEnv: "DevTest", receiveType:"chat")
+                        else
+                            PgyerHelper.share_instace.send_apptest_msg(appId:app_info_obj["appId"], appVersionId:version_item_obj["id"], chatEnv: "", receiveType:"self")
                         end
                         
                     end

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

@@ -86,15 +86,15 @@ 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,app}")
+                        build_path = File.join(current_project_dir, "build", "*.{ipa,app,apk}")
                         @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")
+                            build_path = File.join(current_project_dir, "*.{ipa,app,apk}")
                             @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)")
+                            answer = agree("需要上传的文件是: #{@args_ipa_file} ?(Y/n)")
                             if !answer
                                 @args_ipa_file = nil
                             end
@@ -102,7 +102,7 @@ module Pindo
 
                         if !@args_ipa_file.nil? && File.exist?(@args_ipa_file)
                         else
-                            @args_ipa_file = ask('需要上传的IPA文件:') || nil
+                            @args_ipa_file = ask('需要上传的文件:') || nil
                             @args_ipa_file = @args_ipa_file.strip.gsub(/\\ /, ' ')
                         end
                     end

data/lib/pindo/command/unity/apk.rb

@@ -0,0 +1,76 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+require 'pindo/base/executable'
+
+
+module Pindo
+    class Command
+        class Unity < Command
+            class Apk < Unity
+
+                # 命令的简要说明 - 编译Unity工程生成Android APK
+                self.summary = '编译Unity工程生成Android APK'
+    
+                # 命令的详细说明,包含用法示例
+                self.description = <<-DESC
+                    编译Unity工程生成Android APK。
+                    
+                    支持功能:
+
+                        * 编译生成APK
+
+                        * 上传到测试平台
+
+                        * 发送测试通知
+
+                    使用示例:
+
+                        $ pindo unity apk                    # 编译APK
+
+                        $ pindo unity apk --upload           # 编译并上传
+
+                        $ pindo unity apk --send             # 编译并上传并发送通知
+
+                        $ pindo unity apk --proj=myapp       # 指定项目名称
+                DESC
+
+                # 命令的参数列表
+                self.arguments = [
+
+                ]
+
+                # 命令的选项列表
+                def self.options
+                    [
+                        # 指定上传到蒲公英的项目
+                        ['--proj',   '指定上传到测试平台的项目名称'],
+                        # 上传编译包
+                        ['--upload', '上传编译后的APK到测试平台'],
+                        # 发送通知
+                        ['--send',   '上传成功后发送测试通知']
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    @args_proj_name = argv.option('proj')
+                    @args_upload_flag = argv.flag?('upload', false)
+                    @args_send_flag = argv.flag?('send', false)
+
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
+                    super
+                end
+
+                def run
+                    puts "apk"
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/unity/ipa.rb

@@ -0,0 +1,76 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+require 'pindo/base/executable'
+
+module Pindo
+    class Command
+        class Unity < Command
+            class Ipa < Unity
+                # Unity IPA包编译和上传命令
+                self.summary = '编译Unity工程生成iOS IPA并支持上传到测试平台'
+
+                # 详细说明
+                self.description = <<-DESC
+                    编译Unity工程生成iOS IPA并支持上传到测试平台。
+                    
+                    支持功能:
+
+                        * 编译生成IPA
+
+                        * 上传到测试平台  
+
+                        * 发送测试通知
+
+                    使用示例:
+
+                        $ pindo unity ipa                    # 编译IPA
+
+                        $ pindo unity ipa --upload           # 编译并上传
+
+                        $ pindo unity ipa --send             # 编译上传并发送通知
+
+                        $ pindo unity ipa --proj=myapp       # 指定项目名称
+                DESC
+
+                # 命令参数
+                self.arguments = [
+                    # 暂无参数
+                ]
+
+                # 命令选项
+                def self.options
+                    [
+                        ['--proj',   '指定上传到测试平台的项目名称'],
+                        ['--upload', '上传编译后的IPA到测试平台'],
+                        ['--send',   '上传成功后发送测试通知']
+                    ].concat(super)
+                end
+
+
+                def initialize(argv)
+
+                    @args_proj_name = argv.option('proj')
+                    @args_upload_flag = argv.flag?('upload', false)
+                    @args_send_flag = argv.flag?('send', false)
+
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
+                    super
+                end
+
+
+                def run
+
+                    puts "ipa "
+
+                end
+
+
+            end
+        end
+    end
+end

data/lib/pindo/command/unity.rb

@@ -0,0 +1,16 @@
+
+
+require 'pindo/command/unity/ipa'
+require 'pindo/command/unity/apk'
+
+
+module Pindo
+  class Command
+    
+    class Unity < Command
+      self.abstract_command = true
+      self.summary = 'Unity相关命令'
+    end
+
+  end
+end

data/lib/pindo/command.rb

@@ -47,7 +47,9 @@ module Pindo
         require 'pindo/command/upgrade'
         require 'pindo/command/ipa'
         require 'pindo/command/appstore'
-
+        require 'pindo/command/unity'
+        require 'pindo/command/ios'
+        require 'pindo/command/android'
 
         attr_accessor :args_help_flag
         alias_method :args_help_flag?, :args_help_flag

data/lib/pindo/module/appselect.rb

@@ -130,6 +130,10 @@ module Pindo
           puts
           puts "选择的bundle id是: #{menu_choice}"
           puts
+          if menu_choice.eql?("com.heroneverdie101.*")
+            menu_choice = "com.heroneverdie101"
+          end
+          
           return menu_choice;
           
         end

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

@@ -34,15 +34,23 @@ 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
 
             
@@ -152,7 +160,7 @@ module Pindo
                             end
 
                             if !provisioning_info.nil?
-                                config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
+                                config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"] unless provisioning_info["bundle_id"].eql?("com.heroneverdie101.*")
                                 config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = provisioning_info['profile_name']
                                 config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]'] = provisioning_info['profile_name']
                             end
@@ -176,7 +184,7 @@ module Pindo
                                 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['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"] unless provisioning_info["bundle_id"].eql?("com.heroneverdie101.*")
                                 config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = provisioning_info['profile_name']
                                 config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]'] = provisioning_info['profile_name']
                             end
@@ -299,7 +307,7 @@ 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")
@@ -307,7 +315,8 @@ module Pindo
                 elsif cert_type.downcase.eql?("appstore")
                     cert_sub_dir = "distribution"
                 else
-                  cert_sub_dir = "developer_id_application"
+                    cert_type_temp = "developer_id"
+                    cert_sub_dir = "developer_id_application"
                 end
             else
                 if !cert_type.downcase.include?("development")
@@ -332,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
 
@@ -381,20 +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
@@ -407,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?
@@ -432,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

@@ -168,6 +168,7 @@ module Pindo
                 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
@@ -215,7 +216,9 @@ module Pindo
                     Dir.chdir current_project_dir
                 end
 
-
+                if description.nil? || description.length <= 0
+                    description = " "
+                end
                 puts
                 puts "上传项目: #{app_info_obj["appName"]}"
                 print "上传备注: "
@@ -277,6 +280,20 @@ module Pindo
             wechat_msg_url
         end
 
+        def send_apptest_msg(appId:nil, appVersionId:nil, chatEnv: nil, receiveType:nil)
+            
+            Funlog.instance.fancyinfo_start("正在发送飞书消息...")
+            result =  @pgyer_client.post_message(appId:appId, appVersionId:appVersionId, chatEnv: chatEnv, receiveType:receiveType)
+
+            if !result.nil? && result["code"] == 200 && result["data"] == "success"
+                Funlog.instance.fancyinfo_success("测试信息已经发送飞书!")
+                return true
+            else
+                Funlog.instance.fancyinfo_error("未发送飞书测试信息！")
+                return false
+            end
+        
+        end
 
         def send_apptest_wechat_msg(msg_data:nil, wechat_url:nil)
 

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

@@ -124,7 +124,7 @@ module Pindo
             config.build_settings['CODE_SIGN_IDENTITY'] = "iPhone Developer"
             config.build_settings['DEVELOPMENT_TEAM'] = "9WX2E4VC26"
             config.build_settings['PROVISIONING_PROFILE'] = ""
-            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = bundle_id
+            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] =  bundle_id unless bundle_id.eql?("com.heroneverdie101.*")
             config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = "match Development " + bundle_id
             # config.build_settings['TARGETED_DEVICE_FAMILY'] = "1,2"
             if is_extention

data/lib/pindo/options/deployoptions.rb

@@ -61,6 +61,7 @@ module Pindo
             attr_accessor :config_json
             attr_accessor :additional_args
 
+
             def self.options
                 [
                     ['--u=', 'input apple id'],
@@ -200,6 +201,9 @@ module Pindo
 
                     if @config_json['app_info'] && @config_json['app_info']['app_identifier']
                         @deploy_identifier = @config_json['app_info']['app_identifier']
+                        if @deploy_identifier.eql?("com.heroneverdie101")
+                            @deploy_identifier = "com.heroneverdie101.*"
+                        end
                     end
 
                     if @config_json['app_info'] && @config_json['app_info']['app_identifier_pushcontent']

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.8.6"
+  	VERSION = "4.8.8"
 
   	class VersionCheck