mysigner 0.1.2 → 0.1.4

data/lib/mysigner/upload/app_store_automation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mysigner
   module Upload
     class AppStoreAutomation
@@ -11,23 +13,33 @@ module Mysigner
       def initialize(client:, organization_id:, opts: {})
         @client = client
         @organization_id = organization_id
-        @wait_enabled = opts.key?(:wait) ? !!opts[:wait] : true
+        # Proper boolean coercion — `!x.nil?` evaluates to `true` for `false`,
+        # which previously caused `wait: false` / `no_submit: false` to be
+        # treated as `true`. Use `!!` to get the actual boolean semantics.
+        @wait_enabled = opts.key?(:wait) ? !opts[:wait].nil? : true
 
         poll = opts[:poll_interval] || opts[:poll_seconds]
         poll = poll.to_i if poll
-        @poll_interval = poll && poll.positive? ? poll : DEFAULT_POLL_INTERVAL
+        @poll_interval = poll&.positive? ? poll : DEFAULT_POLL_INTERVAL
 
         timeout = opts[:timeout] || opts[:timeout_seconds]
         timeout = timeout.to_i if timeout
-        @timeout = timeout && timeout.positive? ? timeout : DEFAULT_WAIT_TIMEOUT
+        @timeout = timeout&.positive? ? timeout : DEFAULT_WAIT_TIMEOUT
+
+        @no_submit = !opts[:no_submit].nil?
+
+        # Whether to submit by default when NEITHER cli_defaults nor CLI
+        # overrides specify `auto_submit`. `ship`/`submit` pass true (it's
+        # the user's explicit intent). Dashboard `cli_defaults.auto_submit`
+        # still wins if set — we only fall back to this when silent.
+        @default_submit = opts.key?(:default_submit) ? !opts[:default_submit].nil? : false
 
-        @no_submit = !!opts[:no_submit]
         @now = opts[:now]
       end
 
       def perform!(metadata:, build_info:, metadata_overrides: {})
         build_info = symbolize_keys(build_info)
-        metadata = metadata || {}
+        metadata ||= {}
 
         result = {
           wait: {
@@ -43,9 +55,9 @@ module Mysigner
           submission_source: nil
         }
 
-        puts ""
-        puts "🤖 App Store automation in progress..."
-        puts ""
+        puts ''
+        puts '🤖 App Store automation in progress...'
+        puts ''
 
         app = ensure_app(build_info[:bundle_id])
         raise AutomationError, "App with bundle ID #{build_info[:bundle_id]} not found" unless app
@@ -56,11 +68,13 @@ module Mysigner
         unless build
           version_info = [build_info[:version], build_info[:build_number]].compact.join(' / ')
           version_info = "for #{version_info}" unless version_info.empty?
-          raise AutomationError, "No processed build found #{version_info}. Upload a build first with 'mysigner ship appstore --wait'"
+          raise AutomationError,
+                "No processed build found #{version_info}. Upload a build first with 'mysigner ship appstore --wait'"
         end
 
         unless build_processed?(build)
-          raise AutomationError, "Build #{build_info[:version]} (#{build_info[:build_number]}) is still processing. Wait for it or use --wait flag."
+          raise AutomationError,
+                "Build #{build_info[:version]} (#{build_info[:build_number]}) is still processing. Wait for it or use --wait flag."
         end
 
         version = ensure_app_store_version(app_id: app['id'], metadata: metadata, overrides: metadata_overrides)
@@ -70,12 +84,12 @@ module Mysigner
 
         if should_submit
           submit_for_review(
-            version_id: version['id'], 
+            version_id: version['id'],
             version_string: version['version_string'],
-            metadata: metadata, 
+            metadata: metadata,
             overrides: metadata_overrides
           )
-          puts "✓ Submitted for App Store review"
+          puts '✓ Submitted for App Store review'
           result[:submitted] = true
           result[:submission_source] = submit_source
         else
@@ -83,8 +97,8 @@ module Mysigner
           result[:skip_reason] = skip_reason
         end
 
-        puts ""
-        puts "✅ App Store automation complete"
+        puts ''
+        puts '✅ App Store automation complete'
 
         result
       end
@@ -112,29 +126,29 @@ module Mysigner
 
         return [build, status] unless @wait_enabled
 
-        puts "⏳ Waiting for Apple to finish processing the build..."
+        puts '⏳ Waiting for Apple to finish processing the build...'
         puts "   Polling every #{@poll_interval}s (timeout #{@timeout}s)"
-        print ""
+        print ''
 
         start_time = current_time
-        
+
         loop do
           build = latest_build(app_id, build_info)
           status[:last_state] = build_state(build)
 
           if build && build_processed?(build)
             puts "\r✓ Build is processed and ready".ljust(70)
-            puts ""
+            puts ''
             return [build, status]
           end
-          
+
           elapsed = current_time - start_time
           status[:elapsed_seconds] = elapsed
 
           if elapsed >= @timeout
             status[:timed_out] = true
             puts "\r✗ Timed out after #{format_duration(elapsed)} (use --asc-timeout-seconds to extend)".ljust(90)
-            puts ""
+            puts ''
             return [build, status]
           end
 
@@ -152,32 +166,30 @@ module Mysigner
           app_id: app_id,
           processed_only: !@wait_enabled
         }
