pindo 4.7.1 → 4.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d5ed09cbd0c1dd5f1fae766fd8d97f98e786b25d34056f8065efede5f478cc0
-  data.tar.gz: b75e1716c757c7d2eabcb5c757c5ea8df886f4e1338cf984d04232a6acd180b6
+  metadata.gz: c21050abb1c90a03a0692aac01e408ff0bbce3968b89677358bec75c1e903c7e
+  data.tar.gz: '0235831d8df25e4c7227a4980339a858aa8d271f72480ac6f9afc727d1898cae'
 SHA512:
-  metadata.gz: 670591b6329e7d53bdb36156a3dcea8cac1a1477ada5f1451e22d1e457cdc0c91f34c4a5c705844902c48f259e06fec7bb7800f003e41702f20b1e8026cbd14c
-  data.tar.gz: 1327366d3216fd62a113997380b48bf66797092cb81a374557abb9d50c942278efba586751134babafa27810cad6b30eeed5d7d367eadf7071e00c5f9c081ab5
+  metadata.gz: 3b2b2a2a3e7efdcfe0882510269d7bb8b10ab49a571c15f01f5a6538f64a909fd90b91d246d100b1f9883462adec0f25ae0fda3f5c8640cba235009bd94bbbe0
+  data.tar.gz: 2fa34d8dd3cc0f7c4d0ab76354b63a5bde85307990f33cb08fa7a8fc7654a0eff88b7a2faf882325ba61431ee6b211e3fccdffcca062fe9556b2344300e1fc87

data/lib/pindo/base/aeshelper.rb

@@ -9,14 +9,13 @@ module Pindo
     def self.fetch_password(keychain_name:nil)
       # password = ENV["MATCH_PASSWORD"]
 
-      server_name = ["pindo", keychain_name].join("_")
+      server_name = ["match", keychain_name].join("_")
 
       item = Security::InternetPassword.find(server: server_name)
 
       password = item.password if item
 
       unless password
-
           password = FastlaneCore::Helper.ask_password(message: "请输入证书仓库的加密密码: ", confirm: true)
           Security::InternetPassword.add(server_name, "", password)     
       end
@@ -24,12 +23,12 @@ module Pindo
     end
 
     def self.delete_password(keychain_name:nil)
-      server_name = ["pindo", keychain_name].join("_")
-      Security::InternetPassword.delete(server_name)
+      server_name = ["match", keychain_name].join("_")
+      Security::InternetPassword.delete(server:server_name)
     end
 
     def self.store_password(keychain_name:nil, password:nil)
-      server_name = ["pindo", keychain_name].join("_")
+      server_name = ["match", keychain_name].join("_")
       Security::InternetPassword.add(server_name, "", password)
     end
 

data/lib/pindo/base/githelper.rb

@@ -24,7 +24,6 @@ module Pindo
           current=Dir.pwd
           result = false
 
-          puts local_branch_exists?(local_repo_dir: local_repo_dir, branch: branch)
           if !local_branch_exists?(local_repo_dir: local_repo_dir, branch: branch)
             git!(%W(-C #{local_repo_dir} checkout -b #{branch}))
             result = true

data/lib/pindo/client/aws3sclient.rb

@@ -150,11 +150,11 @@ module Pindo
       def set_progress(index_num, total_num,  char ='>' )
           progress_str = sprintf("%.2f", 100.0 * index_num / total_num )
           total_size = sprintf("%.2f", 1.00 * total_num / 1024 /1024 ) 
-          index = 100.0 * index_num / total_num
+          index = 40.0 * index_num / total_num
 
           # (char * (index/1).floor).ljust(100, ' ')
 
-          upload_message = "已上传:#{progress_str}\%【" + (char * (index/1).floor).ljust(100, '_') +  "】Total: #{total_size} M"
+          upload_message = "已上传:#{progress_str}\%【" + (char * (index/1).floor).ljust(40.0, '_') +  "】Total: #{total_size} M"
           @upload_message = upload_message
           Funlog.instance.fancyinfo_update(upload_message)
           # @spinner.reset

data/lib/pindo/client/giteeclient.rb

@@ -39,7 +39,7 @@ module Pindo
             body_str = body_params.to_json
             url = @base_url + "/api/v5/orgs/#{owner}/repos"
             
-            puts body_str
+            # puts body_str
 
             con = Faraday.new 
             res = con.post do |req|
@@ -48,7 +48,7 @@ module Pindo
                 req.body =  body_str
             end
 
-            puts res.body
+            # puts res.body
 
             # puts res.body
             if  res.body['error'].nil?

data/lib/pindo/command/appstore/iap.rb

@@ -21,7 +21,7 @@ module Pindo
 
                 def self.options
                     [
-                        ['--download', '下载app的所有购买项,用法:pindo ipa output --download'],
+                        ['--download', '下载app的所有购买项,用法:pindo appstore iap --download'],
                     ].concat(super)
                 end
 

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

@@ -17,16 +17,54 @@ module Pindo
                 DESC
 
                 self.arguments = [
-                    
                 ]
 
+
+                def self.options
+                    [
+                        ['--proj', '指定上传到pgyer对应的项目名称(大小写空格忽略)，用法:pindo deploy build --proj=aichatv4'],
+                        ['--upload', '是否上传编译后的ipa, 用法:pindo deploy build --upload'],
+                        ['--send',  '上传到之后是否发送测试信息,用法:pindo deploy build --send'],
+                        ['--resign',  '上传到之后是否重签名,用法:pindo deploy build --resign'],
+                        ['--certid',  '设置重签名的正式id,用法:pindo deploy build --certid=com.test.bundleid'],
+
+
+                    ].concat(super)
+                end
+
                 def initialize(argv)
-                  super
-                  @additional_args = argv.remainder!
+
+                    @args_upload_flag = argv.flag?('upload', false)
+                    @args_send_flag = argv.flag?('send', false)
+                    @args_resign_flag = argv.flag?('resign', false)
+
+                    @args_proj_name = argv.option('proj')
+                    @args_cert_id = argv.option('certid')
+
+                    if !@args_cert_id.nil? && !@args_cert_id.empty?
+                        @args_resign_flag = true
+                    end
+                    if @args_resign_flag
+                        @args_send_flag = true
+                    end
+
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
+                    super
+                    @additional_args = argv.remainder!
+
                 end
 
                 def run
 
+                    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
+
                     new_project_dir = Dir.pwd
                     project_fullname = Dir.glob(File.join(new_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
 
@@ -34,13 +72,41 @@ module Pindo
                         FileUtils.rm_rf(File.join(new_project_dir, "build"))
                     end
 
-
                     gym_options = get_gym_build_values(project_fullname:project_fullname)
 
                     config = FastlaneCore::Configuration.create(Gym::Options.available_options, gym_options)
                     Gym::Manager.new.work(config)
 
 
+
+                    pindo_new_project_dir = Dir.pwd
+                    build_path = File.join(pindo_new_project_dir, "build", "*.ipa")
+                    ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+
+                    if !ipa_file_upload.nil? && !app_info_obj.nil?
+                        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)
+                            if @args_send_flag
+                                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
                 end
 
 

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

@@ -60,7 +60,7 @@ module Pindo
             end
 
             def run
-
+              
                 if @clean_flag
                   puts "Clear cert at local ..."
                   Pindo::Command::Utils::Clearcert::run([])
@@ -98,6 +98,7 @@ module Pindo
 
                   install_certs(cert_url:cert_git_url, certs_dir:certs_dir, cert_type:@build_type)
                   bundle_id_map = get_bundle_id_map
+
                   provisioning_info_array = install_provisionfiles(cert_url:cert_git_url, certs_dir:certs_dir, bundle_id_map:bundle_id_map, cert_type:@build_type)
                   pindo_single_config.set_cert_info(dict: provisioning_info_array)
                 end
@@ -112,16 +113,6 @@ module Pindo
                 #发布机需要给swark注册bundle id
                 add_swark_authorize_json
 
-                if @args_adhoc_flag || @args_appstore_flag
-                  cert_type = "Development".downcase
-                  if @args_adhoc_flag
-                    cert_type = "Adhoc".downcase
-                  end
-                  if @upload_flag
-                    create_upload_cert_info(apple_id:@apple_id, cert_type:cert_type, provisioning_info_array:provisioning_info_array)
-                  end
-                end
-
                 new_project_dir = Dir.pwd
                 new_project_fullname = Dir.glob(File.join(new_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
                 if !new_project_fullname.nil? && File.exist?(new_project_fullname) && !provisioning_info_array.nil? && provisioning_info_array.size > 0
@@ -131,53 +122,59 @@ module Pindo
                   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
-              end
-        end
 
-        def get_create_cert_match_values(apple_id:nil, bundle_id_array:nil, build_type:nil, renew_flag:false)
+                if @upload_flag
+                  create_upload_cert_info(apple_id:@apple_id, cert_type:@build_type)
+                  create_upload_provisioning_info(apple_id:@apple_id, cert_type:@build_type, provisioning_info_array:provisioning_info_array)
+                end
+            end
 
-          if build_type.eql?("appstore") && (apple_id.eql?(pindo_single_config.demo_apple_id))
-            raise Informative, "#{apple_id} 是测试账号，不能创建appstore证书!!!"
-          end
-          if !build_type.eql?("appstore") && !apple_id.eql?(pindo_single_config.demo_apple_id)
-            raise Informative, "账号#{apple_id} 不能创建dev或者adhoc证书!!!"
-          end
+          def get_create_cert_match_values(apple_id:nil, bundle_id_array:nil, build_type:nil, renew_flag:false)
 
-          git_url = pindo_single_config.deploy_cert_giturl
-          if @apple_id.eql?(pindo_single_config.demo_apple_id)
-            git_url = pindo_single_config.dev_cert_giturl
-          end
+            if build_type.eql?("appstore") && (apple_id.eql?(pindo_single_config.demo_apple_id))
+              raise Informative, "#{apple_id} 是测试账号，不能创建appstore证书!!!"
+            end
+            if !build_type.eql?("appstore") && !apple_id.eql?(pindo_single_config.demo_apple_id)
+              raise Informative, "账号#{apple_id} 不能创建dev或者adhoc证书!!!"
+            end
 
-          force_for_new_devices_flag = true
-          if build_type.eql?("appstore")
-            force_for_new_devices_flag = false
-          end
+            git_url = pindo_single_config.deploy_cert_giturl
+            if @apple_id.eql?(pindo_single_config.demo_apple_id)
+              git_url = pindo_single_config.dev_cert_giturl
+            end
 
-          platform_type = "ios"
-          if @config_json && @config_json['project_info'] && @config_json['project_info']['build_type'].include?("MacOS")
-            platform_type = "macos"
-          end
+            force_for_new_devices_flag = true
+            if build_type.eql?("appstore")
+              force_for_new_devices_flag = false
+            end
+
+            platform_type = "ios"
+            if @config_json && @config_json['project_info'] && @config_json['project_info']['build_type'].include?("MacOS")
+              platform_type = "macos"
+            end
 
-          values = {
-            username:apple_id,
-            app_identifier: bundle_id_array,
-            type: build_type,
-            keychain_password:"goodcert1",
-            git_url: git_url,
-            readonly:!renew_flag,
-            force:renew_flag,
-            clone_branch_directly:!renew_flag,
-            include_mac_in_profiles:true,
-            include_all_certificates:true,
-            generate_apple_certs:true,
-            shallow_clone:!renew_flag,
-            git_branch: apple_id,
-            platform:platform_type,
-            force_for_new_devices:force_for_new_devices_flag
-          }
-          return values
-        end
+            values = {
+              username:apple_id,
+              app_identifier: bundle_id_array,
+              type: build_type,
+              keychain_password:"goodcert1",
+              git_url: git_url,
+              readonly:!renew_flag,
+              force:renew_flag,
+              clone_branch_directly:!renew_flag,
+              include_mac_in_profiles:true,
+              include_all_certificates:true,
+              generate_apple_certs:true,
+              shallow_clone:!renew_flag,
+              git_branch: apple_id,
+              platform:platform_type,
+              force_for_new_devices:force_for_new_devices_flag
+            }
+            return values
+
+          end
 
+      end
     end
   end
 end

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

@@ -548,9 +548,8 @@ module Pindo
                         end
 
                         new_iap_items["in_app_purchase_type"] = in_app_purchase_type
-                        new_iap_items["available_in_all_territories"] = true
                         new_iap_items["price"] = purchase_item["price"].to_s.strip
-                        new_iap_items["price_tier"] = iap_consumable_tier_dict[new_iap_items["price"]]
+                        new_iap_items["price_tier"] = iap_consumable_tier_dict[new_iap_items["price"].to_s]
 
                         if new_iap_items["price_tier"].nil?
                           raise "购买项价格错误 " + new_iap_items["product_id"] + " 价格 :" + purchase_item["price"]
@@ -569,7 +568,7 @@ module Pindo
                         new_iap_items["localization"]["en-US"]["description"] = purchase_item["description"].to_s.strip
                         if !new_iap_items["localization"]["en-US"]["description"].nil? && new_iap_items["localization"]["en-US"]["description"].length > 45
                             puts temp_product_id
-                            raise Informative, "description 超出限定的45个字符 !!!"
+                            raise Informative, "purchuse description 超出限定的45个字符 !!!"
                         end
 
                         new_iap_items["review_note"] = "username: " + iap_tester["email"] + "      password: " + iap_tester["password"]
@@ -651,7 +650,6 @@ module Pindo
                           raise Informative, "product_id 超出限定的100个字符 !!!"
                       end
 
-                      new_subs_item["available_in_all_territories"] = true
                       new_subs_item["family_sharable"] = false
                       new_subs_item["price"] = subs_item["price"].to_s.strip
                       new_subs_item["subscription_duration"] = subscription_duration_dict[subs_item["subscription_duration"]]

data/lib/pindo/command/{utils → dev}/applovin.rb

@@ -8,8 +8,8 @@ require 'xcodeproj'
 
 module Pindo
     class Command
-        class Utils < Command
-            class Applovin < Utils
+        class Dev < Command
+            class Applovin < Dev
         
                 self.summary = '接入applovin max广告平台时更新Xcode中info.plist'
   

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

@@ -23,11 +23,11 @@ module Pindo
 
                 def self.options
                     [
-                        ['--deploy', '默认用开发的bundle id，用法:pindo ipa autobuild --deploy'],
-                        ['--adhoc', '默认用dev证书，使用--adhoc设置使用adhoc证书编译, 用法:pindo ipa autobuild  --adhoc'],
-                        ['--proj', '指定上传到pgyer对应的项目名称(大小写空格忽略)，用法:pindo ipa autobuild --proj=aichatv4'],
-                        ['--upload', '是否上传编译后的ipa, 用法:pindo ipa autobuild --upload'],
-                        ['--send',  '上传到之后是否发送测试信息,用法:pindo ipa autobuild --send'],
+                        ['--deploy', '默认用开发的bundle id，用法:pindo dev autobuild --deploy'],
+                        ['--adhoc', '默认用dev证书，使用--adhoc设置使用adhoc证书编译, 用法:pindo dev autobuild  --adhoc'],
+                        ['--proj', '指定上传到pgyer对应的项目名称(大小写空格忽略)，用法:pindo dev autobuild --proj=aichatv4'],
+                        ['--upload', '是否上传编译后的ipa, 用法:pindo dev autobuild --upload'],
+                        ['--send',  '上传到之后是否发送测试信息,用法:pindo dev autobuild --send'],
                     ].concat(super)
                 end
 
@@ -129,10 +129,7 @@ module Pindo
                             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
-                                unless !description.nil? && description.length > 10
-                                    description = nil
-                                end
+                                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)

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

@@ -24,12 +24,12 @@ module Pindo
 
                 def self.options
                     [
-                        ['--ipa', '指定ipa的路径，用法:pindo ipa autoresign --ipa=path/to/name.ipa'],
-                        ['--adhoc', '默认用dev证书，使用--adhoc设置使用adhoc证书编译, 用法:pindo ipa autoresign --adhoc'],
-                        ['--deploy', '默认用开发的bundle id，使用--deploy设置使用发布bundle id来重签名, 用法:pindo ipa autoresign --deploy'],
-                        ['--proj', '指定上传到pgyer对应的项目名称(大小写空格忽略)，用法:pindo ipa autoresign --proj=aichatv4'],
-                        ['--upload', '是否上传编译后的ipa, 用法:pindo ipa autoresign --upload'],
-                        ['--send',  '上传到之后是否发送测试信息,用法:pindo ipa autobuild --send'],
+                        ['--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
 
@@ -92,12 +92,12 @@ module Pindo
 
                     Pindo::Command::Deploy::Pullconfig::run(args_temp)
 
-                    proj_name = nil
-                    if @args_upload_flag || @args_send_flag
+                    app_info_obj = nil
+                    if @args_upload_flag 
                         proj_name = @args_proj_name
-                        proj_name = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name: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"

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

@@ -23,9 +23,9 @@ module Pindo
 
                 def self.options
                     [
-                        ['--proj', '指定上传到pgyer对应的项目名称(大小写空格忽略)，用法:pindo ipa autobuild --proj=aichatv4'],
-                        ['--upload', '是否上传编译后的ipa, 用法:pindo ipa autobuild --upload'],
-                        ['--send',  '上传到之后是否发送测试信息,用法:pindo ipa autobuild --send'],
+                        ['--proj', '指定上传到pgyer对应的项目名称(大小写空格忽略)，用法:pindo dev build --proj=aichatv4'],
+                        ['--upload', '是否上传编译后的ipa, 用法:pindo dev build --upload'],
+                        ['--send',  '上传到之后是否发送测试信息,用法:pindo dev build --send'],
                     ].concat(super)
                 end
 
@@ -39,6 +39,7 @@ module Pindo
                         @args_upload_flag = true
                     end
 
+
                     super
                     @additional_args = argv.remainder!
                 end
@@ -67,7 +68,7 @@ module Pindo
                             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
+                                description = git!(%W(-C #{pindo_new_project_dir} show -s --format=%h::%s)).strip
                                 unless !description.nil? && description.length > 10
                                     description = nil
                                 end
@@ -83,7 +84,6 @@ module Pindo
                         end
                     end
 
-                    system "open #{project_dir}"
 
                 end
 

data/lib/pindo/command/dev.rb

@@ -1,17 +1,13 @@
 # require 'pindo/command/dev/create'
 
 
-# require 'pindo/command/dev/confuseproj'
-# require 'pindo/command/dev/confusecode'
-# require 'pindo/command/dev/cert'
 require 'pindo/command/dev/pub'
 require 'pindo/command/dev/debug'
 require 'pindo/command/dev/autoresign'
 require 'pindo/command/dev/autobuild'
 require 'pindo/command/dev/build'
-# require 'pindo/command/dev/renewcert'
-# require 'pindo/command/dev/pgyercert'
-# require 'pindo/command/dev/createbuild'
+require 'pindo/command/dev/applovin'
+
 
 module Pindo
     class Command

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

@@ -23,7 +23,6 @@ module Pindo
 
                 def self.options
                     [
-
                         ['--ipa', 'iap file name.'],
                         ['--proj', '指定哪个项目(忽略大小写空格等等字符): --proj=\"prancksoundv4\"'],
                         ['--upload', '编译完成后是否上传ipa到pyger: --upload'],

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

@@ -13,9 +13,9 @@ module Pindo
             class Import < Ipa
 
                 include Command::DeployOptions
-
                 include Pindo::XcodeAppConfig
                 include XcodeBuildHelper
+                include Appselect
 
                 self.summary = '提交时设置Xcode工程编译参数'
 
@@ -29,10 +29,13 @@ module Pindo
 
                 def self.options
                     [
-                        ['--proj', '指定哪个项目(忽略大小写空格等等字符): --proj=\"prancksoundv4\"'],
-                        ['--upload', '编译完成后是否上传ipa到pyger: 用法:pindo ipa import --upload'],
                         ['--build', '修改完工程之后直接编译，用法：pindo ipa import --build'],
                         ['--increase', '自动增加编译的app版本号，用法:pindo ipa import --increase'],
+                        ['--proj', '指定哪个项目(忽略大小写空格等等字符): --proj=\"prancksoundv4\"'],
+                        ['--upload', '编译完成后是否上传ipa到pyger: 用法:pindo ipa import --upload'],
+                        ['--send',  '上传到之后是否发送测试信息,用法:pindo ipa import --send'],
+                        ['--resign',  '上传到之后是否发送测试信息,用法:pindo ipa import --resign'],
+
 
                     ].concat(super)
                 end
@@ -41,6 +44,20 @@ module Pindo
                     @build_flag = argv.flag?('build', false)
                     @args_increase_flag = argv.flag?('increase', false)
 
+                    @args_upload_flag = argv.flag?('upload', false)
+                    @args_send_flag = argv.flag?('send', false)
+                    @args_resign_flag = argv.flag?('resign', false)
+                    @args_proj_name = argv.option('proj')
+
+                    if @args_resign_flag
+                        @args_send_flag = true
+                    end
+
+                    if @args_send_flag
+                        @args_upload_flag = true
+                        @build_flag = true
+                    end
+
                     super
                 end
 
@@ -91,9 +108,9 @@ module Pindo
                     pindo_new_project_dir = Dir.pwd
 
                     if @args_increase_flag
-                        auto_increase_buildnumber(File.join(pindo_new_project_dir, "config.json"))
+                        auto_increase_buildnumber(app_config_file:File.join(pindo_new_project_dir, "config.json"))
                         app_config_repo_dir = File.join(pindo_single_config.pindo_dir, @deploy_identifier)
-                        auto_increase_buildnumber(File.join(app_config_repo_dir, "config.json"))
+                        auto_increase_buildnumber(app_config_file:File.join(app_config_repo_dir, "config.json"))
                         git_addpush_repo(path:app_config_repo_dir, message:"increate build number", commit_file_params:["config.json"])
                     end
 
@@ -182,16 +199,35 @@ module Pindo
                         applovin_args = []
                         applovin_args << "--appstore"
                         applovin_args << "--install"
-                        Pindo::Command::Utils::Applovin::run(applovin_args)
+                        Pindo::Command::Dev::Applovin::run(applovin_args)
                     end
 
-
                     if @build_flag
                         Dir.chdir(pindo_new_project_dir)
+                        if @args_upload_flag
+                            args_temp << "--upload"
+                            args_temp << "--proj=#{@args_proj_name}"
+                        end
+                        if @args_send_flag
+                            args_temp << "--send"
+                        end
+
+                        if @args_resign_flag
+                            args_temp << "--resign"
+                            if  @config_json && @config_json['project_info'] && @config_json['project_info']['app_type']
+                                output_repo_name = get_deploy_repo_with_modul_name(module_name:@config_json['project_info']['app_type'])
+                                if output_repo_name.nil? || output_repo_name == ""
+                                    raise Informative, "config.json app_type is error!!!"
+                                end
+                                output_config_dir = clong_buildconfig_repo(repo_name: output_repo_name)
+                                args_bundle_id = get_setting_bundleid_withdir(repo_dir:output_config_dir)
+                                args_temp << "--certid=#{args_bundle_id}"
+                            end
+                        end
+
                         Pindo::Command::Deploy::Build::run(args_temp)
                     end
 
-
                     Dir.chdir(current_dir)
                     puts "Buiid Done !!!"
                     puts "#{pindo_new_project_dir}"

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

@@ -72,9 +72,9 @@ module Pindo
                     end
 
                     if @args_increase_flag
-                        auto_increase_buildnumber(File.join(Dir.pwd, "config.json"))
+                        auto_increase_buildnumber(app_config_file:File.join(Dir.pwd, "config.json"))
                         app_config_repo_dir = File.join(pindo_single_config.pindo_dir, @deploy_identifier)
-                        auto_increase_buildnumber(File.join(app_config_repo_dir, "config.json"))
+                        auto_increase_buildnumber(app_config_file:File.join(app_config_repo_dir, "config.json"))
                         git_addpush_repo(path:app_config_repo_dir, message:"increate build number", commit_file_params:["config.json"])
                     end
 

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

@@ -91,8 +91,8 @@ module Pindo
 
                       progress_str = sprintf("%.2f", 100.0 * index_num / total_num )
                       total_size = sprintf("%.2f", 1.00 * total_num / 1024 /1024 ) 
-                      index = 100.0 * index_num / total_num
-                      download_message = "已下载:#{progress_str}\%【" + (char_in * (index/1).floor).ljust(100, char_out) +  "】Total: #{total_size} M"
+                      index = 40.0 * index_num / total_num
+                      download_message = "已下载:#{progress_str}\%【" + (char_in * (index/1).floor).ljust(40.0, char_out) +  "】Total: #{total_size} M"
                       Funlog.instance.fancyinfo_update(download_message)
 
                     }) do |file|