pindo 4.6.9 → 4.7.1

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

@@ -3,6 +3,8 @@ require 'xcodeproj'
 require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
+require 'pindo/module/xcode/xcodebuildhelper'
+require 'pindo/module/xcode/xcodeappconfig'
 
 module Pindo
     class Command
@@ -10,9 +12,11 @@ module Pindo
             class Output < Ipa
 
                 include Command::DeployOptions
-                include Pindo::Configprojhelper
-
+                
+                include XcodeBuildHelper
+                include XcodeAppConfig
                 include Appselect
+                
 
                 self.summary = '测试时设置Xcode工程编译参数并自动编译及上传'
 
@@ -41,6 +45,11 @@ module Pindo
                     @args_send_flag = argv.flag?('send', false)
                     @args_increase_flag = argv.flag?('increase', false)
 
+
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
                     super
                 end
 
@@ -63,88 +72,42 @@ module Pindo
                     end
 
                     if @args_increase_flag
-                        auto_increase_buildnumber
+                        auto_increase_buildnumber(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"))
+                        git_addpush_repo(path:app_config_repo_dir, message:"increate build number", commit_file_params:["config.json"])
                     end
 
-                    # begin
-
-                        prepare_for_upload
-                        output_fun()
-
-                    # rescue => err
-                    #     puts "#########---------Error-------!!!"
-                    #     puts err
-                    # end
-                end
-
-                def prepare_for_upload
-
-                    if @args_upload_flag
-
-                        @pgyer_client = PgyerClient.new
-                        app_info_obj = nil
-                        login_success = @pgyer_client.do_login(force_login:@args_login_flag)
+                    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
+                
+                
 
-                        if login_success
+                    output_fun()
 
-                            PgyerHelper.share_instace.get_app_list_in_pgyer(client:@pgyer_client)
-                            if @args_proj_name.nil?
-                                @args_proj_name  = @config_json["project_info"]["project_name"]
-                            end
-                            app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:@args_proj_name)
-
-
-                            if app_info_obj.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
-                                        app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:@args_proj_name)
-                                    end
-                                end
-                            end
+                    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 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)
+                    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
-                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
+                    system "open #{pindo_new_project_dir}"
 
-                        puts args_temp
-                        Pindo::Command::Pgyer::Upload::run(args_temp)
-                    end
                 end
 
+
                 def output_fun
 
                     currentDir = Dir.pwd
@@ -173,13 +136,13 @@ module Pindo
 
 
                     Dir.chdir(pindo_new_project_dir)
-                    if File.exist?(File.join(pindo_new_project_dir, "Podfile.lock"))
+                    begin
                         FileUtils.rm_rf(File.join(pindo_new_project_dir, "Podfile.lock"))
-                    end
-                    if File.exist?(File.join(pindo_new_project_dir, "Pods"))
                         FileUtils.rm_rf(File.join(pindo_new_project_dir, "Pods"))
+                    rescue StandardError => e
                     end
 
+
                     Dir.chdir(pindo_new_project_dir)
                     modify_release_config(project_dir:pindo_new_project_dir, config_json:@config_json)
                     Pindo::Command::Deploy::Configproj::run(args_temp)
@@ -187,11 +150,11 @@ module Pindo
 
 
                     if File.exist?(File.join(pindo_new_project_dir, "Podfile"))
-                        Pindo::Command::Utils::Podindex::run([])
+                        Pindo::Command::Lib::Update::run([])
 
                         begin
                             remove_test_pod_modue(project_dir:pindo_new_project_dir)
-                            system 'pod install'
+                            Pod::Command::Install::run([]) 
                         rescue => error
                             puts(error.to_s)
                             raise Informative, "pod install失败！！先pod install 完成后成编译 !"
@@ -246,19 +209,6 @@ module Pindo
                         end
                     end
 
-                  if !ipa_file_upload.nil? && !@args_proj_name.nil?
-
-                        description = nil
-                        commit_id_info = git_latest_commit_id(local_repo_dir:pindo_new_project_dir)
-                        description = "commit " + commit_id_info
-                        start_upload(pgyer_proj_name:@args_proj_name, ipa_file_upload:ipa_file_upload, description:description, args_send_flag:@args_send_flag)
-                    end
-
-                    Dir.chdir(pindo_new_project_dir)
-                    puts "Buiid Done !!!"
-                    puts "#{pindo_new_project_dir}"
-                    system "open #{pindo_new_project_dir}"
-
                 end
 
                 def get_release_build_args
@@ -299,7 +249,7 @@ module Pindo
 
                     pindo_dir = File::expand_path(pindo_single_config.pindo_dir)
                     google_info_config_dir = File.join(pindo_dir, @args_bundle_id)
-                    modify_google_plist(project_dir:project_dir, app_config_dir:google_info_config_dir)
+                    install_google_plist(project_dir:project_dir, app_config_dir:google_info_config_dir)
 
                 end
 
@@ -327,8 +277,8 @@ module Pindo
                         @config_json["app_info"]["applovin_app_id"] = @output_config_json["app_info"]["applovin_app_id"]
                     end
 
