emerge 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f526af7bee28fe19586eb432339f8b6d771e98c9127a5126a4be9f47a32d6ab7
-  data.tar.gz: eb356b6d63d1e66595550516aa78c36d7926b867ac5caf9a35000f0c8b3feeb5
+  metadata.gz: 65f13db01f807a85200615394b091f5bfea4cd3bf4cf4f94ec0a742d5b93c597
+  data.tar.gz: 322a6582fd941518f080ae8d38af3555a404e295a99658083d5032a0127640d9
 SHA512:
-  metadata.gz: 5e3ba42f1367adf1b50e0bb236b79dc58225df5bd29e7e3af419775cac52e2d04415d5c949b0a62f2eb17f0ae5d25bd82cc086f194d34da0f912dd35af0e433a
-  data.tar.gz: adf35a55cf1e66d9b0de879e8bab9843c2da10d3a00784dc2eebab7f865ac6ca501be7f81a28c660c6de60ff6ffb4f8e0670fbaeaf4057a67c943424759c8855
+  metadata.gz: 6e7adb6bafb19cec3408a3e866d9a148ebe99cf80dde147c47f9133fad0a6d8e7e655a2bfdce7ece4be9596235c650d7abf60ef07f899f30a0a700ef40eccb03
+  data.tar.gz: 9ee165532fb1443fda2f5dce215bb545b9a9997d6684cc5e36d3b18de416a73496779dad9685fac1a03735d327077f040dcd4b17050027abe1accaf7ec1562f8

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

@@ -3,6 +3,7 @@ require 'cfpropertylist'
 require 'zip'
 require 'rbconfig'
 require 'tmpdir'
+require 'tty-prompt'
 
 module EmergeCLI
   module Commands
@@ -13,7 +14,7 @@ module EmergeCLI
 
           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 :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',
@@ -32,7 +33,7 @@ module EmergeCLI
               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]
+              raise 'Build ID is required' unless @options[:id]
 
               output_name = nil
               app_id = nil
@@ -41,7 +42,7 @@ module EmergeCLI
                 @network ||= EmergeCLI::Network.new(api_token:)
 
                 Logger.info 'Getting build URL...'
-                request = get_build_url(@options[:build_id])
+                request = get_build_url(@options[:id])
                 response = parse_response(request)
 
                 platform = response['platform']
@@ -49,10 +50,32 @@ module EmergeCLI
                 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}"
+                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
@@ -128,12 +151,34 @@ module EmergeCLI
           end
 
           def install_android_build(build_path)
-            command = "adb -s #{@options[:device_id]} install #{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

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)
@@ -64,7 +68,7 @@ module EmergeCLI
 
               image_files = @profiler.measure('find_image_files') { find_image_files(client) }
 
-              @profiler.measure('check_duplicate_files') { check_duplicate_files(image_files, client) }
+              check_duplicate_files(image_files, client)
 
               run_id = @profiler.measure('create_run') { create_run }
 
@@ -126,18 +130,26 @@ module EmergeCLI
           found_images
         end
 
-        def check_duplicate_files(image_files, client)
+        def check_duplicate_files(image_files, _client)
           seen_files = {}
+          duplicate_files = {}
+
           image_files.each do |image_path|
-            file_name = client.parse_file_info(image_path)[:file_name]
+            file_name = File.basename(image_path)
 
             if seen_files[file_name]
-              Logger.warn "Duplicate file name detected: '#{file_name}'. " \
-                          "Previous occurrence: '#{seen_files[file_name]}'. " \
-                          'This upload will overwrite the previous one.'
+              duplicate_files[file_name] ||= []
+              duplicate_files[file_name] << image_path
+            else
+              seen_files[file_name] = image_path
             end
-            seen_files[file_name] = image_path
           end
+
+          duplicate_files.each do |filename, paths|
+            Logger.warn "Found #{paths.length} duplicate(s) of '#{filename}'. Duplicates: #{paths.join(', ')}"
+          end
+
+          [seen_files, duplicate_files]
         end
 
         def create_run
@@ -178,6 +190,89 @@ 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: []
+          }
+
+          used_filenames, = check_duplicate_files(image_files, client)
+
+          @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|
+                  filename = File.basename(image_path)
+                  # Only add files we haven't seen before
+                  zipfile.add(filename, image_path) if used_filenames[filename] == 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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emerge
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Emerge Tools
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-31 00:00:00.000000000 Z
+date: 2025-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http