pindo 4.6.9 → 4.7.1

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

@@ -0,0 +1,111 @@
+
+
+require 'highline/import'
+require 'fileutils'
+require 'pindo/module/pgyer/pgyerhelper'
+
+module Pindo
+    class Command
+        class Pgyer < Command
+            class Resign < Pgyer
+
+
+                self.summary = '获取pgyer中指定app的测试链接和二维码'
+
+                self.description = <<-DESC
+                  获取pgyer中指定app的测试链接和二维码，终端运行：pindo pgyer apptest
+                DESC
+
+                self.arguments = [
+
+                ]
+
+                def self.options
+                  [
+                    ['--login', '强制再次登录pgyer网站'],
+                    ['--proj', '指定哪个项目(忽略大小写空格等等字符),用法：pindo pgyer apptest  --proj=prancksoundv4'],
+                    ['--list', '列出上传记录并选择，用法：pindo pgyer apptest --list'],
+                    ['--send',  '上传到之后是否发送测试信息,用法:pindo pgyer apptest --send'],
+                    ['--bundleid',  '上传到之后是否发送测试信息,用法:pindo pgyer apptest --bundleid=xxxx'],
+                  ].concat(super)
+                end
+
+
+                def initialize(argv)
+
+                    @args_login_flag = argv.flag?('login', false)
+                    @args_list_flag = argv.flag?('list', false)
+                    @args_send_flag = argv.flag?('send', false)
+                    @args_proj_name = argv.option('proj')
+                    @args_bundle_id = argv.option('bundleid')
+
+                    super(argv)
+                    @additional_args = argv.remainder!
+                end
+
+                def validate!
+                    super
+                end
+
+                def run
+
+                    PgyerHelper.share_instace.setForeLogin(beforeLogin:@args_login_flag)
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:@args_proj_name)
+
+                    if app_info_obj.nil?
+                        raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， pgyer网站没有该App"
+                    end
+
+                    
+                    version_item_obj = PgyerHelper.share_instace.get_versioon_history_item(app_info_obj:app_info_obj, list_select_flat:@args_list_flag)
+
+                    if version_item_obj.nil?
+                        raise Informative, "没有找到上传记录"
+                    end
+                    
+                    cert_List = PgyerHelper.share_instace.get_cert_list()
+                    
+                    if cert_List.nil? || cert_List.empty?
+                        raise Informative, "没有找到上传记录"
+                    end
+
+                    if @args_bundle_id.nil? && cert_List.size > 0
+
+                        bundle_id_list = cert_List.map { |cert| [cert["certType"],cert["mainBundleId"]].join("_") }
+                        cli = HighLine.new
+                        @args_bundle_id = cli.choose do |menu|
+                            menu.prompt = "请选择Pyger上的App代号:"
+                            menu.choices(*bundle_id_list)
+                        end
+                        
+                        cert_item = cert_List.select{|cert| [cert["certType"],cert["mainBundleId"]].join("_") == @args_bundle_id}.first
+                    else
+                        cert_item = cert_List.select{|item| item["mainBundleId"] == @args_bundle_id}.first    
+                    end
+
+                    
+
+                    result = PgyerHelper.share_instace.resign(version_id:version_item_obj["id"], cert_id:cert_item["id"])
+
+                    if result
+                        version_item_obj = PgyerHelper.share_instace.get_versioon_history_item(app_info_obj:app_info_obj, list_select_flat:false)
+
+                        if version_item_obj.nil?
+                            raise Informative, "没有找到上传记录"
+                        end
+                        msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:version_item_obj)
+                        PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+                        if @args_send_flag 
+                            PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                        end
+                    end
+
+     
+
+                end
+
+
+            end
+        end
+    end
+end

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

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

data/lib/pindo/command/pgyer.rb

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

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

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

data/lib/pindo/{utils → command/utils}/applovin.rb

@@ -24,6 +24,7 @@ module Pindo
                   [
                     ['--appstore', 'appstore模式，一般不用'],
                     ['--install', '是否运行applovin脚本'],
+                    ['--upload', '保存ids， 留作applovin网络不好情况使用'],
                   ].concat(super)
                 end
         
@@ -31,6 +32,7 @@ module Pindo
 
                     @args_appstore_flag = argv.flag?('appstore', false)
                     @args_install_flag = argv.flag?('install', false)
+                    @args_upload_flag = argv.flag?('upload', false)
 
                     super(argv)
                     @additional_args = argv.remainder!
@@ -44,7 +46,11 @@ module Pindo
 
                     skadnetwork_id_array = []
 
+                    Funlog.instance.fancyinfo_start("正在请求applovin数据...")
+
                     applovin_res_json = req_applovin_json
+                    # puts JSON.pretty_generate(applovin_res_json)
+
                     if !applovin_res_json.nil? && !applovin_res_json["skadnetwork_ids"].nil?
                         applovin_res_json["skadnetwork_ids"].each do |network_id|
                             skadnetwork_id_array << network_id["skadnetwork_id"]
@@ -52,44 +58,51 @@ module Pindo
                     end
 
                     applovin_media_res_json = req_applovin_mediia_json
+                    # puts JSON.pretty_generate(applovin_media_res_json)
                     if !applovin_media_res_json.nil? && !applovin_media_res_json["mediationSKAdnetworkIdsSpecs"].nil?
                         applovin_media_res_json["mediationSKAdnetworkIdsSpecs"].each do |media_item|
                             skadnetwork_id_array = skadnetwork_id_array + media_item["skAdnetworkIds"]
                         end
                     end
 
-                    skadnetwork_id_array = skadnetwork_id_array.uniq
-                    if !skadnetwork_id_array.nil? && skadnetwork_id_array.size.size > 50
-                        puts "SKAdNetworkItems Size: #{skadnetwork_id_array.size}"
+                    skadnetwork_id_array = skadnetwork_id_array.uniq || []
+
+                    Funlog.instance.fancyinfo_success("请求applovin数据，获取到#{skadnetwork_id_array.size}条数据...")
+
+                    if !skadnetwork_id_array.nil? && skadnetwork_id_array.size > 50
+                        # puts "From Applovin SKAdNetworkItems Size: #{skadnetwork_id_array.size}"
+                        if @args_upload_flag
+                            applovin_config_file = File.join(pindo_single_config.pindo_common_configdir,"applovin_client_config.json")
+                            origin_json = {}
+                            if File.exist?(applovin_config_file)
+                                origin_json = JSON.parse(File.read(applovin_config_file))
+                            end
+                            origin_json["SKAdNetworkItems"] = skadnetwork_id_array
+                            File.write(applovin_config_file, JSON.pretty_generate(origin_json))
+                            git_addpush_repo(path:pindo_single_config.pindo_common_configdir, message:"Applovin SKAdNetworkItems", commit_file_params:["applovin_client_config.json"])
+                        end
                     else
+                        Funlog.instance.fancyinfo_start("网络拉取applovin数据太少,从缓存中获取数据...")
                         config_file = File.join(File::expand_path(Pindoconfig.instance.pindo_common_configdir), "applovin_client_config.json")
                         config_json = JSON.parse(File.read(config_file))
                         skadnetwork_id_array = skadnetwork_id_array + config_json["SKAdNetworkItems"]
-                        puts "SKAdNetworkItems Size: #{skadnetwork_id_array.size}"
+                        # puts "From Config SKAdNetworkItems Size: #{skadnetwork_id_array.size}"
+                        Funlog.instance.fancyinfo_success("网络拉取applovin数据太少,从缓存中获取到#{skadnetwork_id_array.size}条数据...")
                     end
 
-                    
-                    current_dir = Dir.pwd
-                    project_fullname = nil
-                    Dir.chdir(current_dir)
-                    Dir.foreach(current_dir) do |file|  
-                        if file =~ /(.*).xcodeproj/
-                            project_fullname = file
-                            break;
-                        end
-                    end 
-                    project_root_dir = current_dir
 
+                    Funlog.instance.fancyinfo_start("正在写入Xcode中...")
+
+                    skadnetwork_id_array = skadnetwork_id_array.uniq || []
 
