emerge 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ebd308782a251e11a4d515c0728b572456ed730ef2376f634939fec6ace820e
-  data.tar.gz: d476865caa4a62c32d9b258ec6fbfb474cb67c7bdf05c3ef1548ff860a1a9697
+  metadata.gz: 1bc78d26069b4e3ef6c4154958eab2ba668ef0e2074d10bfca920dea1767d742
+  data.tar.gz: 6820120287c28ff285e819a5416c7db6568331664e138402d5b03660e1913dcd
 SHA512:
-  metadata.gz: 149980818e3fcb6741c029a601cb903dcd05051a4564889d41b8e49c4380a7f08662b26cbfe5eca0e3ced6b114a12075118fd749e88ccb27ec694a4352799f8d
-  data.tar.gz: d1ed903d5c8560a649fd4566a45067403fe506112d79ff6e686763bfee02d8c7c9a2823fc7a23fc5af4cf93f5c6a20fb82d59644fd3347b837256df43b09abae
+  metadata.gz: 699e8dfac1ad70f312261ccd34790185e1d0f72ca84b25574470c1b312870da04add5f3c6ce3f51a89840ce21d2713ba27641552345960608dc991c61bf005a1
+  data.tar.gz: 9094c02b3add07de9fe9a0309a55cf133ea9f4f77d0ef1064ce15703e366a940987ddf39d21f8957d2e41dfacf2021d98dd9c89210b8fe49f8c88c2f8d3f8d13

data/lib/commands/build_distribution/download_and_install.rb

@@ -2,6 +2,7 @@ require 'dry/cli'
 require 'cfpropertylist'
 require 'zip'
 require 'rbconfig'
+require 'tmpdir'
 
 module EmergeCLI
   module Commands
@@ -13,7 +14,9 @@ module EmergeCLI
                            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, required: false, desc: 'Device id to install the build'
+        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)
@@ -30,6 +33,9 @@ module EmergeCLI
 
             raise 'Build ID is required' unless @options[:build_id]
 
+            output_name = nil
+            app_id = nil
+
             begin
               @network ||= EmergeCLI::Network.new(api_token:)
 
@@ -39,24 +45,32 @@ module EmergeCLI
 
               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}"
-
-              if @options[:install]
-                install_ios_build(output_name) if platform == 'ios'
-                install_android_build(output_name) if platform == 'android'
-              end
             rescue StandardError => e
-              Logger.error "Failed to download build: #{e.message}"
-              Logger.error 'Check your parameters and try again'
+              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
 
@@ -86,12 +100,30 @@ module EmergeCLI
           end
         end
 
-        def install_ios_build(build_path)
-          command = "xcrun devicectl device install app -d #{@options[:device_id]} #{build_path}"
-          Logger.debug "Running command: #{command}"
-          `#{command}`
-
+        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)

data/lib/emerge_cli.rb

@@ -24,6 +24,7 @@ require_relative 'commands/autofixes/exported_symbols'
 require_relative 'reaper/ast_parser'
 require_relative 'reaper/code_deleter'
 
+require_relative 'utils/environment'
 require_relative 'utils/git_info_provider'
 require_relative 'utils/git_result'
 require_relative 'utils/github'
@@ -34,6 +35,9 @@ require_relative 'utils/profiler'
 require_relative 'utils/project_detector'
 require_relative 'utils/macho_parser'
 require_relative 'utils/version_check'
+require_relative 'utils/xcode_device_manager'
+require_relative 'utils/xcode_simulator'
+require_relative 'utils/xcode_physical_device'
 
 require 'dry/cli'
 

data/lib/utils/environment.rb

@@ -0,0 +1,7 @@
+module EmergeCLI
+  class Environment
+    def execute_command(command)
+      `#{command}`
+    end
+  end
+end

data/lib/utils/xcode_device_manager.rb

