lib/sigh/options.rb in sigh-1.1.3 vs lib/sigh/options.rb in sigh-1.1.4

@@ -2,11 +2,14 @@
 require 'credentials_manager'
 
 module Sigh
   class Options
     def self.available_options
-      @@options ||= [
+      user = CredentialsManager::AppfileConfig.try_fetch_value(:apple_dev_portal_id)
+      user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
+
+      [
         FastlaneCore::ConfigItem.new(key: :adhoc,
                                      env_name: "SIGH_AD_HOC",
                                      description: "Setting this flag will generate AdHoc profiles instead of App Store Profiles",
                                      is_string: false,
                                      default_value: false),
@@ -20,11 +23,11 @@
                                      description: "Renew the development certificate instead of the production one",
                                      is_string: false,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :force,
                                      env_name: "SIGH_FORCE",
-                                     description: "Renew provisioning profiles regardless of its state",
+                                     description: "Renew provisioning profiles regardless of its state - to automatically add all devices for ad hoc profiles",
                                      is_string: false,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :app_identifier,
                                      short_option: "-a",
                                      env_name: "SIGH_APP_IDENTIFIER",
@@ -32,10 +35,10 @@
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)),
         FastlaneCore::ConfigItem.new(key: :username,
                                      short_option: "-u",
                                      env_name: "SIGH_USERNAME",
                                      description: "Your Apple ID Username",
-                                     default_value: CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)),
+                                     default_value: user),
         FastlaneCore::ConfigItem.new(key: :team_id,
                                      short_option: "-b",
                                      env_name: "SIGH_TEAM_ID",
                                      description: "The ID of your team if you're in multiple teams",
                                      optional: true,