ree_spec 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68eb3e82ab6595a8e4115ecfccea6c639c7d4de80a8c2daf4a33bb2fd68b2c3f
-  data.tar.gz: 9b31bb1cb252ba420461afd259e108fa77e1388f8e18a50c1377d6f7e7e4d5c2
+  metadata.gz: 971f1556635ff273e2a921facab36b08918b9d3cddfa236146e054ee59114bbb
+  data.tar.gz: 44d05a565bd7cd4683274361594d90bae3cbdd0d443044b71276cd8a7f77bb38
 SHA512:
-  metadata.gz: 53a62c797bc3d2419a5fb8c53a4905aac5660be16a8916f8309c44ad569b8fc407081808621aeb4713cecb3c999ae222d73b0b653794aeebefb87fa9621770ce
-  data.tar.gz: 2e81850bedb0f88b5ddf72c779160f45b2627f6141b10b1ccbf6225150489dca3b5a4e88021fb380bd3b314e495881332b3fc3519893605dbed1a8b39fcd8388
+  metadata.gz: e366fe6c67b093aef3a47bf71edb74fb283a1d9d098c51f3cbab46f2b190bf644e17645cca216192eccac4d7e47a25982be14c4da3f85c9dfbb9826341fdd74b
+  data.tar.gz: b74d0c9e98c680445835ac9d366e6e4e6f8a6cbc76fa8526cd4001f6d20cf804f68394a053bd3a03f52f1a3b9eaec0f821dcb869987965f8986387d551ff8da4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_spec (0.0.4)
+    ree_spec (0.0.6)
       commander (~> 5.0.0)
       ree (~> 1.0.47)
       ree_lib (~> 1.0.124)

data/lib/ree_spec/packages/ree_spec_cli/package/ree_spec_cli/run_command.rb

@@ -9,10 +9,10 @@ class ReeSpecCli::RunCommand
   end
 
   def call
-    action_proc = Proc.new do |package_names, spec_matcher, tag, files, run_all, project_path, process_count, specs_per_process|
+    action_proc = Proc.new do |package_names, spec_matcher, tag, files, run_all, only_failed, project_path, process_count|
       run_specs(
-        package_names, spec_matcher, tag, files, run_all,
-        project_path, process_count, specs_per_process
+        package_names, spec_matcher, tag, files, run_all, only_failed,
+        project_path, process_count
       )
     end
 

data/lib/ree_spec/packages/ree_spec_cli/package/ree_spec_cli/services/command_builder.rb

@@ -2,14 +2,12 @@ class ReeSpecCli::CommandBuilder
   include Commander::Methods
 
   DEFAULT_PROCESS_COUNT = 1
-  DEFAULT_SPECS_PER_PROCESS_COUNT = 5
 
   def build(&action_proc)
     files = []
     package_names = []
     run_all = false
     process_count = DEFAULT_PROCESS_COUNT
-    specs_per_process = DEFAULT_SPECS_PER_PROCESS_COUNT
 
     program :name, "Ree Spec"
     program :version, "1.0"
@@ -25,7 +23,8 @@ class ReeSpecCli::CommandBuilder
       c.example "ree spec --tag wip", "Run specs for packages which have \"wip\" tag"
       c.option "--project_path [ROOT_DIR]", String, "Root project dir path"
       c.option "--tag TAG_NAME", String, "Run specs for packages with specified tag"
-      c.option "--parallel OPTS", String, "Run specs in parallel processes (e.g. --parallel 15:5, 15 processes, max 5 package spec files per process)"
+      c.option "--parallel PROCESS_COUNT", String, "Run specs in parallel processes (e.g. --parallel 15, 15 processes)"
+      c.option "--only-failed", "Run only failed specs from previous run"
 
       c.option "-f SPEC_FILE", "--fule SPEC_FILE", String, "List of spec files" do |f|
         files ||= []
@@ -39,11 +38,16 @@ class ReeSpecCli::CommandBuilder
       c.action do |args, options|
         package_name = args[0]&.to_sym
         spec_matcher = args[1]
-        options_hash = options.__hash__
-        options_hash.delete(:trace)
 
-        if options_hash[:project_path]
-          options_hash[:project_path] = File.expand_path(options_hash[:project_path])
+        if options.project_path
+          path = File.expand_path(options.project_path.to_s)
+
+          if !File.directory?(path)
+            puts("Project path not found: #{options.project_path}")
+            exit 1
+          end
+
+          options.project_path = File.expand_path(options.project_path.to_s)
         end
 
         if package_name
