pindo 4.6.9 → 4.7.0

data/lib/pindo/{pgyer → command/pgyer}/apptest.rb

@@ -2,7 +2,7 @@
 
 require 'highline/import'
 require 'fileutils'
-require 'pindo/module/pgyerhelper.rb'
+require 'pindo/module/pgyer/pgyerhelper'
 
 module Pindo
     class Command
@@ -42,52 +42,30 @@ module Pindo
                 end
 
                 def validate!
-                    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
+
                     super
                 end
 
                 def run
 
-                    @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.strip
-                            app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:@args_proj_name)    
-                        end
-                    end
+                    PgyerHelper.share_instace.setForeLogin(beforeLogin:@args_login_flag)
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:@args_proj_name)
 
                     if app_info_obj.nil?
                         raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， pgyer网站没有该App"
                     end
 
+
                     if !app_info_obj.nil?
 
-                        version_item_obj = PgyerHelper.share_instace.get_versioon_history_item(client:@pgyer_client, app_info_obj:app_info_obj, list_select_flat:@args_list_flag)
+                        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
 
+                        msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:version_item_obj)
 
-                        msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:version_item_obj, msg_from: @pgyer_client.token["username"])
                         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)    

data/lib/pindo/{pgyer → command/pgyer}/comment.rb

@@ -2,7 +2,7 @@
 
 require 'highline/import'
 require 'fileutils'
-require 'pindo/module/pgyerhelper.rb'
+require 'pindo/module/pgyer/pgyerhelper'
 
 
 module Pindo
@@ -42,50 +42,27 @@ module Pindo
                 end
 
                 def validate!
-                    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
+
                     super
                 end
 
                 def run
                     
-                    @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.strip
-                            app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:@args_proj_name)    
-                        end
-                    end
+                    PgyerHelper.share_instace.setForeLogin(beforeLogin:@args_login_flag)
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:@args_proj_name)
 
                     if app_info_obj.nil?
                         raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， pgyer网站没有该App"
                     end
-                    
 
-                    version_item_obj = PgyerHelper.share_instace.get_versioon_history_item(client:@pgyer_client, app_info_obj:app_info_obj, list_select_flat:@args_list_flag)
+                    
+                    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
                     
-                    PgyerHelper.share_instace.modify_coment(client:@pgyer_client, app_info_obj:app_info_obj, version_item_obj:version_item_obj)
+                    PgyerHelper.share_instace.modify_coment(app_info_obj:app_info_obj, version_item_obj:version_item_obj)
 
                 end
 

data/lib/pindo/{pgyer → command/pgyer}/download.rb

@@ -2,7 +2,8 @@
 
 require 'highline/import'
 require 'fileutils'
-require 'pindo/module/pgyerhelper.rb'
+require 'pindo/module/pgyer/pgyerhelper'
+require 'open-uri'
 
 
 module Pindo
@@ -42,43 +43,20 @@ module Pindo
                 end
 
                 def validate!
-                    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
+
                     super
                 end
 
                 def run
 
-                    @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.strip
-                            app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:@args_proj_name)    
-                        end
-                    end
+                    PgyerHelper.share_instace.setForeLogin(beforeLogin:@args_login_flag)
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:@args_proj_name)
 
                     if app_info_obj.nil?
                         raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， pgyer网站没有该App"
                     end
 
-                    version_item_obj = PgyerHelper.share_instace.get_versioon_history_item(client:@pgyer_client, app_info_obj:app_info_obj, list_select_flat:@args_list_flag)
+                    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, "没有找到上传记录"
@@ -93,9 +71,36 @@ module Pindo
                     file_name = File.join(Dir.pwd, base_name)
                     puts "文件名: #{file_name}"
                     puts "下载中..."
-                    File.binwrite(file_name, FastlaneCore::Helper.open_uri(download_url).read)
-                    puts "下载完成!"
+                    # File.binwrite(file_name, FastlaneCore::Helper.open_uri(download_url).read)
+                    
+
+
+                    # 使用选项参数
+
+                    Funlog.instance.fancyinfo_start("开始下载...")
+                    total_num = 0
+                    total_size = ''
+                    char_in = '>'
+                    char_out = '_'
+                    download_message = ''
+
+                    URI.open(download_url, :content_length_proc => lambda { |total|
+                       total_num = total
+                       total_size = sprintf("%.2f", 1.00 * total_num / 1024 /1024 ) 
+                    }, :progress_proc => lambda { |index_num|
+
+                      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"
+                      Funlog.instance.fancyinfo_update(download_message)
+
+                    }) do |file|
+                      File.binwrite(file_name, file.read)  
+                    end
 
+                    Funlog.instance.fancyinfo_success(download_message)
+                    Funlog.instance.fancyinfo_success("#{file_name} 下载完成!")
 
                 end
 

data/lib/pindo/{pgyer → command/pgyer}/login.rb

@@ -2,7 +2,7 @@
 
 require 'highline/import'
 require 'fileutils'
-require 'pindo/module/pgyerhelper.rb'
+require 'pindo/module/pgyer/pgyerhelper'
 
 
 module Pindo
@@ -44,15 +44,14 @@ module Pindo
                 def run
 
                     app_info_obj = nil
-                    @pgyer_client = PgyerClient.new
 
-                    login_success = @pgyer_client.do_login(force_login:@args_login_flag)
+                    PgyerHelper.share_instace.setForeLogin(beforeLogin:@args_login_flag)
+                    login_success = PgyerHelper.share_instace.login
 
                     if !login_success
                        raise Informative, "登录失败！！！"
                     end
 
-
                 end
 
             end

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

@@ -0,0 +1,111 @@
+
+
+require 'highline/import'
+require 'fileutils'
+require 'pindo/module/pgyer/pgyerhelper'
+
+module Pindo
+    class Command
+        class Pgyer < Command
+            class Resign < Pgyer
+
+
+                self.summary = '获取pgyer中指定app的测试链接和二维码'
+
+                self.description = <<-DESC
+                  获取pgyer中指定app的测试链接和二维码，终端运行：pindo pgyer apptest
+                DESC
+
+                self.arguments = [
+
+                ]
+
+                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'],
+                  ].concat(super)
+                end
+
+
+                def initialize(argv)
+
+                    @args_login_flag = argv.flag?('login', false)
+                    @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')
+
+                    super(argv)
+                    @additional_args = argv.remainder!
+                end
+
+                def validate!
+                    super
+                end
+
+                def run
+
+                    PgyerHelper.share_instace.setForeLogin(beforeLogin:@args_login_flag)
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:@args_proj_name)
+
+                    if app_info_obj.nil?
+                        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
+
+                        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代号:"
+                            menu.choices(*bundle_id_list)
+                        end
+                        
+                        cert_item = cert_List.select{|cert| [cert["certType"],cert["mainBundleId"]].join("_") == @args_bundle_id}.first
+                    else
+                        cert_item = cert_List.select{|item| item["mainBundleId"] == @args_bundle_id}.first    
+                    end
+
+                    
+
+                    result = PgyerHelper.share_instace.resign(version_id:version_item_obj["id"], cert_id:cert_item["id"])
+
+                    if result
+                        version_item_obj = PgyerHelper.share_instace.get_versioon_history_item(app_info_obj:app_info_obj, list_select_flat:false)
+
+                        if version_item_obj.nil?
+                            raise Informative, "没有找到上传记录"
+                        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)    
+                        end
+                    end
+
+     
+
+                end
+
+
+            end
+        end
+    end
+end

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