-                    puts " @config_json[ app_setting] ================12"
-                    puts  @config_json["app_setting"]
+                    # puts " @config_json[ app_setting] ================12"
+                    # puts  @config_json["app_setting"]
 
                     @config_json["app_setting"].each do |k, v|
                         if k.eql?("kGUKeyAppClientHost") ||  k.eql?("kGUKeyResBaseUrl") ||  k.eql?("app_web_host") || k.eql?("app_client_url") ||  k.eql?("app_client_url") then
@@ -347,48 +297,6 @@ module Pindo
 
                 end
 
-                def auto_increase_buildnumber
-
-                    currentDir = Dir.pwd
-
-                    pindo_dir = File::expand_path(pindo_single_config.pindo_dir)
-                    config_repo_dir = File.join(pindo_dir, @deploy_identifier)
-                    app_build_version = @config_json['app_info']['app_build_version']
-
-                    puts "old version #{app_build_version}"
-                    build_version_array = app_build_version.split('.') || []
-                    while build_version_array.size < 3  do
-                        build_version_array << "0"
-                    end
-
-                    last_numer = build_version_array.pop.to_s
-                    new_last_numer = last_numer.to_i + 1
-                    build_version_array << new_last_numer.to_s
-                    app_build_version = build_version_array.join(".")
-                    puts "new version #{app_build_version}"
-
-                    @config_json['app_info']['app_build_version'] = app_build_version
-
-                    app_origin_config = File.join(config_repo_dir, "config.json")
-                    config_json = JSON.parse(File.read(app_origin_config))
-                    config_json['app_info']['app_build_version'] = app_build_version
-                    File.open(app_origin_config, "w") do |file|
-                        file.write(JSON.pretty_generate(config_json))
-                        file.close
-                    end
-
-                    config_json = JSON.parse(File.read(@args_appconfig_fullname))
-                    config_json['app_info']['app_build_version'] = app_build_version
-                    File.open(@args_appconfig_fullname, "w") do |file|
-                        file.write(JSON.pretty_generate(config_json))
-                        file.close
-                    end
-
-
-                    git_addpush_repo(path:config_repo_dir, message:"increate build number", commit_file_params:["config.json"])
-                end
-
-
 
             end
         end

data/lib/pindo/command/ipa.rb

@@ -0,0 +1,16 @@
+
+
+require 'pindo/command/ipa/import'
+require 'pindo/command/ipa/output'
+require 'pindo/command/ipa/autoresign'
+
+module Pindo
+  class Command
+    
+    class Ipa < Command
+      self.abstract_command = true
+      self.summary = '发布阶段自动化相关命令'
+    end
+
+  end
+end

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

@@ -19,13 +19,17 @@ module Pindo
 
                 def self.options
                     [
+                        ['--install', '更新完lib之后执行pod install， pindo lib update --install'],
+                        ['--p', '指定需要lint的pod库所在目录， 例如 --p=~/Users/xxx/MyPod'],
                     ].concat(super)
                 end
 
                 def initialize(argv)
+                    @args_install_flag = argv.flag?('install', false)
+                    @project_dir = argv.option('p')
 
-                    super(argv)
                     @additional_args = argv.remainder!
+                    super(argv)
                 end
 
                 def validate!
@@ -45,27 +49,32 @@ module Pindo
                         raise Informative, '私有Pod索引地址未知！！'
                     end
                     sources = Pod::Config.instance.sources_manager.all
+                    repos_path = File.expand_path("~/.cocoapods/repos")
 
                     private_source = sources.select { |s| s.git? && s.url.to_s.eql?(pod_index_url)}.first
                     if !private_source.nil?
-                        puts "开始更新私有库索引地址..."
-                        puts "地址:#{private_source.url}"
-                        puts "目录：#{private_source.repo}"
-                        git!(%W(-C #{private_source.repo} pull))
+
+                        puts "私有Pod地址:#{pod_index_url}"
+                        puts "私有Pod目录：~/.cocoapods"
+                        getcode_to_dir(reponame:File.basename(private_source.repo), remote_url: pod_index_url, path:repos_path)
                     else
-                        puts "下载私有库索引地址..."
-                        puts "地址:#{pod_index_url}"
-                        puts "目录：~/.cocoapods"
-                        repos_path = File.expand_path("~/.cocoapods/repos")
-                        getcode_to_dir(reponame:"goodpodsindex", remote_url: pod_index_url, path:repos_path)
+                        puts "私有Pod地址:#{pod_index_url}"
+                        puts "私有Pod目录：~/.cocoapods"
+                        repository_name = pod_index_url.split("/").last.chomp(".git")
+                        getcode_to_dir(reponame:repository_name, remote_url: pod_index_url, path:repos_path)
                     end
-                    
 
 
-                    if File.exist?("#{working_dir}/Podfile")
-                        system "pod install"    
+                    if @args_install_flag
+                        begin
+                            if File.exist?("#{working_dir}/Podfile")
+                                Pod::Command::Install::run(['--clean-install'])
+                            end
+                        rescue => e
+                            puts e.message
+                        end
                     end
-                    
+
                 end
 
 

data/lib/pindo/command/lib.rb

@@ -0,0 +1,16 @@
+
+require 'pindo/command/lib/lint'
+require 'pindo/command/lib/push'
+require 'pindo/command/lib/forcepush'
+require 'pindo/command/lib/update'
+
+module Pindo
+  class Command
+
+    class Lib < Command
+      self.abstract_command = true
+      self.summary = 'pod库的相关命令'
+    end
+
+  end
+end

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