pindo 4.9.3 → 4.9.4

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

@@ -1,5 +1,3 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'pindo/module/pgyer/pgyerhelper'
@@ -13,7 +11,21 @@ module Pindo
                 self.summary = '修改pgyer中已经上传安装包的备注信息'
 
                 self.description = <<-DESC
-                  修改pgyer中已经上传安装包的备注信息，终端运行：pindo pgyer apptest
+                修改pgyer中已经上传安装包的备注信息。
+                
+                支持功能:
+
+                    * 修改版本备注
+                    * 查看历史版本
+                    * 选择指定版本
+
+                使用示例:
+
+                        $ pindo pgyer comment                    # 修改当前目录项目的最新版本备注
+                        
+                        $ pindo pgyer comment --proj=demo       # 修改指定项目的版本备注
+                        
+                        $ pindo pgyer comment --list            # 列出历史版本供选择修改
                 DESC
 
                 self.arguments = [

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

@@ -1,5 +1,3 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'pindo/module/pgyer/pgyerhelper'
@@ -15,7 +13,21 @@ module Pindo
                 self.summary = '从pgyer下载指定app的安装包'
 
                 self.description = <<-DESC
-                  从pgyer下载指定app的安装包。终端直接运行:pindo pgyer download 
+                    从pgyer下载指定app的安装包。
+
+                    支持功能:
+
+                        * 下载指定版本安装包
+                        * 查看历史版本
+                        * 显示下载进度
+
+                    使用示例:
+
+                        $ pindo pgyer download                   # 下载当前目录项目的最新版本
+                        
+                        $ pindo pgyer download --proj=demo      # 下载指定项目的安装包
+                        
+                        $ pindo pgyer download --list           # 列出历史版本供选择下载
                 DESC
 
                 self.arguments = [

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

@@ -1,5 +1,3 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'pindo/module/pgyer/pgyerhelper'
@@ -11,10 +9,22 @@ module Pindo
 
             class Login < Pgyer
 
-                self.summary = '登录pgyer'
+                self.summary = '登录pgyer测试平台'
 
                 self.description = <<-DESC
-                  登录pgyer，终端运行：pindo pgyer login
+                    登录pgyer测试平台。
+
+                    支持功能:
+
+                        * 账号密码登录
+                        * 记住登录状态
+                        * 强制重新登录
+
+                    使用示例:
+
+                        $ pindo pgyer login                     # 登录pgyer
+                        
+                        $ pindo pgyer login --force            # 强制重新登录
                 DESC
 
                 self.arguments = [

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

@@ -1,5 +1,3 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'pindo/module/pgyer/pgyerhelper'
@@ -10,10 +8,28 @@ module Pindo
             class Resign < Pgyer
 
 
-                self.summary = '获取pgyer中指定app的测试链接和二维码'
+                self.summary = '重签名pgyer中的安装包'
 
                 self.description = <<-DESC
-                  获取pgyer中指定app的测试链接和二维码，终端运行：pindo pgyer resign
+                    重签名pgyer中的安装包。
+
+                    支持功能:
+
+                        * 选择证书重签名
+                        * 查看历史版本
+                        * 发送测试信息
+
+                    使用示例:
+
+                        $ pindo pgyer resign                    # 重签名当前项目最新版本
+                        
+                        $ pindo pgyer resign --proj=demo       # 重签名指定项目
+                        
+                        $ pindo pgyer resign --list            # 列出历史版本供选择
+                        
+                        $ pindo pgyer resign --certid=xxx      # 使用指定证书重签名
+                        
+                        $ pindo pgyer resign --send            # 重签名后发送测试信息
                 DESC
 
                 self.arguments = [

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

@@ -1,11 +1,9 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'json'
 require 'faraday'
 require 'pindo/module/pgyer/pgyerhelper'
-
+require 'pindo/module/build/buildhelper'
 
 module Pindo
     class Command
@@ -13,10 +11,32 @@ module Pindo
             class Upload < Pgyer
 
 
-                self.summary = '上传ipa包到pgyer测试网站'
+                self.summary = '上传安装包到pgyer测试平台'
 
                 self.description = <<-DESC
-                  上传ipa包到pgyer。用法：例如:pindo pgyer upload  path/to/demo.ipa
+                    上传安装包到pgyer测试平台。
+
+                    支持功能:
+
+                        * 上传ipa/apk安装包
+                        * 添加版本描述
+                        * 上传附件
+                        * 重签名
+                        * 发送测试信息
+
+                    使用示例:
+
+                        $ pindo pgyer upload path/to/app.ipa           # 上传指定安装包
+                        
+                        $ pindo pgyer upload --proj=demo              # 上传到指定项目
+                        
+                        $ pindo pgyer upload --desc="版本说明"         # 添加版本描述
+                        
+                        $ pindo pgyer upload --attach=file.zip        # 上传附件
+                        
+                        $ pindo pgyer upload --resign                 # 上传后重签名
+                        
+                        $ pindo pgyer upload --send                   # 上传后发送企业微信测试信息
                 DESC
 
                 self.arguments = [
@@ -33,7 +53,7 @@ module Pindo
                     ['--desc', '指定上传的备注信息: -pindo pgyer upload -desc="1.upload message"'],
                     ['--resign',  '上传到之后是否重签名,用法:pindo pgyer upload --resign'],
                     ['--certid',  '设置重签名的正式id,用法:pindo pgyer upload --certid=com.test.bundleid'],
-
+                    
                   ].concat(super)
                 end
 
@@ -85,9 +105,33 @@ module Pindo
                 def run
 
                     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,apk}")
-                        @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                        # 获取build目录下的ipa文件
+                        # 
+                        build_helper = Pindo::BuildHelper.share_instance
+                        project_type = build_helper.project_type(current_project_dir)
+                        case project_type
+                        when :ios
+                            build_path = File.join(current_project_dir, "build", "*.{ipa,app}")
+                            @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                        when :android
+                            build_path = File.join(current_project_dir, "build", "*.{apk}")
+                            @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                        when :unity
+                            
+                            if File.exist?(File.join(current_project_dir, "GoodPlatform/BaseiOS"))
+                                build_path = File.join(current_project_dir, "GoodPlatform/BaseiOS/build", "*.{ipa,app}")
+                                @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                            else
+                                build_path = File.join(current_project_dir, "GoodPlatform/iOS/build", "*.{ipa,app}")
+                                @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                            end
+                        else
+                            raise Informative, "当前目录不是工程目录，不能编译"
+                        end
+
+
                         if @args_ipa_file.nil?
                             build_path = File.join(current_project_dir, "*.{ipa,app,apk}")
                             @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}

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

@@ -106,7 +106,6 @@ module Pindo
                         proj_name = @args_proj_name
                         app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
                     end
-                    puts app_info_obj
 
                     mainapp_bundleid= nil
                     if @args_deploy_flag

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.9.3"
+  	VERSION = "4.9.4"
 
   	class VersionCheck
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.9.3
+  version: 4.9.4
 platform: ruby
 authors:
 - wade
@@ -274,15 +274,10 @@ 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
-- lib/pindo/command/dev/confusecode.rb
-- lib/pindo/command/dev/confuseproj.rb
-- lib/pindo/command/dev/createbuild.rb
 - lib/pindo/command/dev/debug.rb
-- lib/pindo/command/dev/pgyercert.rb
+- lib/pindo/command/dev/repoinit.rb
 - lib/pindo/command/dev/tag.rb
 - lib/pindo/command/env.rb
 - lib/pindo/command/env/dreamstudio.rb

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

@@ -1,223 +0,0 @@
-
-
-require 'highline/import'
-require 'fileutils'
-require 'json'
-require 'faraday'
-require 'xcodeproj'
-
-module Pindo
-    class Command
-        class Dev < Command
-            class Applovin < Dev
-        
-                self.summary = '接入applovin max广告平台时更新Xcode中info.plist'
-  
-                self.description = <<-DESC
-                  接入applovin max广告平台时更新Xcode中info.plist,用法：在工程目录下执行 pindo utils applovin
-                DESC
-        
-                self.arguments = [
-                ]
-          
-                def self.options
-                  [
-                    ['--appstore', 'appstore模式，一般不用'],
-                    ['--install', '是否运行applovin脚本'],
-                    ['--upload', '保存ids， 留作applovin网络不好情况使用'],
-                  ].concat(super)
-                end
-        
-                def initialize(argv)
-
-                    @args_appstore_flag = argv.flag?('appstore', false)
-                    @args_install_flag = argv.flag?('install', false)
-                    @args_upload_flag = argv.flag?('upload', false)
-
-                    super(argv)
-                    @additional_args = argv.remainder!
-                end
-        
-                def validate!
-                    super
-                end
-        
-                def run
-
-                    skadnetwork_id_array = []
-
-                    Funlog.instance.fancyinfo_start("正在请求applovin数据...")
-
-                    applovin_res_json = req_applovin_json
-                    # puts JSON.pretty_generate(applovin_res_json)
-
-                    if !applovin_res_json.nil? && !applovin_res_json["skadnetwork_ids"].nil?
-                        applovin_res_json["skadnetwork_ids"].each do |network_id|
-                            skadnetwork_id_array << network_id["skadnetwork_id"]
-                        end
-                    end
-
-                    applovin_media_res_json = req_applovin_mediia_json
-                    # puts JSON.pretty_generate(applovin_media_res_json)
-                    if !applovin_media_res_json.nil? && !applovin_media_res_json["mediationSKAdnetworkIdsSpecs"].nil?
-                        applovin_media_res_json["mediationSKAdnetworkIdsSpecs"].each do |media_item|
-                            skadnetwork_id_array = skadnetwork_id_array + media_item["skAdnetworkIds"]
-                        end
-                    end
-
-                    skadnetwork_id_array = skadnetwork_id_array.uniq || []
-
-                    Funlog.instance.fancyinfo_success("请求applovin数据，获取到#{skadnetwork_id_array.size}条数据...")
-
-                    if !skadnetwork_id_array.nil? && skadnetwork_id_array.size > 50
-                        # puts "From Applovin SKAdNetworkItems Size: #{skadnetwork_id_array.size}"
-                        if @args_upload_flag
-                            applovin_config_file = File.join(pindo_single_config.pindo_common_configdir,"applovin_client_config.json")
-                            origin_json = {}
-                            if File.exist?(applovin_config_file)
-                                origin_json = JSON.parse(File.read(applovin_config_file))
-                            end
-                            origin_json["SKAdNetworkItems"] = skadnetwork_id_array
-                            File.write(applovin_config_file, JSON.pretty_generate(origin_json))
-                            git_addpush_repo(path:pindo_single_config.pindo_common_configdir, message:"Applovin SKAdNetworkItems", commit_file_params:["applovin_client_config.json"])
-                        end
-                    else
-                        Funlog.instance.fancyinfo_start("网络拉取applovin数据太少,从缓存中获取数据...")
-                        config_file = File.join(File::expand_path(Pindoconfig.instance.pindo_common_configdir), "applovin_client_config.json")
-                        config_json = JSON.parse(File.read(config_file))
-                        skadnetwork_id_array = skadnetwork_id_array + config_json["SKAdNetworkItems"]
-                        # puts "From Config SKAdNetworkItems Size: #{skadnetwork_id_array.size}"
-                        Funlog.instance.fancyinfo_success("网络拉取applovin数据太少,从缓存中获取到#{skadnetwork_id_array.size}条数据...")
-                    end
-
-
-                    Funlog.instance.fancyinfo_start("正在写入Xcode中...")
-
-                    skadnetwork_id_array = skadnetwork_id_array.uniq || []
-
-                    project_root_dir = Dir.pwd
-                    xcodeproj_file_name = Dir.glob(File.join(project_root_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-
-                    plist_file_name = File.join(project_root_dir,  "AppEntry/Info.plist")
-                    if !xcodeproj_file_name.nil?
-                        proj_name = File.basename(xcodeproj_file_name, ".xcodeproj")   
-                        plist_file_name = get_applovin_infoplist(project_dir:project_root_dir, proj_name:proj_name) 
-                    end
-
-
-                    info_plist_dict = {}
-                    if File.exist?(plist_file_name)
-                        info_plist_dict = Xcodeproj::Plist.read_from_path(plist_file_name)    
-                    end
-                    
-
-                    info_plist_dict["NSAdvertisingAttributionReportEndpoint"] = info_plist_dict["NSAdvertisingAttributionReportEndpoint"] || "https://postbacks-app.com"
-
-                    if !info_plist_dict.has_key?("NSAppTransportSecurity")
-                        info_plist_dict["NSAppTransportSecurity"] = {}
-                        info_plist_dict["NSAppTransportSecurity"]["NSAllowsArbitraryLoads"] = true
-                    end
-
-
-                    if !skadnetwork_id_array.nil? && skadnetwork_id_array.size > 0
-                        info_plist_dict["SKAdNetworkItems"] = []
-                        skadnetwork_id_array.each do |network_id|
-                            item = {}
-                            item["SKAdNetworkIdentifier"] = network_id
-                            info_plist_dict["SKAdNetworkItems"] << item
-                        end
-                    end
-
-                    Xcodeproj::Plist.write_to_path(info_plist_dict, plist_file_name)
-
-                    Funlog.instance.fancyinfo_success("Xcode中applovin数据修改完成！")
-                    
-                    if @args_install_flag && !xcodeproj_file_name.nil? && File.exist?(xcodeproj_file_name)
-
-                        pindo_common_dir = pindo_single_config.pindo_common_configdir
-
-                        app_lovin_script = File.join(pindo_common_dir, "AppLovinQualityServiceSetup-ios-dev.rb")
-                        if @args_appstore_flag
-                            app_lovin_script = File.join(pindo_common_dir, "AppLovinQualityServiceSetup-ios.rb")
-                        end
-
-                        project_script_file = File.join(project_root_dir, "AppLovinQualityServiceSetup-ios.rb")
-                        FileUtils.cp_r(app_lovin_script, project_script_file)
-                        command = "ruby " + project_script_file
-                        # puts command
-                        system command  
-                    end
-
-
-                end
-
-
-                def get_applovin_infoplist(project_dir:nil, proj_name:nil)
-
-                    info_plist_path = File.join(project_dir,  "AppEntry/Info.plist")
-                    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_info = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-                                info_plist_path = File.join(project_dir, temp_info)
-                            end
-                        end
-                    end
-
-                    return info_plist_path
-                end
-
-
-                def req_applovin_json
-
-                    begin
-                        # https://dash.applovin.com/docs/v1/skadnetwork_ids.json
-                        applovin_url = "https://dash.applovin.com/docs/v1/skadnetwork_ids.json"
-                        con = Faraday.new 
-                        res = con.get do |req|
-                            req.url applovin_url
-                            req.headers['Content-Type'] = 'application/json'
-                        end
-
-                        applovin_res_json = JSON.parse(res.body)
-
-                        return applovin_res_json
-                    rescue Exception => e
-                        return nil 
-                    end
-                    
-
-                    
-                end
-
-                def req_applovin_mediia_json
-
-
-                    begin
-                        applovin_url = "https://dash.applovin.com/docs/v1/mediation_sk_adnetwork_ids"
-                        con = Faraday.new 
-                        res = con.get do |req|
-                            req.url applovin_url
-                            req.headers['Content-Type'] = 'application/json'
-                        end
-
-                        applovin_res_json = JSON.parse(res.body)
-                        return applovin_res_json
-                    rescue Exception => e
-                        return nil 
-                    end
-                end
-
-            end
-        end
-    end
-end
-
-
-
-
-
-

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

@@ -1,143 +0,0 @@
-require 'highline/import'
-require 'xcodeproj'
-require 'find'  
-require 'fileutils'
-require 'pindo/base/executable'
-
-module Pindo
-    class Command
-        class Dev < Command
-            class Autoresign < Dev
-        
-                include Appselect
-
-                self.summary = '开发阶段ipa包重签名'
-    
-                self.description = <<-DESC
-                    用最新的证书重签名ipa. 用法:pindo dev autoresign, 默认使用dev证书给当前目录下面的ipa重签名。
-                    也可以加上可选参数,例如:pindo dev autoresign  ~/Desktop/mydemo.ipa  --adhoc  --deploy --upload.
-                DESC
-
-                self.arguments = [
-                    CLAide::Argument.new('path/to/demo.ipa', true),
-                ]
-
-                def self.options
-                    [
-                        ['--ipa', '指定ipa的路径，用法:pindo dev autoresign --ipa=path/to/name.ipa'],
-                        ['--adhoc', '默认用dev证书，使用--adhoc设置使用adhoc证书编译, 用法:pindo dev autoresign --adhoc'],
-                        ['--deploy', '默认用开发的bundle id，使用--deploy设置使用发布bundle id来重签名, 用法:pindo dev autoresign --deploy'],
-                        ['--proj', '指定上传到pgyer对应的项目名称(大小写空格忽略)，用法:pindo dev autoresign --proj=aichatv4'],
-                        ['--upload', '是否上传编译后的ipa, 用法:pindo dev autoresign --upload'],
-                        ['--send',  '上传到之后是否发送测试信息,用法:pindo dev autoresign --send'],
-                    ].concat(super)
-                end
-
-                
-                def initialize(argv)
-
-                    @args_ipa_file = argv.shift_argument
-                    @args_set_ipa_name = argv.option('ipa')
-                    @args_adhoc_flag = argv.flag?('adhoc', false)
-                    @args_deploy_flag = argv.flag?('deploy', 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 run
-                  
-                    ipa_file_name = @args_ipa_file
-                    if !@args_set_ipa_name.nil?
-                        ipa_file_name = @args_set_ipa_name
-                    end
-
-                    if !ipa_file_name.nil? && File.exist?(ipa_file_name)
-                    else
-                        current_dir = Dir.pwd
-                        # File.basename(f).include?("_resigned") ? Time.local(0, 0, 0)  : File.mtime(f)
-                        ipa_file_name = Dir.glob(File.join(current_dir, "/*.ipa")).max_by {|f| File.basename(f).include?("_resigned") ? Time.local(0, 1, 1)  : File.mtime(f)}
-                    end
-
-                    if !ipa_file_name.nil? && File.exist?(ipa_file_name)
-                        puts 
-                        puts "正在重签名的ipa: #{ipa_file_name}"
-                        puts "时间: #{File.mtime(ipa_file_name)}"
-                        puts
-                    else
-                        return
-                    end
-
-
-                    mainapp_bundleid = nil
-
-                    if @args_deploy_flag
-                        mainapp_bundleid = get_selected_deploy_bundleid()
-                    else
-                        mainapp_bundleid = get_selected_dev_bundleid()
-                    end
-                    puts "mainapp_bundleid: #{mainapp_bundleid}"
-
-                    args_temp = []
-                    args_temp << mainapp_bundleid
-
-                    Pindo::Command::Deploy::Pullconfig::run(args_temp)
-
-                    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 = []
-                    if @args_adhoc_flag
-                        args_temp << "--adhoc"
-                    else
-                        args_temp << "--dev"
-                    end
-
-                    if !ipa_file_name.nil?
-                        
-                        args_temp << "--ipa=#{ipa_file_name}" 
-                        Pindo::Command::Deploy::Resign::run(args_temp)   
-
-
-                        ipa_file_name = File::expand_path(ipa_file_name)
-                        ipa_base_name = File.basename(ipa_file_name, ".ipa")
-                        ipa_dir = File.dirname(ipa_file_name)
-                        ipa_file_upload =  File.join(ipa_dir, ipa_base_name + "_resigned.ipa")
-
-                        if !ipa_file_upload.nil? && !app_info_obj.nil? 
-                            description = "测试包重签名"
-                            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)
-                                if @args_send_flag
-                                    PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
-                                end
-                            end
-                        end
-
-                    end
-                    
-                    
-
-                    # 
-                end
-
-
-            end
-        end
-    end
-end
-