emerge 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bc78d26069b4e3ef6c4154958eab2ba668ef0e2074d10bfca920dea1767d742
-  data.tar.gz: 6820120287c28ff285e819a5416c7db6568331664e138402d5b03660e1913dcd
+  metadata.gz: f526af7bee28fe19586eb432339f8b6d771e98c9127a5126a4be9f47a32d6ab7
+  data.tar.gz: eb356b6d63d1e66595550516aa78c36d7926b867ac5caf9a35000f0c8b3feeb5
 SHA512:
-  metadata.gz: 699e8dfac1ad70f312261ccd34790185e1d0f72ca84b25574470c1b312870da04add5f3c6ce3f51a89840ce21d2713ba27641552345960608dc991c61bf005a1
-  data.tar.gz: 9094c02b3add07de9fe9a0309a55cf133ea9f4f77d0ef1064ce15703e366a940987ddf39d21f8957d2e41dfacf2021d98dd9c89210b8fe49f8c88c2f8d3f8d13
+  metadata.gz: 5e3ba42f1367adf1b50e0bb236b79dc58225df5bd29e7e3af419775cac52e2d04415d5c949b0a62f2eb17f0ae5d25bd82cc086f194d34da0f912dd35af0e433a
+  data.tar.gz: adf35a55cf1e66d9b0de879e8bab9843c2da10d3a00784dc2eebab7f865ac6ca501be7f81a28c660c6de60ff6ffb4f8e0670fbaeaf4057a67c943424759c8855

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

@@ -0,0 +1,141 @@
+require 'dry/cli'
+require 'cfpropertylist'
+require 'zip'
+require 'rbconfig'
+require 'tmpdir'
+
+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 :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
+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/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/reaper/ast_parser.rb

@@ -29,6 +29,29 @@ module EmergeCLI
 
       attr_reader :parser, :language
 
+      @parser_paths_cache = {}
+
+      class << self
+        def find_parser_path(language, platform, arch)
+          cache_key = "#{language}-#{platform}-#{arch}"
+          return @parser_paths_cache[cache_key] if @parser_paths_cache.key?(cache_key)
+
+          extension = platform == 'darwin' ? 'dylib' : 'so'
+          parser_file = "libtree-sitter-#{language}-#{platform}-#{arch}.#{extension}"
+
+          parser_paths = [
+            File.join(File.dirname(__FILE__), '..', '..', 'parsers', parser_file), # Relative to this file
+            File.join(Gem::Specification.find_by_name('emerge').gem_dir, 'parsers', parser_file) # Installed gem path
+          ]
+
+          parser_path = parser_paths.find { |path| File.exist?(path) }
+          raise "No language grammar found for #{language}. Searched in: #{parser_paths.join(', ')}" unless parser_path
+
+          @parser_paths_cache[cache_key] = parser_path
+          parser_path
+        end
+      end
+
       def initialize(language)
         @parser = TreeSitter::Parser.new
         @language = language
@@ -52,11 +75,7 @@ module EmergeCLI
                  raise "Unsupported architecture: #{RUBY_PLATFORM}"
                end
 
-        extension = platform == 'darwin' ? 'dylib' : 'so'
-        parser_file = "libtree-sitter-#{language}-#{platform}-#{arch}.#{extension}"
-        parser_path = File.join('parsers', parser_file)
-        raise "No language grammar found for #{language}" unless File.exist?(parser_path)
-
+        parser_path = self.class.find_parser_path(language, platform, arch)
         @parser.language = TreeSitter::Language.load(language, parser_path)
       end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module EmergeCLI
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emerge
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Emerge Tools
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2025-01-31 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