@@ -0,0 +1,123 @@
+
+
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require 'faraday'
+require 'pindo/module/pgyer/pgyerhelper'
+
+
+module Pindo
+    class Command
+        class Pgyer < Command
+            class Upload < Pgyer
+
+
+                self.summary = '上传ipa包到pgyer测试网站'
+
+                self.description = <<-DESC
+                  上传ipa包到pgyer。用法：例如:pindo pgyer upload  path/to/demo.ipa 
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/demo.ipa', false),
+                ]
+
+                def self.options
+                  [
+                    ['--login', '强制再次登录pgyer网站，用法: pindo pgyer upload --login'],
+                    ['--ipa', '强制指定上传的ipa文件: pindo pgyer upload --ipa=path/to/demo.ipa'],
+                    ['--proj', '指定哪个项目(忽略大小写空格等等字符),用法：pindo pgyer upload --proj=prancksoundv4'],
+                    ['--attach', '指定需要和ipa一起上传的附件: pindo pgyer upload --attach=path/to/attach.zip'],
+                    ['--send',  '上传到之后是否发送测试信息,用法:pindo pgyer upload --send'],
+                    ['--desc', '指定上传的备注信息: -pindo pgyer upload -desc="1.upload message"'],
+
+                  ].concat(super)
+                end
+
+
+                def initialize(argv)
+
+                    @args_ipa_file = argv.shift_argument
+                    @ipa_file = argv.option('ipa')
+
+                    if !@ipa_file.nil?
+                        @args_ipa_file = @ipa_file
+                    end
+                    if @args_ipa_file && !@args_ipa_file.empty?
+                        @args_ipa_file = @args_ipa_file.strip.gsub(/\"/, '')
+                    end
+
+                    @args_login_flag = argv.flag?('login', false)
+                    @args_send_flag = argv.flag?('send', false)
+                    @args_proj_name = argv.option('proj')
+                    @args_attach_name = argv.option('attach')
+                    @args_upload_desc = argv.option('desc')
+                    if @args_upload_desc && !@args_upload_desc.empty?
+                        @args_upload_desc = @args_upload_desc.strip.gsub(/\"/, '')
+                    end
+
+                    
+
+                    super(argv)
+                    @additional_args = argv.remainder!
+                end
+
+                def validate!
+
+                    super
+                end
+
+                def run
+
+                    current_project_dir = Dir.pwd
+                    if @args_ipa_file.nil? || !File.exist?(@args_ipa_file)
+                        build_path = File.join(current_project_dir, "build", "*.ipa")
+                        @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                        if @args_ipa_file.nil?
+                            build_path = File.join(current_project_dir, "*.ipa")
+                            @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)") 
+                            if !answer
+                                @args_ipa_file = nil
+                            end
+                        end
+
+                        if !@args_ipa_file.nil? && File.exist?(@args_ipa_file)
+                        else
+                            @args_ipa_file = ask('需要上传的IPA文件:') || nil
+                            @args_ipa_file = @args_ipa_file.strip.gsub(/\\ /, ' ')
+                        end
+                    end
+                    
+                    if !File.exist?(@args_ipa_file)
+                        raise Informative, "#{@args_ipa_file} 文件不存在"
+                    end
+
+                    PgyerHelper.share_instace.setForeLogin(beforeLogin:@args_login_flag)
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:@args_proj_name)
+
+                    if app_info_obj.nil?
+                        raise Informative, "#{@args_proj_name} 错误， 请输入正确的App代号名称， pgyer网站没有该App"
+                    end
+
+                    result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:@args_ipa_file, description:@args_upload_desc)
+                    if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
+                        msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:result_data["data"])
+                        PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+                        if @args_send_flag
+                            PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                        end
+                    end
+
+                    
+
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/pgyer.rb

@@ -0,0 +1,18 @@
+
+require 'pindo/command/pgyer/login'
+require 'pindo/command/pgyer/upload'
+require 'pindo/command/pgyer/download'
+require 'pindo/command/pgyer/comment'
+require 'pindo/command/pgyer/apptest'
+require 'pindo/command/pgyer/resign'
+
+module Pindo
+  class Command
+    
+    class Pgyer < Command
+      self.abstract_command = true
+      self.summary = 'pgyer网站的相关命令'
+    end
+
+  end
+end

data/lib/pindo/{repo.rb → command/repo.rb}

@@ -1,8 +1,8 @@
 
-require 'pindo/repo/login'
-require 'pindo/repo/clone'
-require 'pindo/repo/create'
-require 'pindo/repo/search'
+require 'pindo/command/repo/login'
+require 'pindo/command/repo/clone'
+require 'pindo/command/repo/create'
+require 'pindo/command/repo/search'
 
 module Pindo
   class Command