-        
+
         # Only filter by version/build if NOT using latest
         unless build_info[:use_latest]
           params[:version] = build_info[:version] if build_info[:version]
           params[:build_number] = build_info[:build_number] if build_info[:build_number]
         end
-        
+
         # Apply min_build_number filter if set in release config
-        if build_info[:min_build_number]
-          params[:min_build_number] = build_info[:min_build_number]
-        end
-        
+        params[:min_build_number] = build_info[:min_build_number] if build_info[:min_build_number]
+
         response = @client.get(
           "/api/v1/organizations/#{@organization_id}/builds",
           params: params.compact
         )
 
         builds = Array(response[:data]['data']['builds'])
-        
+
         # Smart build selection: filter by min_build_number client-side if API doesn't support it
         if build_info[:min_build_number] && builds.any?
           min_bn = build_info[:min_build_number].to_i
           builds = builds.select { |b| b['build_number'].to_i >= min_bn }
         end
-        
-        builds.first  # Already ordered by uploaded_date desc
+
+        builds.first # Already ordered by uploaded_date desc
       rescue Mysigner::NotFoundError
         nil
       rescue StandardError => e
@@ -264,7 +276,7 @@ module Mysigner
       def determine_earliest_release_date(metadata, overrides)
         date = overrides['earliest_release_date'] || metadata['earliest_release_date']
         return nil unless date
-        
+
         # Convert to ISO 8601 if not already
         date.respond_to?(:iso8601) ? date.iso8601 : date.to_s
       end
@@ -287,17 +299,17 @@ module Mysigner
 
       def determine_release_type(metadata, overrides)
         result = overrides['release_type'] || metadata['release_type']
-        
+
         # FIX v7: Changed default from MANUAL to AFTER_APPROVAL
         # Log deprecation notice if no explicit release_type is set
         if result.nil?
           if ENV['MYSIGNER_DEBUG'] || @deprecation_warned.nil?
-            puts "   Note: Using default release_type AFTER_APPROVAL (was MANUAL in older versions)"
+            puts '   Note: Using default release_type AFTER_APPROVAL (was MANUAL in older versions)'
             @deprecation_warned = true
           end
           result = 'AFTER_APPROVAL'
         end
-        
+
         result
       end
 
@@ -307,7 +319,7 @@ module Mysigner
           body: { build_id: build_id }
         )
 
-        puts "✓ Attached build to App Store version"
+        puts '✓ Attached build to App Store version'
       rescue StandardError => e
         raise AutomationError, "Failed to attach build to version: #{e.message}"
       end
