berl 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e882027a7dcb54b844aa6c7878da6a8d14732d7d0a8c1bc666a8ce846657e2a8
-  data.tar.gz: 19b3bed60b1b039bba7fba7e7f4800e1991afbbf3674e739685bc271e1e71bce
+  metadata.gz: cd67392aa53ccf62c963235de2f928c1b24aa66fa100cd65a2c7e91a676f0d4e
+  data.tar.gz: d4b5c1e82de754cd12a349e8ecf80560fdd567c6f5a27f0bd03c4ae2152ff7dc
 SHA512:
-  metadata.gz: '0859f0efe2af68b9df50f5dd5803a19a152b90cdee3abf6b4e1785176bad230ffa64433455fb20572654a340513caa062e550109bdc778a53a0f0c48323e6b62'
-  data.tar.gz: 55337e3bd9c1db7aab34fa11d4a5e7a5c2bcfa866d0b27f27a57b2a93e199161fb99352bd7412cb9017124d9b201962db8c1310b72967013629ba87203dde234
+  metadata.gz: 43b03f0a8eafb06e117ac2e3eef42f90755f3e6b574c14e90bca9943d10650cd8e021679f56e1638d69994111c2ac022450df84bb1539a4a99843e60cdb49d77
+  data.tar.gz: ccc600d3d56c243351178647a24124a14c7fffb2ee9bcb980e49916df5232444da30b285c7b166a6128b8f8244043b3c38a8bf01cbd645cbd94afcb4cf0f02bd

data/lib/berl/application.rb

@@ -5,13 +5,27 @@ module Berl
     def run
       start = Time.now
 
-      number_of_workers = ENV['PARALLELE_WORKERS'].to_s.to_i
+      number_of_workers = ENV['BERL_NUM_OF_WORKERS'].to_i ||= 1
+      db_conn_str_tpl = ENV['BERL_DB_CONN_STR_TPL'] ||= "mysql://root@localhost:3306/db_%s"
+      debug = !!ENV['BERL_DEBUG'] ||= false
+      suites_path = ENV['BERL_SUITES_PATH']
 
-      database_wizard = DatabaseWizard.new
-      database_wizard.initialize_num_of_databases(number_of_workers)
-      suites = SuitesResolver.resolve_suites
+      # database_wizard = DatabaseWizard.new(debug)
+      # database_wizard.initialize_num_of_databases(number_of_workers, db_conn_str_tpl)
 
-      behat_runner = BehatRunner.new(number_of_workers, suites, database_wizard.databases)
+      databases = [
+        sprintf(db_conn_str_tpl, 1),
+        sprintf(db_conn_str_tpl, 2),
+      ]
+
+      puts "[Debug] Resolving suites" if debug
+
+      suites_resolver = SuitesResolver.new(suites_path)
+      suites = suites_resolver.resolve_suites
+
+      puts "[Debug] Running Behat" if debug
+
+      behat_runner = BehatRunner.new(number_of_workers, suites, databases, debug)
       behat_runner.start
 
       behat_runner.print_errors

data/lib/berl/behat_runner.rb

@@ -5,12 +5,13 @@ module Berl
   class BehatRunner
     attr_reader :num_of_succeed, :num_of_failed
 
-    def initialize(num_of_workers, suites, databases)
+    def initialize(num_of_workers, suites, databases, debug)
       @num_of_succeed = 0
       @num_of_failed = 0
       @num_of_workers = num_of_workers
       @suites = suites
       @databases = databases
+      @debug = debug
       @output = {}
     end
 
@@ -24,6 +25,9 @@ module Berl
         cache = "cache_#{Parallel.worker_number}"
 
         behat_cmd = build_behat_cmd(database, cache, suite)
+
+        puts "[DEBUG] command: #{behat_cmd}" if @debug
+
         Open3.popen3(behat_cmd) do |_, stdout, _, wait_thr|
           result = {}
           result['output'] = []
