pindo 5.13.1 → 5.13.3

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

@@ -0,0 +1,105 @@
+require 'fileutils'
+require 'pindo/options/options'
+require 'pindo/config/build_info_manager'
+
+module Pindo
+    class Command
+        class Appstore < Command
+
+            class Initconfig < Appstore
+
+                # 命令的简要说明 - 创建应用配置仓库
+                self.summary = '创建应用配置仓库(在Gitee上创建并初始化)'
+
+                # 命令的详细说明,包含用法示例
+                self.description = <<-DESC
+                    在Gitee上创建新的应用配置仓库,并从模板仓库复制配置文件结构。
+
+                    支持功能:
+
+                        * 在Gitee上创建新的应用配置仓库
+
+                        * 从模板仓库复制配置文件结构
+
+                        * 支持测试环境和生产环境仓库创建
+
+                        * 自动替换配置文件中的Bundle ID
+
+                        * 支持位置参数（向后兼容）和选项参数两种格式
+
+                    使用示例:
+
+                        $ pindo appstore initconfig com.example.app                  # 位置参数（向后兼容）
+
+                        $ pindo appstore initconfig --bundleid=com.example.app      # 选项参数
+
+                        $ pindo appstore initconfig com.example.app --test           # 创建测试环境仓库
+
+                        $ pindo appstore initconfig --bundleid=com.example.app --test  # 选项参数 + 测试环境
+
+                        $ pindo appstore initconfig                                  # 交互式输入Bundle ID
+
+                        $ PINDO_BUNDLE_ID=com.example.app pindo appstore initconfig # 使用环境变量
+                DESC
+
+                # 定义位置参数（向后兼容）
+                self.arguments = [
+                    CLAide::Argument.new('bundleid', true)
+                ]
+
+                # 定义此命令使用的参数项
+                def self.option_items
+                    @option_items ||= Pindo::Options::BuildOptions.select(:bundleid)
+                end
+
+                # 命令的选项列表
+                def self.options
+                    [
+                        ['--test', '创建测试环境仓库']
+                    ].concat(option_items.map { |item| item.to_claide_option }).concat(super)
+                end
+
+                def initialize(argv)
+                    # 首先获取位置参数（向后兼容）
+                    positional_bundleid = argv.shift_argument
+
+                    # 获取 test 标志
+                    @test_flag = argv.flag?('test', false)
+
+                    # 使用 Options 模块初始化参数
+                    @options = initialize_options(argv)
+
+                    # 优先使用选项参数，如果没有则使用位置参数
+                    @bundle_id = @options[:bundleid] || positional_bundleid
+
+                    super
+                    @additional_args = argv.remainder!
+                end
+
+                def validate!
+                    super
+
+                    # 如果没有提供 bundleid，提示用户输入
+                    if @bundle_id.nil? || @bundle_id.empty?
+                        require 'highline/import'
+                        cli = HighLine.new
+                        say "需要输入仓库名称，默认以 Bundle ID 作为仓库名称"
+                        @bundle_id = cli.ask('请输入 Bundle ID: ')
+                    end
+
+                    help! '需要提供 Bundle ID' if @bundle_id.nil? || @bundle_id.empty?
+                end
+
+                def run
+                    # 使用 BuildInfoManager 创建配置仓库
+                    build_info_manager = Pindo::BuildInfoManager.share_instance
+                    build_info_manager.create_appconfig_with_bundleid(
+                        bundle_id: @bundle_id,
+                        test_flag: @test_flag
+                    )
+                end
+
+            end
+        end
+    end
+end

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

@@ -1,52 +1,134 @@
 require 'highline/import'
-require 'xcodeproj'
-require 'find'
 require 'fileutils'
+require 'json'
+require 'pindo/options/options'
+require 'pindo/module/appstore/itcapp_helper'
 
 module Pindo
     class Command
         class Appstore < Command
             class Itcapp < Appstore
 
+                # 命令的简要说明 - 在App Store Connect中创建App
+                self.summary = '在App Store Connect中创建App'
 
-                self.summary = 'Appstore中创建app'
-
+                # 命令的详细说明,包含用法示例
                 self.description = <<-DESC
-                    Appstore中创建app。
+                    根据config.json中的配置, 在App Store Connect中创建应用。
 
                     支持功能:
 
                         * 在App Store Connect创建新应用
 
+                        * 自动生成SKU ID
+
                         * 配置应用基本信息
 
-                        * 设置应用权限
+                        * 自动更新config.json中的App ID
+
+                        * 支持位置参数（向后兼容）和选项参数两种格式
 
                     使用示例:
 
