pindo 4.7.1 → 4.7.3

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

@@ -13,7 +13,7 @@ module Pindo
                 self.summary = '获取pgyer中指定app的测试链接和二维码'
 
                 self.description = <<-DESC
-                  获取pgyer中指定app的测试链接和二维码，终端运行：pindo pgyer apptest
+                  获取pgyer中指定app的测试链接和二维码，终端运行：pindo pgyer resign
                 DESC
 
                 self.arguments = [
@@ -23,10 +23,10 @@ module Pindo
                 def self.options
                   [
                     ['--login', '强制再次登录pgyer网站'],
-                    ['--proj', '指定哪个项目(忽略大小写空格等等字符),用法：pindo pgyer apptest  --proj=prancksoundv4'],
-                    ['--list', '列出上传记录并选择，用法：pindo pgyer apptest --list'],
-                    ['--send',  '上传到之后是否发送测试信息,用法:pindo pgyer apptest --send'],
-                    ['--bundleid',  '上传到之后是否发送测试信息,用法:pindo pgyer apptest --bundleid=xxxx'],
+                    ['--proj', '指定哪个项目(忽略大小写空格等等字符),用法：pindo pgyer resign  --proj=prancksoundv4'],
+                    ['--list', '列出上传记录并选择，用法：pindo pgyer resign --list'],
+                    ['--send',  '上传到之后是否发送测试信息,用法:pindo pgyer resign --send'],
+                    ['--certid',  '设置重签名的正式id,用法:pindo pgyer resign --resignid=com.test.bundleid'],
                   ].concat(super)
                 end
 
@@ -37,7 +37,8 @@ module Pindo
                     @args_list_flag = argv.flag?('list', false)
                     @args_send_flag = argv.flag?('send', false)
                     @args_proj_name = argv.option('proj')
-                    @args_bundle_id = argv.option('bundleid')
+
+                    @args_cert_id = argv.option('certid')
 
                     super(argv)
                     @additional_args = argv.remainder!
@@ -56,34 +57,34 @@ module Pindo
                         raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， pgyer网站没有该App"
                     end
 
-                    
+
                     version_item_obj = PgyerHelper.share_instace.get_versioon_history_item(app_info_obj:app_info_obj, list_select_flat:@args_list_flag)
 
                     if version_item_obj.nil?
                         raise Informative, "没有找到上传记录"
                     end
-                    
+
                     cert_List = PgyerHelper.share_instace.get_cert_list()
-                    
+
                     if cert_List.nil? || cert_List.empty?
                         raise Informative, "没有找到上传记录"
                     end
 
-                    if @args_bundle_id.nil? && cert_List.size > 0
+                    if @args_cert_id.nil? && cert_List.size > 0
 
                         bundle_id_list = cert_List.map { |cert| [cert["certType"],cert["mainBundleId"]].join("_") }
                         cli = HighLine.new
-                        @args_bundle_id = cli.choose do |menu|
-                            menu.prompt = "请选择Pyger上的App代号:"
+                        @args_cert_id = cli.choose do |menu|
+                            menu.prompt = "请选择重签名的证书:"
                             menu.choices(*bundle_id_list)
                         end
-                        
-                        cert_item = cert_List.select{|cert| [cert["certType"],cert["mainBundleId"]].join("_") == @args_bundle_id}.first
+
+                        cert_item = cert_List.select{|certitem| [certitem["certType"],certitem["mainBundleId"]].join("_") == @args_cert_id}.first
                     else
-                        cert_item = cert_List.select{|item| item["mainBundleId"] == @args_bundle_id}.first    
+                        cert_item = cert_List.select{|certitem| certitem["mainBundleId"] == @args_cert_id && certitem["certType"].downcase.include?("adhoc")}.first
                     end
 
-                    
+
 
                     result = PgyerHelper.share_instace.resign(version_id:version_item_obj["id"], cert_id:cert_item["id"])
 
@@ -95,12 +96,13 @@ module Pindo
                         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(msg_data:msg_data)
-                        if @args_send_flag 
-                            PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+
+                        if @args_send_flag
+                            PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data, wechat_url:app_info_obj["prodWeComUrl"])
                         end
                     end
 
-     
+
 
                 end
 

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

@@ -16,7 +16,7 @@ module Pindo
                 self.summary = '上传ipa包到pgyer测试网站'
 
                 self.description = <<-DESC
-                  上传ipa包到pgyer。用法：例如:pindo pgyer upload  path/to/demo.ipa 
+                  上传ipa包到pgyer。用法：例如:pindo pgyer upload  path/to/demo.ipa
                 DESC
 
                 self.arguments = [
@@ -31,6 +31,8 @@ module Pindo
                     ['--attach', '指定需要和ipa一起上传的附件: pindo pgyer upload --attach=path/to/attach.zip'],
                     ['--send',  '上传到之后是否发送测试信息,用法:pindo pgyer upload --send'],
                     ['--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
@@ -50,14 +52,26 @@ module Pindo
 
                     @args_login_flag = argv.flag?('login', false)
                     @args_send_flag = argv.flag?('send', false)
+                    @args_resign_flag = argv.flag?('resign', false)
+
                     @args_proj_name = argv.option('proj')
                     @args_attach_name = argv.option('attach')
                     @args_upload_desc = argv.option('desc')
+                    @args_cert_id = argv.option('certid')
+
+
+
                     if @args_upload_desc && !@args_upload_desc.empty?
                         @args_upload_desc = @args_upload_desc.strip.gsub(/\"/, '')
                     end
 
-                    
+
+                    if !@args_cert_id.nil? && !@args_cert_id.empty?
+                        @args_resign_flag = true
+                    end
+                    if @args_resign_flag
+                        @args_send_flag = true
+                    end
 
                     super(argv)
                     @additional_args = argv.remainder!
@@ -79,7 +93,7 @@ module Pindo
                             @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("需要上传的ipa文件是: #{@args_ipa_file} ?(Y/n)")
                             if !answer
                                 @args_ipa_file = nil
                             end
@@ -91,7 +105,7 @@ module Pindo
                             @args_ipa_file = @args_ipa_file.strip.gsub(/\\ /, ' ')
                         end
                     end
-                    
+
                     if !File.exist?(@args_ipa_file)
                         raise Informative, "#{@args_ipa_file} 文件不存在"
                     end
@@ -107,12 +121,26 @@ module Pindo
                     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)    
+                           if @args_resign_flag
+                                args = []
+                                args << "--send"
+                                if !@args_cert_id.nil? && !@args_cert_id.empty?
+                                    args << "--certid=#{@args_cert_id}"
+                                end
+                                if !@args_proj_name.nil? && !@args_proj_name.empty?
+                                    args << "--proj=#{@args_proj_name}"
+                                end
+                                Pindo::Command::Pgyer::Resign::run(args)
+                            else
+                                PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)
+                            end
                         end
                     end
 
-                    
+
 
 
                 end

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

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

data/lib/pindo/command/utils.rb

@@ -4,9 +4,9 @@ require 'pindo/command/utils/renewproj'
 require 'pindo/command/utils/clearcert'
 require 'pindo/command/utils/xcassets'
 require 'pindo/command/utils/device'
-require 'pindo/command/utils/applovin'
 require 'pindo/command/utils/tgate'
 require 'pindo/command/utils/boss'
+require 'pindo/command/utils/renewcert'
 
 
 module Pindo