ci-helper 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74d9c6d91a9c591011f272a5a7a8ee39845fba3849a4f47a3392c966fff34de4
-  data.tar.gz: 49c4c6e8490934d3f4c209a4f9a55b812165b749de6de98e69fb0bcfce48f449
+  metadata.gz: 3a3609beaea3add57fcaf6627b214509e48913d1751eef0ef87b27b5d30933ab
+  data.tar.gz: 0be1e0e77967f0b9f7d76be546eacce22c3b06f09aa1a3b0d163621c38bc4418
 SHA512:
-  metadata.gz: fc4222158600e219585b25ed5e178b459ecc0f705524ed5a805a460d9816747b0b80d1310643ac9645952d37de92b2d6f61e0d766d1def41c0c508293d83f6ec
-  data.tar.gz: 60d4a95181884382ef2246b303f79abb124b2c40a5f561dd34d99eeca43a23c169db09545badcdc1e4acd3d26b5dba777c6ab6e8e24192c231f7670b63d01adf
+  metadata.gz: ccb2b6707629e1c670853009fb5363122213eee7eabc5b860a6130088a9f4b10b1a4bc9c18c8c50c40b78ace7a17b6b46e2da6a9fefe0e5edd0847ef7eb36e29
+  data.tar.gz: b548c182c810cea40172b22762179a014b86ca075fa1be0b1328e22c5de4ad55a81dd3f58d9ff9babd840d3de22b39df625f38f34e5fe915417c78af2c3301f3

data/.github/workflows/ruby.yml

@@ -13,8 +13,11 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  FULL_COVERAGE_CHECK: true
+
 jobs:
-  test:
+  test-latest:
 
     runs-on: ubuntu-latest
 
@@ -24,7 +27,7 @@ jobs:
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
     # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.7
     - name: Install dependencies
@@ -43,3 +46,39 @@ jobs:
       uses: coverallsapp/github-action@v1.1.1
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
+  specs-for-26:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+    - name: Install dependencies
+      run: bundle install && gem install bundler-audit
+    - name: Build and install gem to systems gems
+      run: bundle exec rake install
+    - name: Run specs
+      run: ci-helper RunSpecs
+  specs-for-25:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.5
+    - name: Install dependencies
+      run: bundle install && gem install bundler-audit
+    - name: Build and install gem to systems gems
+      run: bundle exec rake install
+    - name: Run specs
+      run: ci-helper RunSpecs

data/.gitignore

@@ -6,3 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+Gemfile.lock

data/.rubocop.yml

@@ -10,3 +10,7 @@ Naming/MethodParameterName:
 
 RSpec/EmptyLineAfterHook:
   Enabled: false
+
+Naming/FileName:
+  Exclude:
+    - lib/ci-helper.rb

data/README.md

@@ -42,11 +42,12 @@ List of available commands:
 * **CheckDBDevelopment** — executes rails db commands (`db:drop`, `db:create`, `db:migrate`)
     and seeds database. Does not accept flags.
 * **CheckDBRollback** — executes rails db commands with additional command
-    `db:rollback_new_migrations`, which rollbacks migrations,
-    added in tested branch. Does not accept flags.
+    `db:rollback_new_migrations`, which rollbacks migrations, added in tested branch.
+    Does not accept flags. Gem provides this rake task, but only for `Sequel`.
+    If you want to use `ActiveRecord::Migrator`, you'll have to write rake task by your own.
 * **RubocopLint** — executes rubocop linter. Does not accept flags.
 * **RunSpecs** — executes `rspec` in project root.
-Accepted flags: `--node-index`, `node-total`, `with-database`, `split-resultset`.
+    Accepted flags: `--node-index`, `node-total`, `with-database`, `split-resultset`.
     * `--node-index` — if you run specs in parallel in CI, then you might use this flag.
     * `--node-total` — if you run specs in parallel in CI, then you might use this flag.
     * `--with-database` — if you want to prepare database before executing specs,
@@ -61,6 +62,20 @@ Accepted flags: `--node-index`, `node-total`, `with-database`, `split-resultset`
         delimited by coma.
     * `--ignored-paths [values]` - accepts path patterns that should be ignored,
         delimited by coma.
+* **CheckCoverage** — checks coverage by executing `SimpleCov::collate`.
+    You should set `SimpleCov::minimum_coverage` in your `spec_helper.rb` file.
+    Accepted flags: `--split-resultset`.
+    * `--split-resultset` — if you execute command `RunSpecs` with `--split-resultset true`,
+        you also should set this flag to `true`. If this flag set to `true`, final coverage will be
+        calculated by merging results in all files, matching the mask `coverage/resultset.*.json`.
+        By default final coverage is calculated using result from `coverage/.resultset.json`.
+
+### Rake Tasks
+
+As you can see, some commands use generic rake tasks. To make tasks available in your application,
+you need to require the file `ci_helper/railtie`. Also, you can require it directly in `Gemfile`:
+`gem "ci-helper", require: "ci_helper/railtie, group: :test`.
+Or if you haven't set `require` option to `false`, rake tasks loads automatically.
 
 ### Script
 

data/ci_helper.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "CIHelper is a gem with Continuous Integration helpers for Ruby"
   spec.homepage      = "https://github.com/umbrellio/ci_helper"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/umbrellio/ci_helper"
@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "colorize", "~> 0.8"
   spec.add_runtime_dependency "dry-inflector", "~> 0.2"