@@ -33,6 +37,8 @@ module Berl
           result['suite_name'] = suite
           result['status'] = wait_thr.value == 0 ? 'success' : 'fail'
 
+          puts "[DEBUG] result: #{result}" if @debug
+
           result
         end
       end
@@ -42,7 +48,7 @@ module Berl
       cmd = []
       cmd.push("DATABASE_URL=#{database}")
       cmd.push("PARALLELE_CACHE_DIR=#{cache}")
-      cmd.push("php vendor/bin/behat --suite='#{suite}'")
+      cmd.push("vendor/bin/behat --suite='#{suite}'")
       cmd.push("--tags='~@javascript&&~@todo&&~@cli'")
       cmd.push('--colors --strict --no-interaction -vvv -f progress')
 
@@ -52,6 +58,8 @@ module Berl
     private :build_behat_cmd
 
     def handle_finish(_, _, result)
+      puts "Handling finished job for #{result['suite_name']}" if @debug
+
       if result['status'] == 'success'
         @num_of_succeed += 1
         puts "✅ #{result['suite_name']} (#{num_of_executed}/#{@suites.count})"

data/lib/berl/database_wizard.rb

@@ -7,23 +7,21 @@ require 'open3'
 class DatabaseWizard
   attr_reader :databases
 
-  def initialize
+  def initialize(debug = false)
     @databases = []
     @num_of_set_up_databases = 0
+    @debug = debug
   end
 
-  def initialize_num_of_databases(num_of_databases)
-    database_connection_string_tpl = ENV["PARALLELE_DATABASE_URL_TEMPLATE"]
-
-    if database_connection_string_tpl.nil?
-      database_connection_string_tpl = "mysql://root:root_password@db/sylius_%s?charset=utf8mb4"
-    end
-
+  def initialize_num_of_databases(num_of_databases, db_conn_str_tpl)
     Parallel.each(1..num_of_databases, in_threads: num_of_databases, finish: method(:handle_finish)) do |i|
-      database_connection_string = sprintf(database_connection_string_tpl, i)
+      database_connection_string = sprintf(db_conn_str_tpl, i)
 
       setup_db_cmd = build_setup_db_cmd(database_connection_string)
-      Open3.popen3(setup_db_cmd) do |_, stdout, stderr, wait_thr|
+
+      puts "[DEBUG] command: #{setup_db_cmd}" if @debug
+
+      Open3.popen3(setup_db_cmd) do |stdin, stdout, stderr, wait_thr|
         result = {}
         result['status'] = wait_thr.value == 0 ? 'success' : 'fail'
         result['output'] = []
@@ -31,6 +29,8 @@ class DatabaseWizard
         result['output'].push(*stderr.readlines)
         result['database_connection_string'] = database_connection_string
 
+        stdout.readlines.each { |line| puts line } if @debug
+
         result
       end
     end
@@ -48,6 +48,8 @@ class DatabaseWizard
   private :build_setup_db_cmd
 
   def handle_finish(_, _, result)
+    puts "[Debug] Handling finish for #{result['database_connection_string']}" if @debug
+
     @num_of_set_up_databases += 1
     if result['status'] == 'fail'
       puts "❌ Database #{@num_of_set_up_databases} set up"

data/lib/berl/suites_resolver.rb

@@ -2,10 +2,12 @@
 
 # Service to resolve suites
 class SuitesResolver
-  def self.resolve_suites
-    suites_path = ENV['PARALLELE_SCENARIOS_PATH']
+  def initialize(suites_path)
+    @suites_path = suites_path
+  end
 
-    files = Dir.glob("#{Dir.pwd}/#{suites_path}/**/*.{yml,yaml}")
+  def resolve_suites
+    files = Dir.glob("#{Dir.pwd}/#{@suites_path}/**/*.{yml,yaml}")
     suites = []
 
     files.each do |path|

data/lib/berl/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Berl
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 
   module Version # :nodoc: all
     MAJOR, MINOR, BUILD, *OTHER = Berl::VERSION.split '.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berl
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Jakub Tobiasz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel