arel_toolkit 0.4.2 → 0.4.6

data/README.md

@@ -143,9 +143,26 @@ This gem aims to have full support for PostgreSQL's SQL. In order to do so, it n
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+1. Check out the repo
+1. Run `bin/setup` to install dependencies.
+1. Start the postgres database `docker compose up`
+1. Run `bundle exec rspec` to run the tests
+1. Run `bundle exec appraisal rspec` to run the tests for the different gem sets
+
+You can also run `bin/console` for an interactive prompt that will allow you to experiment. To install this gem onto your local machine, run `bundle exec rake install`.
+
+## Releasing
+
+1. Update version in `version.rb`
+1. Create a new branch `v<<VERSION_HERE>>`
+1. Run `bundle install`
+1. Run `bundle exec appraisal install`
+1. Run `bundle exec rake changelog`
+1. Commit the changes
+1. Open a PR with name `Version <<VERSION_HERE>>` ([example](https://github.com/mvgijssel/arel_toolkit/pull/172))
+1. Merge the PR
+1. Checkout the master branch and pull latest changes
+1. Run `bundle exec rake release`
 
 ## Contributing
 

data/arel_toolkit.gemspec

@@ -25,19 +25,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.extensions    = ['ext/pg_result_init/extconf.rb']
 
-  spec.add_dependency 'arel', '~> 9.0.0'
-  spec.add_dependency 'activerecord', '~> 5.2.0'
+  spec.add_dependency 'activerecord', '>= 5.0.0', '< 6.0.4'
   spec.add_dependency 'pg', '~> 1.1.4'
-  spec.add_dependency 'pg_query', '~> 1.1.0'
+  spec.add_dependency 'pg_query', '~> 2.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'dpl', '~> 1.10.11'
   spec.add_development_dependency 'github_changelog_generator', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rake-compiler', '~> 1.0'
   spec.add_development_dependency 'rspec', '~> 3.8'
   spec.add_development_dependency 'approvals', '~> 0.0.24'
-  spec.add_development_dependency 'appraisal', '~> 2.2.0'
+  spec.add_development_dependency 'appraisal', '~> 2.4.1'
   spec.add_development_dependency 'database_cleaner', '~> 1.7.0'
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'simplecov-console', '~> 0.4.2'
@@ -48,10 +47,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec', '~> 4.7'
   spec.add_development_dependency 'guard-rubocop', '~> 1.3.0'
   spec.add_development_dependency 'guard-rake', '~> 1.0.0'
-
   spec.add_development_dependency 'stackprof', '~> 0.2'
   spec.add_development_dependency 'memory_profiler', '~> 0.9'
-
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-nav'
   spec.add_development_dependency 'pry-doc'

data/bin/console

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
+require 'pry'
+
 require 'arel_toolkit'
 require_relative '../spec/support/active_record'
 
@@ -8,5 +10,4 @@ require_relative '../spec/support/active_record'
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-require 'pry'
 Pry.start

data/bin/setup

@@ -3,6 +3,27 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle install
+asdf plugin-add ruby || true
+asdf install
+
+# Make sure "gem" is available
+asdf reshim ruby
+
+# Need specific version of bundler for this ruby version
+gem install bundler -v 2.2.19
+
+# Make sure "bundle" is available
+asdf reshim ruby
 
-# Do any other automated setup that you need to do here
+EXPECTED_VERSION="Bundler version 2.2.19"
+BUNDLER_VERSION=$(bundle --version)
+
+if [[ "$BUNDLER_VERSION" != "$EXPECTED_VERSION" ]]; then
+  echo "Using the wrong bundler version: '$BUNDLER_VERSION'. Expected '$EXPECTED_VERSION'"
+  exit 1
+fi
+
+bundle install
+bundle exec appraisal install
+bundle exec rake clean
+bundle exec rake compile

data/docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3.8'
+services:
+  database:
+    image: postgres:latest
+    container_name: arel_toolkit_database
+    environment:
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: postgres
+      POSTGRES_DB: arel_toolkit_test
+    ports:
+      - 5432:5432

data/gemfiles/active_record_6.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+
+gemspec path: "../"

data/gemfiles/active_record_6.gemfile.lock

@@ -0,0 +1,212 @@
+PATH
+  remote: ..
+  specs:
+    arel_toolkit (0.4.6)
+      activerecord (>= 5.0.0, < 6.0.4)
+      pg (~> 1.1.4)
+      pg_query (~> 2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ansi (1.5.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    approvals (0.0.24)
+      nokogiri (~> 1.6)
+      thor (~> 0.18)
+    ast (2.4.1)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    database_cleaner (1.7.0)
+    debug_inspector (0.0.3)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    dpl (1.10.15)
+    faraday (1.1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    ffi (1.13.1)
+    formatador (0.2.5)
+    github_changelog_generator (1.15.2)
+      activesupport
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.2.1)
+      rake (>= 10.0)
+      retriable (~> 3.0)
+    google-protobuf (3.17.3)
+    guard (2.16.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rake (1.0.0)
+      guard
+      rake
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    guard-rubocop (1.3.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
+    hirb (0.7.3)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    interception (0.5)
+    jaro_winkler (1.5.4)
+    json (2.3.1)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    memory_profiler (0.9.14)
+    method_source (0.9.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    nenv (0.3.0)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    octokit (4.19.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    pg (1.1.4)
+    pg_query (2.1.0)
+      google-protobuf (>= 3.17.1)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-alias (0.0.1)
+      binding_of_caller
+      pry
+    pry-doc (1.1.0)
+      pry (~> 0.11)
+      yard (~> 0.9.11)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rescue (1.5.2)
+      interception (>= 0.5)
+      pry (>= 0.12.0)
+    pry-stack_explorer (0.4.9.3)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    public_suffix (4.0.6)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rake-compiler (1.1.1)
+      rake
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    retriable (3.1.2)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.3)
+      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.4)
+    rubocop (0.71.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    shellany (0.0.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-console (0.4.2)
+      ansi
+      hirb
+      simplecov
+    simplecov-html (0.10.2)
+    stackprof (0.2.16)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.6.1)
+    yard (0.9.25)
+    zeitwerk (2.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 6.0.0)
+  appraisal (~> 2.4.1)
+  approvals (~> 0.0.24)
+  arel_toolkit!
+  bundler (~> 2.0)
+  database_cleaner (~> 1.7.0)
+  dpl (~> 1.10.11)
+  github_changelog_generator (~> 1.15)
+  guard (~> 2.15)
+  guard-rake (~> 1.0.0)
+  guard-rspec (~> 4.7)
+  guard-rubocop (~> 1.3.0)
+  memory_profiler (~> 0.9)
+  pry
+  pry-alias
+  pry-doc
+  pry-nav
+  pry-rescue
+  pry-stack_explorer
+  rake (~> 13.0)
+  rake-compiler (~> 1.0)
+  rspec (~> 3.8)
+  rubocop (= 0.71.0)
+  simplecov (~> 0.16.1)
+  simplecov-console (~> 0.4.2)
+  stackprof (~> 0.2)
+
+BUNDLED WITH
+   2.2.23

data/gemfiles/arel_gems.gemfile.lock

@@ -31,11 +31,10 @@ GIT
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.2)
-      activerecord (~> 5.2.0)
-      arel (~> 9.0.0)
+    arel_toolkit (0.4.6)
+      activerecord (>= 5.0.0, < 6.0.4)
       pg (~> 1.1.4)
-      pg_query (~> 1.1.0)
+      pg_query (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -67,7 +66,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
-    appraisal (2.2.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
@@ -102,6 +101,7 @@ GEM
       rainbow (>= 2.2.1)
       rake (>= 10.0)
       retriable (~> 3.0)
+    google-protobuf (3.17.3)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -155,7 +155,8 @@ GEM
       ast (~> 2.4.0)
     pg (1.1.4)
     pg_array_parser (0.0.9)
-    pg_query (1.1.1)
+    pg_query (2.1.0)
+      google-protobuf (>= 3.17.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -189,7 +190,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rake-compiler (1.0.7)
       rake
     rb-fsevent (0.10.3)
@@ -252,7 +253,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_record_upsert!
-  appraisal (~> 2.2.0)
+  appraisal (~> 2.4.1)
   approvals (~> 0.0.24)
   arel_toolkit!
   bundler (~> 2.0)
@@ -272,7 +273,7 @@ DEPENDENCIES
   pry-nav
   pry-rescue
   pry-stack_explorer
-  rake (~> 10.0)
+  rake (~> 13.0)
   rake-compiler (~> 1.0)
   rspec (~> 3.8)
   rspec-rails (~> 3.8.0)
@@ -282,4 +283,4 @@ DEPENDENCIES
   stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.0.2
+   2.2.23

data/gemfiles/default.gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.2)
-      activerecord (~> 5.2.0)
-      arel (~> 9.0.0)
+    arel_toolkit (0.4.6)
+      activerecord (>= 5.0.0, < 6.0.4)
       pg (~> 1.1.4)
-      pg_query (~> 1.1.0)
+      pg_query (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -24,7 +23,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
-    appraisal (2.2.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
@@ -56,6 +55,7 @@ GEM
       rainbow (>= 2.2.1)
       rake (>= 10.0)
       retriable (~> 3.0)
+    google-protobuf (3.17.3)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -105,7 +105,8 @@ GEM
     parser (2.6.3.0)
       ast (~> 2.4.0)
     pg (1.1.4)
-    pg_query (1.1.1)
+    pg_query (2.1.0)
+      google-protobuf (>= 3.17.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -125,7 +126,7 @@ GEM
       pry (>= 0.9.11)
     public_suffix (4.0.1)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rake-compiler (1.0.7)
       rake
     rb-fsevent (0.10.3)
@@ -179,7 +180,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (~> 2.2.0)
+  appraisal (~> 2.4.1)
   approvals (~> 0.0.24)
   arel_toolkit!
   bundler (~> 2.0)
@@ -197,7 +198,7 @@ DEPENDENCIES
   pry-nav
   pry-rescue
   pry-stack_explorer
-  rake (~> 10.0)
+  rake (~> 13.0)
   rake-compiler (~> 1.0)
   rspec (~> 3.8)
   rubocop (= 0.71.0)
@@ -206,4 +207,4 @@ DEPENDENCIES
   stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.0.2
+   2.2.23