umbrellio-utils 0.4.3 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6591e877185cd730c9c7fffd76144a0ab204fd8b3c69ea1765be7876209e715c
-  data.tar.gz: c08f9523f33faf6f6ea605edf44a9bb13a600e6fcfdf7620fadcde1f666dea78
+  metadata.gz: a50b129107cbc0b88c6ca792692965517f94d37d55585a4c872ac7ed33f96144
+  data.tar.gz: 5fb7a079b3510edd5ea05a93e9752eba6ce02aba59a7160f8bd06c1ea2344086
 SHA512:
-  metadata.gz: b3c4ee473805b89b4b8f9e7c3de13c4ddbf5d7d3e22062c2e311149b5c2a9aa7d92d581523f5d586e015c0d4c54d3af0f8a89b2bfb84eeb24a26f0e6b97ffda8
-  data.tar.gz: e3aea7d7838ebd2ff3dd3b2d8fb7449563122349f099d469ea217e3fc4c8702b026c94e4240853f64fd402556a250e00a1fbc33b9ce3f46713565a55b3f7da9b
+  metadata.gz: c3d0a08ffac0fac4c414bcdc695ec4b34730f7c1d6570cc8f73328885d3e950ef684c0a96911fd3838de5d4c008b56d96a702599f0b7e7f039bd65ee146a7e21
+  data.tar.gz: e066d6dc4d56ffc7842cc26e787431d053ba441b8c2ebeaa57d57533a4eb47416778860959fb65ace91d95d965d7782591964983d762c587b998666b856e752f

data/.github/workflows/test.yml

@@ -3,53 +3,60 @@ name: Test
 on: [push, pull_request]
 
 env:
-  FULL_COVERAGE_CHECK: false # Sometimes, sometimes...
+  FULL_COVERAGE_CHECK: false # Someday, someday...
 
 jobs:
-  full-check:
+  test:
     runs-on: ubuntu-latest
 
     # We want to run on external PRs, but not on our own internal PRs as they'll be run on push event
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'umbrellio/utils'
 
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0", "3.1"]
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: root
+          POSTGRES_HOST_AUTH_METHOD: trust
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+    env:
+      PGHOST: localhost
+      PGUSER: root
+
     steps:
       - uses: actions/checkout@v2
+
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+
+      - run: psql -c 'CREATE DATABASE umbrellio_utils_test'
+
       - 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
-
-    # We want to run on external PRs, but not on our own internal PRs as they'll be run on push event
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'umbrellio/utils'
-
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [2.6, 2.7]
-
-
-    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,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/log/

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Naming/MethodParameterName:
   AllowedNames: ["x", "y", "z"]
@@ -21,3 +21,6 @@ Naming/RescuedExceptionsVariableName:
 Style/HashConversion:
   Exclude:
     - spec/**/*_spec.rb
+
+Naming/VariableNumber:
+  CheckSymbols: false

data/Gemfile.lock

@@ -1,134 +1,139 @@
 PATH
   remote: .
   specs:
-    umbrellio-utils (0.4.3)
+    umbrellio-utils (0.5.2)
       memery (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+    amazing_print (1.4.0)
     ast (2.4.2)
-    awesome_print (1.9.2)
-    bundler-audit (0.9.0.1)
+    bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
-    ci-helper (0.4.2)
+    ci-helper (0.5.0)
       colorize (~> 0.8)
       dry-inflector (~> 0.2)
       umbrellio-sequel-plugins (~> 0.4)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    dry-inflector (0.2.1)
-    i18n (1.8.10)
+    dry-inflector (0.3.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.1)
+    json (2.6.2)
     memery (1.4.1)
       ruby2_keywords (~> 0.0.2)
     method_source (1.0.0)
-    minitest (5.14.4)
-    nokogiri (1.12.5-arm64-darwin)
+    mini_portile2 (2.8.0)
+    minitest (5.16.2)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.13.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.13.8-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
     nori (2.6.0)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
+    pg (1.4.2)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.6.0)
-    rack (2.2.3)
-    rainbow (3.0.0)
+    rack (2.2.4)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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.10.0)
-    rspec-json_matcher (0.1.6)
-      awesome_print
+      rspec-support (~> 3.11.0)
+    rspec-json_matcher (0.2.0)
+      amazing_print
       json
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.17.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
-      parser (>= 3.0.1.1)
-    rubocop-config-umbrellio (1.17.0.53)
-      rubocop (= 1.17.0)
-      rubocop-performance (= 1.10.0)
-      rubocop-rails (= 2.9.1)
-      rubocop-rake (= 0.5.1)
-      rubocop-rspec (= 2.2.0)
-      rubocop-sequel (= 0.2.0)
-    rubocop-performance (1.10.0)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.19.1)
+      parser (>= 3.1.1.0)
+    rubocop-config-umbrellio (1.30.0.65)
+      rubocop (~> 1.30.0)
+      rubocop-performance (~> 1.14.0)
+      rubocop-rails (~> 2.14.2)
+      rubocop-rake (~> 0.6.0)
+      rubocop-rspec (~> 2.11.1)
+      rubocop-sequel (~> 0.3.3)
+    rubocop-performance (1.14.3)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.14.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.2.0)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
-    rubocop-sequel (0.2.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
+    rubocop-sequel (0.3.4)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    semantic_logger (4.8.2)
+    semantic_logger (4.11.0)
       concurrent-ruby (~> 1.0)
-    sequel (5.49.0)
+    sequel (5.58.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.3)
+    simplecov_json_formatter (0.1.4)
     symbiont-ruby (0.7.0)
-    thor (1.1.0)
-    timecop (0.9.4)
-    tzinfo (2.0.4)
+    thor (1.2.1)
+    timecop (0.9.5)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    umbrellio-sequel-plugins (0.5.1.27)
+    umbrellio-sequel-plugins (0.9.0.76)
       sequel
       symbiont-ruby
-    unicode-display_width (2.1.0)
-    yard (0.9.26)
-    zeitwerk (2.5.1)
+    unicode-display_width (2.2.0)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
+  ruby
   x86_64-darwin-20
   x86_64-linux
 
@@ -139,12 +144,14 @@ DEPENDENCIES
   ci-helper
   nokogiri
   nori
+  pg
   pry
   rake
   rspec
   rspec-json_matcher
   rubocop-config-umbrellio
   semantic_logger
+  sequel
   simplecov
   simplecov-lcov
   timecop
@@ -152,4 +159,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.3.0
+   2.3.19

data/lib/umbrellio_utils/database.rb

@@ -22,16 +22,16 @@ module UmbrellioUtils
     end
 
     def each_record(dataset, **options, &block)
-      primary_key = primary_key_from(options)
+      primary_key = primary_key_from(**options)
+
       with_temp_table(dataset, **options) do |ids|
-        dataset.model.where(primary_key => ids).each(&block)
+        dataset.model.where(primary_key => ids).reverse(primary_key).each(&block)
       end
     end
 
-    def with_temp_table(dataset, **options)
-      primary_key = primary_key_from(options)
-      page_size = options.fetch(:page_size, 1_000)
-      do_sleep = options.fetch(:sleep, Rails.env.production?)
+    def with_temp_table(dataset, page_size: 1_000, sleep: nil, **options)
+      primary_key = primary_key_from(**options)
+      sleep_interval = sleep_interval_from(sleep)
 
       temp_table_name = create_temp_table(dataset, primary_key: primary_key)
 
@@ -49,7 +49,7 @@ module UmbrellioUtils
 
         break if pk_set.empty?
 
-        sleep(1) if do_sleep
+        Kernel.sleep(sleep_interval) if sleep_interval.positive?
         clear_lamian_logs!
       end
     ensure
@@ -57,6 +57,7 @@ module UmbrellioUtils
     end
 
     def clear_lamian_logs!
+      return unless defined?(Lamian)
       Lamian.logger.send(:logdevs).each { |x| x.truncate(0) && x.rewind }
     end
 
@@ -78,8 +79,19 @@ module UmbrellioUtils
 
     private
 
-    def primary_key_from(options)
+    def primary_key_from(**options)
       options.fetch(:primary_key, :id)
     end
+
+    def sleep_interval_from(sleep)
+      case sleep
+      when Numeric
+        sleep
+      when FalseClass
+        0
+      else
+        defined?(Rails) && Rails.env.production? ? 1 : 0
+      end
+    end
   end
 end

data/lib/umbrellio_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UmbrellioUtils
-  VERSION = "0.4.3"
+  VERSION = "0.5.2"
 end

data/umbrellio_utils.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "UmbrellioUtils is collection of utility classes and helpers"
   spec.homepage      = "https://github.com/umbrellio/utils"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.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/utils"
@@ -35,12 +35,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "ci-helper"
   spec.add_development_dependency "nokogiri"
   spec.add_development_dependency "nori"
+  spec.add_development_dependency "pg"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-json_matcher"
   spec.add_development_dependency "rubocop-config-umbrellio"
   spec.add_development_dependency "semantic_logger"
+  spec.add_development_dependency "sequel"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-lcov"
   spec.add_development_dependency "timecop"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-utils
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.2
 platform: ruby
 authors:
 - JustAnotherDude
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memery
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -286,6 +314,7 @@ files:
 - lib/umbrellio_utils/store.rb
 - lib/umbrellio_utils/vault.rb
 - lib/umbrellio_utils/version.rb
+- log/.keep
 - umbrellio_utils.gemspec
 homepage: https://github.com/umbrellio/utils
 licenses:
@@ -302,14 +331,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0
+rubygems_version: 3.3.17
 signing_key:
 specification_version: 4
 summary: A set of utilities that speed up development