pindo 5.4.0 → 5.5.0

data/lib/pindo/command/gplay/metadata.rb

@@ -5,15 +5,33 @@ require 'fileutils'
 
 module Pindo
     class Command
-        class Appstore < Command
-            class Metadata < Appstore
+        class Gplay < Command
+            class Metadata < Gplay
 
 
-                self.summary = 'Appstore中metadata相关操作'
+                self.summary = 'Google Play中应用元数据相关操作'
 
                 self.description = <<-DESC
-                    Appstore中metadata相关操作, 用法:pindo appstre metadata
-                DESC
+Google Play中应用元数据相关操作。
+
+支持功能:
+
+    * 管理应用标题和描述
+
+    * 设置关键词和类别
+
+    * 配置应用图标和特色图片
+
+    * 下载现有元数据配置
+
+使用示例:
+
+    $ pindo gplay metadata               # 默认上传元数据
+
+    $ pindo gplay metadata --download    # 下载应用的元数据配置
+
+    $ pindo gplay metadata config.json   # 使用指定配置文件
+DESC
 
                 self.arguments = [
                     CLAide::Argument.new('path/to/config.json', false),

data/lib/pindo/command/gplay/screenshots.rb

@@ -5,15 +5,33 @@ require 'fileutils'
 
 module Pindo
     class Command
-        class Appstore < Command
-            class Screenshots < Appstore
+        class Gplay < Command
+            class Screenshots < Gplay
 
 
-                self.summary = 'Appstore中screenshots相关操作'
+                self.summary = 'Google Play中应用截图相关操作'
 
                 self.description = <<-DESC
-                    Appstore中screenshots相关操作, 用法:pindo appstre screenshots
-                DESC
+Google Play中应用截图相关操作。
+
+支持功能:
+
+    * 上传应用截图到Google Play
+
+    * 管理不同设备类型的截图
+
+    * 支持手机、平板、电视截图
+
+    * 下载现有截图配置
+
+使用示例:
+
+    $ pindo gplay screenshots            # 默认上传截图
+
+    $ pindo gplay screenshots --download # 下载应用的截图配置
+
+    $ pindo gplay screenshots config.json # 使用指定配置文件
+DESC
 
                 self.arguments = [
                     CLAide::Argument.new('path/to/config.json', false),

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

@@ -5,14 +5,30 @@ require 'fileutils'
 
 module Pindo
     class Command
-        class Appstore < Command
-            class Upload < Appstore
+        class Gplay < Command
+            class Upload < Gplay
 
-                self.summary = '上传ipa到appstore'
+                self.summary = '上传APK/AAB到Google Play'
 
                 self.description = <<-DESC
-                    上传ipa到appstore：pindo appstore upload
-                DESC
+上传APK/AAB到Google Play商店。
+
+支持功能:
+
+    * 上传APK文件到Google Play
+
+    * 上传AAB文件到Google Play
+
+    * 自动版本管理
+
+    * 发布轨道管理（内测、公测、正式）
+
+使用示例:
+
+    $ pindo gplay upload                 # 默认上传应用
+
+    $ pindo gplay upload config.json     # 使用指定配置文件
+DESC
 
                 self.arguments = [
                     CLAide::Argument.new('path/to/config.json', false),

data/lib/pindo/command/gplay.rb

@@ -1,16 +1,16 @@
 
-require 'pindo/command/appstore/iap'
-require 'pindo/command/appstore/itcapp'
-require 'pindo/command/appstore/metadata'
-require 'pindo/command/appstore/screenshots'
-require 'pindo/command/appstore/upload'
+require 'pindo/command/gplay/iap'
+require 'pindo/command/gplay/itcapp'
+require 'pindo/command/gplay/metadata'
+require 'pindo/command/gplay/screenshots'
+require 'pindo/command/gplay/upload'
 
 module Pindo
   class Command
-    
-    class Appstore < Command
+
+    class Gplay < Command
       self.abstract_command = true
-      self.summary = 'appstore的相关命令'
+      self.summary = 'Google Play商店的相关命令'
     end
 
   end

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

@@ -172,10 +172,25 @@ module Pindo
                         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)
+                            PgyerHelper.share_instace.print_app_version_info(
+                                app_info_obj: app_info_obj,
+                                app_version_info_obj: result_data["data"]
+                            )
                             if @args_send_flag
-                                PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                                # 始终发送给自己
+                                PgyerHelper.share_instace.send_apptest_msg(
+                                    app_info_obj: app_info_obj,
+                                    app_version_info_obj: result_data["data"],
+                                    receiveType: "self"
+                                )
+
+                                # 额外发送到测试群
+                                PgyerHelper.share_instace.send_apptest_msg(
+                                    app_info_obj: app_info_obj,
+                                    app_version_info_obj: result_data["data"],
+                                    chatEnv: "DevTest",
+                                    receiveType: "chat"
+                                )
                             end
                         end
                     end

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

@@ -60,9 +60,9 @@ module Pindo
                         # 指定上传到蒲公英的项目
                         ['--proj',   '指定上传到测试平台的项目名称'],
                         # 上传编译包
-                        ['--upload', '上传编译后的ipa到测试平台'],
+                        ['--upload', '上传编译后的ipa到测试平台(上传成功后会自动发送消息给自己)'],
                         # 发送通知
-                        ['--send',   '上传成功后发送测试通知']
+                        ['--send',   '发送消息到项目群(注意:不带此参数也会发送给自己)']
                     ].concat(super)
                 end
 
@@ -156,8 +156,8 @@ module Pindo
                     config_json_file = File.join(pindo_project_dir,"config.json")
                     
                     scheme_name = @args_proj_name if @args_proj_name
-                    if !app_info_obj.nil? && !app_info_obj["appName"].nil? && !app_info_obj["appName"].empty?
-                        scheme_name = app_info_obj["appName"]
+                    if !app_info_obj.nil? && !app_info_obj["projectName"].nil? && !app_info_obj["projectName"].empty?
+                        scheme_name = app_info_obj["projectName"]
                     end
                     if scheme_name.nil? || scheme_name.empty? && is_git_directory?(local_repo_dir:pindo_project_dir)
                         current_git_root_path = git_root_directory(local_repo_dir: pindo_project_dir)
@@ -253,10 +253,25 @@ module Pindo
                         description = nil
                         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)
+                            PgyerHelper.share_instace.print_app_version_info(
+                                app_info_obj: app_info_obj,
+                                app_version_info_obj: result_data["data"]
+                            )
+                            # 始终发送给自己
+                            PgyerHelper.share_instace.send_apptest_msg(
+                                app_info_obj: app_info_obj,
+                                app_version_info_obj: result_data["data"],
+                                receiveType: "self"
+                            )
+
+                            # 如果有 --send 参数，额外发送到测试群
                             if @args_send_flag
-                                PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                                PgyerHelper.share_instace.send_apptest_msg(
+                                    app_info_obj: app_info_obj,
+                                    app_version_info_obj: result_data["data"],
+                                    chatEnv: "DevTest",
+                                    receiveType: "chat"
+                                )
                             end
                         end
                     end

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

@@ -141,10 +141,25 @@ module Pindo
                         if !ipa_file_upload.nil? && !app_info_obj.nil? 
                             result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:nil)
                             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)
+                                PgyerHelper.share_instace.print_app_version_info(
+                                    app_info_obj: app_info_obj,
+                                    app_version_info_obj: result_data["data"]
+                                )
+                                # 始终发送给自己
+                                PgyerHelper.share_instace.send_apptest_msg(
+                                    app_info_obj: app_info_obj,
+                                    app_version_info_obj: result_data["data"],
+                                    receiveType: "self"
+                                )
+
+                                # 如果有 --send 参数，额外发送到测试群
                                 if @args_send_flag
-                                    PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                                    PgyerHelper.share_instace.send_apptest_msg(
+                                        app_info_obj: app_info_obj,
+                                        app_version_info_obj: result_data["data"],
+                                        chatEnv: "DevTest",
+                                        receiveType: "chat"
+                                    )
                                 end
                             end
                         end

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

@@ -130,11 +130,25 @@ module Pindo
                         description = nil
                         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)
+                            PgyerHelper.share_instace.print_app_version_info(
+                                app_info_obj: app_info_obj,
+                                app_version_info_obj: result_data["data"]
+                            )
                             if @args_send_flag
