pindo 4.6.9

data/lib/pindo/ipa/import.rb

@@ -0,0 +1,261 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'cocoapods'
+require 'find'  
+require 'fileutils'
+require 'pindo/base/executable'
+
+module Pindo
+    class Command
+        class Ipa < Command
+            class Import < Ipa
+        
+                include Command::DeployOptions
+                include Pindo::Configprojhelper
+                
+                self.summary = '提交时设置Xcode工程编译参数'
+    
+                self.description = <<-DESC
+                    提交时设置Xcode工程编译参数.在工程目录下执行：pindo ipa import
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/ipa', false),
+                ]
+
+                def self.options
+                    [
+                        ['--build', '修改完工程之后直接编译，用法：pindo ipa import --build'],
+                        ['--increase', '自动增加编译的app版本号，用法:pindo ipa import --increase'],
+
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+                    @build_flag = argv.flag?('build', false)
+                    @args_increase_flag = argv.flag?('increase', false)
+                    
+                    super
+                end
+
+                def run
+
+
+                    build_type_array = @config_json["project_info"]["xcode_build_type"].split("_") || []
+                    @args_nocreate_flag = false
+                    @args_quswark_flag = false
+                    @args_normal_flag = false
+
+                    if build_type_array.include?("nocreate")
+                        @args_nocreate_flag = true
+                    end
+
+                    if build_type_array.include?("normal")
+                        @args_normal_flag = true
+                    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
+
+                def import_fun
+
+                    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
+
+                    @args_appstore_flag = true
+                    args = get_build_type_args()
+                    args_temp = args_temp | args
+
+                    if @args_increase_flag
+                        auto_increase_buildnumber
+                    end
+
+
+                    pindo_new_project_dir = Dir.pwd
+                    
+                    build_verify_file = File.join(app_config_dir, "build_verify.json")
+                    build_verify_json = nil
+
+                    begin
+                        build_verify_json = JSON.parse(File.read(build_verify_file))
+                    rescue => error
+                        build_verify_json = nil
+                    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 
+                            answer = agree("请确认要用当前代码编译:(commit: #{release_code_commit}) (Y/n）:")
+                            if answer
+                            
+                            else
+                                raise Informative,  "请更新代码重新打包！！！"
+                            end
+
+                        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"))
+
+                    
+                    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([])
+
+                        begin
+                            remove_test_pod_modue(project_dir:pindo_new_project_dir)
+                            system 'pod install'
+                        rescue => error
+                            puts(error.to_s)
+                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
+                        end
+
+
+                        pod_lock_file = File.join(pindo_new_project_dir, "Podfile.lock")
+                        if !File.exist?(pod_lock_file)
+                            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?
+                        pod_lock_json["SPEC REPOS"].each do |source, pod_items|
+                            pods_array += pod_items
+                        end
+                    end
+                    if pods_array.include?("FancyAD")
+                        puts 
+                        puts "Run Applovin Script ..."
+                        Dir.chdir(pindo_new_project_dir)
+                        applovin_args = []
+                        applovin_args << "--appstore"
+                        applovin_args << "--install"
+                        Pindo::Command::Utils::Applovin::run(applovin_args)
+                    end
+
+
+
+
+
+                    if @build_flag
+                        Dir.chdir(pindo_new_project_dir)
+                        Pindo::Command::Deploy::Build::run(args_temp)
+                    end
+
+
+                    Dir.chdir(current_dir)
+                    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
+
+
+                    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/output.rb

@@ -0,0 +1,396 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+require 'pindo/base/executable'
+
+module Pindo
+    class Command
+        class Ipa < Command
+            class Output < Ipa
+
+                include Command::DeployOptions
+                include Pindo::Configprojhelper
+
+                include Appselect
+
+                self.summary = '测试时设置Xcode工程编译参数并自动编译及上传'
+
+                self.description = <<-DESC
+                    测试时设置Xcode工程编译参数并自动编译及上传，在工程目录下执行：pindo ipa output --upload --send
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--proj', '指定哪个项目(忽略大小写空格等等字符): --proj=\"prancksoundv4\"'],
+                        ['--upload', '编译完成后是否上传ipa到pyger: 用法:pindo ipa output --upload'],
+                        ['--send',  '上传到之后是否发送测试信息,用法:pindo ipa output --send'],
+                        ['--increase', '自动增加编译的app版本号，用法:pindo ipa output --increase'],
+
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    @args_proj_name = argv.option('proj')
+                    @args_upload_flag = argv.flag?('upload', false)
+                    @args_send_flag = argv.flag?('send', false)
+                    @args_increase_flag = argv.flag?('increase', false)
+
+                    super
+                end
+
+
+                def run
+
+                    build_type_array = @config_json["project_info"]["xcode_build_type"].split("_") || []
+                    @args_nocreate_flag = false
+                    @args_quswark_flag = false
+                    @args_normal_flag = false
+
+                    if build_type_array.include?("nocreate")
+                        @args_nocreate_flag = true
+                    end
+                    if build_type_array.include?("normal")
+                        @args_normal_flag = true
+                    end
+                    if build_type_array.include?("quark") || build_type_array.include?("swark")
+                        @args_quswark_flag = true
+                    end
+
+                    if @args_increase_flag
+                        auto_increase_buildnumber
+                    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)
+
+                        if login_success
+
+                            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
+
+                            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
+
+                        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
+
+                def output_fun
+
+                    currentDir = Dir.pwd
+                    pindo_dir = File::expand_path(pindo_single_config.pindo_dir)
+                    app_config_dir = File.join(pindo_dir, @deploy_identifier)
+                    app_config_dir = clong_buildconfig_repo(repo_name: @deploy_repo_name)
+
+
+                    args_temp = []
+                    args_temp << @args_appconfig
+
+                    args = get_build_type_args()
+                    args_temp = args_temp | args
+
+                    args = get_release_build_args()
+                    args_temp = args_temp | args
+
+
+                    pindo_new_project_dir = Dir.pwd
+                    unless @args_nocreate_flag
+                        Pindo::Command::Utils::Renewproj::run(args_temp)
+                        pindo_new_project_dir = ENV["pindo_new_project_dir"]
+                        system "open #{pindo_new_project_dir}"
+                        puts "New Project: #{pindo_new_project_dir}"
+                    end
+
+
+                    Dir.chdir(pindo_new_project_dir)
+                    if File.exist?(File.join(pindo_new_project_dir, "Podfile.lock"))
+                        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"))
+                    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)
+                    modify_release_firebase(project_dir:pindo_new_project_dir, config_json:@config_json)
+
+
+                    if File.exist?(File.join(pindo_new_project_dir, "Podfile"))
+                        Pindo::Command::Utils::Podindex::run([])
+
+                        begin
+                            remove_test_pod_modue(project_dir:pindo_new_project_dir)
+                            system 'pod install'
+                        rescue => error
+                            puts(error.to_s)
+                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
+                        end
+
+
+                        pod_lock_file = File.join(pindo_new_project_dir, "Podfile.lock")
+                        if !File.exist?(pod_lock_file)
+                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
+                        end
+
+                        backup_podfile_lock(project_dir:pindo_new_project_dir, app_config_dir:app_config_dir, appversion:@config_json["app_info"]["app_build_version"])
+
+                    end
+
+                    if @args_quswark_flag
+                        Dir.chdir(pindo_new_project_dir)
+                        quark_temp = ["./config.json", "--adhoc"]
+                        Pindo::Command::Deploy::Quswark::run(quark_temp)
+                    end
+
+                    unless @args_normal_flag
+                        Dir.chdir(pindo_new_project_dir)
+                        Pindo::Command::Dev::Confuseproj::run(args_temp)
+                    end
+
+                    Dir.chdir(pindo_new_project_dir)
+                    Pindo::Command::Deploy::Cert::run(args_temp)
+
+                    Dir.chdir(pindo_new_project_dir)
+                    Pindo::Command::Deploy::Build::run(args_temp)
+
+
+                    build_path = File.join(pindo_new_project_dir, "build", "*.ipa")
+                    ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+
+                    unless @args_normal_flag
+                        if !ipa_file.nil? && File.exist?(ipa_file_upload)
+                            if @args_quswark_flag
+                                Dir.chdir(pindo_new_project_dir)
+                                quark_temp = ["./config.json", "--adhoc"]
+                                Pindo::Command::Deploy::Quswark::run(quark_temp)
+                            end
+
+                            args_temp << "--push"
+                            Dir.chdir(pindo_new_project_dir)
+                            Pindo::Command::Deploy::Confusecode::run(args_temp)
+
+                            Dir.chdir(pindo_new_project_dir)
+                            Pindo::Command::Deploy::Build::run(args_temp)
+
+                        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
+                    args_temp = []
+                    unless @apple_id.eql?(pindo_single_config.demo_apple_id)
+                        @args_apple_id = pindo_single_config.demo_apple_id
+                        args_temp << "--u=#{@args_apple_id}"
+                    end
+
+                    unless @apple_id.eql?(pindo_single_config.demo_apple_id) && @apple_id.eql?(@deploy_acount_id)
+                        if @args_bundle_id.nil? || @args_bundle_id.empty?
+                            if  @config_json && @config_json['project_info'] && @config_json['project_info']['app_type']
+                                @output_repo_name = get_deploy_repo_with_modul_name(module_name:@config_json['project_info']['app_type'])
+                                if @output_repo_name.nil? || @output_repo_name == ""
+                                    raise Informative, "config.json app_type is error!!!"
+                                end
+                                @output_config_dir = clong_buildconfig_repo(repo_name: @output_repo_name)
+                                @args_bundle_id = get_setting_bundleid_withdir(repo_dir:@output_config_dir)
+                            end
+                            args_temp << "--a=#{@args_bundle_id}"
+                        else
+                            args_temp << "--a=#{@args_bundle_id}"
+                        end
+                    end
+                    return args_temp
+                end
+
+                def modify_release_firebase(project_dir:nil, config_json:nil)
+
+                    if  config_json && config_json['project_info'] && config_json['project_info']['app_type']
+                        @output_repo_name = get_deploy_repo_with_modul_name(module_name:config_json['project_info']['app_type'])
+                        if @output_repo_name.nil? || @output_repo_name == ""
+                            raise Informative, "config.json app_type is error!!!"
+                        end
+                        @output_config_dir = clong_buildconfig_repo(repo_name: @output_repo_name)
+                        @args_bundle_id = get_setting_bundleid_withdir(repo_dir:@output_config_dir)
+                    end
+
+                    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)
+
+                end
+
+                def modify_release_config(project_dir:nil, config_json:nil)
+
+                    if  config_json && config_json['project_info'] && config_json['project_info']['app_type']
+                        @output_repo_name = get_deploy_repo_with_modul_name(module_name:config_json['project_info']['app_type'])
+                        if @output_repo_name.nil? || @output_repo_name == ""
+                            raise Informative, "config.json app_type is error!!!"
+                        end
+                        @output_config_dir = clong_buildconfig_repo(repo_name: @output_repo_name)
+                        @args_bundle_id = get_setting_bundleid_withdir(repo_dir:@output_config_dir)
+                    end
+
+
+                    @output_config_json_file=File::join(@output_config_dir, "config.json")
+                    @output_config_json=JSON.parse(File.read(@output_config_json_file))
+                    @config_json["app_info"]["facebook_app_id"] = @output_config_json["app_info"]["facebook_app_id"]
+                    @config_json["app_info"]["facebook_client_token"] = @output_config_json["app_info"]["facebook_client_token"]
+
+                    if !@config_json["app_info"]["admob_app_id"].nil? && !@output_config_json["app_info"]["admob_app_id"].nil?
+                        @config_json["app_info"]["admob_app_id"] = @output_config_json["app_info"]["admob_app_id"]
+                    end
+                    if !@config_json["app_info"]["applovin_app_id"].nil? && !@output_config_json["app_info"]["applovin_app_id"].nil?
+                        @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"]
+
+                    @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
+
+                        else
+                            if !@output_config_json["app_setting"][k].nil?
+                                @config_json["app_setting"][k] = @output_config_json["app_setting"][k]
+                            end
+                        end
+                    end
+
+                    current_config_file = File.join(project_dir, "config.json")
+                    File.open(current_config_file, "w") do |f|
+                        f.write(JSON.pretty_generate(@config_json))
+                    end
+
+                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
+    end
+end

data/lib/pindo/ipa.rb

@@ -0,0 +1,22 @@
+# require 'pindo/dev/create'
+
+
+# require 'pindo/ipa/normal'
+# require 'pindo/ipa/double'
+# require 'pindo/ipa/crash'
+# require 'pindo/ipa/autodouble'
+
+require 'pindo/ipa/import'
+require 'pindo/ipa/output'
+require 'pindo/ipa/autoresign'
+
+module Pindo
+  class Command
+    
+    class Ipa < Command
+      self.abstract_command = true
+      self.summary = '发布阶段自动化相关命令'
+    end
+
+  end
+end