pindo 4.6.9 → 4.7.0

data/lib/pindo/module/{pgyerhelper.rb → pgyer/pgyerhelper.rb}

@@ -12,6 +12,9 @@ module Pindo
 
     class PgyerHelper
 
+
+        include Pindo::Githelper
+
         class << self
           attr_writer :instance
         end
@@ -20,6 +23,172 @@ module Pindo
           @instance ||= new
         end
 
+
+        def initialize()
+            @force_login = false
+            @has_login = false
+        end
+
+        def setForeLogin(beforeLogin:nil)
+            @force_login = beforeLogin
+        end
+
+        def login
+            @pgyer_client = PgyerClient.new
+            if @force_login || !@has_login
+                @has_login = @pgyer_client.do_login(force_login:@force_login)    
+                @force_login = false
+            end
+            return @has_login
+        end
+
+        def prepare_upload(working_directory:nil, proj_name:nil)
+            upload_proj_name = proj_name
+            app_info_obj = nil
+            if login
+
+                if !proj_name.nil?
+                    app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:upload_proj_name)
+                end
+                
+                if !app_info_obj.nil?
+                    return app_info_obj
+                end
+
+                proj_name_array = []
+                if File.exist?(File.join(working_directory, "config.json"))
+                    config_json = JSON.parse(File.read(File.join(working_directory, "config.json")))
+                    proj_name_array << config_json["project_info"]["project_name"]    
+                end
+
+                xcodeproj_file_name = Dir.glob(File.join(Dir.pwd, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+                upload_proj_name = File.basename(xcodeproj_file_name, ".xcodeproj") if xcodeproj_file_name
+                if !upload_proj_name.nil? && !upload_proj_name.empty?
+                    proj_name_array << upload_proj_name    
+                end
+                
+                puts
+                dir_base_name = File.basename(working_directory)
+                unless ["Desktop", "Documents", "Downloads"].include?(dir_base_name)
+                    proj_name_array << dir_base_name
+                end
+            
+                proj_name_array << "自定义输入Pyger上的App代号"
+
+                if proj_name_array.size > 1
+                    cli = HighLine.new
+                    upload_proj_name = cli.choose do |menu|
+                        menu.prompt = "请选择对应的Pgyer App代号:"
+                        menu.choices(*proj_name_array)
+                    end
+                    if upload_proj_name.include?("自定义输入")
+                        upload_proj_name = ask('请输入对应Pyger上的App代号(大小写空格忽略):') || nil
+                        upload_proj_name = upload_proj_name.strip
+                    end
+                else
+                    upload_proj_name = ask('请输入对应Pyger上的App代号(大小写空格忽略):') || nil
+                    upload_proj_name = upload_proj_name.strip
+                end
+
+
+                app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:upload_proj_name)
+
+                if app_info_obj.nil?
+                    upload_proj_name = ask('请输入对应Pyger上的App代号(大小写空格忽略):') || nil
+                    upload_proj_name = upload_proj_name.strip
+                    app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:upload_proj_name)
+                end
+
+                if app_info_obj.nil?
+                    raise Informative, "#{upload_proj_name} 错误， 请输入正确的App代号， pgyer网站没有该App"
+                end
+            end
+            app_info_obj
+        end
+
+        def start_upload(app_info_obj:nil, ipa_file_upload:nil, description:nil)
+
+                args_ipa_file_dir = File.expand_path(File::dirname(ipa_file_upload))
+                ipa_file_upload=File.join(args_ipa_file_dir, File.basename(ipa_file_upload))
+
+                current_project_dir = Dir.pwd
+                puts "current_project_dir : #{current_project_dir}"
+                puts description
+                puts File.exist?(File.join(current_project_dir, ".git"))
+                if description.nil? && File.exist?(File.join(current_project_dir, ".git"))
+                    commit_id_info = git_latest_commit_id(local_repo_dir:current_project_dir)
+                    if commit_id_info
+                        description = "commit " + commit_id_info    
+                    end
+                end
+
+                puts "description : #{description}"
+
+                addtach_file = nil
+                if ipa_file_upload.include?(File.join(current_project_dir, "build")) && File.exist?(File.join(current_project_dir, "VMData"))
+
+                    server_file_directory = Dir.glob(File.join(current_project_dir, "VMData/Archives/*")).max_by {|f| File.mtime(f)}
+                    zip_base_name = File.basename(server_file_directory)
+
+                    server_zipfile_name  = File.join(current_project_dir, "VMData", zip_base_name+".zip")
+
+                    if File.exist?(server_zipfile_name)
+                        FileUtils.rm_rf(server_zipfile_name)
+                    end
+
+                    Zip::File.open(server_zipfile_name, Zip::File::CREATE) do |zipfile|
+                        Dir.chdir server_file_directory
+                        Dir.glob("**/*").reject {|fn| File.directory?(fn) }.each do |file|
+                            zipfile.add(file.sub(server_file_directory + '/', ''), file)
+                        end
+                    end
+
+                    addtach_file = server_zipfile_name
+                    Dir.chdir current_project_dir
+                end
+
+
+                puts
+                puts "上传项目: #{app_info_obj["appName"]}"
+                puts "上传备注: #{description}"
+
+
+                aws_client = AWSS3Client.new
+                upload_res = aws_client.upload_file(binary_file:ipa_file_upload)
+
+                attach_key_url = nil
+                attachFileUrls = []
+
+                begin
+                    if !addtach_file.nil? && File.exist?(addtach_file)
+                        puts "存在附件, 继续上传附件..."
+                        attach_key_url = aws_client.upload_file(binary_file:addtach_file, isAttach:true)
+                    end
+
+                    if !attach_key_url.nil?
+                        attachFileUrls << attach_key_url
+                    end
+
+                rescue => error
+                    puts "附件上传失败".bold.red
+                end
+
+                if !upload_res.nil? && !app_info_obj.nil?
+
+                    puts attachFileUrls
+
+                    result_data = @pgyer_client.post_app_update_binary(appId:app_info_obj["appId"], params:{
+                        description: description,
+                        s3Url: upload_res,
+                        attachFileUrls:attachFileUrls
+                    })
+
+                    return result_data
+                end
+
+
+        end
+
         def get_user_local_wechat_url( )
 
             wechat_msg_url = nil
