cyrun 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96135ed6aeed78479ce42b7f80413bc3f990060db5a8346ddcb74d21b8502aeb
-  data.tar.gz: ed87be79066218ade6cb1737631b77aca366db0ed199c40f975a9ee24b769cb9
+  metadata.gz: 0e62e6731281630f345c8e1cd166158771fee4ecbd076648922da738eac4242a
+  data.tar.gz: 5dcd1a2da03d3370d916474abc34c25ad978790efa03ab06908528987dea34a5
 SHA512:
-  metadata.gz: b9ecaa1ea3a177d865e3c3a21a78ecad9008ec2d6c3f38830df60be929a254697a46f087d19102746a90ee8594e605f9ae810e7f60a97d5ba87d54f008dd64ab
-  data.tar.gz: d5fe28ff89c6b4b7681bc80ae28d4ddcd3e0a16f4cfece65867aeebc8e37bf1c78d7f8bce849e221d5a1b6d18bc53644b26ad21ae5824ae3477a5bb5da0ccee3
+  metadata.gz: 7f12fef457aa139ee04dd87b2bf8de75376e1cbb2e2a3ef5ba166212b45879ea288212c88d586740e32c2b3c81c3cee876ee28ddcf13762dcf6bc7c944aeb9a7
+  data.tar.gz: b25ad55b81bba08903b632db69b6d8236243e1dfccb2a26571300bde52b6dc989b55093f762d7a036c98b9d9ffac07fb963310650e95b28ef9fb2da524a61648

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,16 +55,16 @@ 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
-        error "Failed to copy screenshot #{path}"
+        FileUtils.mv(path, "#{directory}/#{SecureRandom.uuid}-#{File.basename(path)}")
+      rescue StandardError => e
+        error "Failed to move screenshot #{path}: #{e.message}"
         success = false
       end
 
@@ -97,6 +97,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.2"
+  VERSION = "0.1.4"
 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,7 @@ module Cyrun
     def collect_specs: (String) -> void
 
     def copy_result_files: (Array[SingleSpecExecutionResult], String) -> bool
-    def copy_screenshots: (SpecGroupExecutionResult, 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyrun
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Oskar Kirmis