pindo 4.6.9 → 4.7.1

data/lib/pindo/{deploy → command/deploy}/itcinfo.rb

@@ -13,7 +13,7 @@ module Pindo
 
                 include Command::DeployOptions
 
-                include Xcodebuildpre
+                include XcodeCertHelper
                 include AppstoreMetadataConnectApiHelper
 
 
@@ -69,8 +69,8 @@ module Pindo
                     end
 
                     if @upload_screenshots_flag
+                        ENV["FASTLANE_ENABLE_BETA_DELIVER_SYNC_SCREENSHOTS"] = "YES"
                         app_screenshots_dir = File.join(@app_config_dir,  "fastlane/screenshots")
-
                         fastlane_process_screenshots(app_screenshots_dir:app_screenshots_dir)
 
                         fastlane_login(apple_id:@apple_id)
@@ -80,7 +80,6 @@ module Pindo
                     if @upload_ipa_flag
                         # prepare_screenshots(project_dir:current_project_dir, apple_id:@apple_id, bundle_id:@bundle_id, config_json:@config_json)
                         command = "fastlane uploadipa"
-                        puts "Upload Ipa ..."
                         system command
                     end
 

data/lib/pindo/{deploy → command/deploy}/pem.rb

@@ -1,13 +1,14 @@
 require 'fileutils'
 
+
 module Pindo
     class Command
       class Deploy < Command
         class Pem < Deploy
           
-
+          require 'pindo/module/cert/pemhelper'
           include Command::DeployOptions
-          include Pemcreate
+          include PemHelper
 
           self.summary = '创建App的push证书'
   

data/lib/pindo/{deploy → command/deploy}/resign.rb

@@ -38,17 +38,7 @@ module Pindo
                 def initialize(argv)
                     
                     @ipa_file_name = argv.option('ipa')
-                    super 
-                    
-
-                    @build_type = "appstore"
-                    if  @args_adhoc_flag
-                      @build_type = "adhoc"
-                    end
-                    if  @args_dev_flag
-                      @build_type = "development"
-                    end
-
+                    super(argv)
                 end
 
                 def run
@@ -252,18 +242,18 @@ module Pindo
 
                 def sign_ipa_with_new_cert(ipa_name: nil)
 
-                    bundle_id_dict = pindo_single_config.get_cert_info
-                    bundle_id_signing_identity = bundle_id_dict["bundle_id_cert_common_name"]
-                    puts "bundle_id_signing_identity : #{bundle_id_signing_identity}"
+                    profil_info_array = pindo_single_config.get_cert_info
+                    bundle_id_signing_identity = profil_info_array.first['signing_identity']
+                    # puts "bundle_id_signing_identity : #{bundle_id_signing_identity}"
 
-                    profile_dict = resign_profile_dict()
+                    profile_dict = resign_profile_dict(profil_info_array: profil_info_array)
+
+                    # puts 
+                    # puts "profile_dict :"
+                    # puts
+                    # puts profile_dict
 
-                    puts 
-                    puts "profile_dict :"
-                    puts
-                    puts profile_dict
 
-                
                     # resign(ipa, signing_identity, provisioning_profiles, entitlements, ççç, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path)
 
                     Sigh::Resign.resign(ipa_name, bundle_id_signing_identity, profile_dict, nil, nil, nil, nil, nil, @bundle_id, true, nil)
@@ -281,51 +271,12 @@ module Pindo
                     end
                 end
 
-                def resign_profile_dict
-
-                    bundle_id_dict = pindo_single_config.get_cert_info
-
-                    resign_dict = {}
-                    resign_dict[@bundle_id] = bundle_id_dict['bundle_id']['bundle_id_profile_path']
-
-                    if @bundle_id_pushcontent then
-                        resign_dict[@bundle_id_pushcontent] = bundle_id_dict['bundle_id_pushcontent']['bundle_id_pushcontent_profile_path']
-                    end
+                def resign_profile_dict(profil_info_array: nil)
                     
-                    if @bundle_id_pushservice then
-                        resign_dict[@bundle_id_pushservice] = bundle_id_dict['bundle_id_pushservice']['bundle_id_pushservice_profile_path']
-                    end
-
-                    if @bundle_id_keyboard then
-                        resign_dict[@bundle_id_keyboard] = bundle_id_dict['bundle_id_keyboard']['bundle_id_keyboard_profile_path']
-                    end
-
-                    if @bundle_id_imessage then
-                        resign_dict[@bundle_id_imessage] = bundle_id_dict['bundle_id_imessage']['bundle_id_imessage_profile_path']
-                    end
-
-                    if @bundle_id_siri then
-                        resign_dict[@bundle_id_siri] = bundle_id_dict['bundle_id_siri']['bundle_id_siri_profile_path']
-                    end
-
-                    if @bundle_id_siriui then
-                        resign_dict[@bundle_id_siriui] = bundle_id_dict['bundle_id_siriui']['bundle_id_siriui_profile_path']
-                    end
 