-                        $ pindo appstore itcapp                 # 使用默认配置创建app
+                        $ pindo appstore itcapp                             # 使用当前目录的config.json
+
+                        $ pindo appstore itcapp config.json                 # 位置参数（向后兼容）
+
+                        $ pindo appstore itcapp --config=config.json       # 选项参数
 
-                        $ pindo appstore itcapp config.json     # 使用指定配置文件创建app
+                        $ pindo appstore itcapp --num=1.0.0                 # 指定版本号
+
+                        $ pindo appstore itcapp --com="My Company"          # 指定公司名称
+
+                        $ pindo appstore itcapp --config=config.json --num=1.0.0 --com="My Company"
                 DESC
 
+                # 定义位置参数（向后兼容）
                 self.arguments = [
-                    CLAide::Argument.new('path/to/config.json', false),
+                    CLAide::Argument.new('path/to/config.json', true)
                 ]
 
-                def self.options
-                    [
+                # 定义此命令使用的参数项（类方法，避免重复定义）
+                def self.option_items
+                    @option_items ||= [
+                        Pindo::Options::OptionItem.new(
+                            key: :config,
+                            description: '指定config.json文件路径',
+                            type: String,
+                            optional: true,
+                            example: 'pindo appstore itcapp --config=config.json'
+                        ),
+                        Pindo::Options::OptionItem.new(
+                            key: :num,
+                            description: '指定应用版本号',
+                            type: String,
+                            optional: true,
+                            example: 'pindo appstore itcapp --num=1.0.0'
+                        ),
+                        Pindo::Options::OptionItem.new(
+                            key: :com,
+                            description: '指定公司名称',
+                            type: String,
+                            optional: true,
+                            example: 'pindo appstore itcapp --com="My Company"'
+                        )
+                    ]
+                end
 
-                    ].concat(super)
+                # 命令的选项列表
+                def self.options
+                    # 转换为 CLAide 格式
+                    option_items.map { |item| item.to_claide_option }.concat(super)
                 end
 
                 def initialize(argv)
+                    # 首先获取位置参数（向后兼容）
+                    positional_config = argv.shift_argument
+
+                    # 使用 Options 模块初始化参数
+                    @options = initialize_options(argv)
+
+                    # 优先使用选项参数，如果没有则使用位置参数，最后默认为当前目录的config.json
+                    @config_path = @options[:config] || positional_config || File.join(Dir.pwd, 'config.json')
+                    @app_version = @options[:num]
+                    @company_name = @options[:com]
+
+                    puts "@app_version = #{@app_version}" if @app_version
 
                     super
+                    @additional_args = argv.remainder!
                 end
 
+                def validate!
+                    super
 
-                def run
+                    # 检查 config.json 文件是否存在
+                    unless File.exist?(@config_path)
+                        help! "配置文件不存在: #{@config_path}"
+                    end
+
+                    # 读取并解析 config.json
+                    begin
+                        @config_json = JSON.parse(File.read(@config_path))
+                    rescue JSON::ParserError => e
+                        help! "配置文件格式错误: #{e.message}"
+                    end
+                end
 
+                def run
+                    # 调用 ItcAppHelper 执行 iTunes Connect App 创建流程
+                    begin
+                        Pindo::ItcAppHelper.execute_itcapp_creation(
+                            config_json: @config_json,
+                            config_path: @config_path,
+                            app_version: @app_version,
+                            company_name: @company_name
+                        )
+                        puts "\n✓ iTunes Connect App 创建完成！"
+                    rescue StandardError => e
+                        puts "\n❌ iTunes Connect App 创建失败: #{e.message}"
+                        raise e
+                    end
                 end
 
             end

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

@@ -4,19 +4,15 @@ require 'find'
 require 'fileutils'
 require "fastimage"
 require 'deliver'
-
+require 'pindo/config/ios_config_parser'
 
 module Pindo
     class Command
-        class Deploy < Command
-            class Itcinfo < Deploy
-
-                include Command::DeployOptions
+        class Appstore < Command
+            class Itcinfo < Appstore
 
-                include XcodeCertHelper
                 include AppstoreMetadataConnectApiHelper
 
-
                 self.summary = '更新AppStore中的App信息'
 
                 self.description = <<-DESC
@@ -28,68 +24,79 @@ module Pindo
     - 同步和覆盖现有截图
 
 使用示例:
-    pindo deploy itcinfo path/to/config.json --metadata
-    pindo deploy itcinfo path/to/config.json --screenshots
-    pindo deploy itcinfo path/to/config.json --metadata --screenshots
-    pindo deploy itcinfo path/to/config.json --screenshots --overwrite
+    pindo appstore itcinfo --metadata
+    pindo appstore itcinfo --screenshots
+    pindo appstore itcinfo --metadata --screenshots
+    pindo appstore itcinfo --screenshots --overwrite
                 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.'],
+                        ['--metadata', '上传元数据到iTunes Connect'],
+                        ['--screenshots', '上传截图到iTunes Connect'],
+                        ['--overwrite', '覆盖iTunes Connect中的截图'],
+                        ['--sync', '同步截图到iTunes Connect'],
+                        ['--ipa', '上传ipa到iTunes Connect'],
                     ].concat(super)
                 end
 
-                  def initialize(argv)
-
+                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
-
+                end
 
                 def run
                     current_project_dir = Dir.pwd
+                    config_file = File.join(current_project_dir, "config.json")
 
-                    pindo_dir = File::expand_path(pindo_single_config.pindo_dir)
-                    @app_config_dir = File.join(pindo_dir, @deploy_repo_name)
+                    # 加载配置
+                    config_parser = Pindo::IosConfigParser.instance
+                    config_parser.load_config(config_file: config_file)
+                    @config_json = config_parser.config_json
+                    @bundle_id = config_parser.bundle_id
+                    @apple_id = config_parser.apple_id
 
-                    # @app_config_dir = clong_buildconfig_repo(repo_name: @deploy_repo_name)
+                    if @config_json.nil? || @config_json.empty?
+                        raise Informative, "配置未加载，请检查配置文件: #{config_file}"
+                    end
 
-                    print_info(project_dir:current_project_dir, apple_id:@apple_id, bundle_id:@bundle_id, config_json:@config_json)
+                    if @bundle_id.nil? || @bundle_id.empty?
+                        raise Informative, "无法从配置文件中获取 Bundle ID"
+                    end
+
+                    if @apple_id.nil? || @apple_id.empty?
+                        raise Informative, "无法从配置文件中获取 Apple ID"
+                    end
+
+                    pindo_dir = File.expand_path(pindo_single_config.pindo_dir)
+                    @app_config_dir = File.join(pindo_dir, @bundle_id)
+
+                    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)
+                        fastlane_login(apple_id: @apple_id)
+                        fastlane_upload_metadata(temp_bundle_id: @bundle_id)
                     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)
+                        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)
+                        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"
                         system command
                     end
@@ -97,25 +104,19 @@ module Pindo
                     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")
+                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)
+                        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
 
@@ -138,43 +139,33 @@ module Pindo
                         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")
+                        notes_file = File.join(platform_metadata_path, "review_notes.txt")
                         if File.exist?(notes_file)
-                            notes_file_txt =  File.read(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"].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)
+                                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")
+                                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
@@ -182,9 +173,7 @@ module Pindo
 
                 end
 
-
-
-                def check_app_info_localization(lang:nil, localization_json:nil)
+                def check_app_info_localization(lang: nil, localization_json: nil)
                     if !localization_json.nil?
 
                         localization_json.each do |key, value|
@@ -193,7 +182,7 @@ module Pindo
                                 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
+                            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]
@@ -205,17 +194,12 @@ module Pindo
 
                 end
 
+                def read_app_version_info_localization(lang: nil, localization_json: nil, lang_metadata_path: nil, key_name: nil)
 
-                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")
+                    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}"
+                        key_name_txt = File.read(key_name_file)
                         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]
@@ -229,23 +213,21 @@ module Pindo
                             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)
 
-                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_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)
+                    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)
+                        fastlane_update_app_info_metadata(app: app, app_itunes_json: app_itunes_json)
                     end
 
                     if !app_itunes_json["app_edit_version_info"].nil?
@@ -255,24 +237,21 @@ module Pindo
                             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?
+                            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)
+                                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)
-
+                    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)
 
-                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)
+                    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']
 
@@ -296,23 +275,21 @@ module Pindo
 
                 end
 
-
-
-                def fastlane_process_screenshots(app_screenshots_dir:nil)
+                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)
+                        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)
+                                    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|
+                                        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)
+                                                fastlane_process_lang_screenshots(lang_screenshots_path: imessage_lane_screenshots_path)
                                             end
                                         end
                                     end
@@ -325,52 +302,47 @@ module Pindo
 
                 end
 
-
-                def fastlane_upload_screenshots(apple_id:nil, bundle_id:nil, app_screenshots_dir:nil)
+                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")
+                    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")
-
+                    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,
+                        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,
+                        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,
+                        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