pindo 4.6.9 → 4.7.1

data/lib/pindo/command/appstore/itcapp.rb

@@ -0,0 +1,41 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Itcapp < Appstore
+
+
+                self.summary = 'Appstore中创建app'
+
+                self.description = <<-DESC
+                    Appstore中创建app，配置目录下执行：pindo appstore itcapp
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/appstore/metadata.rb

@@ -0,0 +1,43 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Metadata < Appstore
+
+
+                self.summary = 'Appstore中metadata相关操作'
+
+                self.description = <<-DESC
+                    Appstore中metadata相关操作, 用法:pindo appstre metadata
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--download', '下载app的所有购买项,用法:pindo appstore metadata --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                        @args_download_name = argv.option('download')
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/appstore/screenshots.rb

@@ -0,0 +1,43 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Screenshots < Appstore
+
+
+                self.summary = 'Appstore中screenshots相关操作'
+
+                self.description = <<-DESC
+                    Appstore中screenshots相关操作, 用法:pindo appstre screenshots
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--download', '下载app的所有购买项,用法:pindo appstore screenshots --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                        @args_download_name = argv.option('download')
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

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

@@ -0,0 +1,40 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Upload < Appstore
+
+                self.summary = '上传ipa到appstore'
+
+                self.description = <<-DESC
+                    上传ipa到appstore：pindo appstore upload
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+
+
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    super
+                end
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/appstore.rb

@@ -0,0 +1,17 @@
+
+require 'pindo/command/appstore/iap'
+require 'pindo/command/appstore/itcapp'
+require 'pindo/command/appstore/metadata'
+require 'pindo/command/appstore/screenshots'
+require 'pindo/command/appstore/upload'
+
+module Pindo
+  class Command
+    
+    class Appstore < Command
+      self.abstract_command = true
+      self.summary = 'appstore的相关命令'
+    end
+
+  end
+end

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

@@ -0,0 +1,109 @@
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require 'xcodeproj'
+require 'gym'
+
+module Pindo
+    class Command
+        class Deploy < Command
+            class Build < Deploy
+
+
+                self.summary = '编译工程'
+
+                self.description = <<-DESC
+                    编译工程. 用法：在工程目录下执行 pindo deploy build
+                DESC
+
+                self.arguments = [
+                    
+                ]
+
+                def initialize(argv)
+                  super
+                  @additional_args = argv.remainder!
+                end
+
+                def run
+
+                    new_project_dir = Dir.pwd
+                    project_fullname = Dir.glob(File.join(new_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+
+                    if File.exist?(File.join(new_project_dir, "build"))
+                        FileUtils.rm_rf(File.join(new_project_dir, "build"))
+                    end
+
+
+                    gym_options = get_gym_build_values(project_fullname:project_fullname)
+
+                    config = FastlaneCore::Configuration.create(Gym::Options.available_options, gym_options)
+                    Gym::Manager.new.work(config)
+
+
+                end
+
+
+                def get_gym_build_values(project_fullname:nil)
+
+                    if project_fullname.nil?
+                       raise "请指定要编译的工程"
+                    end
+                    project_path = File.dirname(project_fullname)
+                    proj_name = File.basename(project_fullname, ".xcodeproj")
+                    project_obj = Xcodeproj::Project.open(project_fullname)
+                    main_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
+                    provisioning_profile_name = main_target.build_configurations.first.build_settings['PROVISIONING_PROFILE_SPECIFIER'].downcase.split(" ")
+
+                    build_type = "app-store"
+                    icloud_env = "Production"
+                    if provisioning_profile_name.include?("adhoc")
+                        build_type = "ad-hoc"
+                        icloud_env = "Development"
+                    elsif provisioning_profile_name.include?("development")
+                        build_type = "development"
+                        icloud_env = "Development"
+                    else
+                        build_type = "app-store"
+                        icloud_env = "Production"
+                    end
+
+
+                    app_ipaname_temp = main_target.build_configurations.first.build_settings['INFOPLIST_KEY_CFBundleDisplayName'] || main_target.display_name
+                    app_ipaname_temp = app_ipaname_temp.gsub(/ /, '');
+                    app_ipaname_temp = app_ipaname_temp.gsub(/\'/, '');
+
+                    values = {
+                        project: "#{proj_name}.xcodeproj",
+                        scheme:"#{proj_name}",
+                        configuration: "Release",
+                        clean: true,
+                        export_method: build_type,
+                        output_directory:"./build/",
+                        output_name: "#{app_ipaname_temp}.ipa"
+                      }
+
+
+                    if File.exist?(File.join(project_path, "Podfile"))
+                        values[:workspace] = "#{proj_name}.xcworkspace"
+                        values[:project] = nil
+                    end
+
+                    values[:export_options] ||={}
+                    values[:export_options][:compileBitcode] = false
+                    values[:export_options][:stripSwiftSymbols] = true
+                    values[:export_options][:uploadSymbols] = false
+
+                    if !@deploy_icloud_id.nil?
+                        values[:export_options][:iCloudContainerEnvironment] = icloud_env
+                    end
+
+                    return values
+
+                end
+
+
+            end
+        end
+    end
+end

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

@@ -25,7 +25,7 @@ module Pindo
             [
                 ['--sign', 'sign flags'],
             ].concat(super)
-        end
+          end
 
           def initialize(argv)
             @args_sign_flag = argv.flag?('sign', false)

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

@@ -0,0 +1,183 @@
+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(cert_url:cert_git_url, certs_dir:certs_dir, cert_type:@build_type)
+                  bundle_id_map = get_bundle_id_map
+                  provisioning_info_array = install_provisionfiles(cert_url:cert_git_url, 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
+
+                provisioning_info_array = provisioning_info_array || []
+                unless provisioning_info_array.size > 0
+                  raise Informative, "未找到证书信息"
+                end
+
+                @team_id_vaule = provisioning_info_array.first["team_id"]
+
+                #发布机需要给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")
+                  Funlog.instance.fancyinfo_start("正在给Xcode配置证书...")
+                  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)
+                  Funlog.instance.fancyinfo_success("Xcode配置证书完成！")
+                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