-                                PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                                # 始终发送给自己
+                                PgyerHelper.share_instace.send_apptest_msg(
+                                    app_info_obj: app_info_obj,
+                                    app_version_info_obj: result_data["data"],
+                                    receiveType: "self"
+                                )
+
+                                # 额外发送到测试群
+                                PgyerHelper.share_instace.send_apptest_msg(
+                                    app_info_obj: app_info_obj,
+                                    app_version_info_obj: result_data["data"],
+                                    chatEnv: "DevTest",
+                                    receiveType: "chat"
+                                )
                             end
                         end
                     end

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

@@ -14,7 +14,23 @@ module Pindo
                 self.summary = '发布阶段ipa包重签名及上传'
 
                 self.description = <<-DESC
-                    发布阶段ipa包重签名及上传,用法： pindo iap autoresign path/to/demo.ipa --upload --send
+发布阶段ipa包重签名及上传。
+
+支持功能:
+
+    * IPA包重签名
+
+    * 上传到测试平台
+
+    * 发送测试通知
+
+使用示例:
+
+    $ pindo ipa autoresign demo.ipa          # 仅重签名
+
+    $ pindo ipa autoresign demo.ipa --upload # 重签名并上传
+
+    $ pindo ipa autoresign demo.ipa --send   # 重签名、上传并发送通知
                 DESC
 
                 self.arguments = [
@@ -121,10 +137,25 @@ module Pindo
                             description = "提交包重签名"
                             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)
+                                PgyerHelper.share_instace.print_app_version_info(
+                                    app_info_obj: app_info_obj,
+                                    app_version_info_obj: result_data["data"]
+                                )
+                                # 始终发送给自己
+                                PgyerHelper.share_instace.send_apptest_msg(
+                                    app_info_obj: app_info_obj,
+                                    app_version_info_obj: result_data["data"],
+                                    receiveType: "self"
+                                )
+
+                                # 如果有 --send 参数，额外发送到测试群
                                 if @args_send_flag
-                                    PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                                    PgyerHelper.share_instace.send_apptest_msg(
+                                        app_info_obj: app_info_obj,
+                                        app_version_info_obj: result_data["data"],
+                                        chatEnv: "DevTest",
+                                        receiveType: "chat"
+                                    )
                                 end
                             end
                         end

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

@@ -20,7 +20,25 @@ module Pindo
                 self.summary = '提交时设置Xcode工程编译参数'
 
                 self.description = <<-DESC
-                    提交时设置Xcode工程编译参数.在工程目录下执行：pindo ipa import
+提交时设置Xcode工程编译参数。
+
+支持功能:
+
+    * 设置Xcode工程编译参数
+
+    * 自动增加版本号
+
+    * 支持编译后上传
+
+使用示例:
+
+    $ pindo ipa import                    # 设置编译参数
+
+    $ pindo ipa import --build            # 设置参数并编译
+
+    $ pindo ipa import --upload           # 设置参数、编译并上传
+
+    $ pindo ipa import --send             # 设置参数、编译、上传并发送通知
                 DESC
 
                 self.arguments = [

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

@@ -21,7 +21,27 @@ module Pindo
                 self.summary = '测试时设置Xcode工程编译参数并自动编译及上传'
 
                 self.description = <<-DESC
-                    测试时设置Xcode工程编译参数并自动编译及上传，在工程目录下执行：pindo ipa output --upload --send
+测试时设置Xcode工程编译参数并自动编译及上传。
+
+支持功能:
+
+    * 设置Xcode工程编译参数
+
+    * 自动编译生成IPA
+
+    * 上传到测试平台
+
+    * 发送测试通知
+
+使用示例:
+
+    $ pindo ipa output                    # 设置参数并编译
+
+    $ pindo ipa output --upload           # 编译并上传
+
+    $ pindo ipa output --send             # 编译、上传并发送通知
+
+    $ pindo ipa output --increase         # 自动增加版本号
                 DESC
 
                 self.arguments = [
@@ -95,10 +115,25 @@ module Pindo
                     if !ipa_file_upload.nil? && !app_info_obj.nil? 
                         result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:nil)
                         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)
+                            PgyerHelper.share_instace.print_app_version_info(
+                                app_info_obj: app_info_obj,
+                                app_version_info_obj: result_data["data"]
+                            )
                             if @args_send_flag
-                                PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                                # 始终发送给自己
+                                PgyerHelper.share_instace.send_apptest_msg(
+                                    app_info_obj: app_info_obj,
+                                    app_version_info_obj: result_data["data"],
+                                    receiveType: "self"
+                                )
+
+                                # 额外发送到测试群
+                                PgyerHelper.share_instace.send_apptest_msg(
+                                    app_info_obj: app_info_obj,
+                                    app_version_info_obj: result_data["data"],
+                                    chatEnv: "DevTest",
+                                    receiveType: "chat"
+                                )
                             end
                         end
                     end

data/lib/pindo/command/{pgyer → jps}/apptest.rb

@@ -4,13 +4,13 @@ require 'pindo/module/pgyer/pgyerhelper'
 
 module Pindo
     class Command
-        class Pgyer < Command
-            class Apptest < Pgyer
+        class Jps < Command
+            class Apptest < Jps
 
-                self.summary = '获取pgyer中指定app的测试链接和二维码'
+                self.summary = '获取jps中指定app的测试链接和二维码'
 
                 self.description = <<-DESC
-                    获取pgyer中指定app的测试链接和二维码。
+                    获取jps中指定app的测试链接和二维码。
 
                     支持功能:
 
@@ -21,13 +21,13 @@ module Pindo
 
                     使用示例:
 
-                        $ pindo pgyer apptest                    # 获取当前目录项目的测试链接
-                        
-                        $ pindo pgyer apptest --proj=demo       # 获取指定项目的测试链接
-                        
-                        $ pindo pgyer apptest --list            # 列出历史版本供选择
-                        
-                        $ pindo pgyer apptest --send            # 发送测试信息
+                        $ pindo jps apptest                    # 获取当前目录项目的测试链接
+
+                        $ pindo jps apptest --proj=demo       # 获取指定项目的测试链接
+
+                        $ pindo jps apptest --list            # 列出历史版本供选择
+
+                        $ pindo jps apptest --send            # 发送测试信息
                 DESC
 
                 self.arguments = [
@@ -36,10 +36,10 @@ module Pindo
 
                 def self.options
                   [
-                    ['--login', '强制再次登录pgyer网站'],
-                    ['--proj', '指定哪个项目(忽略大小写空格等等字符),用法：pindo pgyer apptest  --proj=prancksoundv4'],
-                    ['--list', '列出上传记录并选择，用法：pindo pgyer apptest --list'],
-                    ['--send',  '上传到之后是否发送测试信息,用法:pindo pgyer apptest --send'],
+                    ['--login', '强制再次登录jps网站'],
+                    ['--proj', '指定哪个项目(忽略大小写空格等等字符),用法：pindo jps apptest  --proj=prancksoundv4'],
+                    ['--list', '列出上传记录并选择，用法：pindo jps apptest --list'],
+                    ['--send',  '发送消息到项目群(注意:不带此参数也会发送给自己),用法:pindo jps apptest --send'],
                   ].concat(super)
                 end
 
@@ -65,7 +65,7 @@ module Pindo
                     app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:@args_proj_name)
 
                     if app_info_obj.nil?
-                        raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， pgyer网站没有该App"
+                        raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， jps网站没有该App"
                     end
 
                     if !app_info_obj.nil?
@@ -76,17 +76,28 @@ module Pindo
                             raise Informative, "没有找到上传记录"
                         end
 
-                        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(
+                            app_info_obj: app_info_obj,
+                            app_version_info_obj: version_item_obj
+                        )
 
-                        PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+                        # 始终发送给自己
+                        PgyerHelper.share_instace.send_apptest_msg(
+                            app_info_obj: app_info_obj,
+                            app_version_info_obj: version_item_obj,
+                            receiveType: "self"
+                        )
 
+                        # 如果有 --send 参数，额外发送到测试群
                         if @args_send_flag
-                            # 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")
+                            PgyerHelper.share_instace.send_apptest_msg(
+                                app_info_obj: app_info_obj,
+                                app_version_info_obj: version_item_obj,
+                                chatEnv: "DevTest",
+                                receiveType: "chat"
+                            )
                         end
-                        
+
                     end
 
                 end
@@ -94,4 +105,4 @@ module Pindo
             end
         end
     end
-end
+end