@@ -54,13 +58,8 @@ class ReeSpecCli::CommandBuilder
           run_all = true
         end
 
-        if options_hash[:parallel]
-          parallel = options_hash[:parallel].split(":")[0..1]
-          process_count = Integer(parallel.first)
-
-          if parallel.size > 1
-            specs_per_process = Integer(parallel.last)
-          end
+        if options.parallel
+          process_count = Integer(options.parallel)
         end
 
         if package_names.size > 1
@@ -68,9 +67,9 @@ class ReeSpecCli::CommandBuilder
         end
 
         action_proc.call(
-          package_names, spec_matcher, options_hash[:tag], files,
-          run_all, options_hash[:project_path] || File.expand_path(Dir.pwd),
-          process_count, specs_per_process
+          package_names, spec_matcher, options.tag, files,
+          run_all, !!options.only_failed, options.project_path || File.expand_path(Dir.pwd),
+          process_count
         )
       end
     end

data/lib/ree_spec/packages/ree_spec_cli/package/ree_spec_cli/services/run_specs.rb

@@ -2,21 +2,23 @@ class ReeSpecCli::RunSpecs
   include Ree::FnDSL
 
   fn :run_specs do
-    link :in_groups_of, from: :ree_array
     link :run_package_specs
+    link :from_json, from: :ree_json
+    link :symbolize_keys, from: :ree_hash
+    link :group_by, from: :ree_array
+    link :index_by, from: :ree_array
+    link :to_hash, from: :ree_object
+    link :to_json, from: :ree_json
   end
 
-  MAX_SPECS_PER_PROCESS = 1000
+  SPEC_META_FILENAME = "ree_spec_meta.json"
 
-  contract ArrayOf[Symbol], Nilor[String], Nilor[String], ArrayOf[String], Bool, String, Integer, Integer => nil
-  def call(package_names, spec_matcher, tag, files, run_all, project_path,
-           process_count, specs_per_process)
+  contract ArrayOf[Symbol], Nilor[String], Nilor[String], ArrayOf[String], Bool, Bool, String, Integer => nil
+  def call(package_names, spec_matcher, tag, files, run_all, only_failed, project_path, process_count)
     init_ree_project(project_path)
 
     packages = filter_packages_to_run(package_names, tag, run_all)
-    specs_per_process = calculate_specs_per_process(process_count, specs_per_process)
-    jobs = get_jobs(packages, specs_per_process, spec_matcher, files)
-
+    jobs, meta_index = get_jobs(packages, spec_matcher, files, only_failed)
     processes = build_processes(process_count)
     error_files = []
     success_files = []
@@ -29,9 +31,35 @@ class ReeSpecCli::RunSpecs
 
       processes[number] = Process.fork do
         print_start_message(job)
-        result = run_package_specs(job.package, job.files, number)
 
-        if result.status.exitstatus != 0
+        prev_meta = meta_index[job.abs_path]
+        start_time = Time.now
+
+        result = run_package_specs(job.package, [job.abs_path], number)
+
+        end_time = Time.now
+        exec_time = end_time - start_time
+        is_success = result.status.exitstatus == 0
+
+        duration = if is_success
+          exec_time
+        elsif prev_meta
+          prev_meta.duration
+        else
+          exec_time
+        end
+
+        update_scan_metadata(
+          SpecMeta.new(
+            package: job.package.name.to_s,
+            abs_path: job.abs_path,
+            duration: duration,
+            last_scan_at: Time.now,
+            success: is_success
+          )
+        )
+
+        if !is_success
           error_file.write(result.out)
           error_file.rewind
           puts(result.out)
@@ -83,7 +111,7 @@ class ReeSpecCli::RunSpecs
   end
 
   def print_start_message(job)
-    puts("\n**** Running #{job.files.size} spec#{job.files.size == 1 ? "" : "s"} for #{job.package.name} ****\n")
+    puts("Running spec for :#{job.package.name}:\n#{job.abs_path}")
   end
 
   def print_messages(error_files, success_files)
@@ -114,28 +142,58 @@ class ReeSpecCli::RunSpecs
     end
 
     pid = Process.wait
-    number = processes.find { |_, v| v == pid }
+    number = processes.find { |_, v| v == pid }.first
     processes[number] = nil
     number
   end
 
