ci-helper 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61e68cfd07a49efbe7edeedfd4bb579d5359caa0b6660bf00d6a6f8cd653226b
-  data.tar.gz: 915c87759e1da667c808d7136e4c3dc5fcf4be1ae81f3476b11b4b006542ecf2
+  metadata.gz: e63b9bd4d1eedc9ec6cb16d7ad4889017c70d016aef38309e41bdd9f2766fe5b
+  data.tar.gz: d583e5d4938c3c031259062de7977377dd449c554a78ebe10d6bd784fb634d50
 SHA512:
-  metadata.gz: 4e8d5ecaa8724f9f44df8606ebd1be1d64fe010e8c5f27947ee5e320b43b782ec97baa0e52c82b51190fcb68ef184c0aaa98e08f0cc31a8a5f51087348626572
-  data.tar.gz: 5c48c38e8847e5a00d6b987a015d580ee1329b1fc32d9ba84963e677f59cff731eb08ffb6d90578277b82883c28bc7bb50484e129dff4de2445ffa59276925c1
+  metadata.gz: 6bc0d44ab1199a98b7384ff617559b66beb6ce9bf6785952a3e48b0ca573756257c0ed54ef2289ffd5fae7118ffc4540e9cd2486918e9a7222839b923a95cd6a
+  data.tar.gz: 3b5179eeb48c25ae650598e9a024c80954768ff8c8bc579cd57bf9d7986a9e6e62d22559471287b020f3caf16b7368af2794303dcdd27666da54e7700e6a9d3c

data/.github/workflows/test.yml

@@ -0,0 +1,51 @@
+name: Test
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  full-check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.1"
+          bundler-cache: true
+      - name: Build and install gem to systems gems
+        run: bundle exec rake install
+      - name: Run Linter
+        run: bundle exec ci-helper RubocopLint
+      - name: Check missed spec suffixes
+        run: bundle exec ci-helper CheckSpecSuffixes --extra-paths spec/*.rb --ignored-paths spec/*_helper.rb
+      - name: Run specs
+        run: bundle exec ci-helper RunSpecs
+      - name: Audit
+        run: bundle exec ci-helper BundlerAudit
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+  specs:
+    runs-on: ubuntu-latest
+
+    env:
+      FULL_TEST_COVERAGE_CHECK: false
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run specs
+        run: bundle exec rspec

data/.gitignore

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

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 
 Naming/MethodParameterName:
   AllowedNames: ["x", "y", "z"]
@@ -14,3 +14,7 @@ RSpec/EmptyLineAfterHook:
 Naming/FileName:
   Exclude:
     - lib/ci-helper.rb
+
+Style/HashConversion:
+  Exclude:
+    - spec/**/*_spec.rb

data/Gemfile.lock

