fastlane-plugin-screenshotslive 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6957eb0962a899fd926ee2a16a5c88ee497568f7d12d8d6948c0216c0e26d2d4
-  data.tar.gz: 22498ae68c91506f3c47ad2ca484af2124d0908c7668ba3a9ea8d7bbe8111e32
+  metadata.gz: 0a91b927b5744c2efd5aad0a8c96cb6c42b647e3e97068c2b60dbdccf6176936
+  data.tar.gz: 979e2087477a99574ef505dd10f6bff7be07db12de1c35d0e30b57e6af61ffad
 SHA512:
-  metadata.gz: 442f0916ce16e5093e9b04741c3d6f3eb530d61531f323b3fd640b2133fc950af2915dea5fd0072d2f282194f77878e0ef72cc4aa0885b8175766a43bd8e02d3
-  data.tar.gz: 1cc9fa4819ee9eaed055dbeffaf05a2936cf0f9fd479c954e279cf1bd6303736a57035a80035da4b106914043d43d4e036a72eae1e9bc62fa9850d0885f20c2e
+  metadata.gz: 65c7aa68146ce999f8a19fad51dbc643e3935f024df337c295864738ba67ee2a5de9b2b515a250b9117266cabe4f04f065880e8475219e393ca8dab7fd131075
+  data.tar.gz: 9458ad975229773cfa1ce307279d4b43b9d0a98ef922bb424c7c8b94459697d231f4481065834beccad3f4a0134a90762a047cbfa96770d27b0d0a515ed9a535

data/lib/fastlane/plugin/screenshotslive/actions/screenshotslive_action.rb

@@ -14,26 +14,21 @@ module Fastlane
         output_dir = params[:output_directory]
         base_url = params[:base_url]
         overrides = params[:overrides] || {}
-        screenshots = params[:screenshots] || {}
 
         yaml_config = File.read(yaml_path)
+        picture_files = {}
 
-        if !overrides.empty? || !screenshots.empty?
-          yaml_config = apply_overrides(yaml_config, overrides, screenshots)
+        unless overrides.empty?
+          yaml_config, picture_files = apply_overrides(yaml_config, overrides)
         end
 
         UI.message("Dispatching render via Screenshots.live API...")
-
         client = Screenshotslive::ApiClient.new(api_key: api_key, base_url: base_url)
 
-        if screenshots.empty?
+        if picture_files.empty?
           result = client.render(yaml_config: yaml_config)
         else
-          picture_files = {}
-          screenshots.each do |_item_id, path|
-            filename = File.basename(path)
-            picture_files[filename] = path
-          end
+          UI.message("Uploading #{picture_files.size} local screenshot(s)...")
           result = client.render_with_pictures(yaml_config: yaml_config, picture_files: picture_files)
         end
 
@@ -67,31 +62,32 @@ module Fastlane
 
         File.delete(zip_path)
 
-        file_count = Dir.glob(File.join(output_dir, "*.png")).length
+        file_count = Dir.glob(File.join(output_dir, "*.*")).length
         UI.success("#{file_count} screenshots rendered and saved to #{output_dir}")
         output_dir
       end
 
-      def self.apply_overrides(yaml_string, overrides, screenshots)
+      def self.apply_overrides(yaml_string, overrides)
         data = YAML.safe_load(yaml_string)
+        picture_files = {}
 
         items = data["items"] || []
         items.each do |item|
           item_id = item["itemId"]
-
-          if overrides.key?(item_id)
-            overrides[item_id].each do |field, value|
+          next unless overrides.key?(item_id)
+
+          overrides[item_id].each do |field, value|
+            if field.to_s == "screenshotUrl" && File.exist?(value.to_s)
+              filename = File.basename(value.to_s)
+              picture_files[filename] = value.to_s
+              item["screenshotUrl"] = "#{PICTURE_REF_PREFIX}#{filename}"
+            else
               item[field.to_s] = value
             end
           end
-
-          if screenshots.key?(item_id)
-            filename = File.basename(screenshots[item_id])
-            item["screenshotUrl"] = "#{PICTURE_REF_PREFIX}#{filename}"
-          end
         end
 
-        data.to_yaml
+        [data.to_yaml, picture_files]
       end
 
       def self.description
@@ -109,8 +105,8 @@ module Fastlane
       def self.details
         "Sends a YAML configuration to the Screenshots.live render API, polls for completion, " \
         "downloads the rendered ZIP, and extracts flat screenshot PNGs into the output directory. " \
-        "Supports overriding YAML values (text, colors) and injecting local screenshot files " \
-        "via the render-with-pictures endpoint."
+        "Override any YAML field per itemId via the overrides hash. If a screenshotUrl points " \
+        "to a local file, it is automatically uploaded via the render-with-pictures endpoint."
       end
 
       def self.available_options
@@ -138,14 +134,8 @@ module Fastlane
           ),
           FastlaneCore::ConfigItem.new(
             key: :overrides,
-            description: "Hash of itemId => { field => value } overrides to apply to the YAML before rendering",
-            optional: true,
-            default_value: {},
-            type: Hash
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :screenshots,
-            description: "Hash of itemId => local_file_path to inject screenshots via render-with-pictures",
+            description: "Hash of itemId => { field => value } to override in the YAML. " \
+                         "If screenshotUrl points to a local file, it is uploaded automatically",
             optional: true,
             default_value: {},
             type: Hash
@@ -170,22 +160,20 @@ module Fastlane
 
       def self.example_code
         [
-          '# Basic render from YAML
+          '# Basic render
 screenshotslive(
   api_key: ENV["SCREENSHOTSLIVE_API_KEY"],
   yaml_config: "./screenshots.yml",
   output_directory: "./fastlane/screenshots/en-US"
 )',
-          '# Override text and inject local screenshots
+          '# Override text and screenshots per item
 screenshotslive(
   api_key: ENV["SCREENSHOTSLIVE_API_KEY"],
   yaml_config: "./screenshots.yml",
   output_directory: "./fastlane/screenshots/de-DE",
   overrides: {
-    "abc-item-id" => { "content" => "Neue Funktion" },
-  },
-  screenshots: {
-    "def-device-frame-id" => "./screens/de/home.png",
+    "text-item-id" => { "content" => "Neue Funktion", "color" => "#FF0000" },
+    "device-frame-id" => { "screenshotUrl" => "./screens/de/home.png" },
   }
 )',
         ]

data/lib/fastlane/plugin/screenshotslive/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Screenshotslive
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-screenshotslive
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Eric Isensee
@@ -41,16 +41,22 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement