cyrun 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 919223dc8a8848b5503472cf1ba9f83904b7c8a4fd3e80657f9246386aeeeb53
-  data.tar.gz: 46c203fc506cea1a56b6ae6898db6d6fe377d71209097c788a9ad50d85db59bc
+  metadata.gz: 22f061f7542fcae4b9a2dedd25e8a587609a1b92d3b7ca27e2a52877184908e7
+  data.tar.gz: 4121f67c20e6f5ecb7af1963b6968362d5fa1316cb84ecd1d3904dc605711318
 SHA512:
-  metadata.gz: 881d7d0362318f8531ba3119694a9ce6fef346cffd787191bd5b6777b6c93e7c1d5649aa4650e26a6d74374af7b7f9b2baaa09031fe527a2c54a3980ef82010f
-  data.tar.gz: a8f570dac6747227a38a90f5e2aaea39873af04a60f3a3f19df500c632c1b04ae0e958f09b6b3fd5dd20e00dea39d4411b4c84757ad5e7411704af2eb2e53a8e
+  metadata.gz: 6ea6474ebbb7bc53454f106c1c129321e6fcce19878c9ed57ed339a51a0275850a796ab8ab5321cacf64f9681842fb4bf7f259ad9b6259abc23065e3cfd42576
+  data.tar.gz: d8cdec67384115be7599ae31f52bccb12d9f6803486eba1f7dbd723df274e31f8b5342f7666ce6f662eea60a8d023b4c4f775a4f549ce0ded3194c76b41052f0

data/exe/cyrun

@@ -68,10 +68,11 @@ runner = Cyrun::Runner.new(
   base_directory,
   pattern,
   screenshots_pattern,
+  screenshots_directory,
   group_size,
   npm_task_name,
   max_retries: max_retries,
   iterations: iterations
 )
 runner.run
-runner.store_results(results_directory, screenshots_directory)
+runner.store_results(results_directory)

data/lib/cyrun/runner.rb

@@ -7,9 +7,9 @@ module Cyrun
     include Logging
 
     attr_reader :collector, :group_builder, :task_runner,
-                :overall_results, :max_retries, :iterations
+                :overall_results, :max_retries, :iterations, :screenshots_directory
 
-    def initialize(base_directory, pattern, screenshots_pattern, group_size, npm_task_name, max_retries: nil, iterations: nil)
+    def initialize(base_directory, pattern, screenshots_pattern, screenshots_directory, group_size, npm_task_name, max_retries: nil, iterations: nil)
       @collector = SpecCollector.new(base_directory, npm_task_name, [pattern])
       @group_builder = GroupBuilder.new(group_size)
       @task_runner = TaskRunner.new(screenshots_pattern)
@@ -17,6 +17,7 @@ module Cyrun
       @overall_results = SpecGroupExecutionResult.create_empty
       @max_retries = max_retries
       @iterations = iterations
+      @screenshots_directory = screenshots_directory
     end
 
     def run
@@ -26,13 +27,12 @@ module Cyrun
       overall_results
     end
 
-    def store_results(results_directory, screenshots_directory)
+    def store_results(results_directory)
       latest_results = overall_results.latest_results
       invalid_results = latest_results.select { |result| result.result_filename.nil? }
       valid_results = latest_results - invalid_results
 
       copy_result_files valid_results, results_directory
-      copy_screenshots overall_results, screenshots_directory
 
       invalid_results.empty?
     end
@@ -55,22 +55,31 @@ module Cyrun
       success
     end
 
-    def copy_screenshots(results, directory)
+    def move_screenshots(results, directory)
       FileUtils.mkdir_p directory
 
       success = true
 
-      info "Copying #{results.screenshots.size} screenshots"
+      info "Moving #{results.screenshots.size} screenshots to #{directory}"
       results.screenshots.each do |path|
-        FileUtils.cp(path, "#{directory}/#{SecureRandom.uuid}-#{File.basename(path)}")
-      rescue StandardError => e
-        error "Failed to copy screenshot #{path}: #{e.message}"
-        success = false
+        success &&= move_screenshot path, directory
       end
 
       success
     end
 
+    def move_screenshot(path, directory)
+      target_path = "#{directory}/#{SecureRandom.uuid}-#{File.basename(path)}"
+      info "  -> Moving #{path} to #{target_path}"
+      FileUtils.mv(path, target_path)
+
+      true
+    rescue StandardError => e
+      error "Failed to move screenshot #{path}: #{e.message}"
+
+      false
+    end
+
     def collect_specs
       info 'Collecting specs ...'
       collector.files.each do |filename|
@@ -97,6 +106,7 @@ module Cyrun
         .each(&method(:handle_single_execution_result))
 
       log_results overall_results
+      move_screenshots results, screenshots_directory
     end
 
     def handle_single_execution_result(result)

data/lib/cyrun/spec_group_execution_result.rb

@@ -52,5 +52,9 @@ module Cyrun
         task_results(task).last
       end
     end
+
+    def clear_screenshot_list!
+      @screenshots = []
+    end
   end
 end

data/lib/cyrun/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cyrun
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/sig/runner.rbs

@@ -6,12 +6,13 @@ module Cyrun
     attr_reader iterations: Integer?
     attr_reader max_retries: Integer?
     attr_reader npm_task_name: String
+    attr_reader screenshots_directory: String
     attr_reader overall_results: SpecGroupExecutionResult
     attr_reader task_runner: TaskRunner
 
-    def initialize: (String, String, String, Integer, String, max_retries: Integer?, iterations: Integer?) -> void
+    def initialize: (String, String, String, String, Integer, String, max_retries: Integer?, iterations: Integer?) -> void
 
-    def store_results: (String, String)-> bool
+    def store_results: (String)-> bool
 
     def run: -> SpecGroupExecutionResult
 
@@ -20,7 +21,10 @@ module Cyrun
     def collect_specs: (String) -> void
 
     def copy_result_files: (Array[SingleSpecExecutionResult], String) -> bool
-    def copy_screenshots: (SpecGroupExecutionResult, String) -> bool
+
+    def move_screenshot: (String, String)-> bool
+
+    def move_screenshots: (SpecGroupExecutionResult, String) -> bool
 
     def handle_single_execution_result: (SingleSpecExecutionResult) -> void
     def log_results: (SpecGroupExecutionResult) -> void

data/sig/spec_group_execution_result.rbs

@@ -7,6 +7,9 @@ module Cyrun
     attr_reader single_results: Array[SingleSpecExecutionResult]
 
     def initialize: (Array[SingleSpecExecutionResult], Array[String], Integer) -> void
+
+    def clear_screenshot_list!: -> void
+
     def effectiveness: -> Float
     def merge!: (SpecGroupExecutionResult)-> void
     def net_time_in_seconds: -> Integer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyrun
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Oskar Kirmis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize