emerge 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eeb092bc3889613fa27a5e513ac667031a602ed92ea8d3da3936b4db228f816
-  data.tar.gz: a2e8f5b498adfbeda356e5ae8010826eaf21429f0556c2b65f452947df102844
+  metadata.gz: 66e8055e5a23225c6e3d4ca58ba5a65c5f57eb05cfd1aa0dec5a3003cdaa977d
+  data.tar.gz: 7f3ad2aaf92ee59ee9e6e1557b0ae04311ebe83ce40ae14955c4e72a77945e39
 SHA512:
-  metadata.gz: 2a5166082c6668bf0fd0c2a5d431b54a2a70ae58bef468967b6d3120173e9215576fb7ecbe94acc6f8d3ee747d85f0bff0b09232e1343666622f07532f8e783d
-  data.tar.gz: d9638a7b631a4c2831b6d676994bde76a1b4b9e0077effe211ef5c2f1a0f0cf88ebd8f908be6ec72c1ae8b49f56cad71efa82be877be891d5270cbc0944d326e
+  metadata.gz: 130fb2b9274a259ea6f61d85deafacbc6c916616a5bc5a746071a0d38074f45ed1b814298c14d85b7a108124afee8f1f6bd5600f1aa2b01d913fe04f3275fde9
+  data.tar.gz: 5dd9b9f7dbec27f9ab52fc1193541d4ff7be89f32d83f18dd5f7ade9ebd5e5a877cb9935ff68e408b500df1454fca3486fb6c79e0b6d6f2eaef20da592ad783a

data/README.md

