mysigner 0.3.4 → 0.3.7

data/lib/mysigner/upload/uploader.rb

@@ -1,28 +1,18 @@
 # frozen_string_literal: true
 
-require 'English'
-require 'fileutils'
-require 'json'
+require 'open3'
 require 'tmpdir'
 
 module Mysigner
   module Upload
+    # IPA metadata reader. The legacy iTMSTransporter/altool *instance*
+    # uploader that used to live here was removed once the iOS upload path
+    # moved to AscRestUploader/AscSubmitter — only this class method is still
+    # used (by build_commands.rb to read an IPA's build info before upload).
     class Uploader
-      class UploadError < Mysigner::Error; end
-      class TransporterNotFoundError < UploadError; end
-      class AuthenticationError < UploadError; end
-
-      TRANSPORTER_PATHS = [
-        '/Applications/Xcode.app/Contents/Developer/usr/bin/iTMSTransporter', # Bundled with Xcode (primary)
-        '/Applications/Transporter.app/Contents/itms/bin/iTMSTransporter',    # Standalone Transporter app
-        '/usr/local/itms/bin/iTMSTransporter' # Custom installation
-      ].freeze
-
-      # Parses CFBundleVersion + CFBundleShortVersionString from an .ipa
-      # (reads Info.plist from the Payload/*.app/ inside the zip).
-      # Used by the new ASC REST upload flow in build_commands.rb.
+      # Parses CFBundleVersion + CFBundleShortVersionString + CFBundleIdentifier
+      # from an .ipa (reads Info.plist from the Payload/*.app/ inside the zip).
       def self.extract_ipa_info(ipa_path)
-        require 'open3'
         result = { cf_bundle_version: nil, cf_bundle_short_version_string: nil, bundle_id: nil }
         Dir.mktmpdir('mysigner-ipa-inspect-') do |tmp|
           plist_path = File.join(tmp, 'Info.plist')
@@ -34,361 +24,14 @@ module Mysigner
           return result unless xml_status.success?
 
           result[:cf_bundle_version] = xml_out[%r{<key>CFBundleVersion</key>\s*<string>([^<]+)</string>}, 1]
-          result[:cf_bundle_short_version_string] = xml_out[%r{<key>CFBundleShortVersionString</key>\s*<string>([^<]+)</string>}, 1]
+          result[:cf_bundle_short_version_string] =
+            xml_out[%r{<key>CFBundleShortVersionString</key>\s*<string>([^<]+)</string>}, 1]
           result[:bundle_id] = xml_out[%r{<key>CFBundleIdentifier</key>\s*<string>([^<]+)</string>}, 1]
         end
         result
       rescue StandardError
         { cf_bundle_version: nil, cf_bundle_short_version_string: nil, bundle_id: nil }
       end
-
-      def initialize(ipa_path, api_key:, api_issuer:, private_key:)
-        @ipa_path = File.expand_path(ipa_path)
-        @api_key = api_key
-        @api_issuer = api_issuer
-        @private_key = private_key
-
-        validate_ipa!
-        detect_transporter!
-        setup_private_key!
-      end
-
-      def upload!(wait_for_processing: false)
-        say_uploading
-
-        begin
-          # Validate IPA first
-          validate_result = validate_ipa
-          raise UploadError, "IPA validation failed: #{validate_result[:error]}" unless validate_result[:success]
-
-          # Upload to App Store Connect
-          upload_result = upload_ipa
-          raise UploadError, "Upload failed: #{upload_result[:error]}" unless upload_result[:success]
-
-          say_success
-
-          # Optionally wait for processing
-          if wait_for_processing
-            say_waiting_for_processing
-            # NOTE: Build processing status is polled via the dashboard's sync API
-            # in build_commands.rb, not directly here. This flag is reserved for
-            # future use or manual uploads outside the `ship` command flow.
-          end
-
-          {
-            success: true,
-            message: 'Upload completed successfully'
-          }
-        rescue StandardError => e
-          raise UploadError, "Upload failed: #{e.message}"
-        ensure
-          cleanup_private_key!
-        end
-      end
-
-      private
-
-      def validate_ipa!
-        raise UploadError, "IPA file not found: #{@ipa_path}" unless File.exist?(@ipa_path)
-
-        raise UploadError, "Invalid file type: #{@ipa_path} (must be .ipa)" unless @ipa_path.end_with?('.ipa')
-
-        # Check file size (should be at least 10KB to catch truly corrupt files)
-        file_size = File.size(@ipa_path)
-        return unless file_size < 10_000
-
-        raise UploadError, "IPA file seems too small: #{file_size} bytes (possible corruption)"
-      end
-
-      def detect_transporter!
-        # We primarily use xcrun altool, but check for iTMSTransporter as fallback
-        @transporter_path = TRANSPORTER_PATHS.find { |path| File.exist?(path) }
-
-        # Even if iTMSTransporter is not found, xcrun altool should work
-        # This is just for informational purposes
-        @using_altool = true
-      end
-
-      def setup_private_key!
-        # Phase 0: write the .p8 to a per-run tempdir (0600) and point altool
-        # there via API_PRIVATE_KEYS_DIR. #cleanup_private_key! in the upload!
-        # ensure block removes the tempdir, so the key never persists across
-        # invocations. Replaces the old ~/.private_keys/ persistent write.
-        @private_keys_dir = Dir.mktmpdir('mysigner-p8-')
-        @private_key_path = File.join(@private_keys_dir, "AuthKey_#{@api_key}.p8")
-        File.write(@private_key_path, @private_key)
-        File.chmod(0o600, @private_key_path)
-        ENV['API_PRIVATE_KEYS_DIR'] = @private_keys_dir
-      end
-
-      def cleanup_private_key!
-        FileUtils.rm_rf(@private_keys_dir) if @private_keys_dir && Dir.exist?(@private_keys_dir)
-        ENV.delete('API_PRIVATE_KEYS_DIR')
-      rescue StandardError
-        # Best-effort cleanup; never raise from ensure.
-      end
-
-      def validate_ipa
-        puts '📋 Validating IPA...'
-        puts ''
-
-        # Try altool first (simpler, works today)
-        if altool_available?
-          validate_with_altool
-        elsif @transporter_path
-          validate_with_transporter
-        else
-          puts '⚠️  Skipping validation (no tools available)'
-          { success: true } # Continue anyway
-        end
-      end
-
-      def validate_with_altool
-        cmd = [
-          'xcrun', 'altool',
-          '--validate-app',
-          '-f', @ipa_path,
-          '-t', 'ios',
-          '--apiKey', @api_key,
-          '--apiIssuer', @api_issuer
-        ].join(' ')
-
-        output = `#{cmd} 2>&1`
-        success = $CHILD_STATUS.success?
-
-        if success
-          puts '✓ Validation passed (altool)'
-          { success: true }
-        else
-          error_message = extract_error_from_output(output)
-          puts "✗ Validation failed: #{error_message}"
-          { success: false, error: error_message }
-        end
-      end
-
-      def validate_with_transporter
-        # iTMSTransporter verify mode
-        # According to https://help.apple.com/itc/transporteruserguide/en.lproj/static.html
-        cmd = [
-          @transporter_path,
-          '-m', 'verify',
-          '-f', @ipa_path,
-          '-apiKey', @api_key,
-          '-apiIssuer', @api_issuer,
-          '-t', 'Signiant' # Transport mode
-        ].join(' ')
-
-        output = `#{cmd} 2>&1`
-        success = $CHILD_STATUS.success?
-
-        if success
-          puts '✓ Validation passed (iTMSTransporter)'
-          { success: true }
-        else
-          error_message = extract_error_from_output(output)
-          puts "✗ Validation failed: #{error_message}"
-          { success: false, error: error_message }
-        end
-      end
-
-      def upload_ipa
-        puts ''
-        puts '☁️  Uploading to App Store Connect...'
-        puts ''
-
-        # Try altool first, fall back to iTMSTransporter
-        if altool_available?
-          upload_with_altool
-        elsif @transporter_path
-          upload_with_transporter
-        else
-          raise UploadError, 'No upload tool available. Please ensure Xcode is installed.'
-        end
-      end
-
-      def upload_with_altool
-        puts 'Using: xcrun altool'
-        puts ''
-
-        cmd = [
-          'xcrun', 'altool',
-          '--upload-app',
-          '-f', @ipa_path,
-          '-t', 'ios',
-          '--apiKey', @api_key,
-          '--apiIssuer', @api_issuer
-        ].join(' ')
-
-        # Capture full output for error detection
-        output = []
-        has_errors = false
-
-        # Run with live output
-        IO.popen(cmd, err: %i[child out]) do |io|
-          io.each_line do |line|
-            output << line
-            next if line.strip.empty?
-
-            # Detect errors
-            has_errors = true if line.include?('ERROR') || line.include?('UPLOAD FAILED')
-
-            # Show progress indicators
-            if line.include?('Uploading') || line.include?('Processing') ||
-               line.include?('Verifying') || line.include?('Package')
-              print '.'
-            elsif line.include?('error') || line.include?('ERROR')
-              puts ''
-              puts line
-            elsif line.include?('SUCCESS') || line.include?('No errors')
-              puts ''
-              puts line
-            end
-          end
-        end
-
-        puts '' # New line after progress dots
-
-        # Check both exit code and output for errors
-        if $CHILD_STATUS.success? && !has_errors
-          { success: true }
-        else
-          error_msg = extract_error_from_output(output.join("\n"))
-          { success: false, error: error_msg }
-        end
-      end
-
-      def upload_with_transporter
-        puts 'Using: iTMSTransporter (future-proof)'
-        puts ''
-
-        # iTMSTransporter upload mode
-        # According to https://help.apple.com/itc/transporteruserguide/en.lproj/static.html
-        cmd = [
-          @transporter_path,
-          '-m', 'upload',
-          '-f', @ipa_path,
-          '-apiKey', @api_key,
-          '-apiIssuer', @api_issuer,
-          '-t', 'Signiant' # Transport mode (can also use 'Aspera' or 'DAV')
-        ].join(' ')
-
-        # Capture output
-        output = []
-
-        IO.popen(cmd, err: %i[child out]) do |io|
-          io.each_line do |line|
-            output << line
-            next if line.strip.empty?
-
-            # Show progress
-            if line.include?('Uploading') || line.include?('Processing') ||
-               line.include?('Verifying')
-              print '.'
-            elsif line.include?('ERROR')
-              puts ''
-              puts line
-            elsif line.include?('SUCCESS')
-              puts ''
-              puts line
-            end
-          end
-        end
-
-        puts ''
-
-        if $CHILD_STATUS.success?
-          { success: true }
-        else
-          error_msg = extract_error_from_output(output.join("\n"))
-          { success: false, error: error_msg }
-        end
-      end
-
-      def altool_available?
-        # Check if altool is available
-        system('xcrun --find altool > /dev/null 2>&1')
-      end
-
-      def extract_error_from_output(output)
-        # Try to extract meaningful error from altool output
-        error_lines = output.lines.select do |l|
-          l.include?('ERROR') || l.include?('error') || l.include?('Invalid')
-        end
-
-        if error_lines.any?
-          # Clean up and join error messages
-          cleaned_errors = error_lines.map(&:strip)
-                                      .reject { |l| l.empty? || l.start_with?('code :') || l.start_with?('iris-code') }
-                                      .join("\n")
-
-          # Add helpful context for common errors
-          if output.include?('Cannot determine the Apple ID from Bundle ID')
-            cleaned_errors += "\n\n💡 This usually means:\n"
-            cleaned_errors += "   • Your bundle ID doesn't have an App created in App Store Connect\n"
-            cleaned_errors += "   • Or your Xcode project's bundle ID doesn't match the App's bundle ID\n"
-            cleaned_errors += "\n   Fix:\n"
-            cleaned_errors += "   1. Check your app in App Store Connect → App Information\n"
-            cleaned_errors += "   2. Note the Bundle ID shown there\n"
-            cleaned_errors += "   3. Either:\n"
-            cleaned_errors += "      a) Update your Xcode project to use that bundle ID\n"
-            cleaned_errors += "      b) Or run: mysigner ship testflight --bundle-id <correct-bundle-id>\n"
-          elsif output.include?('Missing required icon file')
-            cleaned_errors += "\n\n💡 Your app is missing required icon assets.\n"
-            cleaned_errors += "   Fix:\n"
-            cleaned_errors += "   1. Open your Xcode project\n"
-            cleaned_errors += "   2. Go to Assets.xcassets → AppIcon\n"
-            cleaned_errors += "   3. Add icon images for all required sizes\n"
-            cleaned_errors += "   4. Or use a tool like https://appicon.co to generate all sizes\n"
-          end
-
-          cleaned_errors
-        else
-          'Unknown error'
-        end
-      end
-
-      def say_uploading
-        puts '☁️  Uploading to TestFlight...'
-        puts ''
-        puts "IPA:        #{File.basename(@ipa_path)}"
-        puts "Size:       #{format_bytes(File.size(@ipa_path))}"
-
-        # Show which tool will be used
-        if altool_available?
-          puts 'Tool:       xcrun altool'
-        elsif @transporter_path
-          puts 'Tool:       iTMSTransporter (future-proof)'
-        else
-          puts 'Tool:       Auto-detect'
-        end
-        puts ''
-      end
-
-      def say_success
-        puts ''
-        puts '=' * 80
-        puts '✓ Upload succeeded!'
-        puts '=' * 80
-        puts ''
-        puts '🎉 Your build is now processing in App Store Connect'
-        puts ''
-      end
-
-      def say_waiting_for_processing
-        puts '⏳ Waiting for App Store Connect to process the build...'
-        puts 'This may take 5-15 minutes...'
-        puts ''
-      end
-
-      def format_bytes(bytes)
-        if bytes < 1024
-          "#{bytes} B"
-        elsif bytes < 1024 * 1024
-          "#{(bytes / 1024.0).round(1)} KB"
-        else
-          "#{(bytes / (1024.0 * 1024)).round(1)} MB"
-        end
-      end
     end
   end
 end

