pindo 4.6.9 → 4.7.0

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

@@ -1,20 +1,24 @@
 require 'highline/import'
 require 'xcodeproj'
 require 'cocoapods'
-require 'find'  
+require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
+require 'pindo/module/xcode/xcodeappconfig'
+require 'pindo/module/xcode/xcodebuildhelper'
 
 module Pindo
     class Command
         class Ipa < Command
             class Import < Ipa
-        
+
                 include Command::DeployOptions
-                include Pindo::Configprojhelper
-                
+
+                include Pindo::XcodeAppConfig
+                include XcodeBuildHelper
+
                 self.summary = '提交时设置Xcode工程编译参数'
-    
+
                 self.description = <<-DESC
                     提交时设置Xcode工程编译参数.在工程目录下执行：pindo ipa import
                 DESC
@@ -25,6 +29,8 @@ module Pindo
 
                 def self.options
                     [
+                        ['--proj', '指定哪个项目(忽略大小写空格等等字符): --proj=\"prancksoundv4\"'],
+                        ['--upload', '编译完成后是否上传ipa到pyger: 用法:pindo ipa import --upload'],
                         ['--build', '修改完工程之后直接编译，用法：pindo ipa import --build'],
                         ['--increase', '自动增加编译的app版本号，用法:pindo ipa import --increase'],
 
@@ -34,7 +40,7 @@ module Pindo
                 def initialize(argv)
                     @build_flag = argv.flag?('build', false)
                     @args_increase_flag = argv.flag?('increase', false)
-                    
+
                     super
                 end
 
@@ -55,20 +61,17 @@ module Pindo
                     end
                     if build_type_array.include?("quark") || build_type_array.include?("swark")
                         @args_quswark_flag = true
-                    end                    
-                    
-
-                    # begin
-                        clone_pindo_common_config_repo(force_delete:false)
-                        clone_pindo_env_config_repo(force_delete:false)
-                        
-                        Pindo::VersionCheck::check_pindo_force_upgrade()
-                        
-                        import_fun
-                    # rescue => err
-                    #     puts "#########---------Error-------!!!"
-                    #     puts err
-                    # end
+                    end
+
+
+
+                    clone_pindo_common_config_repo(force_delete:false)
+                    clone_pindo_env_config_repo(force_delete:false)
+
+                    Pindo::VersionCheck::check_pindo_force_upgrade()
+
+                    import_fun
+
                 end
 
                 def import_fun
@@ -76,7 +79,7 @@ module Pindo
                     current_dir = Dir.pwd
                     pindo_dir = File::expand_path(pindo_single_config.pindo_dir)
                     app_config_dir = File.join(pindo_dir, @deploy_identifier)
-                    
+
                     args_temp = []
                     args_temp << @args_appconfig
                     args_temp = args_temp | @args_array
@@ -85,13 +88,17 @@ module Pindo
                     args = get_build_type_args()
                     args_temp = args_temp | args
 
+                    pindo_new_project_dir = Dir.pwd
+
                     if @args_increase_flag
-                        auto_increase_buildnumber
+                        auto_increase_buildnumber(File.join(pindo_new_project_dir, "config.json"))
+                        app_config_repo_dir = File.join(pindo_single_config.pindo_dir, @deploy_identifier)
+                        auto_increase_buildnumber(File.join(app_config_repo_dir, "config.json"))
+                        git_addpush_repo(path:app_config_repo_dir, message:"increate build number", commit_file_params:["config.json"])
                     end
 
 
-                    pindo_new_project_dir = Dir.pwd
-                    
+
                     build_verify_file = File.join(app_config_dir, "build_verify.json")
                     build_verify_json = nil
 
@@ -99,21 +106,21 @@ module Pindo
                         build_verify_json = JSON.parse(File.read(build_verify_file))
                     rescue => error
                         build_verify_json = nil
-                    end 
+                    end
 
                     release_code_commit = git_latest_commit_id(local_repo_dir:pindo_new_project_dir)
                     if !release_code_commit.nil? && !build_verify_json.nil? && !build_verify_json["output_code_commit"].nil?
                         output_code_commit = build_verify_json["output_code_commit"]
                         if !release_code_commit.eql?(output_code_commit)
 
-                            puts 
-                            puts 
+                            puts
+                            puts
                             puts "不是最新代码，请更新代码 ！！！"
                             puts "不是最新代码，请更新代码 ！！！"
-                            puts 
+                            puts
                             answer = agree("请确认要用当前代码编译:(commit: #{release_code_commit}) (Y/n）:")
                             if answer
-                            
+
                             else
                                 raise Informative,  "请更新代码重新打包！！！"
                             end
@@ -121,29 +128,24 @@ module Pindo
                         end
                     end
 
-
-
-                    
-                    system "open #{pindo_new_project_dir}"
-                    puts "New Project: #{pindo_new_project_dir}"
                     Dir.chdir(pindo_new_project_dir)
 
-
                     pod_lock_file = File.join(pindo_new_project_dir, "Podfile.lock")
-                    FileUtils.rm_rf(pod_lock_file) if File.exist?(pod_lock_file)
-                    FileUtils.rm_rf(File.join(pindo_new_project_dir, "Pods")) if File.exist?(File.join(pindo_new_project_dir, "Pods"))
+                    begin
+                        FileUtils.rm_rf(pod_lock_file)
+                        FileUtils.rm_rf(File.join(pindo_new_project_dir, "Pods"))
+                    rescue StandardError => e
+                    end
 
-                    
                     Pindo::Command::Deploy::Configproj::run(args_temp)
-                    
+
                     if File.exist?(File.join(pindo_new_project_dir, "Podfile"))
 
                         pull_podfile_lock(project_dir:pindo_new_project_dir, app_config_dir:app_config_dir)
-                        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 完成后成编译 !"
@@ -155,28 +157,16 @@ module Pindo
                             raise Informative, "pod install失败！！先pod install 完成后成编译 !"
                         end
                     end
-                    
-                    # unless @args_normal_flag
-                    #     Dir.chdir(pindo_new_project_dir)
-                    #     Pindo::Command::Deploy::Confuseproj::run(args_temp)
-                    #     args_temp << "--pull"
-    
-                    #     Dir.chdir(pindo_new_project_dir)
-                    #     Pindo::Command::Deploy::Confusecode::run(args_temp)
-                    # end
 
                     if @args_quswark_flag
                         Dir.chdir(pindo_new_project_dir)
                         Pindo::Command::Deploy::Quswark::run([])
                     end
-                    
                     Dir.chdir(pindo_new_project_dir)
                     Pindo::Command::Deploy::Cert::run(args_temp)
-
                     Pindo::Command::Deploy::Tag::run(args_temp)
 
 
-
                     pod_lock_json = Pod::YAMLHelper.load_file(pod_lock_file)
                     pods_array = []
                     if !pod_lock_json["SPEC REPOS"].nil?
@@ -184,8 +174,9 @@ module Pindo
                             pods_array += pod_items
                         end
                     end
+
                     if pods_array.include?("FancyAD")
-                        puts 
+                        puts
                         puts "Run Applovin Script ..."
                         Dir.chdir(pindo_new_project_dir)
                         applovin_args = []
@@ -195,9 +186,6 @@ module Pindo
                     end
 
 
-
-
-
                     if @build_flag
                         Dir.chdir(pindo_new_project_dir)
                         Pindo::Command::Deploy::Build::run(args_temp)
@@ -208,54 +196,11 @@ module Pindo
                     puts "Buiid Done !!!"
                     puts "#{pindo_new_project_dir}"
                     system "open #{pindo_new_project_dir}"
-                    
-                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
+                end
 
 
-                    git_addpush_repo(path:config_repo_dir, message:"increate build number", commit_file_params:["config.json"])
-                end             
-                
-  
             end
         end
     end
 end
-  

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工程编译参数并自动编译及上传'
 
@@ -63,88 +67,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?
 
+                    system "open #{pindo_new_project_dir}"
 
-                        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
 
+
                 def output_fun
 
                     currentDir = Dir.pwd
@@ -173,13 +131,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 +145,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 +204,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 +244,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 +272,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 +292,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))
+                        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)
+                        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