-  class Job < Struct.new(:package, :dir, :files); end
+  class Job
+    include ReeDto::DSL
+
+    build_dto do
+      field :package, Ree::Package
+      field :abs_path, String
+    end
+  end
 
-  def get_jobs(package_names, specs_per_process, spec_matcher, files)
+  def get_jobs(package_names, spec_matcher, files, only_failed)
+    prev_scan_meta = read_prev_scan_metadata
     result = []
     packages = package_names.map { packages_facade.get_package(_1) }
+    scan_index = index_by(prev_scan_meta) { _1.abs_path }
 
     packages.each do |package|
-      dir = Ree::PathHelper.abs_package_module_dir(package)
-
       spec_files = get_spec_files(package, spec_matcher, files)
 
-      in_groups_of(spec_files, specs_per_process).each do |specs_group|
-        result << Job.new(package, dir, specs_group)
+      spec_files.each do |abs_path|
+        result << Job.new(package:, abs_path:)
       end
     end
 
-    result
+    if only_failed
+      result = result.select do |item|
+        if scan_index[item.abs_path]
+          !scan_index[item.abs_path].success
+        else
+          false
+        end
+      end
+    end
+
+    cur_min_duration = prev_scan_meta.min { _1.duration }&.duration || 0
+
+    result.sort_by do |item|
+      dur = if el = scan_index[item.abs_path]
+        el.duration
+      else
+        cur_min_duration -= 1
+        cur_min_duration
+      end
+
+      -dur
+    end
+
+    [result, scan_index]
   end
 
   def get_spec_files(package, spec_matcher, files)
@@ -172,21 +230,11 @@ class ReeSpecCli::RunSpecs
           result
         end
       end
-    elsif files && files.size > 0
-      files
     else
       all_specs
     end
   end
 
-  def calculate_specs_per_process(process_count, specs_per_process)
-    if process_count > 1
-      specs_per_process
-    else
-      MAX_SPECS_PER_PROCESS
-    end
-  end
-
   def filter_packages_to_run(package_names, tag, run_all)
     packages_to_run = []
 
@@ -238,4 +286,60 @@ class ReeSpecCli::RunSpecs
       package.tags.include?(tag)
     end
   end
+
+  def spec_meta_file_name
+    dir = Dir.pwd
+    File.join(dir, SPEC_META_FILENAME)
+  end
+
+  def read_prev_scan_metadata
+    path = spec_meta_file_name
+
+    if File.exist?(path)
+      result = begin
+        from_json(File.read(path))
+      rescue
+        []
+      end
+
+      build_metadata(result)
+    else
+      build_metadata([])
+    end
+  end
+
+  def update_scan_metadata(spec_meta)
+    meta = read_prev_scan_metadata
+    prev_spec = meta.find { _1.abs_path == spec_meta.abs_path }
+    meta.delete(prev_spec) if prev_spec
+    meta << spec_meta
+
+    result = to_json(meta.map { to_hash(_1) })
+
+    File.open(spec_meta_file_name, "w") do |f|
+      f.flock(File::LOCK_EX)
+      f.write(result)
+      f.flock(File::LOCK_UN)
+    end
+  end
+
+  class SpecMeta
+    include ReeDto::DSL
+
+    build_dto do
+      field :package, String
+      field :abs_path, String
+      field :duration, Float
+      field :last_scan_at, Time
+      field :success, Bool
+    end
+  end
+
+  def build_metadata(data)
+    data.map do |d|
+      SpecMeta.new(symbolize_keys(d))
+    end.compact
+  rescue
+    []
+  end
 end

data/lib/ree_spec/packages/ree_spec_cli/package/ree_spec_cli.rb

@@ -3,5 +3,9 @@ module ReeSpecCli
 
   package do
     depends_on :ree_array
+    depends_on :ree_json
+    depends_on :ree_dto
+    depends_on :ree_hash
+    depends_on :ree_object
   end
 end

data/lib/ree_spec/packages/ree_spec_cli/spec/ree_spec_cli/run_command_spec.rb

@@ -13,6 +13,8 @@ RSpec.describe :run_command do
     ARGV << "accounts"
     ARGV << "--project_path"
     ARGV << project_path
+    ARGV << "--parallel"
+    ARGV << "2"
 
     run_command()
   }

data/lib/ree_spec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeSpec
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree_spec
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Ruslan Gatiyatov