ci-helper 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6752c279e742404a6b104c4d4e2bccfaf4c18e17cfb0c6693ce1ddb0ce2b58e1
-  data.tar.gz: 4e9960ccc6a0f0bd7b1ecf65a4c6df063cf579cdc71338dddb90248065368332
+  metadata.gz: 00bf40738c9997e76bf3f9c7339d1608e7bd706d7a93d4f00322f4f5b5336d4d
+  data.tar.gz: 6612126f35b0440904ffdada78380edff042b062009d7f51b17df0797c72ee59
 SHA512:
-  metadata.gz: 3d8da6805297e53be7955d7219289dbece6f2decacdf760b81061e5745c4066a458b8b23ffa64cf06691ac270b00d58259941523e39ed919d056acc28aff0a85
-  data.tar.gz: 97b48c63728b3ef1c3a3457a1b5c90e4f2954d250783db38eed9ae6414aeb177cacfca9038d9d46226f6c307f0439a608c38e9bee83ec5999f93d39ba8a2a141
+  metadata.gz: 5b0404a8c11b9dc5326654f672befed4bf0ed24d898789013b7eb00c7726b1f28f5e0aa9101cd6d0492426bcbcb79266e76064962184d873733ac392e8eec9be
+  data.tar.gz: c64d2b1b049753074b1fe5aae027c928c30e428f4c1f9b9022385568566a2ddb24be0445f5a3e20f713533ed098f6a2efe139eb06c7dd52825cab2a47e532591

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci-helper (0.8.0)
+    ci-helper (0.10.0)
       colorize (~> 1.1)
       dry-inflector (~> 1.0)
       umbrellio-sequel-plugins (~> 0.14)
@@ -9,119 +9,139 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.2)
+    activesupport (8.1.3)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    benchmark (0.4.1)
-    bigdecimal (3.1.4)
-    bundler-audit (0.9.1)
-      bundler (>= 1.2.0, < 3)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.2)
+    bundler-audit (0.9.3)
+      bundler (>= 1.2.0)
       thor (~> 1.0)
     coderay (1.1.3)
     colorize (1.1.0)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.4.1)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    drb (2.2.0)
-      ruby2_keywords
-    dry-inflector (1.0.0)
-    i18n (1.14.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    diff-lcs (1.6.2)
+    docile (1.4.1)
+    drb (2.2.3)
+    dry-inflector (1.3.1)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.7.1)
-    method_source (1.0.0)
-    minitest (5.20.0)
-    mutex_m (0.2.0)
+    io-console (0.8.2)
+    json (2.19.4)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    method_source (1.1.0)
+    minitest (6.0.5)
+      drb (~> 2.0)
+      prism (~> 1.5)
     ostruct (0.6.3)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.28.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2)
