pindo 5.12.2 → 5.13.2

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

@@ -1,20 +1,16 @@
 require 'highline/import'
 require 'xcodeproj'
-require 'find'  
+require 'find'
 require 'fileutils'
 require "fastimage"
-
+require 'pindo/config/ios_config_parser'
 
 module Pindo
     class Command
-        class Deploy < Command
-            class Getitcinfo < Deploy
-        
-                include Command::DeployOptions
+        class Appstore < Command
+            class Getitcinfo < Appstore
 
-                include XcodeCertHelper
                 include AppstoreMetadataConnectApiHelper
-                
 
                 self.summary = '从AppStore中获取app详细信息'
 
@@ -27,81 +23,88 @@ module Pindo
     - 支持隐私数据和版本信息获取
 
 使用示例:
-    pindo deploy getitcinfo path/to/config.json --metadata
-    pindo deploy getitcinfo path/to/config.json --screenshots
-    pindo deploy getitcinfo path/to/config.json --metadata --screenshots
+    pindo appstore getitcinfo --metadata
+    pindo appstore getitcinfo --screenshots
+    pindo appstore getitcinfo --metadata --screenshots
                 DESC
 
                 self.arguments = [
-                    CLAide::Argument.new('path/to/config.json', true),
                 ]
 
                 def self.options
                     [
-                        ['--metadata', '获取metadata信息.'],
-                        ['--screenshots', '下载商店截屏.'],
+                        ['--metadata', '获取metadata信息'],
+                        ['--screenshots', '下载商店截屏'],
+                        ['--overwrite', '覆盖已存在的文件'],
                     ].concat(super)
                 end
-        
-                  def initialize(argv)
-                    
+
+                def initialize(argv)
                     @upload_metadata_flag = argv.flag?('metadata', false)
                     @upload_screenshots_flag = argv.flag?('screenshots', false)
-
                     @over_write = argv.flag?('overwrite', false)
 
                     super
-                  end          
+                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_itunes_dir = File.join(@app_config_dir,  "fastlane") 
+                    config_file = File.join(current_project_dir, "config.json")
+
+                    # 加载配置
+                    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
+
+                    if @config_json.nil? || @config_json.empty?
+                        raise Informative, "配置未加载，请检查配置文件: #{config_file}"
+                    end
+
+                    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)
+                    app_itunes_dir = File.join(@app_config_dir, "fastlane")
                     begin
                         FileUtils.mkdir_p(File.join(app_itunes_dir))
                     rescue
-                         # if it's already there
+                        # if it's already there
                     end
 
-                    fastlane_login(apple_id:@apple_id)
+                    fastlane_login(apple_id: @apple_id)
 
-                    if @upload_metadata_flag 
-                        fastlane_download_metadata(temp_bundle_id:@bundle_id)
+                    if @upload_metadata_flag
+                        fastlane_download_metadata(temp_bundle_id: @bundle_id)
                     end
 
-
-                    if @upload_screenshots_flag 
-                        fastlane_download_screenshots(temp_bundle_id:@bundle_id)
+                    if @upload_screenshots_flag
+                        fastlane_download_screenshots(temp_bundle_id: @bundle_id)
                         valid_screenshots_html
                     end
 
                     puts "Done !!!"
                 end
 
-                def fastlane_download_metadata(temp_bundle_id:nil)   
+                def fastlane_download_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 = {}
-                    # if File.exist?(app_itunes_file)
-                    #     app_itunes_json = JSON.parse(File.read(app_itunes_file))  
-                    # else 
-                    #     app_itunes_json = {}
-                    # end
-                    
 
                     app = Spaceship::ConnectAPI::App.find(temp_bundle_id)
-                    
-                    # app_itunes_json["prices"] = app.prices
+
                     app_itunes_json["primary_locale"] = app.primary_locale
-                    # app_itunes_json["is_opted_in_to_distribute_ios_app_on_mac_app_store"] = app.is_opted_in_to_distribute_ios_app_on_mac_app_store
                     app_itunes_json["content_rights_declaration"] = app.content_rights_declaration
 
-
-
                     all_usages = Spaceship::ConnectAPI::AppDataUsage.all(app_id: app.id, includes: "category,grouping,purpose,dataProtection", limit: 500)
                     if !all_usages.nil? && all_usages.size > 0
                         app_itunes_json["privacy_data"] = []
@@ -110,19 +113,19 @@ module Pindo
 
                         all_usages.each do |privacy_usage|
 
-                            if !privacy_usage.category.nil? 
-                                category= privacy_usage.category.id
+                            if !privacy_usage.category.nil?
+                                category = privacy_usage.category.id
                                 all_usages_config[category] = all_usages_config[category] || {}
                                 all_usages_config[category]["category"] = category
 
-                                if !privacy_usage.purpose.nil? 
-                                    all_usages_config[category]["purposes"] = all_usages_config[category]["purposes"] || [] 
+                                if !privacy_usage.purpose.nil?
+                                    all_usages_config[category]["purposes"] = all_usages_config[category]["purposes"] || []
                                     all_usages_config[category]["purposes"] << privacy_usage.purpose.id
 
                                 end
 
                                 if !privacy_usage.data_protection.nil?
-                                    all_usages_config[category]["data_protections"] = all_usages_config[category]["data_protections"] || [] 
+                                    all_usages_config[category]["data_protections"] = all_usages_config[category]["data_protections"] || []
                                     all_usages_config[category]["data_protections"] << privacy_usage.data_protection.id
                                 end
 
