emerge 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b51ab2fab1683825f19ebb9be0eb07b7901cb49d194adcfcb3488ebf17440dd
-  data.tar.gz: cb8d2ead013d712c99e5213a7d4d39cac1b2ad67afa0d51aaed3b06e86a43605
+  metadata.gz: f4bfa9e9a7d920f4f41ca06eef1283b73be375bffda3d414c27b55eeb11c1cef
+  data.tar.gz: ed994835ee23a65f5ccfbec7acc84114f363f82f2464b4147939bb32b2664c3f
 SHA512:
-  metadata.gz: 1360c8d0acde63b549d69c23468fdd24b7c4a37e399988faec47e88060d9edf7e9abf945657f6deaa4af052c9b9cc307b6f4cd2c5eefe741bc3e9cce4dbff1b0
-  data.tar.gz: 7c515b04f02ef2c28e9452f9edeb36d62bf4754fe52c0a78b727b202c233a1291d418cab3d341e2eab527afd7fd5ffc77726b2e7af85c46693538fc273cfd3c6
+  metadata.gz: de61137a2b6d33d3c6e3e8f8ab63b705658098d42c613a991f69102f01b93d3b374010939c087af06c8becfd20cb77c1f4279092ff5dc12556d803b607698a30
+  data.tar.gz: bde1f8a729fd46b45600e8fcc50921399e334c1bf50b071c222bac4c81050a200819baeb643fbbab91fa1ef13c9b9dc5123258416e1c88fe2fd9cd284efb58f0

data/lib/commands/config/orderfiles/orderfiles_ios.rb

@@ -0,0 +1,101 @@
+require 'xcodeproj'
+
+module EmergeCLI
+  module Commands
+    module Config
+      class OrderFilesIOS < EmergeCLI::Commands::GlobalOptions
+        desc 'Configure order files for iOS'
+
+        # Optional options
+        option :skip_download_script, type: :boolean, required: false, desc: 'Only enable linkmaps'
+        option :project_path, type: :string, required: false,
+                              desc: 'Path to the xcode project (will use first found if not provided)'
+
+        # 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
+        ORDER_FILE = 'ORDER_FILE'.freeze
+        ORDER_FILE_PATH = '$(PROJECT_DIR)/orderfiles/orderfile.txt'.freeze
+
+        def initialize; end
+
+        def call(**options)
+          @options = options
+          before(options)
+
+          if @options[:project_path]
+            project = Xcodeproj::Project.open(@options[:project_path])
+          else
+            project = Xcodeproj::Project.open(Dir.glob('*.xcodeproj').first)
+            Logger.warn 'No project path provided, using first found xcodeproj in current directory'
+          end
+
+          enable_linkmaps(project)
+
+          add_order_files_download_script(project) unless @options[:skip_download_script]
+
+          project.save
+        end
+
+        private
+
+        def enable_linkmaps(project)
+          Logger.info 'Enabling Linkmaps'
+          project.targets.each do |target|
+            # Only do it for app targets
+            next unless target.product_type == 'com.apple.product-type.application'
+
+            Logger.info "  Target: #{target.name}"
+            target.build_configurations.each do |config|
+              config.build_settings[LINK_MAPS_CONFIG] = 'YES'
+              config.build_settings[LINK_MAPS_PATH] = PATH_TO_LINKMAP
+            end
+          end
+        end
+
+        def add_order_files_download_script(project)
+          Logger.info 'Adding order files download script'
+          project.targets.each do |target|
+            # Only do it for app targets
+            next unless target.product_type == 'com.apple.product-type.application'
+
+            Logger.info "  Target: #{target.name}"
+
+            # Create the script phase if it doesn't exist
+            phase = target.shell_script_build_phases.find { |item| item.name == 'EmergeTools Download Order Files' }
+            if phase.nil?
+              Logger.info "  Creating script 'EmergeTools Download Order Files'"
+              phase = target.new_shell_script_build_phase('EmergeTools Download Order Files')
+              phase.shell_script = <<~BASH
+                if [ "$CONFIGURATION" != "Release" ]; then
+                  echo "Skipping script for non-Release build"
+                  exit 0
+                fi
+
+                if curl --fail "https://order-files-prod.emergetools.com/$PRODUCT_BUNDLE_IDENTIFIER/$MARKETING_VERSION" \
+                  -H "X-API-Token: $EMERGE_API_TOKEN" -o ORDER_FILE.gz ; then
+                    mkdir -p "$PROJECT_DIR/orderfiles"
+                    gunzip -c ORDER_FILE.gz > $PROJECT_DIR/orderfiles/orderfile.txt
+                else
+                    echo "cURL request failed. Creating an empty file."
+                    mkdir -p "$PROJECT_DIR/orderfiles"
+                    touch "$PROJECT_DIR/orderfiles/orderfile.txt"
+                fi;
+              BASH
+              phase.output_paths = ['$(PROJECT_DIR)/orderfiles/orderfile.txt']
+            else
+              Logger.info "  'EmergeTools Download Order Files' already exists"
+            end
+            # Make sure it is the first build phase
+            target.build_phases.move(phase, 0)
+
+            target.build_configurations.each do |config|
+              config.build_settings[ORDER_FILE] = ORDER_FILE_PATH
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module EmergeCLI
+  module Commands
+    module Upload
+      module ClientLibraries
+        class Roborazzi
+          def initialize(project_root)
+            @project_root = project_root
+          end
+
+          def image_files
+            Dir.glob(File.join(@project_root, '**/build/outputs/roborazzi/**/*.png'))
+          end
+
+          def parse_file_info(image_path)
+            file_name = image_path.split('build/outputs/roborazzi/').last
+            base_name = File.basename(file_name, '.png')
+            parts = base_name.split('.')
+
+            # Get the last two parts regardless of whether there's a package name in the file name
+            # For "com.example.MyTest.testName" -> ["MyTest", "testName"]
+            # For "MyTest.testName" -> ["MyTest", "testName"]
+            relevant_parts = parts.last(2)
+
+            {
+              file_name:,
+              group_name: relevant_parts[0],
+              variant_name: relevant_parts[1]
+            }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -27,7 +27,7 @@ module EmergeCLI
         option :pr_number, type: :string, required: false, desc: 'PR number'
         option :concurrency, type: :integer, default: 5, desc: 'Number of concurrency for parallel uploads'
 
