pindo 4.6.9 → 4.7.0

data/lib/pindo/command/deploy/cert.rb

@@ -0,0 +1,179 @@
+require 'fileutils'
+require 'match'
+require 'pindo/module/build/swarkhelper'
+require 'pindo/module/cert/xcodecerthelper'
+require 'pindo/module/cert/certhelper'
+
+module Pindo
+    class Command
+      class Deploy < Command
+        class Cert < Deploy
+
+            include Command::DeployOptions
+            include XcodeCertHelper
+            include CertHelper
+            include SwarkHelper
+
+
+
+            self.summary = '创建证书并使用设置工程的证书'
+
+            self.description = <<-DESC
+              根据config.json中的bundle id获取最新证书，默认不创建证书。如果在工程目录下，会自动设置工程证书。用法 pindo deploy cert
+              默认创建appstore证书。 如果需要重新创建dev 证书， 用法：pindo deploy cert --dev --renew
+            DESC
+
+            self.arguments = [
+              CLAide::Argument.new('path/to/config.json', true),
+            ]
+
+            def self.options
+
+              [
+                ['--dev', '操作dev证书'],
+                ['--adhoc', '操作adhoc证书'],
+                ['--clean', '删除本地缓存的证书'],
+                ['--cleangit', '删除远程仓库中的证书'],
+                ['--upload', '生成上传pgyer的证书'],
+                ['--match', '生成上传pgyer的证书'],
+                ['--renew', '重新生成证书']
+              ].concat(super)
+            end
+
+            def initialize(argv)
+              @clean_flag = argv.flag?('clean', false)
+              @clean_git_flag = argv.flag?('cleangit', false)
+              @upload_flag = argv.flag?('upload', false)
+              @renew_cert_flag = argv.flag?('renew', false)
+              @match_flag = argv.flag?('match', false)
+
+              super
+
+              @build_type = "appstore"
+              if  @args_adhoc_flag
+                @build_type = "adhoc"
+              end
+              if  @args_dev_flag
+                @build_type = "development"
+              end
+
+            end
+
+            def run
+
+                if @clean_flag
+                  puts "Clear cert at local ..."
+                  Pindo::Command::Utils::Clearcert::run([])
+                end
+
+                if @renew_cert_flag && @clean_git_flag
+                      pindo_dir = pindo_single_config.pindo_dir
+                      git_url = pindo_single_config.deploy_cert_giturl
+                      if @apple_id.eql?(pindo_single_config.demo_apple_id)
+                        git_url = pindo_single_config.dev_cert_giturl
+                      end
+                      cert_repo_dir = getcode_to_dir(reponame:get_repo_base_name(repo_url:git_url), remote_url:git_url, path:pindo_dir, new_branch:@apple_id)
+                      FileUtils.rm_rf(File.join(cert_repo_dir, "certs"))
+                      FileUtils.rm_rf(File.join(cert_repo_dir, "profiles"))
+                      git_addpush_repo(path:cert_repo_dir, message:"remove #{@apple_id} certs")
+                end
+
+                bundle_id_array = get_bundle_id_map.values
+                provisioning_info_array = nil
+
+                # if @renew_cert_flag || @match_flag
+                  values = get_create_cert_match_values(apple_id:@apple_id, bundle_id_array:bundle_id_array, build_type:@build_type, renew_flag:@renew_cert_flag)
+                  config = FastlaneCore::Configuration.create(Match::Options.available_options, values)
+                  Match::Runner.new.run(config)
+                  provisioning_info_array = create_provisioning_info_array(build_type:@build_type)
+                  pindo_single_config.set_cert_info(dict: provisioning_info_array)
+
+                # else
+
+                #   cert_git_url = pindo_single_config.deploy_cert_giturl
+                #   if @apple_id.eql?(pindo_single_config.demo_apple_id)
+                #     cert_git_url = pindo_single_config.dev_cert_giturl
+                #   end
+                #   cert_reponame = cert_git_url.split("/").last.chomp(".git")
+                #   certs_dir = getcode_to_dir(reponame:cert_reponame, remote_url:cert_git_url, path: pindo_single_config.pindo_dir, new_branch:@apple_id)
+
+                #   install_certs(certs_dir:certs_dir, cert_type:@build_type)
+                #   bundle_id_map = get_bundle_id_map
+                #   provisioning_info_array = install_provisionfiles(certs_dir:certs_dir, bundle_id_map:bundle_id_map, cert_type:@build_type)
+                #   pindo_single_config.set_cert_info(dict: provisioning_info_array)
+                # end
+
+
+                team_id_key =  Match::Utils.environment_variable_name_team_id(app_identifier: @bundle_id,type:@build_type)
+                @team_id_vaule = ENV[team_id_key]
+
+                #发布机需要给swark注册bundle id
+                add_swark_authorize_json
+
+                if @args_adhoc_flag || @args_appstore_flag
+                  cert_type = "Development".downcase
+                  if @args_adhoc_flag
+                    cert_type = "Adhoc".downcase
+                  end
+                  if @upload_flag
+                    create_upload_cert_info(apple_id:@apple_id, cert_type:cert_type, provisioning_info_array:provisioning_info_array)
+                  end
+                end
+
+                new_project_dir = Dir.pwd
+                new_project_fullname = Dir.glob(File.join(new_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+                if !new_project_fullname.nil? && File.exist?(new_project_fullname) && !provisioning_info_array.nil? && provisioning_info_array.size > 0
+                  new_proj_name = File.basename(new_project_fullname, ".xcodeproj")
+                  config_project_cert(new_proj_name:new_proj_name, new_project_dir:new_project_dir, cert_type:@build_type, team_id_vaule:@team_id_vaule, provisioning_info_array:provisioning_info_array)
+                  config_infoplist_cert(new_proj_name:new_proj_name, new_project_dir:new_project_dir, icloud_id:@icloud_id, group_id:@group_id, provisioning_info_array:provisioning_info_array)
+                end
+              end
+        end
+
+        def get_create_cert_match_values(apple_id:nil, bundle_id_array:nil, build_type:nil, renew_flag:false)
+
+          if build_type.eql?("appstore") && (apple_id.eql?(pindo_single_config.demo_apple_id))
+            raise Informative, "#{apple_id} 是测试账号，不能创建appstore证书!!!"
+          end
+          if !build_type.eql?("appstore") && !apple_id.eql?(pindo_single_config.demo_apple_id)
+            raise Informative, "账号#{apple_id} 不能创建dev或者adhoc证书!!!"
+          end
+
+          git_url = pindo_single_config.deploy_cert_giturl
+          if @apple_id.eql?(pindo_single_config.demo_apple_id)
+            git_url = pindo_single_config.dev_cert_giturl
+          end
+
+          force_for_new_devices_flag = true
+          if build_type.eql?("appstore")
+            force_for_new_devices_flag = false
+          end
+
+          platform_type = "ios"
+          if @config_json && @config_json['project_info'] && @config_json['project_info']['build_type'].include?("MacOS")
+            platform_type = "macos"
+          end
+
+          values = {
+            username:apple_id,
+            app_identifier: bundle_id_array,
+            type: build_type,
+            keychain_password:"goodcert1",
+            git_url: git_url,
+            readonly:!renew_flag,
+            force:renew_flag,
+            clone_branch_directly:!renew_flag,
+            include_mac_in_profiles:true,
+            include_all_certificates:true,
+            generate_apple_certs:true,
+            shallow_clone:!renew_flag,
+            git_branch: apple_id,
+            platform:platform_type,
+            force_for_new_devices:force_for_new_devices_flag
+          }
+          return values
+        end
+
+    end
+  end
+end

data/lib/pindo/command/deploy/configproj.rb

@@ -0,0 +1,105 @@
+
+require 'find'
+require 'cocoapods-core'
+require 'pindo/module/xcode/xcodebuildhelper'
+require 'pindo/module/xcode/xcodeappconfig'
+require 'pindo/module/build/swarkhelper'
+
+module Pindo
+    class Command
+        class Deploy < Command
+            class Configproj < Deploy
+        
+                include Command::DeployOptions
+
+                include XcodeBuildHelper
+                include XcodeAppConfig
+                include XcodeCertHelper
+
+                include SwarkHelper
+
+                # include Configprojhelper
+                
+                self.summary = '修改Xcode工程编译参数'
+        
+                self.description = <<-DESC
+                    根据config.json修改Xcode工程编译参数, 用法：工程目录下执行pindo deploy configproj
+                DESC
+        
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', true),
+                ]
+
+                def run
+
+                    check_config_version
+
+                    current_dir = Dir.pwd
+
+                    app_config_dir = clong_buildconfig_repo(repo_name: @deploy_repo_name)
+
+                    project_fullname = Dir.glob(File.join(current_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+                    if project_fullname.nil?  || !File.exist?(project_fullname) then
+                        raise "找到多个.xcodeproj文件,请检查"
+                    end
+                    @proj_name = File.basename(project_fullname, ".xcodeproj")
+
+
+                    Funlog.instance.fancyinfo_start("正在替换google-info.plist...")
+                    google_info_config_dir = clong_buildconfig_repo(repo_name: @bundle_id)
+                    install_google_plist(project_dir:current_dir, app_config_dir:google_info_config_dir)
+                    Funlog.instance.fancyinfo_success("替换google-info.plist完成！")
+
+
+                    icon_name = File.join(app_config_dir,"fastlane","icon.png")
+                    time = Time.now.strftime('%m%d-%H%M%S')
+                    new_icon_dir = File.join(current_dir, "icon_"+time)  
+
+                    Funlog.instance.fancyinfo_start("正在创建icon...")
+                    XcodeResHelper.create_icons(icon_name: icon_name, new_icon_dir: new_icon_dir)
+                    Funlog.instance.fancyinfo_success("创建icon完成!")
+
+                    Funlog.instance.fancyinfo_start("正在替换icon...")
+                    XcodeResHelper.install_icon(proj_dir: current_dir, new_icon_dir: new_icon_dir)
+                    Funlog.instance.fancyinfo_success("替换icon完成!")
+
+                    begin
+                        FileUtils.rm_rf(new_icon_dir)
+                    rescue StandardError => err
+                    end
+
+                    Funlog.instance.fancyinfo_start("正在替换启动页...")
+                    launchimg_filename = File.join(app_config_dir,"launch","w768_h1024@2x.png")
+                    XcodeResHelper.install_launchimg(proj_dir:current_dir, launchimg_filename:launchimg_filename)
+                    Funlog.instance.fancyinfo_success("启动页处理完成!")
+                    
+                    add_project_modue(project_dir:current_dir, proj_name:@proj_name, config_json:@config_json)
+
+                    Funlog.instance.fancyinfo_start("正在修改工程配置...")
+                    modify_info_plist(project_dir:current_dir, proj_name:@proj_name, config_json:@config_json)
+                    
+
+
+                    modify_project_config(project_dir:current_dir, proj_name:@proj_name, config_json:@config_json)
+                    
+                    appprefix_file = "AppPrefix.plist"
+                    if @config_json && @config_json['project_info']['appprefix_plist'] then
+                        appprefix_file = @config_json['project_info']['appprefix_plist']
+                    end
+                    modify_appprefix_plist(project_dir:current_dir, appprefix_file:appprefix_file, config_json:@config_json)
+
+                    Funlog.instance.fancyinfo_success("工程配置修改完成!")
+
+                    check_swark_authorize(config_json:@config_json)
+
+                end
+
+
+
+                
+
+            end
+               
+        end
+    end
+end

data/lib/pindo/{deploy → command/deploy}/getitcinfo.rb

@@ -12,7 +12,7 @@ module Pindo
         
                 include Command::DeployOptions
 
-                include Xcodebuildpre
+                include XcodeCertHelper
                 include AppstoreMetadataConnectApiHelper
                 
 

data/lib/pindo/{deploy → command/deploy}/iap.rb

@@ -161,17 +161,26 @@ module Pindo
 
                                   appstore_iap_items = vip_group_item["items"] || vip_group_item["subscription_items"]
 
-                                  boss_iap_json = {}
-                                  boss_iap_json["client_vip"] = {}
-                                  boss_iap_json["offer_map"] = {}
-                                  boss_iap_json["client_vip"]["style"] = "tribble_style"
-                                  boss_iap_json["client_vip"]["best_deal"] = "offer.id." + vip_mode + "0"
-                                  boss_iap_json["client_vip"]["offer"] = []
+                                  boss_iap_json = {
+                                    "client_vip" => {
+                                      "situation_list" => [],
+                                      "style_list" => []
+                                    },
+                                    "offer_map" => {}
+                                  }
+
+                                  situation_list_item = {
+                                        "situation" => "launch",
+                                        "style" => "tribble_style"
+                                  }
+                                  style_list_item = {
+                                        "style" => "tribble_style",
+                                        "best_deal" => "offer.id." + vip_mode + "0",
+                                        "offer" => []
+                                  }
 
                                   if !appstore_iap_items.nil? && appstore_iap_items.size > 0
-
                                       appstore_iap_items.each do |appstore_iap_item|
-
                                           boss_iap_item = {}
                                           boss_iap_item["offer_id"] = "offer.id." + vip_mode
                                           boss_iap_item["kind"] = "vip"
@@ -213,10 +222,22 @@ module Pindo
                                           end
 
                                           boss_iap_json["offer_map"][boss_iap_item["offer_id"]] = boss_iap_item
-                                          boss_iap_json["client_vip"]["offer"]  <<  boss_iap_item["offer_id"]
+                                          style_list_item["offer"] << boss_iap_item["offer_id"]
+                                      end
 
+                                      if style_list_item["offer"].size == 3
+                                        situation_list_item["style"] = "tribble_style"
+                                        style_list_item["style"] = "tribble_style"
+                                      elsif style_list_item["offer"].size == 2
+                                        situation_list_item["style"] = "double_style"
+                                        style_list_item["style"] = "double_style"
+                                      elsif style_list_item["offer"].size == 1
+                                        situation_list_item["style"] = "single_style"
+                                        style_list_item["style"] = "single_style"
                                       end
 
+                                      boss_iap_json["client_vip"]["situation_list"] << situation_list_item
+                                      boss_iap_json["client_vip"]["style_list"] << style_list_item
                                   end
 
                                   puts JSON.pretty_generate(boss_iap_json)

data/lib/pindo/{deploy → command/deploy}/itcapp.rb

@@ -1,4 +1,3 @@
-require 'pindo/deploy/bundleid'
 
 module Pindo
     class Command

data/lib/pindo/{deploy → command/deploy}/itcinfo.rb

@@ -13,7 +13,7 @@ module Pindo
 
                 include Command::DeployOptions
 
-                include Xcodebuildpre
+                include XcodeCertHelper
                 include AppstoreMetadataConnectApiHelper
 
 
@@ -69,8 +69,8 @@ module Pindo
                     end
 
                     if @upload_screenshots_flag
+                        ENV["FASTLANE_ENABLE_BETA_DELIVER_SYNC_SCREENSHOTS"] = "YES"
                         app_screenshots_dir = File.join(@app_config_dir,  "fastlane/screenshots")
-
                         fastlane_process_screenshots(app_screenshots_dir:app_screenshots_dir)
 
                         fastlane_login(apple_id:@apple_id)
@@ -80,7 +80,6 @@ module Pindo
                     if @upload_ipa_flag
                         # prepare_screenshots(project_dir:current_project_dir, apple_id:@apple_id, bundle_id:@bundle_id, config_json:@config_json)
                         command = "fastlane uploadipa"
-                        puts "Upload Ipa ..."
                         system command
                     end
 

data/lib/pindo/{deploy → command/deploy}/pem.rb

@@ -1,13 +1,14 @@
 require 'fileutils'
 
+
 module Pindo
     class Command
       class Deploy < Command
         class Pem < Deploy
           
-
+          require 'pindo/module/cert/pemhelper'
           include Command::DeployOptions
-          include Pemcreate
+          include PemHelper
 
           self.summary = '创建App的push证书'
   

data/lib/pindo/{deploy → command/deploy}/resign.rb

@@ -38,17 +38,7 @@ module Pindo
                 def initialize(argv)
                     
                     @ipa_file_name = argv.option('ipa')
-                    super 
-                    
-
-                    @build_type = "appstore"
-                    if  @args_adhoc_flag
-                      @build_type = "adhoc"
-                    end
-                    if  @args_dev_flag
-                      @build_type = "development"
-                    end
-
+                    super(argv)
                 end
 
                 def run
@@ -252,18 +242,18 @@ module Pindo
 
                 def sign_ipa_with_new_cert(ipa_name: nil)
 
-                    bundle_id_dict = pindo_single_config.get_cert_info
-                    bundle_id_signing_identity = bundle_id_dict["bundle_id_cert_common_name"]
-                    puts "bundle_id_signing_identity : #{bundle_id_signing_identity}"
+                    profil_info_array = pindo_single_config.get_cert_info
+                    bundle_id_signing_identity = profil_info_array.first['signing_identity']
+                    # puts "bundle_id_signing_identity : #{bundle_id_signing_identity}"
 
-                    profile_dict = resign_profile_dict()
+                    profile_dict = resign_profile_dict(profil_info_array: profil_info_array)
+
+                    # puts 
+                    # puts "profile_dict :"
+                    # puts
+                    # puts profile_dict
 
-                    puts 
-                    puts "profile_dict :"
-                    puts
-                    puts profile_dict
 
-                
                     # resign(ipa, signing_identity, provisioning_profiles, entitlements, ççç, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path)
 
                     Sigh::Resign.resign(ipa_name, bundle_id_signing_identity, profile_dict, nil, nil, nil, nil, nil, @bundle_id, true, nil)
@@ -281,51 +271,12 @@ module Pindo
                     end
                 end
 
-                def resign_profile_dict
-
-                    bundle_id_dict = pindo_single_config.get_cert_info
-
-                    resign_dict = {}
-                    resign_dict[@bundle_id] = bundle_id_dict['bundle_id']['bundle_id_profile_path']
-
-                    if @bundle_id_pushcontent then
-                        resign_dict[@bundle_id_pushcontent] = bundle_id_dict['bundle_id_pushcontent']['bundle_id_pushcontent_profile_path']
-                    end
+                def resign_profile_dict(profil_info_array: nil)
                     
-                    if @bundle_id_pushservice then
-                        resign_dict[@bundle_id_pushservice] = bundle_id_dict['bundle_id_pushservice']['bundle_id_pushservice_profile_path']
-                    end
-
-                    if @bundle_id_keyboard then
-                        resign_dict[@bundle_id_keyboard] = bundle_id_dict['bundle_id_keyboard']['bundle_id_keyboard_profile_path']
-                    end
-
-                    if @bundle_id_imessage then
-                        resign_dict[@bundle_id_imessage] = bundle_id_dict['bundle_id_imessage']['bundle_id_imessage_profile_path']
-                    end
-
-                    if @bundle_id_siri then
-                        resign_dict[@bundle_id_siri] = bundle_id_dict['bundle_id_siri']['bundle_id_siri_profile_path']
-                    end
-
-                    if @bundle_id_siriui then
-                        resign_dict[@bundle_id_siriui] = bundle_id_dict['bundle_id_siriui']['bundle_id_siriui_profile_path']
-                    end
 
-                    if @bundle_id_widget then
-                        resign_dict[@bundle_id_widget] = bundle_id_dict['bundle_id_widget']['bundle_id_widget_profile_path']
-                    end
-
-                    if @bundle_id_extension then
-                        resign_dict[@bundle_id_extension] = bundle_id_dict['bundle_id_extension']['bundle_id_extension_profile_path']
-                    end
-
-                    if @bundle_id_extensionad then
-                        resign_dict[@bundle_id_extensionad] = bundle_id_dict['bundle_id_extensionad']['bundle_id_extensionad_profile_path']
-                    end
-
-                    if @bundle_id_extensionpron then
-                        resign_dict[@bundle_id_extensionpron] = bundle_id_dict['bundle_id_extensionpron']['bundle_id_extensionpron_profile_path']
+                    resign_dict = {}
+                    profil_info_array.each do |profil_info|
+                        resign_dict[profil_info["bundle_id"]] = profil_info["profile_path"]
                     end
 
                     return resign_dict

data/lib/pindo/command/deploy.rb

@@ -0,0 +1,44 @@
+
+
+
+require 'pindo/command/deploy/updateconfig'
+require 'pindo/command/deploy/initconfig'
+require 'pindo/command/deploy/pullconfig'
+require 'pindo/command/deploy/reportbug'
+
+require 'pindo/command/deploy/bundleid'
+require 'pindo/command/deploy/itcapp'
+require 'pindo/command/deploy/cert'
+require 'pindo/command/deploy/pem'
+require 'pindo/command/deploy/build'
+
+require 'pindo/command/deploy/configproj'
+require 'pindo/command/deploy/confusecode'
+require 'pindo/command/deploy/confuseproj'
+require 'pindo/command/deploy/fabric'
+require 'pindo/command/deploy/resign'
+require 'pindo/command/deploy/iap'
+require 'pindo/command/deploy/itcinfo'
+require 'pindo/command/deploy/getitcinfo'
+require 'pindo/command/deploy/quswark'
+require 'pindo/command/deploy/quswauth'
+require 'pindo/command/deploy/check'
+require 'pindo/command/deploy/tag'
+
+# require 'pindo/command/deploy/uploadipa'
+
+module Pindo
+  class Command
+
+
+    class Deploy < Command
+      
+
+        self.abstract_command = true
+        self.summary = '发布阶段相关命令'  
+
+
+
+    end
+  end
+end