+  spec.add_runtime_dependency "umbrellio-sequel-plugins", "~> 0.4"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "bundler-audit"

data/lib/ci-helper.rb

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

data/lib/ci_helper.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+module CIHelper
+end
+
 require "colorized_string"
 require "delegate"
 require "dry/inflector"
@@ -14,5 +17,6 @@ require "ci_helper/tools/colorize"
 require "ci_helper/tools/inflector"
 require "ci_helper/version"
 
-module CIHelper
-end
+# :nocov:
+require "ci_helper/railtie" if defined?(Rails)
+# :nocov:

data/lib/ci_helper/commands.rb

@@ -12,7 +12,7 @@ module CIHelper
 
         # :nocov:
         def process_stdout
-          @process_stdout ||= STDOUT
+          @process_stdout ||= $stdout
         end
         # :nocov:
       end

data/lib/ci_helper/commands/check_coverage.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "simplecov"
+
+module CIHelper
+  module Commands
+    class CheckCoverage < BaseCommand
+      def call
+        ::SimpleCov.collate(files)
+        0
+      end
+
+      private
+
+      def files
+        return path.glob("coverage/resultset.*.json") if split_resultset?
+
+        [path.join("coverage/.resultset.json")]
+      end
+
+      def split_resultset?
+        options[:split_resultset] == "true"
+      end
+    end
+  end
+end

data/lib/ci_helper/railtie.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module CIHelper
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      load "tasks/sequel_management.rake"
+    end
+  end
+end

data/lib/ci_helper/tools/inflector.rb

@@ -5,9 +5,11 @@ module CIHelper
     class Inflector < Delegator
       include Singleton
 
+      # rubocop:disable Lint/MissingSuper
       def initialize
         @inflector = Dry::Inflector.new { |inflections| inflections.acronym "DB" }
       end
+      # rubocop:enable Lint/MissingSuper
 
       def __getobj__
         @inflector

data/lib/ci_helper/version.rb

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

data/lib/tasks/sequel_management.rake

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "logger"
+require "sequel/timestamp_migrator_undo_extension"
+
+class SequelManagement
+  include Rake::DSL
+
+  MIGRATIONS_PATH = "db/migrate"
+
+  def initialize
+    self.logger = Logger.new($stdout)
+
+    define_db_task!
+  end
+
+  private
+
+  attr_accessor :logger
+
+  def migrations_path
+    self.class::MIGRATIONS_PATH
+  end
+
+  def define_db_task!
+    namespace :db 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"
+
+        original_migrations = `#{git_command}`.split.map { |path| File.basename(path) }
+        migrations_to_rollback = (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")
+
+        rollback!(migrations_to_rollback)
+      end
+    end
+  end
+
+  def git_command
+    "git ls-tree --name-only origin/master #{migrations_path}/"
+  end
+
+  def migrator
+    @migrator ||= begin
+      full_path = Rails.root.join(migrations_path)
+      Sequel::TimestampMigrator.new(DB, full_path, allow_missing_migration_files: true)
+    end
+  end
+
+  def rollback!(migrations)
+    migrations.each do |migration|
+      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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-helper
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - JustAnotherDude
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: umbrellio-sequel-plugins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +178,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -172,18 +185,22 @@ files:
 - bin/setup
 - ci_helper.gemspec
 - exe/ci-helper
+- lib/ci-helper.rb
 - lib/ci_helper.rb
 - lib/ci_helper/cli.rb
 - lib/ci_helper/commands.rb
 - lib/ci_helper/commands/bundler_audit.rb
+- lib/ci_helper/commands/check_coverage.rb
 - lib/ci_helper/commands/check_db_development.rb
 - lib/ci_helper/commands/check_db_rollback.rb
 - lib/ci_helper/commands/check_spec_suffixes.rb
 - lib/ci_helper/commands/rubocop_lint.rb
 - lib/ci_helper/commands/run_specs.rb
+- lib/ci_helper/railtie.rb
 - lib/ci_helper/tools/colorize.rb
 - lib/ci_helper/tools/inflector.rb
 - lib/ci_helper/version.rb
+- lib/tasks/sequel_management.rake
 homepage: https://github.com/umbrellio/ci_helper
 licenses:
 - MIT
@@ -198,14 +215,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Continuous Integration helpers for Ruby

data/Gemfile.lock

@@ -1,104 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ci-helper (0.2.1)
-      colorize (~> 0.8)
-      dry-inflector (~> 0.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.0.3.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
-    bundler-audit (0.7.0.1)
-      bundler (>= 1.2.0, < 3)
-      thor (>= 0.18, < 2)
-    coderay (1.1.3)
-    colorize (0.8.1)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    dry-inflector (0.2.0)
-    i18n (1.8.3)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    method_source (1.0.0)
-    minitest (5.14.1)
-    parallel (1.19.2)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rack (2.2.3)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.81.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      rexml
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-config-umbrellio (0.81.0.78)
-      rubocop (= 0.81.0)
-      rubocop-performance (= 1.5.2)
-      rubocop-rails (= 2.5.0)
-      rubocop-rspec (= 1.38.1)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    rubocop-rails (2.5.0)
-      activesupport
-      rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    rubocop-rspec (1.38.1)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
-    simplecov (0.18.5)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    simplecov-lcov (0.8.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  bundler-audit
-  ci-helper!
-  pry
-  rake
-  rspec
-  rubocop-config-umbrellio
-  simplecov
-  simplecov-lcov
-
-BUNDLED WITH
-   2.1.4