@@ -315,49 +327,85 @@ module Mysigner
       def should_submit_with_reason(metadata, overrides)
         return [false, nil, '--no-auto-submit flag'] if @no_submit
 
+        # Precedence: explicit CLI flag > dashboard cli_defaults > command default.
+        # The command default is set by `ship appstore` / `submit` (true),
+        # preserving backward-compat when the user runs those commands without
+        # configuring anything. Dashboard `auto_submit: false` now correctly
+        # suppresses submission (previously hard-overridden at the call site).
         if overrides.key?('auto_submit')
-          return overrides['auto_submit'] ? [true, 'CLI override', nil] : [false, nil, 'CLI override disabled auto_submit']
+          return overrides['auto_submit'] ? [true, 'CLI override',
+                                             nil] : [false, nil, 'CLI override disabled auto_submit']
         end
 
         if metadata.key?('auto_submit')
-          return metadata['auto_submit'] ? [true, 'Dashboard configuration', nil] : [false, nil, 'Dashboard auto_submit disabled']
+          return metadata['auto_submit'] ? [true, 'Dashboard configuration',
+                                            nil] : [false, nil, 'Dashboard auto_submit disabled']
         end
 
+        return [true, 'command default', nil] if @default_submit
+
         [false, nil, 'No auto_submit configuration']
       end
 
       def submit_for_review(version_id:, version_string: nil, metadata: {}, overrides: {})
         # Merge metadata and overrides
         merged = metadata.merge(overrides)
-        
+
         # Get version string to check if first version
         version_string ||= merged['version_string'] || merged['version'] || '1.0'
         is_first_version = version_string.split('.').first.to_i <= 1
-        
+
         # Validate required fields for Apple submission
         # Note: What's New is NOT required for version 1.0 (first release)
         # Support URL may already be set in App Store Connect, so we only warn if missing
         missing_fields = []
         missing_fields << "What's New text" if !is_first_version && merged['whats_new'].to_s.strip.empty?
-        
+
         # Don't block on missing support_url - it may already be in App Store Connect
         # Just warn about it
-        if merged['support_url'].to_s.strip.empty?
-          puts "⚠️  Note: No Support URL provided via CLI - using value from App Store Connect if available"
-        end
-        
+        puts '⚠️  Note: No Support URL provided via CLI - using value from App Store Connect if available' if merged['support_url'].to_s.strip.empty?
+
         unless missing_fields.empty?
-          raise AutomationError, "Cannot submit to Apple Store: missing required fields: #{missing_fields.join(', ')}. Please configure these in your My Signer dashboard or provide via --whats-new flag."
+          raise AutomationError,
+                "Cannot submit to Apple Store: missing required fields: #{missing_fields.join(', ')}. Please configure these in your My Signer dashboard or provide via --whats-new flag."
         end
-        
+
+        # Primary-locale fields (backward-compatible path): backend will
+        # upsert a single localization for the app's primary locale when
+        # these top-level keys are present.
         payload = {
           whats_new: merged['whats_new'],
           keywords: merged['keywords'],
           marketing_url: merged['marketing_url'],
           promotional_text: merged['promotional_text'],
           support_url: merged['support_url'],
+          description: merged['description'],
           locale: merged['locale']
-        }.compact  # Remove nil values
+        }.compact
+
+        # Multi-locale path: if cli_defaults includes a `localizations` array,
+        # forward it so the backend can PATCH/POST each locale on ASC
+        # (appStoreVersionLocalizations) instead of only the primary.
+        if merged['localizations'].is_a?(Array) && merged['localizations'].any?
+          payload[:localizations] = merged['localizations'].map do |loc|
+            next nil unless loc.is_a?(Hash)
+
+            {
+              locale: loc['locale'] || loc[:locale],
+              whats_new: loc['whats_new'] || loc[:whats_new],
+              keywords: loc['keywords'] || loc[:keywords],
+              marketing_url: loc['marketing_url'] || loc[:marketing_url],
+              promotional_text: loc['promotional_text'] || loc[:promotional_text],
+              support_url: loc['support_url'] || loc[:support_url],
+              description: loc['description'] || loc[:description]
+            }.compact
+          end.compact
+        end
+
+        # Phased release: backend flips @version.phased_release_pending and
+        # enqueues PhasedReleaseActivationJob, which POSTs
+        # appStoreVersionPhasedReleases after Apple approves the submission.
+        payload[:phased_release] = true if merged['phased_release']
 
         @client.post(
           "/api/v1/organizations/#{@organization_id}/app_store_versions/#{version_id}/submit",
@@ -375,7 +423,6 @@ module Mysigner
         end
       end
 
-
       def format_duration(seconds)
         minutes = (seconds / 60).floor
         seconds = (seconds % 60).round
@@ -383,7 +430,7 @@ module Mysigner
       end
 
       def current_time
-        (@now && @now.call) || Time.now
+        @now&.call || Time.now
       end
     end
   end

data/lib/mysigner/upload/app_store_submission.rb

@@ -1,4 +1,4 @@
-require 'set'
+# frozen_string_literal: true
 
 module Mysigner
   module Upload
@@ -16,52 +16,47 @@ module Mysigner
 
       # Submit build for App Store review
       def submit_for_review!(automation: nil)
-        puts ""
-        puts "📤 Preparing for App Store submission..."
-        puts ""
-        
+        puts ''
+        puts '📤 Preparing for App Store submission...'
+        puts ''
+
         begin
           # Step 1: Fetch release metadata from My Signer API
           merged = merge_metadata(fetch_release_metadata)
           metadata = merged[:merged]
-          
-          if metadata && metadata.any?
-            puts "✓ Loaded release configuration from My Signer"
-            puts ""
+
+          if metadata&.any?
+            puts '✓ Loaded release configuration from My Signer'
+            puts ''
             display_metadata(metadata)
           else
-            puts "⚠️  No release configuration found in My Signer"
+            puts '⚠️  No release configuration found in My Signer'
             puts "   Create one at: #{@client.api_url}/organizations/#{@organization_id}/app_store_releases"
-            puts ""
+            puts ''
           end
-          
+
           # Enrich build_info with config values for smart build selection
           enriched_build_info = symbolize_keys(@build_info)
           if metadata
             # min_build_number: skip builds below this number
-            if metadata['build_number'] && !enriched_build_info[:build_number]
-              enriched_build_info[:min_build_number] = metadata['build_number'].to_i
-            end
+            enriched_build_info[:min_build_number] = metadata['build_number'].to_i if metadata['build_number'] && !enriched_build_info[:build_number]
             # Use version_string from config if not specified
-            if metadata['version_string'] && !enriched_build_info[:version]
-              enriched_build_info[:version] = metadata['version_string']
-            end
+            enriched_build_info[:version] = metadata['version_string'] if metadata['version_string'] && !enriched_build_info[:version]
           end
-          
+
           automation_result = if automation
-            automation.perform!(
-              metadata: metadata,
-              build_info: enriched_build_info,
-              metadata_overrides: @metadata_overrides
-            )
-          else
-            guide_to_manual_submission(metadata)
-            nil
-          end
+                                automation.perform!(
+                                  metadata: metadata,
+                                  build_info: enriched_build_info,
+                                  metadata_overrides: @metadata_overrides
+                                )
+                              else
+                                guide_to_manual_submission(metadata)
+                                nil
+                              end
 
           { success: true, metadata: metadata, automation: automation_result }
-          
-        rescue => e
+        rescue StandardError => e
           raise SubmissionError, "Failed to prepare submission: #{e.message}"
         end
       end
@@ -70,40 +65,37 @@ module Mysigner
 
       def fetch_release_metadata
         # Fetch release metadata from My Signer API
-        begin
-          response = @client.get(
-            "/api/v1/organizations/#{@organization_id}/app_store_releases",
-            params: { bundle_id: @build_info[:bundle_id] }
-          )
-          
-          if response[:success]
-            data = response[:data]
-            # API returns { app_store_releases: [...] } - extract first release
-            if data.is_a?(Hash) && data['app_store_releases'].is_a?(Array)
-              data['app_store_releases'].first
-            elsif data.is_a?(Hash) && data['app_store_release']
-              # Single release format
-              data['app_store_release']
-            else
-              data
-            end
+
+        response = @client.get(
+          "/api/v1/organizations/#{@organization_id}/app_store_releases",
+          params: { bundle_id: @build_info[:bundle_id] }
+        )
+
+        if response[:success]
+          data = response[:data]
+          # API returns { app_store_releases: [...] } - extract first release
+          if data.is_a?(Hash) && data['app_store_releases'].is_a?(Array)
+            data['app_store_releases'].first
+          elsif data.is_a?(Hash) && data['app_store_release']
+            # Single release format
+            data['app_store_release']
           else
-            nil
+            data
           end
-        rescue Mysigner::NotFoundError
-          # No configuration found - that's okay
-          nil
-        rescue StandardError => e
-          puts "⚠️  Could not fetch release metadata: #{e.message}"
-          nil
         end
+      rescue Mysigner::NotFoundError
+        # No configuration found - that's okay
+        nil
+      rescue StandardError => e
+        puts "⚠️  Could not fetch release metadata: #{e.message}"
+        nil
       end
 
       # Fetch release config and extract min_build_number for smart build selection
       def fetch_release_config
         metadata = fetch_release_metadata
         return {} unless metadata
-        
+
         config = {}
         config[:min_build_number] = metadata['build_number'].to_i if metadata['build_number']
         config[:release_type] = metadata['release_type'] if metadata['release_type']
@@ -122,39 +114,40 @@ module Mysigner
       end
 
       def guide_to_manual_submission(metadata)
-        puts "📋 Next Steps for App Store Submission"
-        puts "=" * 60
-        puts ""
-        puts "Your build is uploaded to App Store Connect!"
-        puts ""
-        puts "To submit for review:"
-        puts "  1. Wait for Apple to process the build (5-15 minutes)"
-        puts "  2. Open App Store Connect:"
-        puts "     https://appstoreconnect.apple.com"
+        puts '📋 Next Steps for App Store Submission'
+        puts '=' * 60
+        puts ''
+        puts 'Your build is uploaded to App Store Connect!'
+        puts ''
+        puts 'To submit for review:'
+        puts '  1. Wait for Apple to process the build (5-15 minutes)'
+        puts '  2. Open App Store Connect:'
+        puts '     https://appstoreconnect.apple.com'
         puts "  3. Select your app and go to 'App Store' tab"
-        puts "  4. Create a new version or select existing one"
+        puts '  4. Create a new version or select existing one'
         puts "  5. Select this build (#{@build_info[:version]} / #{@build_info[:build_number]})"
-        puts "  6. Add screenshots and metadata if not already present"
+        puts '  6. Add screenshots and metadata if not already present'
         puts "  7. Click 'Submit for Review'"
-        puts ""
+        puts ''
 
-        if metadata && metadata['auto_submit']
-          puts "💡 Auto-submit enabled"
-        end
+        puts '💡 Auto-submit enabled' if metadata && metadata['auto_submit']
 
-        puts ""
-        puts "Tip: rerun with --submit-for-review when ready"
-        puts "     Use --wait/--asc-timeout-seconds to control polling"
-        puts ""
+        puts ''
+        puts 'Tip: rerun with --submit-for-review when ready'
+        puts '     Use --wait/--asc-timeout-seconds to control polling'
+        puts ''
       end
 
       def display_metadata(metadata)
-        puts "📝 Release Configuration:"
+        puts '📝 Release Configuration:'
         print_metadata_line('Bundle ID', metadata['bundle_identifier'], 'bundle_identifier')
         print_metadata_line('App Name', metadata['app_name'], 'app_name') if metadata['app_name']
-        
+
         # Version info from config
-        print_metadata_line('Version String', metadata['version_string'], 'version_string') if metadata['version_string']
+        if metadata['version_string']
+          print_metadata_line('Version String', metadata['version_string'],
+                              'version_string')
+        end
         print_metadata_line('Min Build #', metadata['build_number'], 'build_number') if metadata['build_number']
 
         if metadata['whats_new'] && !metadata['whats_new'].to_s.strip.empty?
@@ -162,7 +155,7 @@ module Mysigner
         else
           puts "   What's New: —#{override_suffix('whats_new')}"
         end
-        
+
         if metadata['promotional_text'] && !metadata['promotional_text'].to_s.strip.empty?
           puts "   Promo Text: #{truncate(metadata['promotional_text'])}#{override_suffix('promotional_text')}"
         end
@@ -170,14 +163,14 @@ module Mysigner
         print_metadata_line('Support URL', metadata['support_url'], 'support_url')
         print_metadata_line('Marketing URL', metadata['marketing_url'], 'marketing_url')
         print_metadata_line('Privacy URL', metadata['privacy_policy_url'], 'privacy_policy_url')
-        
+
         # Release settings
         release_type_label = format_release_type(metadata['release_type'])
         print_metadata_line('Release Type', release_type_label, 'release_type')
         if metadata['release_type'] == 'SCHEDULED' && metadata['earliest_release_date']
           print_metadata_line('Scheduled Date', metadata['earliest_release_date'], 'earliest_release_date')
         end
-        
+
         print_metadata_toggle('Auto-submit', metadata['auto_submit'], 'auto_submit')
         print_metadata_toggle('Phased Release', metadata['phased_release'], 'phased_release')
 
@@ -188,9 +181,9 @@ module Mysigner
         end
 
         warn_missing_submission_fields(metadata)
-        puts ""
+        puts ''
       end
-      
+
       def format_release_type(release_type)
         case release_type
         when 'AFTER_APPROVAL' then 'After Approval (auto-release)'
@@ -205,10 +198,10 @@ module Mysigner
 
         overrides.each do |key, value|
           merged[key] = if merged[key].is_a?(Hash) && value.is_a?(Hash)
-            deep_merge(merged[key], value)
-          else
-            value
-          end
+                          deep_merge(merged[key], value)
+                        else
+                          value
+                        end
         end
 
         merged
@@ -253,7 +246,11 @@ module Mysigner
       end
 
       def print_metadata_toggle(label, value, key)
-        human = value.nil? ? '—' : (value ? 'Yes' : 'No')
+        human = if value.nil?
+                  '—'
+                else
+                  (value ? 'Yes' : 'No')
+                end
         puts "   #{label}: #{human}#{override_suffix(key)}"
       end
 
@@ -294,19 +291,17 @@ module Mysigner
         warnings = []
         # What's New only required for updates (version > 1.0)
         warnings << "Missing What's New copy (required for version updates)" if !is_first_version && metadata['whats_new'].to_s.strip.empty?
-        
+
         # Support URL may already be in App Store Connect, so just note it
         if metadata['support_url'].to_s.strip.empty?
-          warnings << "Support URL not configured in My Signer (will use App Store Connect value if available)"
+          warnings << 'Support URL not configured in My Signer (will use App Store Connect value if available)'
         end
 
         return if warnings.empty?
 
-        puts "   ⚠️  Notes:" unless warnings.empty?
+        puts '   ⚠️  Notes:' unless warnings.empty?
         warnings.each { |msg| puts "     - #{msg}" }
       end
     end
   end
 end
-
-