@@ -0,0 +1,158 @@
+require 'json'
+require_relative 'xcode_simulator'
+require 'zip'
+require 'cfpropertylist'
+
+module EmergeCLI
+  class XcodeDeviceManager
+    class DeviceType
+      VIRTUAL = :virtual
+      PHYSICAL = :physical
+      ANY = :any
+    end
+
+    def initialize(environment: Environment.new)
+      @environment = environment
+    end
+
+    class << self
+      def get_supported_platforms(ipa_path)
+        return [] unless ipa_path&.end_with?('.ipa')
+
+        Zip::File.open(ipa_path) do |zip_file|
+          app_entry = zip_file.glob('**/*.app/').first ||
+                      zip_file.glob('**/*.app').first ||
+                      zip_file.find { |entry| entry.name.end_with?('.app/') || entry.name.end_with?('.app') }
+
+          raise 'No .app found in .ipa file' unless app_entry
+
+          app_dir = app_entry.name.end_with?('/') ? app_entry.name.chomp('/') : app_entry.name
+          info_plist_path = "#{app_dir}/Info.plist"
+          info_plist_entry = zip_file.find_entry(info_plist_path)
+          raise 'Info.plist not found in app bundle' unless info_plist_entry
+
+          info_plist_content = info_plist_entry.get_input_stream.read
+          plist = CFPropertyList::List.new(data: info_plist_content)
+          info_plist = CFPropertyList.native_types(plist.value)
+
+          info_plist['CFBundleSupportedPlatforms'] || []
+        end
+      end
+    end
+
+    def find_device_by_id(device_id)
+      Logger.debug "Looking for device with ID: #{device_id}"
+      devices_json = execute_command('xcrun xcdevice list')
+      devices_data = JSON.parse(devices_json)
+
+      found_device = devices_data.find { |device| device['identifier'] == device_id }
+      raise "No device found with ID: #{device_id}" unless found_device
+
+      device_type = found_device['simulator'] ? 'simulator' : 'physical'
+      Logger.info "✅ Found device: #{found_device['name']} " \
+                  "(#{found_device['identifier']}, #{device_type})"
+      if found_device['simulator']
+        XcodeSimulator.new(found_device['identifier'])
+      else
+        XcodePhysicalDevice.new(found_device['identifier'])
+      end
+    end
+
+    def find_device_by_type(device_type, ipa_path)
+      case device_type
+      when DeviceType::VIRTUAL
+        find_and_boot_most_recently_used_simulator
+      when DeviceType::PHYSICAL
+        find_connected_device
+      when DeviceType::ANY
+        # Check supported platforms in Info.plist to make intelligent choice
+        supported_platforms = self.class.get_supported_platforms(ipa_path)
+        Logger.debug "Build supports platforms: #{supported_platforms.join(', ')}"
+
+        if supported_platforms.include?('iPhoneOS')
+          device = find_connected_device
+          return device if device
+
+          # Only fall back to simulator if it's also supported
+          unless supported_platforms.include?('iPhoneSimulator')
+            raise 'Build only supports physical devices, but no device is connected'
+          end
+          Logger.info 'No physical device found, falling back to simulator since build supports both'
+          find_and_boot_most_recently_used_simulator
+
+        elsif supported_platforms.include?('iPhoneSimulator')
+          find_and_boot_most_recently_used_simulator
+        else
+          raise "Build doesn't support either physical devices or simulators"
+        end
+      end
+    end
+
+    private
+
+    def execute_command(command)
+      @environment.execute_command(command)
+    end
+
+    def find_connected_device
+      Logger.info 'Finding connected device...'
+      devices_json = execute_command('xcrun xcdevice list')
+      Logger.debug "Device list output: #{devices_json}"
+
+      devices_data = JSON.parse(devices_json)
+      physical_devices = devices_data
+                         .select do |device|
+        device['simulator'] == false &&
+          device['ignored'] == false &&
+          device['available'] == true &&
+          device['platform'] == 'com.apple.platform.iphoneos'
+      end
+
+      Logger.debug "Found physical devices: #{physical_devices}"
+
+      if physical_devices.empty?
+        Logger.info 'No physical connected device found'
+        return nil
+      end
+
+      device = physical_devices.first
+      Logger.info "Found connected physical device: #{device['name']} (#{device['identifier']})"
+      XcodePhysicalDevice.new(device['identifier'])
+    end
+
+    def find_and_boot_most_recently_used_simulator
+      Logger.info 'Finding and booting most recently used simulator...'
+      simulators_json = execute_command('xcrun simctl list devices --json')
+      Logger.debug "Simulators JSON: #{simulators_json}"
+
+      simulators_data = JSON.parse(simulators_json)
+
+      simulators = simulators_data['devices'].flat_map do |runtime, devices|
+        next [] unless runtime.include?('iOS') # Only include iOS devices
+
+        devices.select do |device|
+          (device['name'].start_with?('iPhone', 'iPad') &&
+            device['isAvailable'] &&
+            !device['isDeleted'])
+        end.map do |device|
+          version = runtime.match(/iOS-(\d+)-(\d+)/)&.captures&.join('.').to_f
+          last_booted = device['lastBootedAt'] ? Time.parse(device['lastBootedAt']) : Time.at(0)
+          [device['udid'], device['state'], version, last_booted]
+        end
+      end.sort_by { |_, _, _, last_booted| last_booted }.reverse
+
+      Logger.debug "Simulators: #{simulators}"
+
+      raise 'No available simulator found' unless simulators.any?
+
+      simulator_id, simulator_state, version, last_booted = simulators.first
+      version_str = version.zero? ? '' : " (#{version})"
+      last_booted_str = last_booted == Time.at(0) ? 'never' : last_booted.strftime('%Y-%m-%d %H:%M:%S')
+      Logger.info "Found simulator #{simulator_id}#{version_str} (#{simulator_state}, last booted: #{last_booted_str})"
+
+      simulator = XcodeSimulator.new(simulator_id, environment: @environment)
+      simulator.boot unless simulator_state == 'Booted'
+      simulator
+    end
+  end
+end