@@ -130,24 +133,21 @@ module Pindo
                                 usages_config = {}
                                 usages_config["data_protections"] = usages_config["data_protections"] || []
                                 if !privacy_usage.data_protection.nil?
-                                    usages_config["data_protections"] = usages_config["data_protections"] || [] 
+                                    usages_config["data_protections"] = usages_config["data_protections"] || []
                                     usages_config["data_protections"] << privacy_usage.data_protection.id
                                 end
-                                 app_itunes_json["privacy_data"] << usages_config
+                                app_itunes_json["privacy_data"] << usages_config
                             end
                         end
 
-                        all_usages_config.each do |k, item| 
+                        all_usages_config.each do |k, item|
                             app_itunes_json["privacy_data"] << item
                         end
 
                     end
 
-                    
-
-
                     app_itunes_json["app_info"] = app_itunes_json["app_info"] || {}
-                    
+
                     platforms = ["IOS", "MAC_OS", "TV_OS", "XR_OS"]
 
                     platforms.each do |platform|
@@ -156,30 +156,25 @@ module Pindo
 
                         app_edit_version_info = app.get_edit_app_store_version(platform: platform, includes: 'appStoreVersionSubmission,build,appStoreVersionPhasedRelease,appStoreVersionLocalizations')
 
-
-                        if app_edit_version_info.nil? 
+                        if app_edit_version_info.nil?
 
                             if File.exist?(File.join(app_itunes_dir, platform.downcase))
                                 FileUtils.rm_rf(File.join(app_itunes_dir, platform.downcase))
                             end
 
-
                             app_itunes_json["app_edit_version_info"].delete(platform)
                             app_itunes_json["app_edit_version_info"].delete(platform.downcase)
-                            
+
                         else
 
-                            fastlane_download_app_version_info(app_version_info: app_edit_version_info, platform:platform, app_itunes_json:app_itunes_json, app_itunes_dir:app_itunes_dir)    
+                            fastlane_download_app_version_info(app_version_info: app_edit_version_info, platform: platform, app_itunes_json: app_itunes_json, app_itunes_dir: app_itunes_dir)
 
                         end
 
-
-                    end                    
+                    end
 
                     app_itunes_json["app_info"]["app_info_localization"] = {}
-                    fastlane_download_app_info(app: app, app_itunes_json:app_itunes_json, app_itunes_dir:app_itunes_dir)    
-                
-
+                    fastlane_download_app_info(app: app, app_itunes_json: app_itunes_json, app_itunes_dir: app_itunes_dir)
 
                     File.open(app_itunes_file, "w") do |file|
                         file.write(JSON.pretty_generate(app_itunes_json))
@@ -188,11 +183,9 @@ module Pindo
 
                 end
 
+                def fastlane_download_screenshots(temp_bundle_id: nil)
 
-
-                def fastlane_download_screenshots(temp_bundle_id:nil) 
-
-                    app_screenshots_dir = File.join(@app_config_dir,  "fastlane/screenshots") 
+                    app_screenshots_dir = File.join(@app_config_dir, "fastlane/screenshots")
                     app = Spaceship::ConnectAPI::App.find(temp_bundle_id)
                     platforms = ["IOS", "MAC_OS", "TV_OS", "XR_OS"]
 
@@ -203,56 +196,48 @@ module Pindo
 
                         app_edit_version_info = app.get_edit_app_store_version(platform: platform)
 
-                        if app_edit_version_info.nil? 
+                        if app_edit_version_info.nil?
 
                             if File.exist?(File.join(app_screenshots_dir, platform.downcase))
-                                FileUtils.rm_rf(File.join(app_screenshots_dir, platform.platform.downcase))
+                                FileUtils.rm_rf(File.join(app_screenshots_dir, platform.downcase))
                             end
                         else
-                            fastlane_download_app_screenshots(app_version_info: app_edit_version_info, platform:platform, app_screenshots_dir:app_screenshots_dir, over_write:@over_write)    
+                            fastlane_download_app_screenshots(app_version_info: app_edit_version_info, platform: platform, app_screenshots_dir: app_screenshots_dir, over_write: @over_write)
                         end
 
                     end
 
                 end
 
-
                 def valid_screenshots_html()
 
-                    app_screenshots_dir = File.join(@app_config_dir,  "fastlane/screenshots")               
-                    screenshots_path = File.join(app_screenshots_dir,  "ios") 
+                    app_screenshots_dir = File.join(@app_config_dir, "fastlane/screenshots")
+                    screenshots_path = File.join(app_screenshots_dir, "ios")
                     screenshots = Deliver::Loader.load_app_screenshots(screenshots_path, true)
 
-
-                    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))
 
-                    
-
                     # Validate
                     options = {}
-                    options[:name] = {} 
+                    options[:name] = {}
                     options[:name]["en-US"] = app_itunes_json["app_info"]["app_info_localization"]["en-US"]["name"]
-                    options[:description] = {} 
+                    options[:description] = {}
 
-                    app_itunes_json["app_info"]["app_info_localization"].each do |lang , data|
+                    app_itunes_json["app_info"]["app_info_localization"].each do |lang, data|
                         options[:description][lang] = ""
                     end
-                    
+
                     html_path = Deliver::HtmlGenerator.new.render(options, screenshots, app_itunes_dir)
                     system("open '#{html_path}'")
                 end
 
-
-
-                
-                def download_iap_info(temp_bundle_id:nil)   
+                def download_iap_info(temp_bundle_id: nil)
 
                 end
 
-
             end
         end
     end
-end
+end