+                    project_root_dir = Dir.pwd
+                    xcodeproj_file_name = Dir.glob(File.join(project_root_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
 
-                    plist_file_name = File.join(project_root_dir,  "Applovin-info.plist")
-                    if !project_fullname.nil?
-                        proj_name = File.basename(project_fullname, ".xcodeproj")   
+                    plist_file_name = File.join(project_root_dir,  "AppEntry/Info.plist")
+                    if !xcodeproj_file_name.nil?
+                        proj_name = File.basename(xcodeproj_file_name, ".xcodeproj")   
                         plist_file_name = get_applovin_infoplist(project_dir:project_root_dir, proj_name:proj_name) 
                     end
-                
-                    
-                    puts plist_file_name
 
 
                     info_plist_dict = {}
@@ -105,9 +118,6 @@ module Pindo
                         info_plist_dict["NSAppTransportSecurity"]["NSAllowsArbitraryLoads"] = true
                     end
 
-                    # puts JSON.pretty_generate(info_plist_dict["SKAdNetworkItems"])
-                    # puts 111
-                    # info_plist_dict["NSUserTrackingUsageDescription"] = info_plist_dict["NSUserTrackingUsageDescription"] || "Your data will be used to provide you a better experience.  We don't share any data with 3rd parties."
 
                     if !skadnetwork_id_array.nil? && skadnetwork_id_array.size > 0
                         info_plist_dict["SKAdNetworkItems"] = []
@@ -118,13 +128,11 @@ module Pindo
                         end
                     end
 
-
-
                     Xcodeproj::Plist.write_to_path(info_plist_dict, plist_file_name)
-                    
 
+                    Funlog.instance.fancyinfo_success("Xcode中applovin数据修改完成！")
                     
-                    if @args_install_flag && !project_fullname.nil?
+                    if @args_install_flag && !xcodeproj_file_name.nil? && File.exist?(xcodeproj_file_name)
 
                         pindo_common_dir = pindo_single_config.pindo_common_configdir
 
@@ -136,15 +144,17 @@ module Pindo
                         project_script_file = File.join(project_root_dir, "AppLovinQualityServiceSetup-ios.rb")
                         FileUtils.cp_r(app_lovin_script, project_script_file)
                         command = "ruby " + project_script_file
-                        puts command
-                        system command
-                        
+                        # puts command
+                        system command  
                     end
+
+
                 end
 
+
                 def get_applovin_infoplist(project_dir:nil, proj_name:nil)
 
-                    info_plist_path = File.join(project_dir,  "Applovin-info.plist")
+                    info_plist_path = File.join(project_dir,  "AppEntry/Info.plist")
                     proj_fullname = File.join(project_dir, proj_name) + ".xcodeproj"
                     if File.exist?(proj_fullname)
                         project_obj = Xcodeproj::Project.open(proj_fullname)
@@ -163,7 +173,6 @@ module Pindo
 
                 def req_applovin_json
 
-
                     begin
                         # https://dash.applovin.com/docs/v1/skadnetwork_ids.json
                         applovin_url = "https://dash.applovin.com/docs/v1/skadnetwork_ids.json"
@@ -174,6 +183,7 @@ module Pindo
                         end
 
                         applovin_res_json = JSON.parse(res.body)
+
                         return applovin_res_json
                     rescue Exception => e
                         return nil 

data/lib/pindo/{utils → command/utils}/boss.rb

@@ -110,15 +110,15 @@ module Pindo
                         if @platform.nil?
                             @platform = current_config_json["app_setting"]["kGUKeyAppPlatform"]
                         end
-
+                        
                         if base_url.nil?
                             base_url = current_config_json["app_setting"]["kGUKeyAppClientHost"]
                         end
                     end
 
                     app_version = @appversion || "1.0.0"
-                    bundle_id = @bundleid || "com.heroneverdie101.fancyapptest"
-                    platform = @platform || "iOS_Funny_Test"
+                    bundle_id = @bundleid || "com.heroneverdie101.fancyapp"
+                    platform = @platform || "iOS_Funny_Release"
                     apptype = @apptype || "FunnyApp"
 
                     boss_client = BossClient.new(app_type:apptype, is_dev:false, base_url:base_url)

data/lib/pindo/command/utils/icon.rb

@@ -0,0 +1,81 @@
+
+
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require "pindo/base/xcodeconst"
+require 'pindo/module/xcode/xcodereshelper'
+
+module Pindo
+    class Command
+        class Utils < Command
+            class Icon < Utils
+        
+                extend Executable
+                executable :sips
+
+
+                self.summary = '根据1024*1024icon生成Xcode标准icon文件'
+  
+                self.description = <<-DESC
+                  根据1024*1024icon生成Xcode标准icon文件，用法：pindo utils icon path/to/demo.png 
+                DESC
+        
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/demo.png', true),
+                  ]
+          
+                def self.options
+                    [
+                        ['--install', '生成icon后拷贝进Xcode工程里, 用法 pindo utils icon --install'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)                    
+                    @icon_name = argv.shift_argument 
+                    @args_install_flag = argv.flag?('install', false)
+                    super(argv)
+                    @additional_args = argv.remainder!
+                end
+
+                def validate!
+                    super
+                    help! 'Need a icon name' if @icon_name.nil? || @icon_name.empty?
+                end
+        
+                def run
+                    icon_name = @icon_name
+                    time = Time.now.strftime('%m%d-%H%M%S')
+                    new_icon_dir = File.join(Dir.pwd, "icon_"+time)  
+
+
+                    Funlog.instance.fancyinfo_start("正在生成icon...")
+                    begin
+                        XcodeResHelper.create_icons(icon_name: icon_name, new_icon_dir: new_icon_dir)
+                        Funlog.instance.fancyinfo_success("生成icon成功!")
+                    rescue StandardError => e
+                        Funlog.instance.fancyinfo_error("生成icon失败!")
+                    end
+                    
+
+                    if @args_install_flag
+                        Funlog.instance.fancyinfo_start("正在给Xcode替换icon...")
+                        XcodeResHelper.install_icon(proj_dir: Dir.pwd, new_icon_dir: new_icon_dir)
+                        Funlog.instance.fancyinfo_success("Xcode替换icon完成！")
+                        begin
+                            FileUtils.remove_dir(new_icon_dir)
+                        rescue StandardError => e
+                            
+                        end
+                    else
+                        puts "open #{new_icon_dir}"
+                    end
+
+                end
+        
+                
+            end
+        end
+    end
+end

data/lib/pindo/{utils → command/utils}/renewproj.rb

@@ -2,6 +2,7 @@
 require 'xcodeproj'
 require 'find'  
 require 'fileutils'
+require 'pindo/module/xcode/xcodehelper'
 
 module Pindo
     class Command

data/lib/pindo/command/utils.rb

@@ -0,0 +1,26 @@
+
+require 'pindo/command/utils/icon'
+require 'pindo/command/utils/renewproj'
+require 'pindo/command/utils/clearcert'
+require 'pindo/command/utils/xcassets'
+require 'pindo/command/utils/device'
+require 'pindo/command/utils/applovin'
+require 'pindo/command/utils/tgate'
+require 'pindo/command/utils/boss'
+
+
+module Pindo
+    class Command
+  
+      class Utils < Command
+
+
+        self.abstract_command = true
+      
+        self.summary = '其他工具类的相关命令'
+    
+
+      end
+  
+    end
+end

data/lib/pindo/command.rb

@@ -3,11 +3,13 @@
 require 'claide'
 require 'json'
 require 'pindo/version'
-require 'pindo/config/pindoconfig'
+require 'pindo/base/funlog'
+require 'pindo/base/hashhelper'
 require 'pindo/base/plaininformative'
 require 'pindo/base/githelper'
 require 'pindo/client/giteeclient'
-require 'pindo/base/hashhelper'
+require 'pindo/config/pindoconfig'
+
 
 module Pindo
     class Informative < PlainInformative
@@ -20,33 +22,28 @@ module Pindo
 
         include Pindo::Githelper
         include Pindoconfig::Mixin
+        include Funlog::Mixin
 
         require 'pindo/options/deployoptions'
-
-
         require 'pindo/module/appselect'
-        require 'pindo/module/buildconfighelper'
-        require 'pindo/module/buildhelper'
-        require 'pindo/module/pemcreate'
-        require 'pindo/module/commonconfuseproj'
-        require 'pindo/module/xcodebuildpre'
-        require 'pindo/module/xcodehelper'
-        require 'pindo/module/configprojhelper'
-        require 'pindo/module/appstore_in_app_purchase'
-        require 'pindo/module/appstore_metadata_fastlane_helper'
-        require 'pindo/module/appstore_metadata_connect_api_helper'
-
-
-        require 'pindo/deploy'
-        require 'pindo/dev'
-        require 'pindo/env'
-        require 'pindo/lib'
-        require 'pindo/utils'
-        require 'pindo/pgyer'
-        require 'pindo/setup'
-        require 'pindo/repo'
-        require 'pindo/upgrade'
-        require 'pindo/ipa'
+        require 'pindo/module/build/commonconfuseproj'
+        require 'pindo/module/cert/xcodecerthelper'
+        
+        require 'pindo/module/appstore/appstore_in_app_purchase'
+        require 'pindo/module/appstore/appstore_metadata_fastlane_helper'
+        require 'pindo/module/appstore/appstore_metadata_connect_api_helper'
+
+        require 'pindo/command/deploy'
+        require 'pindo/command/dev'
+        require 'pindo/command/env'
+        require 'pindo/command/lib'
+        require 'pindo/command/utils'
+        require 'pindo/command/pgyer'
+        require 'pindo/command/setup'
+        require 'pindo/command/repo'
+        require 'pindo/command/upgrade'
+        require 'pindo/command/ipa'
+        require 'pindo/command/appstore'
 
 
         attr_accessor :args_help_flag