@@ -147,10 +316,15 @@ module Pindo
         end
 
         def find_app_info_with_obj_list(proj_name:nil)
+
             if proj_name.nil?
                 return nil
             end
 
+            Funlog.instance.fancyinfo_start("正在拉取app信息列表,查找app信息...")
+
+            get_app_list_in_pgyer()
+
             key_proj_name = proj_name.downcase.strip.gsub(/[\s\-_]/, '')
 
             app_info_list = Pindoconfig.instance.get_pgyerapps_info_list()
@@ -159,12 +333,14 @@ module Pindo
                 app_info_item_name.eql?(key_proj_name) && app_info_item["appType"].eql?("iOS")
             end
 
+            Funlog.instance.fancyinfo_success("拉取app信息列表完成，app信息获取成功！")
+
             app_info_obj
         end
 
-        def get_app_version(client:nil, appId:nil, app_version_index:nil, latest_version:true)
+        def get_app_version(appId:nil, app_version_index:nil, latest_version:true)
 
-            version_data = client.get_app_version_list_req(appId:appId)
+            version_data = @pgyer_client.get_app_version_list_req(appId:appId)
 
             version_item_obj = nil
             if latest_version
@@ -180,9 +356,9 @@ module Pindo
             return version_item_obj
         end
 
-        def get_app_list_in_pgyer(client:nil)
+        def get_app_list_in_pgyer()
+
 
-            puts "正在向pgyer拉取app信息列表， 查找app信息..."
             params = {
                 pageNo:1,
                 pageSize:1000
@@ -190,7 +366,7 @@ module Pindo
 
             app_info_list = Pindoconfig.instance.get_pgyerapps_info_list()
             if app_info_list.nil?
-                res_data = client.get_app_list_req(params:params)
+                res_data = @pgyer_client.get_app_list_req(params:params)
                 # puts JSON.pretty_generate(res_data)
                 if !res_data["data"].nil? && res_data["data"].size > 0
                     app_info_list = res_data["data"]
@@ -199,7 +375,7 @@ module Pindo
             end
 
             if app_info_list.nil?
-                res_data = client.get_app_list_req(params:params)
+                res_data = @pgyer_client.get_app_list_req(params:params)
                 # puts JSON.pretty_generate(res_data)
                 if !res_data["data"].nil? && res_data["data"].size > 0
                     app_info_list = res_data["data"]
@@ -208,15 +384,20 @@ module Pindo
             end
 
             if app_info_list.nil?
+                Funlog.instance.fancyinfo_error("拉取app信息列表失败!")
                 raise Informative, "Pgyer网络数据异常!!!"
             end
+            
+
             return app_info_list
         end
 
-        def get_versioon_history_item(client:nil, app_info_obj:nil, list_select_flat:false)
+        def get_versioon_history_item(app_info_obj:nil, list_select_flat:false)
+
+                Funlog.instance.fancyinfo_start("正在拉取app上传记录...")
 
                 appId = app_info_obj["appId"]
-                version_data = client.get_app_version_list_req(appId:appId) || {}
+                version_data = @pgyer_client.get_app_version_list_req(appId:appId) || {}
 
                 if version_data["data"].nil? || version_data["data"].size <=0
                     raise Informative, "#{proj_name} 错误， 没有找到上传记录"
@@ -240,10 +421,11 @@ module Pindo
                     version_array_temp.each do |item|
                         puts "版本:#{item["appVersion"]}  Build号:#{item["incId"]}  bundleId:#{item["bundleId"]} 上传时间:#{item["updateTime"]}"
                     end
-                    puts
                     app_incId_index = ask('请选择上面的Build号:')
 
                 end
+                
+                Funlog.instance.fancyinfo_success("拉取app上传记录完成!")
 
                 version_item_obj = nil
                 if !app_incId_index.nil?
@@ -252,6 +434,7 @@ module Pindo
                     version_item_obj = version_data["data"].find{ |item| item["latest"]}
                 end
 
+
                 version_item_obj
 
         end
@@ -277,7 +460,7 @@ module Pindo
             return comment_str
         end
 
-        def modify_coment(client:nil, app_info_obj:nil, version_item_obj:nil)
+        def modify_coment(app_info_obj:nil, version_item_obj:nil)
 
             comment_str = get_description()
             puts
@@ -300,36 +483,64 @@ module Pindo
                 raise Informative, "暂停修改！！"
             end
 
-            client.post_update_upload_comment(appId:app_info_obj["appId"], id:version_item_obj["id"], comment:comment_str.strip)
+            @pgyer_client.post_update_upload_comment(appId:app_info_obj["appId"], id:version_item_obj["id"], comment:comment_str.strip)
 
             puts "备注信息修改成功！！"
 
         end
 
-        def make_msg_data(app_info_obj:nil, app_version_info_obj:nil, msg_from: nil)
-
-                app_name = app_info_obj["appName"]
-                download_password = app_info_obj["password"]
-                download_url = app_info_obj["downloadUrl"] + "?" + "id=" + app_version_info_obj["id"]
-                bundle_id = app_version_info_obj["bundleId"]
-                app_version = app_version_info_obj["appVersion"]
-                index_num = app_version_info_obj["incId"]
-                time = app_version_info_obj["updateTime"]
-                description = app_version_info_obj["description"]
-                msg_from = msg_from || " "
-                msg_data  ={
-                    app_name: app_name,
-                    download_password: download_password,
-                    download_url: download_url,
-                    bundle_id: bundle_id,
-                    app_version: app_version,
-                    index_num: index_num,
-                    time: time,
-                    description: description,
-                    msg_from:msg_from
-                }
-
-                return msg_data
+        def get_cert_list( )
+
+            Funlog.instance.fancyinfo_start("正在获取可用证书...")
+            result = @pgyer_client.get_cert_list()
+
+            Funlog.instance.fancyinfo_success("获取可用证书完成!")
+            return result["data"]
+
+        end
+
+        def resign(version_id:nil, cert_id:nil)
+
+            Funlog.instance.fancyinfo_start("正在重签名...")
+            result =  @pgyer_client.post_resign(appVersionId:version_id, certId:cert_id)
+            if !result.nil? && result["code"] == 200 && result["data"] == "success"
+                Funlog.instance.fancyinfo_success("重签名成功!")
+                return true
+            else
+                Funlog.instance.fancyinfo_error("重签名失败!")
+                return false                
+            end
+
+        end
+
+
+
+        def make_msg_data(app_info_obj:nil, app_version_info_obj:nil)
+
+            msg_from =  @pgyer_client.token["username"]
+
+            app_name = app_info_obj["appName"]
+            download_password = app_info_obj["password"]
+            download_url = app_info_obj["downloadUrl"] + "?" + "id=" + app_version_info_obj["id"]
+            bundle_id = app_version_info_obj["bundleId"]
+            app_version = app_version_info_obj["appVersion"]
+            index_num = app_version_info_obj["incId"]
+            time = app_version_info_obj["updateTime"]
+            description = app_version_info_obj["description"]
+            msg_from = msg_from || " "
+            msg_data  ={
+                app_name: app_name,
+                download_password: download_password,
+                download_url: download_url,
+                bundle_id: bundle_id,
+                app_version: app_version,
+                index_num: index_num,
+                time: time,
+                description: description,
+                msg_from:msg_from
+            }
+
+            return msg_data
 
         end
 

data/lib/pindo/module/xcode/xcodeappconfig.rb

@@ -0,0 +1,188 @@
+require 'fileutils'
+require 'xcodeproj'
+require 'json'
+
+module Pindo
+
+    module XcodeAppConfig
+        
+        def auto_increase_buildnumber(app_config_file:nil)
+
+            if !File.exist?(app_config_file)
+                config_json = JSON.parse(File.read(app_config_file))
+                app_version = config_json['app_info']['app_version']
+                app_build_version = config_json['app_info']['app_build_version']
+                
+                app_version_array = app_version.split('.') || []
+                app_build_version_array = app_build_version.split('.') || []
+
+                while app_build_version_array.size < app_version_array.size + 1  do
+                    app_version_array << "0"
+                end
+
+                last_numer = app_build_version_array.pop.to_s
+                new_last_numer = last_numer.to_i + 1
+                app_build_version_array << new_last_numer.to_s
+                app_build_version = app_build_version_array.join(".")
+
+                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
+            end        
+        end    
+
+        def add_project_modue(project_dir:nil, proj_name:nil, config_json:nil)
+
+                module_dict = config_json['project_info']['project_module']
+                if !module_dict.nil?
+                    module_dict.each do |key, module_item|
+                        # puts module_item
+                        # puts module_item['module_type'] 
+                        if module_item && module_item['module_type'] = 'pod'
+                            add_pod_modue(project_dir:project_dir, pod_name:key, pod_version:module_item['module_git_tag'])
+                        elsif module_item && module_item['module_type'] = 'sub_git'
+                        
+                        elsif module_item && module_item['module_type'] = 'package'
+
+                        end
+                    end
+                end
+                    
+        end
+        def remove_test_pod_modue(project_dir:nil)
+            
+            pod_file = File.join(project_dir, "Podfile")
+
+            command = 'sed -i "" "/.*' + "FancySettingsPlugin" +'.*/d" ' + pod_file
+            system command
+
+            command = 'sed -i "" "/.*' + "TYSettingsPlugin" +'.*/d" ' + pod_file
+            system command
+
+            command = 'sed -i "" "/.*' + "CSSettingsPlugin" +'.*/d" ' + pod_file
+            system command
+
+            command = 'sed -i "" "/.*' + "FunnySettingsPlugin" +'.*/d" ' + pod_file
+            system command
+        end
+
+        def add_pod_modue(project_dir:nil, pod_name:nil, pod_version:nil)
+                    
+            puts "Modify App Podfile: "
+            # if File.exist?(File.join(project_dir, "Podfile.lock"))
+            #     FileUtils.rm_rf(File.join(project_dir, "Podfile.lock"))
+            # end
+
+            pod_file = File.join(project_dir, "Podfile")
+
+            command = 'sed -i "" "/.*' + "AppSource" +'.*/d" ' + pod_file
+            system command
+
+            command = 'sed -i "" "/.*' + "QuarkData" +'.*/d" ' + pod_file
+            system command
+
+            command = 'sed -i "" "/.*' + "VMData" +'.*/d" ' + pod_file
+            system command
+
+            command = 'sed -i "" "/.*' + pod_name +'.*/d" ' + pod_file
+            system command
+
+            if File.exist?(File.join(project_dir, "Podfile"))
+                puts " #{pod_name} #{pod_version}"
+                text = File.read(File.join(project_dir, "Podfile"))
+
+                if pod_version.nil? || pod_version == "" || pod_version.empty?
+
+                    if text.include?("FirebaseAnalytics")
+                        new_contents = text.gsub!(/\'FirebaseAnalytics\'.*$/, "\'FirebaseAnalytics\'\r\n     pod \'#{pod_name}\' ")
+                    elsif text.include?("UMCommon")
+                        new_contents = text.gsub!(/\'UMCommon\'.*$/, "\'UMCommon\'\r\n     pod \'#{pod_name}\' ")
+                    end
+                else
+                    if text.include?("FirebaseAnalytics")
+                        new_contents = text.gsub!(/\'FirebaseAnalytics\'.*$/, "\'FirebaseAnalytics\'\r\n    pod \'#{pod_name}\', \'#{pod_version}\' ")
+                    elsif text.include?("UMCommon")
+                        new_contents = text.gsub!(/\'UMCommon\'.*$/, "\'UMCommon\'\r\n    pod \'#{pod_name}\', \'#{pod_version}\' ")
+                    end
+                end
+                File.open(File.join(project_dir, "Podfile"), "w") {|file| file.puts new_contents }
+            end  
+        end
+
+
+        def find_group(group:nil, group_name:nil)
+
+            if group.display_name == group_name
+                return group
+            else
+                if group.children.count > 0
+                    group.children.each do |child|
+                        if Xcodeproj::Project::Object::PBXGroup == child.class
+                            result = find_group(group:child, group_name:group_name)
+                            if !result.nil?
+                                return result
+                            end
+                        end
+                    end
+                end  
+                
+            end
+
+            return nil
+        end
+
+
+        def modify_appprefix_plist(project_dir:nil, appprefix_file:nil, config_json:nil)
+            
+            project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+            project_obj = Xcodeproj::Project.open(project_fullname) 
+            presources_group = find_group(group:project_obj.main_group, group_name:"PResources")
+
+            if presources_group.nil? 
+                raise Informative, "没有找到资源目录PResources!!!!"
+            end 
+
+            presources_path = presources_group.real_path
+            
+            config_file = Dir.glob(File.join(presources_path, "**", appprefix_file)).first
+            if config_file.nil? || config_file.empty? || !File.exist?(config_file)
+                raise Informative, "工程本地配置未修改，PResources/目录下没有找到对应的配置文件 #{appprefix_file} !!!!"
+            end 
+
+
+            config_json['app_setting'].each do |key, value|
+                # puts value
+                if !value.nil? && value.to_s.include?("__________config")
+                    raise Informative, "config.json 配置文件key : #{key} 包含初始值未修改, 配置正确的值或者删除！！！"
+                end
+            end
+
+            xcode_config_value = nil
+            if config_file.end_with?(".plist") then
+                xcode_config_value = Xcodeproj::Plist.read_from_path(config_file)
+            else
+                xcode_config_value=JSON.parse(File.read(config_file))
+            end
+
+            new_info_plist_dict = {}
+            xcode_config_value.each do |key, value|
+                if !config_json['app_setting'][key].nil? && config_json['app_setting'][key] != ""
+                    new_info_plist_dict[key] = config_json['app_setting'][key]
+                else
+                    new_info_plist_dict[key] = value
+                end
+            end
+
+            if config_file.end_with?(".plist") then
+                Xcodeproj::Plist.write_to_path(new_info_plist_dict, config_file)
+            else
+                File.open(config_file, "w") do |f|
+                    f.write(JSON.pretty_generate(new_info_plist_dict))
+                end
+            end
+        end
+
+    end
+end

data/lib/pindo/module/xcode/xcodebuildconfig.rb

@@ -0,0 +1,12 @@
+require 'fileutils'
+require 'xcodeproj'
+require 'json'
+
+module Pindo
+
+    class XcodeBuildConfig
+
+
+    end
+
+end