pindo 4.6.9 → 4.7.0

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

@@ -57,7 +57,11 @@ module Pindo
                         mainapp_bundleid = get_selected_dev_bundleid()
                     end
 
-                    prepare_for_upload()
+                    app_info_obj = nil
+                    if @args_upload_flag || @args_send_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 +72,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 +115,25 @@ 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?
-
-                        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    
-                                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)
+                    if !ipa_file_upload.nil? && !app_info_obj.nil? 
+                        result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:nil)
+                        if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
+                            msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:result_data["data"])
+                            PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+                            if @args_send_flag
+                                PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
                             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

@@ -88,7 +88,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 +110,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 +131,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/{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
+  

data/lib/pindo/command/dev.rb

@@ -0,0 +1,25 @@
+# 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/renewcert'
+# require 'pindo/command/dev/pgyercert'
+# require 'pindo/command/dev/createbuild'
+
+module Pindo
+    class Command
+        
+        class Dev < Command
+            self.abstract_command = true
+            self.summary = '开发阶段使用的相关命令'
+
+        end
+        
+    end
+end

data/lib/pindo/command/env.rb

@@ -0,0 +1,17 @@
+
+require 'pindo/command/env/dreamstudio'
+require 'pindo/command/env/workhard'
+# require 'pindo/command/env/flutter'
+require 'pindo/command/env/quarkenv'
+require 'pindo/command/env/swarkenv'
+
+module Pindo
+    class Command
+      
+      class Env < Command
+        self.abstract_command = true
+        self.summary = '环境配置的相关命令'
+      end
+    end
+end
+

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

@@ -90,7 +90,11 @@ module Pindo
 
                     Pindo::Command::Deploy::Pullconfig::run(args_temp)
 
-                    prepare_for_upload()
+                    app_info_obj = nil
+                    if @args_upload_flag || @args_send_flag
+                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:@args_proj_name)
+                    end
+                
 
                     args_temp = []
                     if @args_dev_flag
@@ -100,88 +104,32 @@ module Pindo
                     end
 
 
+                    args_temp << "--ipa=#{ipa_file_name}"
+                    Pindo::Command::Deploy::Resign::run(args_temp)
 
-                    if !ipa_file_name.nil?
-
-                        args_temp << "--ipa=#{ipa_file_name}"
-                        Pindo::Command::Deploy::Resign::run(args_temp)
-
+                    if !ipa_file_name.nil? && !app_info_obj.nil?
 
                         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:"提交包重签名", args_send_flag:@args_send_flag)
-                        end
-
-                    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    
+                        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: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
-                        
-                        @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
-
-                        Pindo::Command::Pgyer::Upload::run(args_temp)  
-                    end
                 end
-
             end
         end
     end