emerge 0.6.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 615b959713db3bc2be8d96888f8d6de83aa903ef7d20ac8d4516962f627a4b93
-  data.tar.gz: ef95d430576322ebf5810296438aa5f67ff754d99ac2be9520a4978b94caad6e
+  metadata.gz: 409fec8581e499747b3c9ca5cd80e0f9c9e491ca0d94688bc1e0d299a974a95b
+  data.tar.gz: 64863c523c84b25f5ff21a9bbda0863f13ef7a5165d5437aeb66d60211e7fe84
 SHA512:
-  metadata.gz: cb5d892cf29c7994dcc9139ed8dbda403c1cf2b376e1370a5be993aef9f0d030b9335f34544a1a41a4dc6d8fc05d9a13740e6f530412ab502d4e68117e3e197d
-  data.tar.gz: afd1dba61977e93757b1d19086f6ae43c3436dcf3efe193b9d0c7eab671e00dffbb41c42611516283e280607ac5a2b869d9cbc51a8a11d76b53f6f4fb526f265
+  metadata.gz: 5a6dc2be9e2ad1f3078c9f6703d35c2f1e70d5630d14a2f682216fb949c1111b7bc236702e2e9698714f4662e5e7a70bcb67118c510542b61d1b58c00f13dc1e
+  data.tar.gz: 76f622ef6797a7c420d1406e9f43ddceb9f075180641ae6e5b78cbb63a3a18489d883d63346d973f9ff8e6b225281d2d0671e6ad33d5ff667b5c7d347c8ba769

data/lib/commands/build/distribution/install.rb

@@ -0,0 +1,186 @@
+require 'dry/cli'
+require 'cfpropertylist'
+require 'zip'
+require 'rbconfig'
+require 'tmpdir'
+require 'tty-prompt'
+
+module EmergeCLI
+  module Commands
+    module Build
+      module Distribution
+        class Install < EmergeCLI::Commands::GlobalOptions
+          desc 'Download and install a build from Build Distribution'
+
+          option :api_token, type: :string, required: false,
+                             desc: 'API token for authentication, defaults to ENV[EMERGE_API_TOKEN]'
+          option :id, type: :string, required: true, desc: 'Emerge build ID to download'
+          option :install, type: :boolean, default: true, required: false, desc: 'Install the build on the device'
+          option :device_id, type: :string, desc: 'Specific device ID to target'
+          option :device_type, type: :string, enum: %w[virtual physical any], default: 'any',
+                               desc: 'Type of device to target (virtual/physical/any)'
+          option :output, type: :string, required: false, desc: 'Output path for the downloaded build'
+
+          def initialize(network: nil)
+            @network = network
+          end
+
+          def call(**options)
+            @options = options
+            before(options)
+
+            Sync do
+              api_token = @options[:api_token] || ENV.fetch('EMERGE_API_TOKEN', nil)
+              raise 'API token is required' unless api_token
+
+              raise 'Build ID is required' unless @options[:id]
+
+              output_name = nil
+              app_id = nil
+
+              begin
+                @network ||= EmergeCLI::Network.new(api_token:)
+
+                Logger.info 'Getting build URL...'
+                request = get_build_url(@options[:id])
+                response = parse_response(request)
+
+                platform = response['platform']
+                download_url = response['downloadUrl']
+                app_id = response['appId']
+
+                extension = platform == 'ios' ? 'ipa' : 'apk'
+                output_name = @options[:output] || "#{@options[:id]}.#{extension}"
+
+                if File.exist?(output_name)
+                  Logger.info "Build file already exists at #{output_name}"
+                  prompt = TTY::Prompt.new
+                  choice = prompt.select('What would you like to do?', {
+                                           'Install existing file' => :install,
+                                           'Overwrite with new download' => :overwrite,
+                                           'Cancel' => :cancel
+                                         })
+
+                  case choice
+                  when :install
+                    Logger.info 'Proceeding with existing file...'
+                  when :overwrite
+                    Logger.info 'Downloading new build...'
+                    `curl --progress-bar -L '#{download_url}' -o #{output_name}`
+                    Logger.info "✅ Build downloaded to #{output_name}"
+                  when :cancel
+                    raise 'Operation cancelled by user'
+                  end
+                else
+                  Logger.info 'Downloading build...'
+                  `curl --progress-bar -L '#{download_url}' -o #{output_name}`
+                  Logger.info "✅ Build downloaded to #{output_name}"
+                end
+              rescue StandardError => e
+                Logger.error "❌ Failed to download build: #{e.message}"
+                raise e
+              ensure
+                @network&.close
+              end
+
+              begin
+                if @options[:install] && !output_name.nil?
+                  if platform == 'ios'
+                    install_ios_build(output_name, app_id)
+                  elsif platform == 'android'
+                    install_android_build(output_name)
+                  end
+                end
+              rescue StandardError => e
+                Logger.error "❌ Failed to install build: #{e.message}"
+                raise e
+              end
+            end
+          end
+
+          private
+
+          def get_build_url(build_id)
+            @network.get(
+              path: '/distribution/downloadUrl',
+              max_retries: 3,
+              query: {
+                buildId: build_id
+              }
+            )
+          end
+
+          def parse_response(response)
+            case response.status
+            when 200
+              JSON.parse(response.read)
+            when 400
+              error_message = JSON.parse(response.read)['errorMessage']
+              raise "Invalid parameters: #{error_message}"
+            when 401, 403
+              raise 'Invalid API token'
+            else
+              raise "Getting build failed with status #{response.status}"
+            end
+          end
+
+          def install_ios_build(build_path, app_id)
+            device_type = case @options[:device_type]
+                          when 'simulator'
+                            XcodeDeviceManager::DeviceType::VIRTUAL
+                          when 'physical'
+                            XcodeDeviceManager::DeviceType::PHYSICAL
+                          else
+                            XcodeDeviceManager::DeviceType::ANY
+                          end
+
+            device_manager = XcodeDeviceManager.new
+            device = if @options[:device_id]
+                       device_manager.find_device_by_id(@options[:device_id])
+                     else
+                       device_manager.find_device_by_type(device_type, build_path)
+                     end
+
+            Logger.info "Installing build on #{device.device_id}"
+            device.install_app(build_path)
+            Logger.info '✅ Build installed'
+
+            Logger.info "Launching app #{app_id}..."
+            device.launch_app(app_id)
+            Logger.info '✅ Build launched'
+          end
+
+          def install_android_build(build_path)
+            device_id = @options[:device_id] || select_android_device
+            raise 'No Android devices found' unless device_id
+
+            command = "adb -s #{device_id} install #{build_path}"
+            Logger.debug "Running command: #{command}"
+            `#{command}`
+
+            Logger.info '✅ Build installed'
+          end
+
+          def select_android_device
+            devices = get_android_devices
+            return nil if devices.empty?
+            return devices.first if devices.length == 1
+
+            prompt = TTY::Prompt.new
+            Logger.info 'Multiple Android devices found.'
+            prompt.select('Choose a device:', devices)
+          end
+
+          def get_android_devices
+            output = `adb devices`
+            # Split output into lines, remove first line (header), and extract device IDs
+            output.split("\n")[1..]
+                  .map(&:strip)
+                  .reject(&:empty?)
+                  .map { |line| line.split("\t").first }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/commands/build/distribution/validate.rb