+    prism (1.9.0)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.3)
-    rack (3.0.8)
+      reline (>= 0.6.0)
+    racc (1.8.1)
+    rack (3.2.6)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.8.3)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rake (13.4.2)
+    regexp_parser (2.12.0)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.50.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    rubocop (1.84.2)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
-      rubocop (~> 1.41)
-    rubocop-config-umbrellio (1.50.0.85)
-      rubocop (~> 1.50.0)
-      rubocop-performance (~> 1.17.0)
-      rubocop-rails (~> 2.19.0)
-      rubocop-rake (~> 0.6.0)
-      rubocop-rspec (~> 2.20.0)
-      rubocop-sequel (~> 0.3.3)
-    rubocop-performance (1.17.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.19.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-config-umbrellio (1.84.118)
+      rubocop (~> 1.84.0)
+      rubocop-factory_bot (~> 2.28.0)
+      rubocop-performance (~> 1.26.0)
+      rubocop-rails (~> 2.34.0)
+      rubocop-rake (~> 0.7.0)
+      rubocop-rspec (~> 3.9.0)
+      rubocop-sequel (~> 0.4.0)
+    rubocop-factory_bot (2.28.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-performance (1.26.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (2.20.0)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
-    rubocop-sequel (0.3.4)
-      rubocop (~> 1.0)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.9.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.81)
+    rubocop-sequel (0.4.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1, < 2)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    sequel (5.75.0)
+    securerandom (0.4.1)
+    sequel (5.103.0)
       bigdecimal
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov-lcov (0.8.0)
+    simplecov-html (0.13.2)
+    simplecov-lcov (0.9.0)
     simplecov_json_formatter (0.1.4)
-    symbiont-ruby (0.7.0)
-    thor (1.3.0)
+    thor (1.5.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    umbrellio-sequel-plugins (0.14.0.189)
+    umbrellio-sequel-plugins (0.17.2)
       sequel
-      symbiont-ruby
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
 
 PLATFORMS
   arm64-darwin

data/ci_helper.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "colorize", "~> 1.1"
-  spec.add_runtime_dependency "dry-inflector", "~> 1.0"
-  spec.add_runtime_dependency "umbrellio-sequel-plugins", "~> 0.14"
+  spec.add_dependency "colorize", "~> 1.1"
+  spec.add_dependency "dry-inflector", "~> 1.0"
+  spec.add_dependency "umbrellio-sequel-plugins", "~> 0.14"
 end

data/lib/ci-helper.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require_relative "./ci_helper"
+require_relative "ci_helper"

data/lib/ci_helper/commands/check_coverage.rb

@@ -21,7 +21,7 @@ module CIHelper
       end
 
       def split_resultset?
-        boolean_option(:split_resultset)
+        boolean_option?(:split_resultset)
       end
 
       def setup_file_path

data/lib/ci_helper/commands/check_db_development.rb

@@ -6,6 +6,8 @@ module CIHelper
       def call
         create_and_migrate_database!
         execute("bundle exec rake db:seed")
+        create_and_migrate_clickhouse_database! if with_clickhouse?
+        0
       end
 
       private
@@ -13,6 +15,10 @@ module CIHelper
       def env
         :development
       end
+
+      def with_clickhouse?
+        boolean_option?(:with_clickhouse)
+      end
     end
   end
 end

data/lib/ci_helper/commands/check_db_rollback.rb

@@ -7,6 +7,13 @@ module CIHelper
         create_and_migrate_database!
         execute_with_env("bundle exec rake db:rollback_new_migrations")
         execute_with_env("bundle exec rake db:migrate")
+
+        if with_clickhouse?
+          create_and_migrate_clickhouse_database!
+          execute_with_env("bundle exec rake ch:rollback_new_migrations")
+          execute_with_env("bundle exec rake ch:migrate")
+        end
+        0
       end
 
       private
@@ -14,6 +21,10 @@ module CIHelper
       def env
         :test
       end
+
+      def with_clickhouse?
+        boolean_option?(:with_clickhouse)
+      end
     end
   end
 end

data/lib/ci_helper/commands/check_sidekiq_scheduler_config.rb

@@ -33,7 +33,7 @@ module CIHelper
       end
 
       def with_database?
-        boolean_option(:with_database)
+        boolean_option?(:with_database)
       end
 
       def config

data/lib/ci_helper/commands/run_specs.rb

@@ -1,15 +1,21 @@
 # frozen_string_literal: true
 
+require "json"
+require "tmpdir"
+
 module CIHelper
   module Commands
     class RunSpecs < BaseCommand
       def call
-        files_to_run = job_files
-        return if files_to_run.empty?
+        return if all_spec_files.empty?
 
         create_and_migrate_database! if with_database?
         create_and_migrate_clickhouse_database! if with_clickhouse?
-        execute("bundle exec rspec #{Shellwords.join(files_to_run)}")
+
+        specs_to_run = job_count == 1 ? job_files : job_examples
+        return 0 if specs_to_run.empty?
+
+        execute("bundle exec rspec #{Shellwords.join(specs_to_run)}")
         return 0 unless split_resultset?
 
         execute("mv coverage/.resultset.json coverage/resultset.#{job_index}.json")
@@ -21,28 +27,47 @@ module CIHelper
         :test
       end
 
+      def all_spec_files
+        @all_spec_files ||= path.glob("spec/**/*_spec.rb")
+      end
+
       def job_files
-        all_files = path.glob("spec/**/*_spec.rb")
+        heavy_files, std_files = all_spec_files.partition { |f| heavy?(relative(f)) }
+        sorted_std = std_files.map { |f| [f.size, relative(f)] }.sort.map(&:last)
+        distribute(sorted_std + heavy_files)
+      end
 
-        heavy_files = []
-        std_files   = []
+      def job_examples
+        heavy, std = example_ids.partition do |id|
+          heavy?(id.split("[", 2).first.delete_prefix("./"))
+        end
+        distribute(std.sort + heavy.sort)
+      end
 
-        all_files.each do |file|
-          relative_path = file.relative_path_from(path).to_s
-          if heavy_specs_paths.any? { |pattern| File.fnmatch?(pattern, relative_path) }
-            heavy_files << file
-          else
-            std_files << file
-          end
+      def example_ids
+        Dir.mktmpdir do |dir|
+          output_file = File.join(dir, "rspec_examples.json")
+          execute(
+            "bundle exec rspec --dry-run --format=json --out #{Shellwords.escape(output_file)}",
+          )
+          JSON.parse(File.read(output_file)).fetch("examples").map { |e| e.fetch("id") }
         end
+      end
 
-        sorted_files =
-          std_files.map { |x| [x.size, x.relative_path_from(path).to_s] }.sort.map(&:last)
-        (sorted_files + heavy_files).reverse.select.with_index do |_file, index|
+      def distribute(items)
+        items.reverse.select.with_index do |_item, index|
           (index % job_count) == (job_index - 1)
         end
       end
 
+      def heavy?(relative_path)
+        heavy_specs_paths.any? { |pattern| File.fnmatch?(pattern, relative_path) }
+      end
+
+      def relative(file)
+        file.relative_path_from(path).to_s
+      end
+
       def heavy_specs_paths
         @heavy_specs_paths ||=
           begin
@@ -61,15 +86,15 @@ module CIHelper
       end
 
       def with_database?
-        boolean_option(:with_database)
+        boolean_option?(:with_database)
       end
 
       def with_clickhouse?
-        boolean_option(:with_clickhouse)
+        boolean_option?(:with_clickhouse)
       end
 
       def split_resultset?
-        boolean_option(:split_resultset)
+        boolean_option?(:split_resultset)
       end
     end
   end

data/lib/ci_helper/commands.rb

@@ -6,8 +6,8 @@ module CIHelper
 
     class BaseCommand
       class << self
-        def call!(**options)
-          new(**options).call
+        def call!(**)
+          new(**).call
         end
 
         # :nocov:
@@ -58,7 +58,7 @@ module CIHelper
         raise Error, message
       end
 
-      def boolean_option(key)
+      def boolean_option?(key)
         options[key] == "true"
       end
 

data/lib/ci_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CIHelper
-  VERSION = "0.8.0"
+  VERSION = "0.10.0"
 end

data/lib/tasks/sequel_management.rake

@@ -13,6 +13,7 @@ class SequelManagement
     self.logger = Logger.new($stdout)
 
     define_db_task!
+    define_ch_task!
   end
 
   private
@@ -23,6 +24,10 @@ class SequelManagement
     self.class::MIGRATIONS_PATH
   end
 
+  def ch_migrations_path
+    "db/migrate/clickhouse"
+  end
+
   def define_db_task!
     namespace :db do
       desc "Rollback all migrations, which doesn't exist in master branch"
@@ -47,6 +52,31 @@ class SequelManagement
     end
   end
 
+  def define_ch_task!
+    namespace :ch do
+      desc "Rollback all migrations, which doesn't exist in master branch"
+      task rollback_new_migrations: :environment do
+        abort "Shouldn't run in production mode!" if Rails.env.production?
+
+        logger.info "Begin rolling back new migrations"
+
+        git_command = "git ls-tree --name-only origin/master #{ch_migrations_path}/"
+        migration_files, error, status = Open3.capture3(git_command)
+        abort "Can't get list of migration files:\n#{error}" unless status.success?
+
+        original_migrations = migration_files.split.map { |path| File.basename(path) }
+        migrations_to_rollback = (ch_migrator.applied_migrations - original_migrations).sort.reverse
+
+        next if migrations_to_rollback.empty?
+
+        logger.info "Rolling back migrations:"
+        logger.info migrations_to_rollback.join("\n")
+
+        ch_rollback!(migrations_to_rollback)
+      end
+    end
+  end
+
   def git_command
     "git ls-tree --name-only origin/master #{migrations_path}/"
   end
@@ -58,6 +88,14 @@ class SequelManagement
     end
   end
 
+  def ch_migrator
+    @ch_migrator ||= begin
+      full_path = Rails.root.join(ch_migrations_path)
+      Sequel::TimestampMigrator.new(DB, full_path, allow_missing_migration_files: true,
+                                                   table: "clickhouse_migrations")
+    end
+  end
+
   def rollback!(migrations)
     migrations.each do |migration|
       migrator.undo(migration.to_i)
@@ -69,6 +107,18 @@ class SequelManagement
       end
     end
   end
+
+  def ch_rollback!(migrations)
+    migrations.each do |migration|
+      ch_migrator.undo(migration.to_i)
+    rescue Sequel::Migrator::Error => error
+      if error.message.include?("does not exist in the filesystem")
+        logger.info error.message
+      else
+        raise error
+      end
+    end
+  end
 end
 
 SequelManagement.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci-helper
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - JustAnotherDude
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Continuous Integration helpers for Ruby
 test_files: []