data/lib/utils/xcode_physical_device.rb

@@ -0,0 +1,108 @@
+require 'English'
+require 'timeout'
+require 'zip'
+require 'cfpropertylist'
+require 'fileutils'
+
+module EmergeCLI
+  class XcodePhysicalDevice
+    attr_reader :device_id
+
+    def initialize(device_id)
+      @device_id = device_id
+    end
+
+    def install_app(ipa_path)
+      raise "Non-IPA file provided: #{ipa_path}" unless ipa_path.end_with?('.ipa')
+
+      Logger.info "Installing app to device #{@device_id}..."
+
+      begin
+        # Set a timeout since I've noticed xcrun devicectl can occasionally hang for invalid apps
+        Timeout.timeout(60) do
+          command = "xcrun devicectl device install app --device #{@device_id} \"#{ipa_path}\""
+          Logger.debug "Running command: #{command}"
+
+          output = `#{command} 2>&1`
+          Logger.debug "Install command output: #{output}"
+
+          if output.include?('ERROR:') || output.include?('error:')
+            if output.include?('This provisioning profile cannot be installed on this device')
+              bundle_id = extract_bundle_id_from_error(output)
+              raise "Failed to install app: The provisioning profile for #{bundle_id} is not " \
+                    "valid for this device. Make sure the device's UDID is included in the " \
+                    'provisioning profile.'
+            elsif output.include?('Unable to Install')
+              error_message = output.match(/Unable to Install.*\n.*NSLocalizedRecoverySuggestion = ([^\n]+)/)&.[](1)
+              check_device_compatibility(ipa_path)
+              raise "Failed to install app: #{error_message || 'Unknown error'}"
+            else
+              check_device_compatibility(ipa_path)
+              raise "Failed to install app: #{output}"
+            end
+          end
+
+          success = $CHILD_STATUS.success?
+          unless success
+            check_device_compatibility(ipa_path)
+            raise "Installation failed with exit code #{$CHILD_STATUS.exitstatus}"
+          end
+        end
+      rescue Timeout::Error
+        raise 'Installation timed out after 30 seconds. The device might be locked or ' \
+              'installation might be stuck. Try unlocking the device and trying again.'
+      end
+
+      true
+    end
+
+    def launch_app(bundle_id)
+      command = "xcrun devicectl device process launch --device #{@device_id} #{bundle_id}"
+      Logger.debug "Running command: #{command}"
+
+      begin
+        Timeout.timeout(30) do
+          output = `#{command} 2>&1`
+          success = $CHILD_STATUS.success?
+
+          unless success
+            Logger.debug "Launch command output: #{output}"
+            if output.include?('The operation couldn\'t be completed. Application is restricted')
+              raise 'Failed to launch app: The app is restricted. Make sure the device is ' \
+                    'unlocked and the app is allowed to run.'
+            elsif output.include?('The operation couldn\'t be completed. Unable to launch')
+              raise 'Failed to launch app: Unable to launch. The app might be in a bad state - ' \
+                    'try uninstalling and reinstalling.'
+            else
+              raise "Failed to launch app #{bundle_id} on device: #{output}"
+            end
+          end
+        end
+      rescue Timeout::Error
+        raise 'Launch timed out after 30 seconds. The device might be locked. ' \
+              'Try unlocking the device and trying again.'
+      end
+
+      true
+    end
+
+    private
+
+    def check_device_compatibility(ipa_path)
+      supported_platforms = XcodeDeviceManager.get_supported_platforms(ipa_path)
+      Logger.debug "Supported platforms: #{supported_platforms.join(', ')}"
+
+      unless supported_platforms.include?('iPhoneOS')
+        raise 'This build is not compatible with physical devices. Please use a simulator ' \
+              'or make your build compatible with physical devices.'
+      end
+
+      Logger.debug 'Build is compatible with physical devices'
+    end
+
+    def extract_bundle_id_from_error(output)
+      # Extract bundle ID from error message like "...profile for com.emerge.hn.Hacker-News :"
+      output.match(/profile for ([\w\.-]+) :/)&.[](1) || 'unknown bundle ID'
+    end
+  end
+end

data/lib/utils/xcode_simulator.rb