data/lib/mysigner/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mysigner
-  VERSION = '0.3.4'
+  VERSION = '0.3.7'
 end

data/lib/mysigner.rb

@@ -5,6 +5,7 @@ module Mysigner
 end
 
 require 'mysigner/version'
+require 'mysigner/formatting'
 require 'mysigner/config'
 require 'mysigner/local_credentials'
 require 'mysigner/client'

data/mysigner.gemspec

@@ -58,7 +58,12 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    # Ship only what the installed gem needs. Exclude tests, the dev-only
+    # bin/ helpers (console/setup — the real CLI is exe/mysigner), and the
+    # internal MANUAL_TEST.md process notes.
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{\A(?:test|spec|features|bin)/}) || f == 'MANUAL_TEST.md'
+    end
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -69,7 +74,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', '~> 2.14'
   spec.add_dependency 'faraday-retry', '~> 2.2'
   spec.add_dependency 'plist', '~> 3.7'
-  spec.add_dependency 'reline', '~> 0.5'
   spec.add_dependency 'thor', '~> 1.4'
   spec.add_dependency 'xcodeproj', '~> 1.27'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysigner
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.7
 platform: ruby
 authors:
 - Jurgen Leka
@@ -65,20 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: reline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -224,17 +210,13 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- MANUAL_TEST.md
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - exe/mysigner
 - lib/mysigner.rb
 - lib/mysigner/auth/asc_jwt_minter.rb
@@ -261,6 +243,7 @@ files:
 - lib/mysigner/config.rb
 - lib/mysigner/credential_resolver.rb
 - lib/mysigner/export/exporter.rb
+- lib/mysigner/formatting.rb
 - lib/mysigner/local_credentials.rb
 - lib/mysigner/signing/certificate_checker.rb
 - lib/mysigner/signing/gradle_signing_injector.rb
@@ -275,7 +258,6 @@ files:
 - lib/mysigner/upload/uploader.rb
 - lib/mysigner/version.rb
 - mysigner.gemspec
-- test_manual.rb
 homepage: https://mysigner.dev
 licenses:
 - Apache-2.0

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.10
-before_install: gem install bundler -v 1.17.2