@@ -0,0 +1,166 @@
+require 'dry/cli'
+require 'cfpropertylist'
+require 'zip'
+require 'rbconfig'
+
+module EmergeCLI
+  module Commands
+    module Build
+      module Distribution
+        class ValidateApp < EmergeCLI::Commands::GlobalOptions
+          desc 'Validate app for build distribution'
+
+          option :path, type: :string, required: true, desc: 'Path to the xcarchive, IPA or APK to validate'
+
+          # Constants
+          PLIST_START = '<plist'.freeze
+          PLIST_STOP = '</plist>'.freeze
+
+          UTF8_ENCODING = 'UTF-8'.freeze
+          STRING_FORMAT = 'binary'.freeze
+          EMPTY_STRING = ''.freeze
+
+          EXPECTED_ABI = 'arm64-v8a'.freeze
+
+          def call(**options)
+            @options = options
+            before(options)
+
+            Sync do
+              file_extension = File.extname(@options[:path])
+              case file_extension
+              when '.xcarchive'
+                handle_xcarchive
+              when '.ipa'
+                handle_ipa
+              when '.app'
+                handle_app
+              when '.apk'
+                handle_apk
+              else
+                raise "Unknown file extension: #{file_extension}"
+              end
+            end
+          end
+
+          private
+
+          def handle_xcarchive
+            raise 'Path must be an xcarchive' unless @options[:path].end_with?('.xcarchive')
+
+            app_path = Dir.glob("#{@options[:path]}/Products/Applications/*.app").first
+            run_codesign_check(app_path)
+            read_provisioning_profile(app_path)
+          end
+
+          def handle_ipa
+            raise 'Path must be an IPA' unless @options[:path].end_with?('.ipa')
+
+            Dir.mktmpdir do |tmp_dir|
+              Zip::File.open(@options[:path]) do |zip_file|
+                zip_file.each do |entry|
+                  entry.extract(File.join(tmp_dir, entry.name))
+                end
+              end
+
+              app_path = File.join(tmp_dir, 'Payload/*.app')
+              app_path = Dir.glob(app_path).first
+              run_codesign_check(app_path)
+              read_provisioning_profile(app_path)
+            end
+          end
+
+          def handle_app
+            raise 'Path must be an app' unless @options[:path].end_with?('.app')
+
+            app_path = @options[:path]
+            run_codesign_check(app_path)
+            read_provisioning_profile(app_path)
+          end
+
+          def handle_apk
+            raise 'Path must be an APK' unless @options[:path].end_with?('.apk')
+
+            apk_path = @options[:path]
+            check_supported_abis(apk_path)
+          end
+
+          def run_codesign_check(app_path)
+            unless RbConfig::CONFIG['host_os'] =~ /darwin/i
+              Logger.info 'Skipping codesign check on non-macOS platform'
+              return
+            end
+
+            command = "codesign -dvvv '#{app_path}'"
+            Logger.debug command
+            stdout, _, status = Open3.capture3(command)
+            Logger.debug stdout
+            raise '❌ Codesign check failed' unless status.success?
+
+            Logger.info '✅ Codesign check passed'
+          end
+
+          def read_provisioning_profile(app_path)
+            entitlements_path = File.join(app_path, 'embedded.mobileprovision')
+            raise '❌ Entitlements file not found' unless File.exist?(entitlements_path)
+
+            content = File.read(entitlements_path)
+            lines = content.lines
+
+            buffer = ''
+            inside_plist = false
+            lines.each do |line|
+              inside_plist = true if line.include? PLIST_START
+              if inside_plist
+                buffer << line
+                break if line.include? PLIST_STOP
+              end
+            end
+
+            encoded_plist = buffer.encode(UTF8_ENCODING, STRING_FORMAT, invalid: :replace, undef: :replace,
+                                                                        replace: EMPTY_STRING)
+            encoded_plist = encoded_plist.sub(/#{PLIST_STOP}.+/, PLIST_STOP)
+
+            plist = CFPropertyList::List.new(data: encoded_plist)
+            parsed_data = CFPropertyList.native_types(plist.value)
+
+            expiration_date = parsed_data['ExpirationDate']
+            if expiration_date > Time.now
+              Logger.info '✅ Provisioning profile hasn\'t expired'
+            else
+              Logger.info "❌ Provisioning profile is expired. Expiration date: #{expiration_date}"
+            end
+
+            provisions_all_devices = parsed_data['ProvisionsAllDevices']
+            if provisions_all_devices
+              Logger.info 'Provisioning profile supports all devices (likely an enterprise profile)'
+            else
+              devices = parsed_data['ProvisionedDevices']
+              Logger.info 'Provisioning profile does not support all devices (likely a development profile).'
+              Logger.info "Devices: #{devices.inspect}"
+            end
+          end
+
+          def check_supported_abis(apk_path)
+            abis = []
+
+            Zip::File.open(apk_path) do |zip_file|
+              zip_file.each do |entry|
+                if entry.name.start_with?('lib/') && entry.name.count('/') == 2
+                  abi = entry.name.split('/')[1]
+                  abis << abi unless abis.include?(abi)
+                end
+              end
+            end
+
+            unless abis.include?(EXPECTED_ABI)
+              raise "APK does not support #{EXPECTED_ABI} architecture, found: #{abis.join(', ')}"
+            end
+
+            Logger.info "✅ APK supports #{EXPECTED_ABI} architecture"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/commands/{autofixes → fix}/exported_symbols.rb

@@ -3,7 +3,7 @@ require 'xcodeproj'
 
 module EmergeCLI
   module Commands
-    module Autofixes
+    module Fix
       class ExportedSymbols < EmergeCLI::Commands::GlobalOptions
         desc 'Remove exported symbols from built binaries'
 

data/lib/commands/{autofixes → fix}/minify_strings.rb

@@ -3,7 +3,7 @@ require 'xcodeproj'
 
 module EmergeCLI
   module Commands
-    module Autofixes
+    module Fix
       class MinifyStrings < EmergeCLI::Commands::GlobalOptions
         desc 'Minify strings in the app'
 

data/lib/commands/{autofixes → fix}/strip_binary_symbols.rb

@@ -3,7 +3,7 @@ require 'xcodeproj'
 
 module EmergeCLI
   module Commands
-    module Autofixes
+    module Fix
       class StripBinarySymbols < EmergeCLI::Commands::GlobalOptions
         desc 'Strip binary symbols from the app'
 

data/lib/commands/order_files/download_order_files.rb

@@ -2,75 +2,77 @@ require 'dry/cli'
 
 module EmergeCLI
   module Commands
-    class DownloadOrderFiles < EmergeCLI::Commands::GlobalOptions
-      desc 'Download order files from Emerge'
+    module OrderFiles
+      class Download < EmergeCLI::Commands::GlobalOptions
+        desc 'Download order files from Emerge'
 
-      option :bundle_id, type: :string, required: true, desc: 'Bundle identifier to download order files for'
+        option :bundle_id, type: :string, required: true, desc: 'Bundle identifier to download order files for'
 
-      option :api_token, type: :string, required: false,
-                         desc: 'API token for authentication, defaults to ENV[EMERGE_API_TOKEN]'
+        option :api_token, type: :string, required: false,
+                           desc: 'API token for authentication, defaults to ENV[EMERGE_API_TOKEN]'
 
-      option :app_version, type: :string, required: true,
-                           desc: 'App version to download order files for'
+        option :app_version, type: :string, required: true,
+                             desc: 'App version to download order files for'
 
-      option :unzip, type: :boolean, required: false,
-                     desc: 'Unzip the order file after downloading'
+        option :unzip, type: :boolean, required: false,
+                       desc: 'Unzip the order file after downloading'
 
-      option :output, type: :string, required: false,
-                      desc: 'Output name for the order file, defaults to bundle_id-app_version.gz'
+        option :output, type: :string, required: false,
+                        desc: 'Output name for the order file, defaults to bundle_id-app_version.gz'
 
-      EMERGE_ORDER_FILE_URL = 'order-files-prod.emergetools.com'.freeze
+        EMERGE_ORDER_FILE_URL = 'order-files-prod.emergetools.com'.freeze
 
-      def initialize(network: nil)
-        @network = network
-      end
+        def initialize(network: nil)
+          @network = network
+        end
 
-      def call(**options)
-        @options = options
-        before(options)
+        def call(**options)
+          @options = options
+          before(options)
 
-        begin
-          api_token = @options[:api_token] || ENV.fetch('EMERGE_API_TOKEN', nil)
-          raise 'API token is required' unless api_token
+          begin
+            api_token = @options[:api_token] || ENV.fetch('EMERGE_API_TOKEN', nil)
+            raise 'API token is required' unless api_token
 
-          raise 'Bundle ID is required' unless @options[:bundle_id]
-          raise 'App version is required' unless @options[:app_version]
+            raise 'Bundle ID is required' unless @options[:bundle_id]
+            raise 'App version is required' unless @options[:app_version]
 
-          @network ||= EmergeCLI::Network.new(api_token:, base_url: EMERGE_ORDER_FILE_URL)
-          output_name = @options[:output] || "#{@options[:bundle_id]}-#{@options[:app_version]}.gz"
-          output_name = "#{output_name}.gz" unless output_name.end_with?('.gz')
+            @network ||= EmergeCLI::Network.new(api_token:, base_url: EMERGE_ORDER_FILE_URL)
+            output_name = @options[:output] || "#{@options[:bundle_id]}-#{@options[:app_version]}.gz"
+            output_name = "#{output_name}.gz" unless output_name.end_with?('.gz')
 
-          Sync do
-            request = get_order_file(options[:bundle_id], options[:app_version])
-            response = request.read
+            Sync do
+              request = get_order_file(options[:bundle_id], options[:app_version])
+              response = request.read
 
-            File.write(output_name, response)
+              File.write(output_name, response)
 
-            if @options[:unzip]
-              Logger.info 'Unzipping order file...'
-              Zlib::GzipReader.open(output_name) do |gz|
-                File.write(output_name.gsub('.gz', ''), gz.read)
+              if @options[:unzip]
+                Logger.info 'Unzipping order file...'
+                Zlib::GzipReader.open(output_name) do |gz|
+                  File.write(output_name.gsub('.gz', ''), gz.read)
+                end
               end
-            end
 
-            Logger.info 'Order file downloaded successfully'
+              Logger.info 'Order file downloaded successfully'
+            end
+          rescue StandardError => e
+            Logger.error "Failed to download order file: #{e.message}"
+            Logger.error 'Check your parameters and try again'
+            raise e
+          ensure
+            @network&.close
           end
-        rescue StandardError => e
-          Logger.error "Failed to download order file: #{e.message}"
-          Logger.error 'Check your parameters and try again'
-          raise e
-        ensure
-          @network&.close
         end
-      end
 
-      private
+        private
 
-      def get_order_file(bundle_id, app_version)
-        @network.get(
-          path: "/#{bundle_id}/#{app_version}",
-          max_retries: 0
-        )
+        def get_order_file(bundle_id, app_version)
+          @network.get(
+            path: "/#{bundle_id}/#{app_version}",
+            max_retries: 0
+          )
+        end
       end
     end
   end

data/lib/commands/order_files/validate_linkmaps.rb

@@ -3,52 +3,54 @@ require 'cfpropertylist'
 
 module EmergeCLI
   module Commands
-    class ValidateLinkmaps < EmergeCLI::Commands::GlobalOptions
-      desc 'Validate linkmaps in xcarchive'
+    module OrderFiles
+      class ValidateLinkmaps < EmergeCLI::Commands::GlobalOptions
+        desc 'Validate linkmaps in xcarchive'
 
-      option :path, type: :string, required: true, desc: 'Path to the xcarchive to validate'
+        option :path, type: :string, required: true, desc: 'Path to the xcarchive to validate'
 
-      def initialize(network: nil)
-        @network = network
-      end
+        def initialize(network: nil)
+          @network = network
+        end
 
-      def call(**options)
-        @options = options
-        before(options)
+        def call(**options)
+          @options = options
+          before(options)
 
-        Sync do
-          executable_name = get_executable_name
-          raise 'Executable not found' if executable_name.nil?
+          Sync do
+            executable_name = get_executable_name
+            raise 'Executable not found' if executable_name.nil?
 
-          Logger.info "Using executable: #{executable_name}"
+            Logger.info "Using executable: #{executable_name}"
 
-          linkmaps_path = File.join(@options[:path], 'Linkmaps')
-          raise 'Linkmaps folder not found' unless File.directory?(linkmaps_path)
+            linkmaps_path = File.join(@options[:path], 'Linkmaps')
+            raise 'Linkmaps folder not found' unless File.directory?(linkmaps_path)
 
-          linkmaps = Dir.glob("#{linkmaps_path}/*.txt")
-          raise 'No linkmaps found' if linkmaps.empty?
+            linkmaps = Dir.glob("#{linkmaps_path}/*.txt")
+            raise 'No linkmaps found' if linkmaps.empty?
 
-          executable_linkmaps = linkmaps.select do |linkmap|
-            File.basename(linkmap).start_with?(executable_name)
-          end
-          raise 'No linkmaps found for executable' if executable_linkmaps.empty?
+            executable_linkmaps = linkmaps.select do |linkmap|
+              File.basename(linkmap).start_with?(executable_name)
+            end
+            raise 'No linkmaps found for executable' if executable_linkmaps.empty?
 
-          Logger.info "✅ Found linkmaps for #{executable_name}"
+            Logger.info "✅ Found linkmaps for #{executable_name}"
+          end
         end
-      end
 
-      private
+        private
 
-      def get_executable_name
-        raise 'Path must be an xcarchive' unless @options[:path].end_with?('.xcarchive')
+        def get_executable_name
+          raise 'Path must be an xcarchive' unless @options[:path].end_with?('.xcarchive')
 
-        app_path = Dir.glob("#{@options[:path]}/Products/Applications/*.app").first
-        info_path = File.join(app_path, 'Info.plist')
-        plist_data = File.read(info_path)
-        plist = CFPropertyList::List.new(data: plist_data)
-        parsed_data = CFPropertyList.native_types(plist.value)
+          app_path = Dir.glob("#{@options[:path]}/Products/Applications/*.app").first
+          info_path = File.join(app_path, 'Info.plist')
+          plist_data = File.read(info_path)
+          plist = CFPropertyList::List.new(data: plist_data)
+          parsed_data = CFPropertyList.native_types(plist.value)
 
-        parsed_data['CFBundleExecutable']
+          parsed_data['CFBundleExecutable']
+        end
       end
     end
   end

data/lib/commands/order_files/validate_xcode_project.rb

@@ -3,67 +3,69 @@ require 'xcodeproj'
 
 module EmergeCLI
   module Commands
-    class ValidateXcodeProject < EmergeCLI::Commands::GlobalOptions
-      desc 'Validate xcodeproject for order files'
+    module OrderFiles
+      class ValidateXcodeProject < EmergeCLI::Commands::GlobalOptions
+        desc 'Validate xcodeproject for order files'
 
-      option :path, type: :string, required: true, desc: 'Path to the xcodeproject to validate'
-      option :target, type: :string, required: false, desc: 'Target to validate'
-      option :build_configuration, type: :string, required: false,
-                                   desc: 'Build configuration to validate (Release by default)'
+        option :path, type: :string, required: true, desc: 'Path to the xcodeproject to validate'
+        option :target, type: :string, required: false, desc: 'Target to validate'
+        option :build_configuration, type: :string, required: false,
+                                     desc: 'Build configuration to validate (Release by default)'
 
-      # Constants
-      LINK_MAPS_CONFIG = 'LD_GENERATE_MAP_FILE'.freeze
-      LINK_MAPS_PATH = 'LD_MAP_FILE_PATH'.freeze
-      PATH_TO_LINKMAP = '$(TARGET_TEMP_DIR)/$(PRODUCT_NAME)-LinkMap-$(CURRENT_VARIANT)-$(CURRENT_ARCH).txt'.freeze
+        # Constants
+        LINK_MAPS_CONFIG = 'LD_GENERATE_MAP_FILE'.freeze
+        LINK_MAPS_PATH = 'LD_MAP_FILE_PATH'.freeze
+        PATH_TO_LINKMAP = '$(TARGET_TEMP_DIR)/$(PRODUCT_NAME)-LinkMap-$(CURRENT_VARIANT)-$(CURRENT_ARCH).txt'.freeze
 
-      def call(**options)
-        @options = options
-        before(options)
+        def call(**options)
+          @options = options
+          before(options)
 
-        raise 'Path must be an xcodeproject' unless @options[:path].end_with?('.xcodeproj')
-        raise 'Path does not exist' unless File.exist?(@options[:path])
+          raise 'Path must be an xcodeproject' unless @options[:path].end_with?('.xcodeproj')
+          raise 'Path does not exist' unless File.exist?(@options[:path])
 
-        @options[:build_configuration] ||= 'Release'
+          @options[:build_configuration] ||= 'Release'
 
-        Sync do
-          project = Xcodeproj::Project.open(@options[:path])
+          Sync do
+            project = Xcodeproj::Project.open(@options[:path])
 
-          validate_xcproj(project)
+            validate_xcproj(project)
+          end
         end
-      end
 
-      private
+        private
 
-      def validate_xcproj(project)
-        project.targets.each do |target|
-          next if @options[:target] && target.name != @options[:target]
-          next unless target.product_type == 'com.apple.product-type.application'
+        def validate_xcproj(project)
+          project.targets.each do |target|
+            next if @options[:target] && target.name != @options[:target]
+            next unless target.product_type == 'com.apple.product-type.application'
 
-          target.build_configurations.each do |config|
-            next if config.name != @options[:build_configuration]
-            validate_target_config(target, config)
+            target.build_configurations.each do |config|
+              next if config.name != @options[:build_configuration]
+              validate_target_config(target, config)
+            end
           end
         end
-      end
 
-      def validate_target_config(target, config)
-        has_error = false
-        if config.build_settings[LINK_MAPS_CONFIG] != 'YES'
-          has_error = true
-          Logger.error "❌ Write Link Map File (#{LINK_MAPS_CONFIG}) is not set to YES"
-        end
-        if config.build_settings[LINK_MAPS_PATH] != ''
-          has_error = true
-          Logger.error "❌ Path to Link Map File (#{LINK_MAPS_PATH}) is not set, we recommend \
+        def validate_target_config(target, config)
+          has_error = false
+          if config.build_settings[LINK_MAPS_CONFIG] != 'YES'
+            has_error = true
+            Logger.error "❌ Write Link Map File (#{LINK_MAPS_CONFIG}) is not set to YES"
+          end
+          if config.build_settings[LINK_MAPS_PATH] != ''
+            has_error = true
+            Logger.error "❌ Path to Link Map File (#{LINK_MAPS_PATH}) is not set, we recommend \
 setting it to '#{PATH_TO_LINKMAP}'"
-        end
+          end
 
-        if has_error
-          Logger.error "❌ Target '#{target.name}' has errors, this means \
+          if has_error
+            Logger.error "❌ Target '#{target.name}' has errors, this means \
 that the linkmaps will not be generated as expected"
-          Logger.error "Use `emerge configure order-files-ios --project-path '#{@options[:path]}'` to fix this"
-        else
-          Logger.info "✅ Target '#{target.name}' is valid"
+            Logger.error "Use `emerge configure order-files-ios --project-path '#{@options[:path]}'` to fix this"
+          else
+            Logger.info "✅ Target '#{target.name}' is valid"
+          end
         end
       end
     end

data/lib/commands/reaper/reaper.rb

@@ -7,7 +7,7 @@ module EmergeCLI
     class Reaper < EmergeCLI::Commands::GlobalOptions
       desc 'Analyze dead code from an Emerge upload'
 
-      option :upload_id, type: :string, required: true, desc: 'Upload ID to analyze'
+      option :id, type: :string, required: true, desc: 'Emerge build ID to analyze'
       option :project_root, type: :string, required: true,
                             desc: 'Root directory of the project, defaults to current directory'
 
@@ -38,7 +38,7 @@ module EmergeCLI
           project_root = @options[:project_root] || Dir.pwd
 
           Sync do
-            all_data = @profiler.measure('fetch_dead_code') { fetch_all_dead_code(@options[:upload_id]) }
+            all_data = @profiler.measure('fetch_dead_code') { fetch_all_dead_code(@options[:id]) }
             result = @profiler.measure('parse_dead_code') { DeadCodeResult.new(all_data) }
 
             Logger.info result.to_s

data/lib/commands/upload/snapshots/snapshots.rb

@@ -6,6 +6,8 @@ require 'async'
 require 'async/barrier'
 require 'async/semaphore'
 require 'async/http/internet/instance'
+require 'zip'
+require 'tempfile'
 
 module EmergeCLI
   module Commands
@@ -33,6 +35,8 @@ module EmergeCLI
 
         option :profile, type: :boolean, default: false, desc: 'Enable performance profiling metrics'
 
+        option :batch, type: :boolean, default: false, desc: 'Upload images in batch using zip file'
+
         argument :image_paths, type: :array, required: false, desc: 'Paths to folders containing images'
 
         def initialize(network: nil, git_info_provider: nil)
@@ -178,6 +182,86 @@ module EmergeCLI
         def upload_images(run_id, concurrency, image_files, client)
           Logger.info 'Uploading images...'
 
+          if @options[:batch]
+            batch_upload_images(run_id, image_files, client)
+          else
+            individual_upload_images(run_id, concurrency, image_files, client)
+          end
+        end
+
+        def batch_upload_images(run_id, image_files, client)
+          Logger.info 'Preparing batch upload...'
+
+          metadata_barrier = Async::Barrier.new
+          metadata_semaphore = Async::Semaphore.new(10, parent: metadata_barrier)
+
+          image_metadata = {
+            manifestVersion: 1,
+            images: {},
+            errors: []
+          }
+
+          @profiler.measure('process_image_metadata') do
+            image_files.each do |image_path|
+              metadata_semaphore.async do
+                file_info = client.parse_file_info(image_path)
+
+                dimensions = @profiler.measure('chunky_png_processing') do
+                  datastream = ChunkyPNG::Datastream.from_file(image_path)
+                  {
+                    width: datastream.header_chunk.width,
+                    height: datastream.header_chunk.height
+                  }
+                end
+
+                metadata = {
+                  fileName: file_info[:file_name],
+                  groupName: file_info[:group_name],
+                  displayName: file_info[:variant_name],
+                  width: dimensions[:width],
+                  height: dimensions[:height]
+                }
+
+                image_name = File.basename(image_path, '.*')
+                image_metadata[:images][image_name] = metadata
+              end
+            end
+
+            metadata_barrier.wait
+          end
+
+          Tempfile.create(['snapshot_batch', '.zip']) do |zip_file|
+            @profiler.measure('create_zip_file') do
+              Zip::File.open(zip_file.path, Zip::File::CREATE) do |zipfile|
+                zipfile.get_output_stream('manifest.json') { |f| f.write(JSON.generate(image_metadata)) }
+
+                image_files.each do |image_path|
+                  image_name = File.basename(image_path)
+                  zipfile.add(image_name, image_path)
+                end
+              end
+            end
+
+            upload_url = @profiler.measure('create_batch_upload_url') do
+              response = @network.post(path: '/v1/snapshots/run/batch-image', body: { run_id: run_id })
+              JSON.parse(response.read).fetch('zip_url')
+            end
+
+            Logger.info 'Uploading images...'
+            Logger.debug "Uploading batch zip file to #{upload_url}"
+            @profiler.measure('upload_batch_zip') do
+              @network.put(
+                path: upload_url,
+                headers: { 'Content-Type' => 'application/zip' },
+                body: File.read(zip_file.path)
+              )
+            end
+          end
+        ensure
+          metadata_barrier&.stop
+        end
+
+        def individual_upload_images(run_id, concurrency, image_files, client)
           post_image_barrier = Async::Barrier.new
           post_image_semaphore = Async::Semaphore.new(concurrency, parent: post_image_barrier)
 

data/lib/emerge_cli.rb

@@ -1,25 +1,25 @@
 require_relative 'version'
 
 require_relative 'commands/global_options'
-require_relative 'commands/upload/snapshots/snapshots'
-require_relative 'commands/upload/snapshots/client_libraries/swift_snapshot_testing'
-require_relative 'commands/upload/snapshots/client_libraries/paparazzi'
-require_relative 'commands/upload/snapshots/client_libraries/roborazzi'
-require_relative 'commands/upload/snapshots/client_libraries/default'
-require_relative 'commands/integrate/fastlane'
+require_relative 'commands/build/distribution/validate'
+require_relative 'commands/build/distribution/install'
 require_relative 'commands/config/snapshots/snapshots_ios'
 require_relative 'commands/config/orderfiles/orderfiles_ios'
-require_relative 'commands/reaper/reaper'
-require_relative 'commands/snapshots/validate_app'
+require_relative 'commands/integrate/fastlane'
+require_relative 'commands/fix/minify_strings'
+require_relative 'commands/fix/strip_binary_symbols'
+require_relative 'commands/fix/exported_symbols'
 require_relative 'commands/order_files/download_order_files'
 require_relative 'commands/order_files/validate_linkmaps'
 require_relative 'commands/order_files/validate_xcode_project'
+require_relative 'commands/reaper/reaper'
+require_relative 'commands/snapshots/validate_app'
 require_relative 'commands/upload/build'
-require_relative 'commands/build_distribution/validate_app'
-require_relative 'commands/build_distribution/download_and_install'
-require_relative 'commands/autofixes/minify_strings'
-require_relative 'commands/autofixes/strip_binary_symbols'
-require_relative 'commands/autofixes/exported_symbols'
+require_relative 'commands/upload/snapshots/snapshots'
+require_relative 'commands/upload/snapshots/client_libraries/swift_snapshot_testing'
+require_relative 'commands/upload/snapshots/client_libraries/paparazzi'
+require_relative 'commands/upload/snapshots/client_libraries/roborazzi'
+require_relative 'commands/upload/snapshots/client_libraries/default'
 
 require_relative 'reaper/ast_parser'
 require_relative 'reaper/code_deleter'
@@ -44,41 +44,42 @@ require 'dry/cli'
 module EmergeCLI
   extend Dry::CLI::Registry
 
-  register 'upload', aliases: ['u'] do |prefix|
-    prefix.register 'build', Commands::Upload::Build
-    prefix.register 'snapshots', Commands::Upload::Snapshots
-  end
-
-  register 'integrate' do |prefix|
-    prefix.register 'fastlane-ios', Commands::Integrate::Fastlane, aliases: ['i']
-  end
-
   register 'configure' do |prefix|
     prefix.register 'snapshots-ios', Commands::Config::SnapshotsIOS
     prefix.register 'order-files-ios', Commands::Config::OrderFilesIOS
   end
 
-  register 'reaper', Commands::Reaper
+  register 'download' do |prefix|
+    prefix.register 'order-files', Commands::OrderFiles::Download
+  end
 
-  register 'snapshots' do |prefix|
-    prefix.register 'validate-app-ios', Commands::Snapshots::ValidateApp
+  register 'fix' do |prefix|
+    prefix.register 'minify-strings', Commands::Fix::MinifyStrings
+    prefix.register 'strip-binary-symbols', Commands::Fix::StripBinarySymbols
+    prefix.register 'exported-symbols', Commands::Fix::ExportedSymbols
   end
 
-  register 'order-files' do |prefix|
-    prefix.register 'download', Commands::DownloadOrderFiles
-    prefix.register 'validate-linkmaps', Commands::ValidateLinkmaps
-    prefix.register 'validate-xcode-project', Commands::ValidateXcodeProject
+  register 'integrate' do |prefix|
+    prefix.register 'fastlane-ios', Commands::Integrate::Fastlane, aliases: ['i']
   end
 
-  register 'build-distribution' do |prefix|
-    prefix.register 'validate-app', Commands::BuildDistribution::ValidateApp
-    prefix.register 'install', Commands::BuildDistribution::DownloadAndInstall
+  register 'install' do |prefix|
+    prefix.register 'build', Commands::Build::Distribution::Install
+  end
+
+  # TODO: make this command action oriented
+  register 'reaper', Commands::Reaper
+
+  register 'upload', aliases: ['u'] do |prefix|
+    prefix.register 'build', Commands::Upload::Build
+    prefix.register 'snapshots', Commands::Upload::Snapshots
   end
 
-  register 'autofix' do |prefix|
-    prefix.register 'minify-strings', Commands::Autofixes::MinifyStrings
-    prefix.register 'strip-binary-symbols', Commands::Autofixes::StripBinarySymbols
-    prefix.register 'exported-symbols', Commands::Autofixes::ExportedSymbols
+  register 'validate' do |prefix|
+    prefix.register 'build-distribution', Commands::Build::Distribution::ValidateApp
+    prefix.register 'order-files-linkmaps', Commands::OrderFiles::ValidateLinkmaps
+    prefix.register 'order-files-xcode-project', Commands::OrderFiles::ValidateXcodeProject
+    prefix.register 'snapshots-app-ios', Commands::Snapshots::ValidateApp
   end
 end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module EmergeCLI
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.7.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emerge
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.1
 platform: ruby
 authors:
 - Emerge Tools
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-27 00:00:00.000000000 Z
+date: 2025-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -209,13 +209,13 @@ files:
 - CHANGELOG.md
 - README.md
 - exe/emerge
-- lib/commands/autofixes/exported_symbols.rb
-- lib/commands/autofixes/minify_strings.rb
-- lib/commands/autofixes/strip_binary_symbols.rb
-- lib/commands/build_distribution/download_and_install.rb
-- lib/commands/build_distribution/validate_app.rb
+- lib/commands/build/distribution/install.rb
+- lib/commands/build/distribution/validate.rb
 - lib/commands/config/orderfiles/orderfiles_ios.rb
 - lib/commands/config/snapshots/snapshots_ios.rb
+- lib/commands/fix/exported_symbols.rb
+- lib/commands/fix/minify_strings.rb
+- lib/commands/fix/strip_binary_symbols.rb
 - lib/commands/global_options.rb
 - lib/commands/integrate/fastlane.rb
 - lib/commands/order_files/download_order_files.rb

data/lib/commands/build_distribution/download_and_install.rb

@@ -1,139 +0,0 @@
-require 'dry/cli'
-require 'cfpropertylist'
-require 'zip'
-require 'rbconfig'
-require 'tmpdir'
-
-module EmergeCLI
-  module Commands
-    module BuildDistribution
-      class DownloadAndInstall < EmergeCLI::Commands::GlobalOptions
-        desc 'Download build from Build Distribution'
-
-        option :api_token, type: :string, required: false,
-                           desc: 'API token for authentication, defaults to ENV[EMERGE_API_TOKEN]'
-        option :build_id, type: :string, required: true, desc: 'Build ID to download'
-        option :install, type: :boolean, default: true, required: false, desc: 'Install the build on the device'
-        option :device_id, type: :string, desc: 'Specific device ID to target'
-        option :device_type, type: :string, enum: %w[virtual physical any], default: 'any',
-                             desc: 'Type of device to target (virtual/physical/any)'
-        option :output, type: :string, required: false, desc: 'Output path for the downloaded build'
-
-        def initialize(network: nil)
-          @network = network
-        end
-
-        def call(**options)
-          @options = options
-          before(options)
-
-          Sync do
-            api_token = @options[:api_token] || ENV.fetch('EMERGE_API_TOKEN', nil)
-            raise 'API token is required' unless api_token
-
-            raise 'Build ID is required' unless @options[:build_id]
-
-            output_name = nil
-            app_id = nil
-
-            begin
-              @network ||= EmergeCLI::Network.new(api_token:)
-
-              Logger.info 'Getting build URL...'
-              request = get_build_url(@options[:build_id])
-              response = parse_response(request)
-
-              platform = response['platform']
-              download_url = response['downloadUrl']
-              app_id = response['appId']
-
-              extension = platform == 'ios' ? 'ipa' : 'apk'
-              Logger.info 'Downloading build...'
-              output_name = @options[:output] || "#{@options[:build_id]}.#{extension}"
-              `curl --progress-bar -L '#{download_url}' -o #{output_name} `
-              Logger.info "✅ Build downloaded to #{output_name}"
-            rescue StandardError => e
-              Logger.error "❌ Failed to download build: #{e.message}"
-              raise e
-            ensure
-              @network&.close
-            end
-
-            begin
-              if @options[:install] && !output_name.nil?
-                if platform == 'ios'
-                  install_ios_build(output_name, app_id)
-                elsif platform == 'android'
-                  install_android_build(output_name)
-                end
-              end
-            rescue StandardError => e
-              Logger.error "❌ Failed to install build: #{e.message}"
-              raise e
-            end
-          end
-        end
-
-        private
-
-        def get_build_url(build_id)
-          @network.get(
-            path: '/distribution/downloadUrl',
-            max_retries: 3,
-            query: {
-              buildId: build_id
-            }
-          )
-        end
-
-        def parse_response(response)
-          case response.status
-          when 200
-            JSON.parse(response.read)
-          when 400
-            error_message = JSON.parse(response.read)['errorMessage']
-            raise "Invalid parameters: #{error_message}"
-          when 401, 403
-            raise 'Invalid API token'
-          else
-            raise "Getting build failed with status #{response.status}"
-          end
-        end
-
-        def install_ios_build(build_path, app_id)
-          device_type = case @options[:device_type]
-                        when 'simulator'
-                          XcodeDeviceManager::DeviceType::VIRTUAL
-                        when 'physical'
-                          XcodeDeviceManager::DeviceType::PHYSICAL
-                        else
-                          XcodeDeviceManager::DeviceType::ANY
-                        end
-
-          device_manager = XcodeDeviceManager.new
-          device = if @options[:device_id]
-                     device_manager.find_device_by_id(@options[:device_id])
-                   else
-                     device_manager.find_device_by_type(device_type, build_path)
-                   end
-
-          Logger.info "Installing build on #{device.device_id}"
-          device.install_app(build_path)
-          Logger.info '✅ Build installed'
-
-          Logger.info "Launching app #{app_id}..."
-          device.launch_app(app_id)
-          Logger.info '✅ Build launched'
-        end
-
-        def install_android_build(build_path)
-          command = "adb -s #{@options[:device_id]} install #{build_path}"
-          Logger.debug "Running command: #{command}"
-          `#{command}`
-
-          Logger.info '✅ Build installed'
-        end
-      end
-    end
-  end
-end

data/lib/commands/build_distribution/validate_app.rb

@@ -1,164 +0,0 @@
-require 'dry/cli'
-require 'cfpropertylist'
-require 'zip'
-require 'rbconfig'
-
-module EmergeCLI
-  module Commands
-    module BuildDistribution
-      class ValidateApp < EmergeCLI::Commands::GlobalOptions
-        desc 'Validate app for build distribution'
-
-        option :path, type: :string, required: true, desc: 'Path to the xcarchive, IPA or APK to validate'
-
-        # Constants
-        PLIST_START = '<plist'.freeze
-        PLIST_STOP = '</plist>'.freeze
-
-        UTF8_ENCODING = 'UTF-8'.freeze
-        STRING_FORMAT = 'binary'.freeze
-        EMPTY_STRING = ''.freeze
-
-        EXPECTED_ABI = 'arm64-v8a'.freeze
-
-        def call(**options)
-          @options = options
-          before(options)
-
-          Sync do
-            file_extension = File.extname(@options[:path])
-            case file_extension
-            when '.xcarchive'
-              handle_xcarchive
-            when '.ipa'
-              handle_ipa
-            when '.app'
-              handle_app
-            when '.apk'
-              handle_apk
-            else
-              raise "Unknown file extension: #{file_extension}"
-            end
-          end
-        end
-
-        private
-
-        def handle_xcarchive
-          raise 'Path must be an xcarchive' unless @options[:path].end_with?('.xcarchive')
-
-          app_path = Dir.glob("#{@options[:path]}/Products/Applications/*.app").first
-          run_codesign_check(app_path)
-          read_provisioning_profile(app_path)
-        end
-
-        def handle_ipa
-          raise 'Path must be an IPA' unless @options[:path].end_with?('.ipa')
-
-          Dir.mktmpdir do |tmp_dir|
-            Zip::File.open(@options[:path]) do |zip_file|
-              zip_file.each do |entry|
-                entry.extract(File.join(tmp_dir, entry.name))
-              end
-            end
-
-            app_path = File.join(tmp_dir, 'Payload/*.app')
-            app_path = Dir.glob(app_path).first
-            run_codesign_check(app_path)
-            read_provisioning_profile(app_path)
-          end
-        end
-
-        def handle_app
-          raise 'Path must be an app' unless @options[:path].end_with?('.app')
-
-          app_path = @options[:path]
-          run_codesign_check(app_path)
-          read_provisioning_profile(app_path)
-        end
-
-        def handle_apk
-          raise 'Path must be an APK' unless @options[:path].end_with?('.apk')
-
-          apk_path = @options[:path]
-          check_supported_abis(apk_path)
-        end
-
-        def run_codesign_check(app_path)
-          unless RbConfig::CONFIG['host_os'] =~ /darwin/i
-            Logger.info 'Skipping codesign check on non-macOS platform'
-            return
-          end
-
-          command = "codesign -dvvv '#{app_path}'"
-          Logger.debug command
-          stdout, _, status = Open3.capture3(command)
-          Logger.debug stdout
-          raise '❌ Codesign check failed' unless status.success?
-
-          Logger.info '✅ Codesign check passed'
-        end
-
-        def read_provisioning_profile(app_path)
-          entitlements_path = File.join(app_path, 'embedded.mobileprovision')
-          raise '❌ Entitlements file not found' unless File.exist?(entitlements_path)
-
-          content = File.read(entitlements_path)
-          lines = content.lines
-
-          buffer = ''
-          inside_plist = false
-          lines.each do |line|
-            inside_plist = true if line.include? PLIST_START
-            if inside_plist
-              buffer << line
-              break if line.include? PLIST_STOP
-            end
-          end
-
-          encoded_plist = buffer.encode(UTF8_ENCODING, STRING_FORMAT, invalid: :replace, undef: :replace,
-                                                                      replace: EMPTY_STRING)
-          encoded_plist = encoded_plist.sub(/#{PLIST_STOP}.+/, PLIST_STOP)
-
-          plist = CFPropertyList::List.new(data: encoded_plist)
-          parsed_data = CFPropertyList.native_types(plist.value)
-
-          expiration_date = parsed_data['ExpirationDate']
-          if expiration_date > Time.now
-            Logger.info '✅ Provisioning profile hasn\'t expired'
-          else
-            Logger.info "❌ Provisioning profile is expired. Expiration date: #{expiration_date}"
-          end
-
-          provisions_all_devices = parsed_data['ProvisionsAllDevices']
-          if provisions_all_devices
-            Logger.info 'Provisioning profile supports all devices (likely an enterprise profile)'
-          else
-            devices = parsed_data['ProvisionedDevices']
-            Logger.info 'Provisioning profile does not support all devices (likely a development profile).'
-            Logger.info "Devices: #{devices.inspect}"
-          end
-        end
-
-        def check_supported_abis(apk_path)
-          abis = []
-
-          Zip::File.open(apk_path) do |zip_file|
-            zip_file.each do |entry|
-              if entry.name.start_with?('lib/') && entry.name.count('/') == 2
-                abi = entry.name.split('/')[1]
-                abis << abi unless abis.include?(abi)
-              end
-            end
-          end
-
-          unless abis.include?(EXPECTED_ABI)
-            raise "APK does not support #{EXPECTED_ABI} architecture, found: #{abis.join(', ')}"
-          end
-
-          Logger.info "✅ APK supports #{EXPECTED_ABI} architecture"
-        end
-      end
-    end
-  end
-end