-        option :client_library, type: :string, required: false, values: %w[swift-snapshot-testing paparazzi],
+        option :client_library, type: :string, required: false, values: %w[swift-snapshot-testing paparazzi roborazzi],
                                 desc: 'Client library used for snapshots'
         option :project_root, type: :string, required: false, desc: 'Path to the project root'
 
@@ -48,6 +48,7 @@ module EmergeCLI
 
           start_time = Time.now
           run_id = nil
+          success = false
 
           begin
             api_token = @options[:api_token] || ENV['EMERGE_API_TOKEN']
@@ -76,19 +77,23 @@ module EmergeCLI
             Logger.info "Time taken: #{(Time.now - start_time).round(2)} seconds"
             @profiler.report
             Logger.info "✅ View your snapshots at https://emergetools.com/snapshot/#{run_id}"
+            success = true
           rescue StandardError => e
             Logger.error "CLI Error: #{e.message}"
             Sync { report_error(run_id, e.message, 'crash') } if run_id
+            raise e # Re-raise the error to dry-cli
           ensure
             @network&.close
           end
+
+          success
         end
 
         private
 
         def validate_options(image_paths)
           if @options[:client_library] && !@options[:project_root]
-            raise 'Project path is required when using a client library'
+            raise 'Project root is required when using a client library'
           end
           if @options[:project_root] && !@options[:client_library]
             raise 'Client library is required when using a project path'
@@ -98,11 +103,17 @@ module EmergeCLI
         end
 
         def create_client(image_paths)
-          case @options[:client_library]
-          when 'swift-snapshot-testing'
-            ClientLibraries::SwiftSnapshotTesting.new(@options[:project_root])
-          when 'paparazzi'
-            ClientLibraries::Paparazzi.new(@options[:project_root])
+          if @options[:client_library]
+            case @options[:client_library]
+            when 'swift-snapshot-testing'
+              ClientLibraries::SwiftSnapshotTesting.new(@options[:project_root])
+            when 'paparazzi'
+              ClientLibraries::Paparazzi.new(@options[:project_root])
+            when 'roborazzi'
+              ClientLibraries::Roborazzi.new(@options[:project_root])
+            else
+              raise "Unsupported client library: #{@options[:client_library]}"
+            end
           else
             ClientLibraries::Default.new(image_paths)
           end
@@ -110,6 +121,7 @@ module EmergeCLI
 
         def find_image_files(client)
           found_images = client.image_files
+          raise 'No images found. Please check your image paths or project configuration.' if found_images.empty?
           Logger.info "Found #{found_images.size} images"
           found_images
         end

data/lib/emerge_cli.rb

@@ -2,9 +2,11 @@ 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/config/snapshots/snapshots_ios'
+require_relative './commands/config/orderfiles/orderfiles_ios'
 
 require_relative './utils/git_info_provider'
 require_relative './utils/git_result'
@@ -29,7 +31,8 @@ module EmergeCLI
   end
 
   register 'configure' do |prefix|
-    prefix.register 'snapshots-ios', Commands::Config::SnapshotsIOS, aliases: ['c']
+    prefix.register 'snapshots-ios', Commands::Config::SnapshotsIOS
+    prefix.register 'order-files-ios', Commands::Config::OrderFilesIOS
   end
 end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module EmergeCli
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emerge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Emerge Tools
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.27.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.27.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -231,11 +245,13 @@ files:
 - CHANGELOG.md
 - README.md
 - exe/emerge
+- lib/commands/config/orderfiles/orderfiles_ios.rb
 - lib/commands/config/snapshots/snapshots_ios.rb
 - lib/commands/global_options.rb
 - lib/commands/integrate/fastlane.rb
 - lib/commands/upload/snapshots/client_libraries/default.rb
 - lib/commands/upload/snapshots/client_libraries/paparazzi.rb
+- lib/commands/upload/snapshots/client_libraries/roborazzi.rb
 - lib/commands/upload/snapshots/client_libraries/swift_snapshot_testing.rb
 - lib/commands/upload/snapshots/snapshots.rb
 - lib/emerge_cli.rb