pindo 4.6.9

data/lib/pindo/deploy/initconfig.rb

@@ -0,0 +1,128 @@
+require 'fileutils'
+require 'faraday'
+require 'pindo/client/giteeclient'
+
+module Pindo
+    class Command
+        class Deploy < Command
+
+          class Initconfig < Deploy
+        
+            self.summary = '创建App配置仓库'
+    
+            self.description = <<-DESC
+                创建App配置仓库, 用法:pindo deploy pullconfig
+            DESC
+    
+            self.arguments = [
+              CLAide::Argument.new('bundle id', true),
+            ]
+      
+            def self.options
+              [
+                ['--test', 'use dev build mode']
+              ].concat(super)
+            end
+    
+            def initialize(argv)
+              @bundle_id = argv.shift_argument 
+              @test_flag = argv.flag?('test', false)
+              super
+              @additional_args = argv.remainder!
+            end
+    
+            def validate!
+              super
+
+              if @bundle_id.nil?
+                
+                say "需要输入仓库名称, 默认以bundle id作为仓库名称"
+
+                @bundle_id = ask('bundle id: ') || nil
+                
+              end
+
+              help! '你需要输入一个仓库名称' if @bundle_id.nil? || @bundle_id.empty?
+
+            end
+  
+            def run
+
+              @gitee_client = GiteeClient.new(access_token:pindo_single_config.gitee_api_key)
+
+              demo_dir = clong_buildconfig_repo(repo_name: pindo_single_config.demo_bundle_id) 
+
+              public_type = 0
+              owner_org = pindo_single_config.build_deploy_org
+              repo_name = @bundle_id
+
+              if @test_flag
+                owner_org = pindo_single_config.build_test_org
+                public_type = 2
+              end
+
+              success = @gitee_client.gitee_create_repo(owner:owner_org, repo_name:repo_name, public_type:public_type)
+              if success
+
+                  if @test_flag
+                    modify_repo_setting(repo_name:repo_name, owner_org:owner_org)
+                  end
+
+                  app_config_dir = clong_buildconfig_repo(repo_name: repo_name)
+                  system 'open ' + app_config_dir
+
+                  if File.exist?(app_config_dir)                     
+                    update_appconfig_repo(resDir:demo_dir, desDir:app_config_dir)
+                  else
+                    puts "Creaate app config repo error !!!"
+                  end
+              else
+                app_config_dir = clong_buildconfig_repo(repo_name: repo_name)
+                system 'open ' + app_config_dir
+              end
+
+            end
+
+            def modify_repo_setting(repo_name:nil, owner_org:nil)
+                pindo_setting_dir = pindo_single_config.pindo_env_configdir
+                git_repo_file = pindo_single_config.git_base_url_fullname
+                git_repo_json = JSON.parse(File.read(git_repo_file))
+                git_repo_json = git_repo_json || {}
+                if git_repo_json 
+                  git_repo_json[repo_name] = owner_org
+                end
+                File.open(git_repo_file, "w") do |f|
+                  f.write(JSON.pretty_generate(git_repo_json))
+                end
+                git_addpush_repo(path:pindo_setting_dir, message:"add #{repo_name}")
+            end
+
+            def update_appconfig_repo(resDir:nil, desDir:nil)
+              if File.exist?(resDir) 
+                
+                if File.exist?(File.join(resDir, "config.json"))
+                  FileUtils.cp_r(File.join(resDir, "config.json"), desDir)
+                end
+
+                if File.exist?(File.join(resDir, "fastlane"))
+                  FileUtils.cp_r(File.join(resDir, "fastlane"), desDir)
+                end
+
+                if File.exist?(File.join(resDir, "launch"))
+                  FileUtils.cp_r(File.join(resDir, "launch"), desDir)
+                end
+
+                text = File.read(File.join(desDir, "config.json"))
+                new_contents = text.gsub(/#{pindo_single_config.demo_bundle_id}/, "#{@bundle_id}")
+                File.open(File.join(desDir, "config.json"), "w") {|file| file.puts new_contents }
+                
+                git_addpush_repo(path:desDir, message:"init app config")
+
+              end
+            end
+
+        end
+      end
+    end
+  end
+  

data/lib/pindo/deploy/itcapp.rb

@@ -0,0 +1,147 @@
+require 'pindo/deploy/bundleid'
+
+module Pindo
+    class Command
+      class Deploy < Command
+        class Itcapp < Deploy
+          
+          include Command::DeployOptions
+        
+          self.summary = '在AppStore中创建App'
+  
+          self.description = <<-DESC
+            在AppStore中创建App
+          DESC
+  
+          self.arguments = [
+            CLAide::Argument.new('path/to/config.json', true),
+          ]
+
+          def self.options
+            [
+                ['--num', 'itc num version'],
+                ['--com', 'itc num version'],
+            ].concat(super)
+        end
+
+          def initialize(argv)
+            @app_version = argv.option('num')
+            @com_name = argv.option('com')
+            puts "@app_version = #{@app_version}"
+            super
+          end          
+
+  
+          def run
+
+            Spaceship::Portal.login(@apple_id.to_s)
+            Spaceship::Portal.select_team
+            app = Spaceship::Portal.app.find(@bundle_id)
+            if app.nil?
+              Bundleid::run([@args_appconfig])
+              sleep(2)
+            end
+            puts "Create app in itc ..."
+            puts @apple_id
+            puts "Login #{@apple_id}..."
+            Spaceship::Tunes.login(@apple_id.to_s)
+            Spaceship::Tunes.select_team
+
+            create_itcapp(temp_bundle_id:@bundle_id)
+            modify_appconfig_appleid(temp_bundle_id:@bundle_id)
+
+          end
+
+          def modify_appconfig_appleid(temp_bundle_id:nil)
+
+            app = Spaceship::ConnectAPI::App.find(temp_bundle_id)
+            unless app.nil?
+              puts 
+              puts " app.id :  #{app.id}  +++++++++",
+              puts
+              modify_appconfig_file(app_config_file:@args_appconfig_fullname, app_info_detail:app)
+              app_config_dir = clong_buildconfig_repo(repo_name: @deploy_repo_name)
+              app_config_file = File.join(app_config_dir, "config.json")
+              modify_appconfig_file(app_config_file:app_config_file, app_info_detail:app)
+              prepare_gitenv()
+              git_addpush_repo(path:app_config_dir, message:"modify apple id ")
+            end
+            
+          end
+
+          def modify_appconfig_file(app_config_file:nil, app_info_detail:nil)
+            config_content=JSON.parse(File.read(app_config_file))
+            File.open(app_config_file, "w") do |f|
+              config_content['app_info']['app_id_ios'] = app_info_detail.id
+              if config_content['app_setting']["apple_app_id"]
+                config_content['app_setting']["apple_app_id"] =  app_info_detail.id
+              end
+
+              if config_content['app_setting']["kGUKeyAppId"]
+                config_content['app_setting']["kGUKeyAppId"] =  app_info_detail.id
+              end
+
+              f.write(JSON.pretty_generate(config_content))
+            end
+
+          end
+
+          def create_itcapp(temp_bundle_id:nil)
+
+            temp_version = "1.0.0"
+            if @config_json && @config_json["app_info"] && @config_json["app_info"]["app_version"]
+              temp_version = @config_json["app_info"]["app_version"]
+            end 
+
+            if @com_name.nil? && @config_json.nil? && @config_json["account_info"] && @config_json["app_info"]["acount_company_name"]
+              @com_name = @config_json["account_info"]["acount_company_name"].strip
+            end 
+
+            app = nil
+            if !temp_bundle_id.nil?
+              app = Spaceship::ConnectAPI::App.find(temp_bundle_id)
+              if app == nil
+                app_sku_id_fixed = temp_bundle_id + ".sku"
+                puts "App的默认sku id 为:    #{app_sku_id_fixed}"
+                input_skuid = ask("请自定义输入App Sku ID: ") || nil
+                if !input_skuid.nil? && input_skuid.length > 1
+                  app_sku_id_fixed = input_skuid
+                end
+
+                if @com_name.nil?
+                  @com_name = ask('Company Name : ') || nil
+                end
+                puts "App Sku ID   : #{app_sku_id_fixed}"
+                puts "Company Name : #{@com_name}"
+                answer = agree("请确认上面信息是否正确(Y/n）:")
+                unless answer
+                  raise Informative, "重新创建 !!!"
+                end 
+                app_default_name = temp_bundle_id.gsub('.', '')
+                if app_default_name.length > 30
+                  app_default_name.slice!(30)
+                end
+                app = Spaceship::ConnectAPI::App.create(name: app_default_name,
+                                          version_string: temp_version, # initial version
+                                          sku: app_sku_id_fixed,
+                                          primary_locale: "en-US",
+                                          bundle_id: temp_bundle_id,
+                                          platforms: ["IOS"],
+                                          company_name:@com_name
+                                        )
+                puts "App is created !!!"
+              else
+                puts "App is already exist !!!"
+              end
+
+            end
+            return app
+          end
+
+
+
+        end
+      end
+    end
+  end
+  

data/lib/pindo/deploy/itcinfo.rb

@@ -0,0 +1,369 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+require "fastimage"
+require 'deliver'
+
+
+module Pindo
+    class Command
+        class Deploy < Command
+            class Itcinfo < Deploy
+
+                include Command::DeployOptions
+
+                include Xcodebuildpre
+                include AppstoreMetadataConnectApiHelper
+
+
+                self.summary = '更新AppStore中的App信息'
+
+                self.description = <<-DESC
+                    更新AppStore中的App信息
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', true),
+                ]
+
+                def self.options
+                    [
+                        ['--metadata', 'Upload metadata to iTunes Connect.'],
+                        ['--screenshots', 'Upload screenshots to iTunes Connect.'],
+                        ['--overwrite', 'overwrite screenshots to iTunes Connect.'],
+                        ['--sync', 'sync screenshots to iTunes Connect.'],
+
+                        ['--ipa', 'Upload ipa to iTunes Connect.'],
+                    ].concat(super)
+                end
+
+                  def initialize(argv)
+
+                    @upload_metadata_flag = argv.flag?('metadata', false)
+                    @upload_screenshots_flag = argv.flag?('screenshots', false)
+
+                    @overwrite_flag = argv.flag?('overwrite', false)
+                    @sync_flag = argv.flag?('sync', false)
+
+                    @upload_ipa_flag = argv.flag?('ipa', false)
+
+                    super
+                  end
+
+
+                def run
+                    current_project_dir = Dir.pwd
+
+                    pindo_dir = File::expand_path(pindo_single_config.pindo_dir)
+                    @app_config_dir = File.join(pindo_dir, @deploy_repo_name)
+
+                    # @app_config_dir = clong_buildconfig_repo(repo_name: @deploy_repo_name)
+
+                    print_info(project_dir:current_project_dir, apple_id:@apple_id, bundle_id:@bundle_id, config_json:@config_json)
+
+                    if @upload_metadata_flag
+                        process_itunes_metadata()
+                        fastlane_login(apple_id:@apple_id)
+                        fastlane_upload_metadata(temp_bundle_id:@bundle_id)
+                    end
+
+                    if @upload_screenshots_flag
+                        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)
+                        fastlane_upload_screenshots(apple_id:@apple_id, bundle_id:@bundle_id, app_screenshots_dir:app_screenshots_dir)
+                    end
+
+                    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
+
+                    puts "Done !!!"
+                end
+
+                def process_itunes_metadata( )
+                    app_itunes_dir = File.join(@app_config_dir,  "fastlane")
+                    app_itunes_file = File.join(app_itunes_dir,  "app_itunes.json")
+                    app_itunes_json = JSON.parse(File.read(app_itunes_file))
+
+
+
+
+                    app_itunes_json = app_itunes_json || {}
+
+
+
+                    app_itunes_json["app_info"] = app_itunes_json["app_info"] || {}
+                    app_itunes_json["app_info"]["app_info_localization"] = app_itunes_json["app_info"]["app_info_localization"] || {}
+
+
+                    if !app_itunes_json["app_info"]["app_info_localization"].nil?
+                        app_itunes_json["app_info"]["app_info_localization"].each do |lang , app_info_localization|
+                            check_app_info_localization(lang:lang, localization_json:app_info_localization)
+                        end
+                    end
+
+                    app_itunes_json["app_edit_version_info"] = app_itunes_json["app_edit_version_info"] || {}
+                    app_itunes_json["app_edit_version_info"].each do |platform, value|
+
+                        platform_metadata_path = File.join(app_itunes_dir, platform.downcase)
+                        if !File.exist?(platform_metadata_path)
+                            FileUtils.mkdir_p(platform_metadata_path)
+                        end
+
+                        app_itunes_json["app_edit_version_info"][platform] = app_itunes_json["app_edit_version_info"][platform] || {}
+                        app_itunes_json["app_edit_version_info"][platform]["app_review_info"] = app_itunes_json["app_edit_version_info"][platform]["app_review_info"] || {}
+
+                        app_version = @config_json['app_info']['app_version']
+                        app_itunes_json["app_edit_version_info"][platform]["version_string"] = app_version
+                        app_itunes_json["app_edit_version_info"][platform]["app_review_info"] = app_itunes_json["app_edit_version_info"][platform]["app_review_info"] || {}
+                        app_itunes_json["app_edit_version_info"][platform]["app_review_info"]["contact_email"] = @config_json['account_info']['apple_acount_id']
+
+                        app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"] = app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"] || {}
+                        app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"]["en-US"] = app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"]["en-US"] || {}
+
+
+                        notes_file =  File.join(platform_metadata_path,  "review_notes.txt")
+                        if File.exist?(notes_file)
+                            notes_file_txt =  File.read(notes_file)
+                            app_itunes_json["app_edit_version_info"][platform]["app_review_info"]["notes"] = notes_file_txt.to_s.strip
+                        end
+
+
+                        if !app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"].nil?
+                            app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"].each do |lang , value|
+
+                                app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"][lang] = app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"][lang] || {}
+
+                                lang_metadata_path = File.join(platform_metadata_path,  lang)
+                                if !File.exist?(lang_metadata_path)
+                                    FileUtils.mkdir_p(lang_metadata_path)
+                                end
+
+                                read_app_version_info_localization(lang:lang, localization_json:app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"][lang], lang_metadata_path:lang_metadata_path, key_name:"description")
+                                read_app_version_info_localization(lang:lang, localization_json:app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"][lang], lang_metadata_path:lang_metadata_path, key_name:"keywords")
+                                read_app_version_info_localization(lang:lang, localization_json:app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"][lang], lang_metadata_path:lang_metadata_path, key_name:"support_url")
+                                read_app_version_info_localization(lang:lang, localization_json:app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"][lang], lang_metadata_path:lang_metadata_path, key_name:"marketing_url")
+                                read_app_version_info_localization(lang:lang, localization_json:app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"][lang], lang_metadata_path:lang_metadata_path, key_name:"promotional_text")
+                                read_app_version_info_localization(lang:lang, localization_json:app_itunes_json["app_edit_version_info"][platform]["app_version_info_localization"][lang], lang_metadata_path:lang_metadata_path, key_name:"whats_new")
+                            end
+                        end
+
+                    end
+
+
+                    #platforms = ["IOS", "MAC_OS", "TV_OS"]
+
+                    # Dir.foreach(app_itunes_dir) do |file|
+                    #     if File::directory?(File.join(app_itunes_dir, file)) && platforms.include?(file)
+                    #     end
+                    # end
+
+                    File.open(app_itunes_file, "w") do |file|
+                        file.write(JSON.pretty_generate(app_itunes_json))
+                        file.close
+                    end
+
+                end
+
+
+
+                def check_app_info_localization(lang:nil, localization_json:nil)
+                    if !localization_json.nil?
+
+                        localization_json.each do |key, value|
+
+                            if !value.nil? && value.to_s.length > 0
+                                localization_json[key] = value.to_s.strip
+                            end
+
+                            if ( key.eql?("name") || key.eql?("subtitle") ) && !localization_json[key].nil? && localization_json[key].length > 30 && localization_json[key].length <2
+                                puts
+                                puts
+                                puts localization_json[key]
+                                puts "长度: #{localization_json[key].length}"
+                                raise Informative, "#{lang} : #{key} 超出限定的30个字符 !!!"
+                            end
+                        end
+                    end
+
+                end
+
+
+                def read_app_version_info_localization(lang:nil, localization_json:nil, lang_metadata_path:nil, key_name:nil)
+
+                    # puts "lang_metadata_path : #{lang_metadata_path}"
+
+                    key_name_file = File.join(lang_metadata_path,  key_name + ".txt")
+                    if File.exist?(key_name_file)
+                        localization_json = localization_json || {}
+                        key_name_txt =  File.read(key_name_file)
+                        # puts "key_name : #{key_name}"
+                        # puts "key_name_txt : #{key_name_txt}"
+                        localization_json[key_name] = key_name_txt.to_s.strip
+                        if key_name.eql?("keywords") && !localization_json[key_name].nil? && localization_json[key_name].length > 100
+                            puts localization_json[key_name]
+                            puts "长度: #{localization_json[key_name].length}"
+
+                            raise Informative, "#{lang} : keywords 超出限定的100个字符 !!!"
+                        end
+
+                        if key_name.eql?("description") && !localization_json[key_name].nil? && localization_json[key_name].length > 4000
+                            puts localization_json[key_name]
+                            puts "长度: #{localization_json[key_name].length}"
+                            raise Informative, "#{lang} : description 超出限定的4000个字符 !!!"
+                        end
+                        # puts localization_json
+                    end
+                end
+
+
+                def fastlane_upload_metadata(temp_bundle_id:nil)
+
+                    app_itunes_dir = File.join(@app_config_dir,  "fastlane")
+                    app_itunes_file = File.join(app_itunes_dir,  "app_itunes.json")
+                    app_itunes_json = JSON.parse(File.read(app_itunes_file))
+
+                    app = Spaceship::ConnectAPI::App.find(temp_bundle_id)
+
+                    fastlane_update_app_metadata(app: app, app_itunes_json:app_itunes_json)
+
+                    if !app_itunes_json["app_info"].nil?
+                        fastlane_update_app_info_metadata(app: app, app_itunes_json:app_itunes_json)
+                    end
+
+                    if !app_itunes_json["app_edit_version_info"].nil?
+                        app_itunes_json["app_edit_version_info"].each do |platform, platform_info_data|
+                            puts
+                            puts
+                            puts "===========正在处理平台: #{platform}"
+                            app_edit_version_info = app.get_edit_app_store_version(platform: platform)
+
+                            if !app_edit_version_info.nil? && !app_itunes_json["app_edit_version_info"].nil? &&  !app_itunes_json["app_edit_version_info"][platform].nil?
+
+                                fastlane_update_app_version_info_metadata(app: app, platform:platform, app_itunes_json:app_itunes_json)
+                            end
+
+                        end
+                    end
+
+
+                    fastlane_update_app_info_localizations(app: app, app_itunes_json:app_itunes_json)
+
+
+                end
+
+
+                def print_info(project_dir:nil, apple_id:nil, bundle_id:nil, config_json:nil)
+
+                    pindo_dir = File::expand_path(pindo_single_config.pindo_dir)
+                    config_repo_dir = File.join(pindo_dir, bundle_id)
+                    apple_id = @config_json['app_info']['app_id_ios']
+
+                    puts
+                    puts "++++++  App Store Download Url: ++++++"
+                    puts ""
+                    puts ""
+                    puts ""
+                    puts "下载链接:  " + "https://itunes.apple.com/us/app/id" + "#{apple_id}"
+                    puts ""
+
+                    puts "版本: " + @config_json['app_info']['app_version']
+                    puts ""
+
+                    if @config_json['app_setting']['app_platform']
+                        puts "平台号: " + @config_json['app_setting']['app_platform']
+                    end
+                    puts
+                    puts "Bundle Id: " + @config_json['app_info']['app_identifier']
+                    puts
+
+                end
+
+
+
+                def fastlane_process_screenshots(app_screenshots_dir:nil)
+
+                    if File.exist?(app_screenshots_dir)
+                        platforms = ["IOS", "MAC_OS", "TV_OS", "XR_OS"]
+                        platforms.each do  | platform|
+                            platform_screenshots_path = File.join(app_screenshots_dir,  platform.downcase)
+                            if File.exist?(platform_screenshots_path)
+                                Dir.glob(File.join(platform_screenshots_path, "*")).each do |lang_screenshots_path|
+                                    if File.directory?(lang_screenshots_path) && ![".", "..","iMessage", "imessage"].include?(File.basename(lang_screenshots_path))
+                                        fastlane_process_lang_screenshots(lang_screenshots_path:lang_screenshots_path)
+                                    elsif File.directory?(lang_screenshots_path) && ["iMessage", "imessage", "IMESSAGE"].include?(File.basename(lang_screenshots_path))
+                                        imessage_screenshots_path = lang_screenshots_path
+                                         Dir.glob(File.join(imessage_screenshots_path, "*")).each do |imessage_lane_screenshots_path|
+                                            if File.directory?(lang_screenshots_path) && ![".", ".."].include?(File.basename(imessage_lane_screenshots_path))
+                                                fastlane_process_lang_screenshots(lang_screenshots_path:imessage_lane_screenshots_path)
+                                            end
+                                        end
+                                    end
+
+                                end
+                            end
+
+                        end
+                    end
+
+                end
+
+
+                def fastlane_upload_screenshots(apple_id:nil, bundle_id:nil, app_screenshots_dir:nil)
+
+                    if !File.exist?(app_screenshots_dir)
+                        return
+                    end
+
+                    platform_screenshots_path = File.join(app_screenshots_dir,  "ios")
+
+                    if !File.exist?(platform_screenshots_path)
+                        puts "!!! Screenshots Path is not exist !!!"
+                        return
+                    end
+
+                    app_metadata_dir = File.join(@app_config_dir,  "fastlane")
+                    app_metadata_path = File.join(app_metadata_dir,  "ios")
+
+
+                    if @overwrite_flag
+                        @sync_flag = false
+                    end
+
+
+                    if @sync_flag
+                        @overwrite_flag = false
+                    end
+
+
+                    values = {
+                        username:apple_id,
+                        app_identifier: bundle_id,
+                        skip_metadata: true,
+                        skip_binary_upload:true,
+                        skip_app_version_update:true,
+                        precheck_include_in_app_purchases:false,
+                        metadata_path:app_metadata_dir,
+                        screenshots_path:platform_screenshots_path,
+                        overwrite_screenshots: @overwrite_flag,
+                        ignore_language_directory_validation:true,
+                        sync_screenshots: @sync_flag
+                    }
+
+                    config = FastlaneCore::Configuration.create(Deliver::Options.available_options, values)
+                    Deliver::Runner.new(config).run
+
+
+                end
+
+            end
+        end
+    end
+end