@@ -4,137 +4,6 @@ The official CLI for Emerge Tools.
 
 [Emerge](https://emergetools.com) offers a suite of products to help optimize app size, performance, and quality by detecting regressions before they make it to production. This plugin provides a set of actions to interact with the Emerge API.
 
-## Installation
+# Documentation
 
-This tool is packaged as a Ruby Gem which can be installed by:
-
-```
-gem install emerge
-```
-
-## API Key
-
-Follow our guide to obtain an [API key](https://docs.emergetools.com/docs/uploading-basics#obtain-an-api-key) for your organization. The API Token is used by the CLI to authenticate with the Emerge API. The CLI will automatically pick up the API key if configured as an `EMERGE_API_TOKEN` environment variable, or you can manually pass it into individual commands with the `--api-token` option.
-
-## Snapshots
-
-Uploads a directory of images to be used in [Emerge Snapshot Testing](https://docs.emergetools.com/docs/snapshot-testing).
-
-Run `emerge upload snapshots -h` for a full list of supported options.
-
-Example:
-
-```shell
-emerge upload snapshots \
-  --name "AwesomeApp" \
-  --id "com.emerge.awesomeapp" \
-  --repo-name "EmergeTools/AwesomeApp" \
-  path/to/snapshot/images
-```
-
-### Git Configuration
-
-For CI diffs to work, Emerge needs the appropriate Git `sha` and `base_sha` values set on each build. Emerge will automatically compare a build at `sha` against the build we find matching the `base_sha` for a given application id. We also recommend setting `pr_number`, `branch`, and `repo_name` for the best experience.
-
-For example:
-
-- `sha`: `pr-branch-commit-1`
-- `base_sha`: `main-branch-commit-1`
-- `pr_number`: `42`
-- `branch`: `my-awesome-feature`
-- `repo_name`: `EmergeTools/hackernews`
-
-Will compare the snapshot diffs of your pull request changes.
-
-This plugin will automatically configure Git values for you assuming certain Github workflow triggers:
-
-```yaml
-on:
-  # Produce base builds with a 'sha' when commits are pushed to the main branch
-  push:
-    branches: [main]
-
-  # Produce branch comparison builds with `sha` and `base_sha` when commits are pushed
-  # to open pull requests
-  pull_request:
-    branches: [main]
-  ...
-```
-
-If this doesn't cover your use-case, manually set the `sha` and `base_sha` values when calling the Emerge plugin.
-
-### Using with swift-snapshot-testing
-
-Snapshots generated via [swift-snapshot-testing](https://github.com/pointfreeco/swift-snapshot-testing) are natively supported by the CLI by setting `--client-library swift-snapshot-testing` and a `--project-root` directory. This will scan your project for all images found in `__Snapshot__` directories.
-
-Example:
-
-```shell
-emerge upload snapshots \
-  --name "AwesomeApp swift-snapshot-testing" \
-  --id "com.emerge.awesomeapp.swift-snapshot-testing" \
-  --repo-name "EmergeTools/AwesomeApp" \
-  --client-library swift-snapshot-testing \
-  --project-root /my/awesomeapp/ios/repo
-```
-
-### Using with Paparazzi
-
-Snapshots generated via [Paparazzi](https://github.com/cashapp/paparazzi) are natively supported by the CLI by setting `--client-library paparazzi` and a `--project-root` directory. This will scan your project for all images found in `src/test/snapshots/images` directories.
-
-Example:
-
-```shell
-emerge upload snapshots \
-  --name "AwesomeApp Paparazzi" \
-  --id "com.emerge.awesomeapp.paparazzi" \
-  --repo-name "EmergeTools/AwesomeApp" \
-  --client-library paparazzi \
-  --project-root /my/awesomeapp/android/repo
-```
-
-### Using with Roborazzi
-
-Snapshots generated via [Roborazzi](https://github.com/takahirom/roborazzi) are natively supported by the CLI by setting `--client-library roborazzi` and a `--project-root` directory. This will scan your project for all images found in `**/build/outputs/roborazzi` directories.
-
-Example:
-
-```shell
-emerge upload snapshots \
-  --name "AwesomeApp Roborazzi" \
-  --id "com.emerge.awesomeapp.roborazzi" \
-  --repo-name "EmergeTools/AwesomeApp" \
-  --client-library roborazzi \
-  --project-root /my/awesomeapp/android/repo
-```
-
-## Reaper
-
-Experimental support has been added to interactively examine [Reaper](https://docs.emergetools.com/docs/reaper) results and also **delete them from your codebase**.
-
-Use the `reaper` subcommand to get started, e.g.:
-
-```shell
-emerge reaper --upload-id 40f1dfe7-6c57-47c3-bc52-b621aec0ba8d \
-  --project-root /path/to/your/repo
-```
-
-After which it will prompt you to select classes to delete.
-
-### How it works
-
-Under the hood we are using [Tree Sitter](https://tree-sitter.github.io/tree-sitter/) to parse your source files into an AST which is then used for deletions. There are some obvious limitations to this approach, namely that Tree Sitter is designed for source code editors and only looks at a single file at a time. We are exploring some better long-term approaches but this works well enough for now!
-
-### Supported languages
-
-We currently support the following languages:
-
-- Swift
-- Kotlin
-- Java
-
-Please open an issue if you need an additional language grammar.
-
-### Building
-
-Because many of the language grammars we use are third-party, we have to package them with our CLI tool as shared libraries for distribution. We depend on [tsdl](https://github.com/stackmystack/tsdl) to build the grammars from our `parsers.toml` file.
+See [Emerge CLI](https://docs.emergetools.com/docs/emerge-cli#/) for our full documentation.

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

@@ -3,8 +3,9 @@ module EmergeCLI
     module Upload
       module ClientLibraries
         class Default
-          def initialize(image_paths)
+          def initialize(image_paths, group_delimiter)
             @image_paths = image_paths
+            @group_delimiter = group_delimiter
           end
 
           def image_files
@@ -13,10 +14,14 @@ module EmergeCLI
 
           def parse_file_info(image_path)
             file_name = File.basename(image_path)
+            file_name_without_extension = File.basename(file_name, '.*')
+            parts = file_name_without_extension.split(@group_delimiter)
+            group_name = parts.first
+            variant_name = parts[1..].join(@group_delimiter)
             {
               file_name:,
-              group_name: File.basename(image_path, '.*'),
-              variant_name: nil
+              group_name:,
+              variant_name:
             }
           end
         end

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

@@ -27,7 +27,8 @@ module EmergeCLI
         option :base_sha, type: :string, required: false, desc: 'Base SHA'
         option :previous_sha, type: :string, required: false, desc: 'Previous SHA'
         option :pr_number, type: :string, required: false, desc: 'PR number'
-        option :concurrency, type: :integer, default: 5, desc: 'Number of concurrency for parallel uploads'
+        option :concurrency, type: :integer, default: 5,
+                             desc: 'Number of concurrency for parallel image uploads when not using batch mode'
 
         option :client_library, type: :string, required: false, values: %w[swift-snapshot-testing paparazzi roborazzi],
                                 desc: 'Client library used for snapshots'
@@ -35,8 +36,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'
-
+        option :batch, type: :boolean, default: true, desc: 'Upload images in batch using zip file'
+        option :group_delimiter, type: :string, default: '__', desc: 'Delimiter for group and variant names'
         argument :image_paths, type: :array, required: false, desc: 'Paths to folders containing images'
 
         def initialize(network: nil, git_info_provider: nil)
@@ -119,7 +120,7 @@ module EmergeCLI
               raise "Unsupported client library: #{@options[:client_library]}"
             end
           else
-            ClientLibraries::Default.new(image_paths)
+            ClientLibraries::Default.new(image_paths, @options[:group_delimiter])
           end
         end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module EmergeCLI
-  VERSION = '0.7.3'.freeze
+  VERSION = '0.7.5'.freeze
 end

metadata

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