-                    if @bundle_id_widget then
-                        resign_dict[@bundle_id_widget] = bundle_id_dict['bundle_id_widget']['bundle_id_widget_profile_path']
-                    end
-
-                    if @bundle_id_extension then
-                        resign_dict[@bundle_id_extension] = bundle_id_dict['bundle_id_extension']['bundle_id_extension_profile_path']
-                    end
-
-                    if @bundle_id_extensionad then
-                        resign_dict[@bundle_id_extensionad] = bundle_id_dict['bundle_id_extensionad']['bundle_id_extensionad_profile_path']
-                    end
-
-                    if @bundle_id_extensionpron then
-                        resign_dict[@bundle_id_extensionpron] = bundle_id_dict['bundle_id_extensionpron']['bundle_id_extensionpron_profile_path']
+                    resign_dict = {}
+                    profil_info_array.each do |profil_info|
+                        resign_dict[profil_info["bundle_id"]] = profil_info["profile_path"]
                     end
 
                     return resign_dict

data/lib/pindo/command/deploy.rb

@@ -0,0 +1,44 @@
+
+
+
+require 'pindo/command/deploy/updateconfig'
+require 'pindo/command/deploy/initconfig'
+require 'pindo/command/deploy/pullconfig'
+require 'pindo/command/deploy/reportbug'
+
+require 'pindo/command/deploy/bundleid'
+require 'pindo/command/deploy/itcapp'
+require 'pindo/command/deploy/cert'
+require 'pindo/command/deploy/pem'
+require 'pindo/command/deploy/build'
+
+require 'pindo/command/deploy/configproj'
+require 'pindo/command/deploy/confusecode'
+require 'pindo/command/deploy/confuseproj'
+require 'pindo/command/deploy/fabric'
+require 'pindo/command/deploy/resign'
+require 'pindo/command/deploy/iap'
+require 'pindo/command/deploy/itcinfo'
+require 'pindo/command/deploy/getitcinfo'
+require 'pindo/command/deploy/quswark'
+require 'pindo/command/deploy/quswauth'
+require 'pindo/command/deploy/check'
+require 'pindo/command/deploy/tag'
+
+# require 'pindo/command/deploy/uploadipa'
+
+module Pindo
+  class Command
+
+
+    class Deploy < Command
+      
+
+        self.abstract_command = true
+        self.summary = '发布阶段相关命令'  
+
+
+
+    end
+  end
+end

data/lib/pindo/{dev → command/dev}/autobuild.rb

@@ -39,6 +39,10 @@ module Pindo
                     @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
@@ -57,7 +61,11 @@ module Pindo
                         mainapp_bundleid = get_selected_dev_bundleid()
                     end
 
-                    prepare_for_upload()
+                    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
@@ -68,12 +76,11 @@ module Pindo
                     config_json_file = File.join(project_dir,"config.json")
                     Debug::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::Utils::Podindex::run([])
+                        Pindo::Command::Lib::Update::run([])
 
                         begin
                             if File.exist?(File.join(project_dir, "Podfile.lock"))
@@ -112,91 +119,36 @@ module Pindo
                     Dir.chdir(project_dir)
                     Pindo::Command::Deploy::Build::run(args_temp)
 
-                    puts "Buiid Done !!!"
-                    system "open #{project_dir}"
-
-
-                    build_path = File.join(project_dir, "build", "*.ipa")
+                    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? && !@args_proj_name.nil?
-
+                    if !ipa_file_upload.nil? && !app_info_obj.nil? 
                         description = nil
-                        if File.exist?(File.join(project_dir, ".release_info"))
-                           description = File.read(File.join(project_dir, ".release_info"))
-                        end
-                        if description.nil?
-                            commit_id_info = git_latest_commit_id(local_repo_dir:project_dir)
-                            description = "commit " + commit_id_info
-                        end
-                        start_upload(pgyer_proj_name:@args_proj_name, ipa_file_upload:ipa_file_upload, description:description, args_send_flag:@args_send_flag)
-                    end
-
-                end
-
-                def prepare_for_upload
-
-                    if @args_upload_flag 
-                        if @args_proj_name.nil?
-                            xcodeproj_file_name = Dir.glob(File.join(Dir.pwd, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-                            proj_name = File.basename(xcodeproj_file_name, ".xcodeproj") if xcodeproj_file_name
-                            if !proj_name.nil?
-                                puts 
-                                answer = agree("Pgyer的App项目代号是: #{proj_name} ?(Y/n)") 
-                                if answer
-                                    @args_proj_name = proj_name    
+                        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
+                                unless !description.nil? && description.length > 10
+                                    description = nil
                                 end
                             end
                         end
-                        
-                        @pgyer_client = PgyerClient.new
-                        app_info_obj = nil
-                        login_success = @pgyer_client.do_login(force_login:@args_login_flag)
-                        if login_success
-                            PgyerHelper.share_instace.get_app_list_in_pgyer(client:@pgyer_client)
-                            if !@args_proj_name.nil?
-                                app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:@args_proj_name)
+                        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
-
-                            if app_info_obj.nil?
-                                proj_name = ask('请输入Pyger上的App代号(大小写空格忽略):') || nil
-                                @args_proj_name = proj_name
-                                app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:@args_proj_name)
-                            end
-                        end
-
-                        if app_info_obj.nil?
-                            raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， pgyer网站没有该App"
                         end
-
                     end
+                    
+                    system "open #{project_dir}"
 
                 end
 
-                def start_upload(pgyer_proj_name:nil, ipa_file_upload:nil, description:nil, args_send_flag:true)
-
-                    if !pgyer_proj_name.nil? && !ipa_file_upload.nil?
-
-
-                        args_temp = []
-                        pgyer_proj_name = pgyer_proj_name.strip.gsub(/ /, '')
-                        args_temp << "--proj=#{pgyer_proj_name}"
-                        args_temp << "--ipa=\"#{ipa_file_upload}\""
-
-                        if args_send_flag
-                            args_temp << "--send"
-                        end
-
-                        if !description.nil?
-                            args_temp << "--desc=\"#{description}\""
-                        end
-
-                        puts args_temp
-                        Pindo::Command::Pgyer::Upload::run(args_temp)  
-                    end
-                end
-
             end
         end
     end

data/lib/pindo/{dev → command/dev}/autoresign.rb

@@ -45,6 +45,10 @@ module Pindo
                     @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
@@ -88,7 +92,11 @@ module Pindo
 
                     Pindo::Command::Deploy::Pullconfig::run(args_temp)
 
-                    prepare_for_upload()
+                    proj_name = nil
+                    if @args_upload_flag || @args_send_flag
+                        proj_name = @args_proj_name
+                        proj_name = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+                    end
 
                     args_temp = []
                     if @args_adhoc_flag
@@ -106,10 +114,18 @@ module Pindo
                         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)
-                        resign_ipa_name =  File.join(ipa_dir, ipa_base_name + "_resigned.ipa")
-
-                        if File.exist?(resign_ipa_name) && (@args_upload_flag || !@args_proj_name.nil?)
-                            start_upload(pgyer_proj_name:@args_proj_name, ipa_file_upload:resign_ipa_name, description:nil, args_send_flag:@args_send_flag)
+                        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
@@ -119,65 +135,6 @@ module Pindo
                     # 
                 end
 
-                def prepare_for_upload
-
-                   if @args_upload_flag 
-                        if @args_proj_name.nil?
-                            xcodeproj_file_name = Dir.glob(File.join(Dir.pwd, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-                            proj_name = File.basename(xcodeproj_file_name, ".xcodeproj") if xcodeproj_file_name
-                            if !proj_name.nil?
-                                puts 
-                                answer = agree("Pgyer的App项目代号是: #{proj_name} ?(Y/n)") 
-                                if answer
-                                    @args_proj_name = proj_name    
-                                end
-                            end
-                        end
-
-                        @pgyer_client = PgyerClient.new
-                        app_info_obj = nil
-                        login_success = @pgyer_client.do_login(force_login:@args_login_flag)
-                        if login_success
-                            PgyerHelper.share_instace.get_app_list_in_pgyer(client:@pgyer_client)
-                            if !@args_proj_name.nil?
-                                app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:@args_proj_name)
-                            end
-
-                            if app_info_obj.nil?
-                                proj_name = ask('请输入Pyger上的App代号(大小写空格忽略):') || nil
-                                @args_proj_name = proj_name
-                                app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:@args_proj_name)
-                            end
-                        end
-
-                        if app_info_obj.nil?
-                            raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， pgyer网站没有该App"
-                        end
-                    end
-
-                end
-
-                def start_upload(pgyer_proj_name:nil, ipa_file_upload:nil, description:nil, args_send_flag:true)
-
-                    if !pgyer_proj_name.nil? && !ipa_file_upload.nil?
-
-                        args_temp = []
-                        pgyer_proj_name = pgyer_proj_name.strip.gsub(/ /, '')
-                        args_temp << "--proj=#{pgyer_proj_name}"
-                        args_temp << "--ipa=\"#{ipa_file_upload}\""
-
-                        if args_send_flag
-                            args_temp << "--send"
-                        end
-
-                        if !description.nil?
-                            args_temp << "--desc=\"#{description}\""
-                        end
-
-                        puts args_temp
-                        Pindo::Command::Pgyer::Upload::run(args_temp)  
-                    end
-                end
 
             end
         end

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

@@ -0,0 +1,94 @@
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require 'xcodeproj'
+require 'gym'
+
+module Pindo
+    class Command
+        class Dev < Command
+            class Build < Dev
+
+
+                self.summary = '编译工程,并支持上传ipa到测试网站'
+
+                self.description = <<-DESC
+                    编译工程. 用法：在工程目录下执行 pindo dev build --upload
+                DESC
+
+                self.arguments = [
+
+                ]
+
+
+                def self.options
+                    [
+                        ['--proj', '指定上传到pgyer对应的项目名称(大小写空格忽略)，用法:pindo ipa autobuild --proj=aichatv4'],
+                        ['--upload', '是否上传编译后的ipa, 用法:pindo ipa autobuild --upload'],
+                        ['--send',  '上传到之后是否发送测试信息,用法:pindo ipa autobuild --send'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    @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
+
+                    
+                    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 = []
+                    Pindo::Command::Deploy::Build::run(args_temp)
+
+
+                    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
+                        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
+                                unless !description.nil? && description.length > 10
+                                    description = nil
+                                end
+                            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/{dev → command/dev}/createbuild.rb

@@ -8,8 +8,6 @@ module Pindo
       class Createbuild < Dev
 
             include Appselect
-            include Buildconfighelper
-
 
             self.summary = '创建工程编译选项'
     

data/lib/pindo/{dev → command/dev}/debug.rb

@@ -7,7 +7,7 @@ module Pindo
         
             include Appselect
             
-            include Xcodebuildpre
+            include XcodeCertHelper
 
             self.summary = '更新证书并使用新证书设置工程'
     
@@ -26,12 +26,14 @@ module Pindo
               [
                 ['--deploy', '默认用开发的bundle id，使用--deploy设置使用发布bundle id'],
                 ['--adhoc', '默认用dev证书，使用--adhoc设置使用adhoc证书'],
+                ['--upload', '生成上传pgyer的证书'],
               ].concat(super)
             end
 
             def initialize(argv)
               @args_adhoc_flag = argv.flag?('adhoc', false)
               @args_deploy_flag = argv.flag?('deploy', false)
+              @upload_flag = argv.flag?('upload', false)
               super 
             end
 
@@ -44,7 +46,6 @@ module Pindo
               else
                 mainapp_bundleid = get_selected_dev_bundleid()
               end
-              puts "选择使用的bundle id: #{mainapp_bundleid}"
 
               args_temp = []
               args_temp << mainapp_bundleid
@@ -63,6 +64,9 @@ module Pindo
                   args_temp << "--dev"
               end
 
+              if @upload_flag
+                args_temp << "--upload"
+              end
               Pindo::Command::Deploy::Cert::run(args_temp)
 
             end

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

@@ -0,0 +1,75 @@
+require 'fileutils'
+
+module Pindo
+  class Command
+    class Dev < Command
+      class Pgyercert < Dev
+        
+            include Appselect
+            
+            include XcodeCertHelper
+
+            self.summary = '生成pgyer需要的证书，上传个pgyer重签名用'
+    
+            self.description = <<-DESC
+                
+                生成pgyer需要的证书，上传个pgyer重签名用。              
+
+            DESC
+
+            self.arguments = [
+
+            ]
+  
+            def self.options
+              [
+                ['--deploy', '默认用开发的bundle id，使用--deploy设置使用发布bundle id'],
+                ['--adhoc', '默认用dev证书，使用--adhoc设置使用adhoc证书'],
+              ].concat(super)
+            end
+
+            def initialize(argv)
+              @args_adhoc_flag = argv.flag?('adhoc', false)
+              @args_deploy_flag = argv.flag?('deploy', false)
+              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
+              puts "选择使用的bundle id: #{mainapp_bundleid}"
+
+              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")
+              # Debug::modify_cert_with_project(project_dir:project_dir, config_file:config_json_file)
+
+              args_temp = []
+              if @args_adhoc_flag
+                  args_temp << "--adhoc"
+              else
+                  args_temp << "--dev"
+              end
+
+              Pindo::Command::Deploy::Cert::run(args_temp)
+
+            end
+
+
+
+      end
+    end
+  end
+end
+