@@ -0,0 +1,120 @@
+PATH
+  remote: .
+  specs:
+    ci-helper (0.5.0)
+      colorize (~> 0.8)
+      dry-inflector (~> 0.2)
+      umbrellio-sequel-plugins (~> 0.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.2.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    bundler-audit (0.9.0.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
+    coderay (1.1.3)
+    colorize (0.8.1)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    dry-inflector (0.2.1)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    minitest (5.15.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.3.1)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.25.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    rubocop-config-umbrellio (1.25.0.61)
+      rubocop (~> 1.25.0)
+      rubocop-performance (~> 1.13.0)
+      rubocop-rails (~> 2.13.0)
+      rubocop-rake (~> 0.6.0)
+      rubocop-rspec (~> 2.7.0)
+      rubocop-sequel (~> 0.3.3)
+    rubocop-performance (1.13.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.13.2)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.7.0)
+      rubocop (~> 1.19)
+    rubocop-sequel (0.3.3)
+      rubocop (~> 1.0)
+    ruby-progressbar (1.11.0)
+    sequel (5.56.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov-lcov (0.8.0)
+    simplecov_json_formatter (0.1.4)
+    symbiont-ruby (0.7.0)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    umbrellio-sequel-plugins (0.5.1.27)
+      sequel
+      symbiont-ruby
+    unicode-display_width (2.1.0)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  bundler
+  bundler-audit
+  ci-helper!
+  pry
+  rake
+  rspec
+  rubocop-config-umbrellio
+  simplecov
+  simplecov-lcov
+
+BUNDLED WITH
+   2.3.13

data/README.md

@@ -31,8 +31,10 @@ A command can accept list of options (parameters). Option values are passed thro
 For example, the BundlerAudit command accepts the ignored_advisories option
 You can set a value of this option by setting the flag `--ignored-advisories ignored-advisory`.
 It should be noted that all hyphens in flag names are automatically replaced with underscores.
+If command accepts array as option's value, you can separate values with either commas or spaces.
 ```bash
-$ ci-helper BundlerAudit --ignored-advisories first,second
+$ ci-helper BundlerAudit --ignored-advisories first,second # Valid
+$ ci-helper BundlerAudit --ignored-advisories first second # Valid too!
 ```
 
 List of available commands:
@@ -74,6 +76,8 @@ List of available commands:
     Accepted flags: `--config-path`
     * `--config-path` — relative path to your config yaml file with schedule.
       Usually it is `config/sidekiq_scheduler.yml`.
+    * `--with-database` — if you want to prepare database before executing specs,
+      you should set this flag to `true`.
 
 ### Rake Tasks
 

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.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/umbrellio/ci_helper"

data/lib/ci_helper/cli.rb

@@ -26,13 +26,14 @@ module CIHelper
     end
 
     def parse_options_from(args)
-      args.each_slice(2).with_object({}) do |args, options|
-        key = Tools::Inflector.instance.underscore(args.first.split("--").last)
-        value = args[1] || ""
-        raise Error, "Not valid options" if key.empty?
-
-        options[key.to_sym] = value
-      end
+      args
+        .slice_when { |_el_before, el_after| el_after.start_with?("--") }
+        .each_with_object({}) do |commands, options|
+          key = Tools::Inflector.instance.underscore(commands.shift.split("--").last)
+          raise "Invalid options" if key.empty?
+          value = commands.size <= 1 ? commands.first : commands
+          options[key.to_sym] = value || ""
+        end
     end
 
     def perform_command!

data/lib/ci_helper/commands/check_coverage.rb

@@ -21,7 +21,7 @@ module CIHelper
       end
 
       def split_resultset?
-        options[:split_resultset] == "true"
+        boolean_option(:split_resultset)
       end
 
       def setup_file_path

data/lib/ci_helper/commands/check_sidekiq_scheduler_config.rb

@@ -8,6 +8,7 @@ module CIHelper
       def call
         return 0 if job_constants.empty?
 
+        create_and_migrate_database! if with_database?
         cmd = craft_jobs_const_get_cmd
         execute_with_rails_runner(cmd)
         0
@@ -15,8 +16,12 @@ module CIHelper
 
       private
 
+      def env
+        :development
+      end
+
       def execute_with_rails_runner(cmd)
-        execute("bundle exec rails runner \"#{cmd}\"")
+        execute("bundle exec rails runner '#{cmd}'")
       end
 
       def craft_jobs_const_get_cmd
@@ -24,11 +29,20 @@ module CIHelper
       end
 
       def job_constants
-        @job_constants ||= config.values.reject(&:nil?).flat_map(&:keys).uniq
+        @job_constants ||= config.values.compact.flat_map(&:keys).uniq
+      end
+
+      def with_database?
+        boolean_option(:with_database)
       end
 
       def config
-        @config ||= YAML.load_file(options[:config_path])
+        @config ||= begin
+          path = options[:config_path]
+          # :nocov:
+          YAML.respond_to?(:unsafe_load_file) ? YAML.unsafe_load_file(path) : YAML.load_file(path)
+          # :nocov:
+        end
       end
     end
   end

data/lib/ci_helper/commands/run_specs.rb

@@ -37,11 +37,11 @@ module CIHelper
       end
 
       def with_database?
-        options[:with_database] == "true"
+        boolean_option(:with_database)
       end
 
       def split_resultset?
-        options[:split_resultset] == "true"
+        boolean_option(:split_resultset)
       end
     end
   end

data/lib/ci_helper/commands.rb

@@ -54,8 +54,15 @@ module CIHelper
         raise Error, message
       end
 
+      def boolean_option(key)
+        options[key] == "true"
+      end
+
       def plural_option(key)
         return [] unless options.key?(key)
+        value = options[key]
+        return value if value.is_a?(Array)
+
         options[key].split(",")
       end
 

data/lib/ci_helper/version.rb

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

data/lib/tasks/sequel_management.rake

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "logger"
+require "open3"
 require "sequel/timestamp_migrator_undo_extension"
 
 class SequelManagement
@@ -30,7 +31,10 @@ class SequelManagement
 
         logger.info "Begin rolling back new migrations"
 
-        original_migrations = `#{git_command}`.split.map { |path| File.basename(path) }
+        migration_files, _, status = Open3.capture3(git_command)
+        abort "Can't get list of migration files" unless status.success?
+
+        original_migrations = migration_files.split.map { |path| File.basename(path) }
         migrations_to_rollback = (migrator.applied_migrations - original_migrations).sort.reverse
 
         next if migrations_to_rollback.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-helper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - JustAnotherDude
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -173,11 +173,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
-- ".github/workflows/ruby.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -208,7 +209,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/umbrellio/ci_helper
   source_code_uri: https://github.com/umbrellio/ci_helper
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,15 +217,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.12
+signing_key:
 specification_version: 4
 summary: Continuous Integration helpers for Ruby
 test_files: []

data/.github/workflows/ruby.yml

@@ -1,84 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-env:
-  FULL_COVERAGE_CHECK: true
-
-jobs:
-  test-latest:
-
-    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.7
-    - 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 Linter
-      run: ci-helper RubocopLint
-    - name: Check missed spec suffixes
-      run: ci-helper CheckSpecSuffixes --extra-paths spec/*.rb --ignored-paths spec/*_helper.rb
-    - name: Run specs
-      run: ci-helper RunSpecs
-    - name: Audit
-      run: ci-helper BundlerAudit
-    - name: Coveralls
-      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