@@ -0,0 +1,114 @@
+require 'English'
+require 'zip'
+require 'cfpropertylist'
+require 'fileutils'
+
+module EmergeCLI
+  class XcodeSimulator
+    attr_reader :device_id
+
+    def initialize(device_id, environment: Environment.new)
+      @device_id = device_id
+      @environment = environment
+    end
+
+    def boot
+      Logger.info "Booting simulator #{@device_id}..."
+      output = @environment.execute_command("xcrun simctl boot #{@device_id}")
+      raise 'Failed to boot simulator' if output.include?('error') || output.include?('failed')
+    end
+
+    def install_app(ipa_path)
+      raise "Non-IPA file provided: #{ipa_path}" unless ipa_path.end_with?('.ipa')
+
+      Dir.mktmpdir do |tmp_dir|
+        Logger.debug "Extracting .app from .ipa in temporary directory: #{tmp_dir}"
+
+        Zip::File.open(ipa_path) do |zip_file|
+          # Debug: List all entries to see what's in the IPA
+          Logger.debug 'IPA contents:'
+          zip_file.each do |entry|
+            Logger.debug "  #{entry.name}"
+          end
+
+          # Try different patterns to find the .app directory
+          app_entry = zip_file.glob('**/*.app/').first ||
+                      zip_file.glob('**/*.app').first ||
+                      zip_file.find { |entry| entry.name.end_with?('.app/') || entry.name.end_with?('.app') }
+
+          raise 'No .app found in .ipa file' unless app_entry
+          Logger.debug "Found app entry: #{app_entry.name}"
+
+          # Extract the .app directory and its contents
+          app_dir = app_entry.name.end_with?('/') ? app_entry.name.chomp('/') : app_entry.name
+          pattern = "#{File.dirname(app_dir)}/#{File.basename(app_dir)}/**/*"
+          Logger.debug "Using glob pattern: #{pattern}"
+
+          zip_file.glob(pattern).each do |entry|
+            entry_path = File.join(tmp_dir, entry.name)
+            FileUtils.mkdir_p(File.dirname(entry_path))
+            zip_file.extract(entry, entry_path) unless File.exist?(entry_path)
+          end
+
+          extracted_app = Dir.glob(File.join(tmp_dir, '**/*.app')).first
+          raise 'Failed to extract .app from .ipa' unless extracted_app
+          Logger.debug "Extracted app at: #{extracted_app}"
+
+          install_extracted_app(extracted_app)
+        end
+      end
+    end
+
+    def launch_app(bundle_id)
+      command = "xcrun simctl launch #{@device_id} #{bundle_id}"
+      Logger.debug "Running command: #{command}"
+
+      output = `#{command} 2>&1`
+      success = $CHILD_STATUS.success?
+
+      unless success
+        Logger.debug "Launch command output: #{output}"
+        raise "Failed to launch app #{bundle_id} on simulator"
+      end
+
+      true
+    end
+
+    private
+
+    def install_extracted_app(app_path)
+      command = "xcrun simctl install #{@device_id} \"#{app_path}\""
+      Logger.debug "Running command: #{command}"
+
+      output = `#{command} 2>&1`
+      success = $CHILD_STATUS.success?
+
+      return if success
+      Logger.debug "Install command output: #{output}"
+      check_simulator_compatibility(app_path)
+      raise "Failed to install build on simulator #{@device_id}"
+    end
+
+    def check_simulator_compatibility(app_path)
+      supported_platforms = if app_path.end_with?('.ipa')
+                              XcodeDeviceManager.get_supported_platforms(app_path)
+                            else
+                              info_plist_path = File.join(app_path, 'Info.plist')
+                              raise 'Info.plist not found in app bundle' unless File.exist?(info_plist_path)
+
+                              plist = CFPropertyList::List.new(file: info_plist_path)
+                              info_plist = CFPropertyList.native_types(plist.value)
+                              info_plist['CFBundleSupportedPlatforms'] || []
+                            end
+
+      Logger.debug "Supported platforms: #{supported_platforms.join(', ')}"
+
+      unless supported_platforms.include?('iPhoneSimulator')
+        raise 'This build is not compatible with simulators. ' \
+              'Please use a real device or make your build compatible with simulators.'
+      end
+
+      Logger.debug 'Build is compatible with simulators'
+    end
+  end
+end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emerge
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Emerge Tools
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.86.0
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: nkf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: open3
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +232,7 @@ files:
 - lib/emerge_cli.rb
 - lib/reaper/ast_parser.rb
 - lib/reaper/code_deleter.rb
+- lib/utils/environment.rb
 - lib/utils/git.rb
 - lib/utils/git_info_provider.rb
 - lib/utils/git_result.rb
@@ -214,6 +243,9 @@ files:
 - lib/utils/profiler.rb
 - lib/utils/project_detector.rb
 - lib/utils/version_check.rb
+- lib/utils/xcode_device_manager.rb
+- lib/utils/xcode_physical_device.rb
+- lib/utils/xcode_simulator.rb
 - lib/version.rb
 - parsers/libtree-sitter-java-darwin-arm64.dylib
 - parsers/libtree-sitter-java-linux-x86_64.so