table_saw 2.7.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7ba43df3b9906b32dc2478f41c974ee5cca5036d5ec7f95fa0ba6f04ece6812
-  data.tar.gz: d4775622ad45fc31d5a658d095807e925e4b0570a6a01eeb302546c5b5669540
+  metadata.gz: 2523b019080dccb116fed85c38ecb0a629cd6f8630abd65a1a30e2214c6a71b3
+  data.tar.gz: 03e53e17ef16f72e976772bc027ca4698ba8eaa7bf4498a2fae5ab7e7dfd3f7d
 SHA512:
-  metadata.gz: 5833756a4f1746c2b54a9ddd27766f2ff3fe651455e2dcb8112938e2c0b06984a6c0c3b1d5990b1a8acfabe3e65cb2ef85807dbc2f6156f254e7c3cf794c0a17
-  data.tar.gz: c620092fcdf65362c007c38ea4bbb3e66ed016d6a29a24d11e62e0f6d23fd5e70e2aa92c9c82b5b3cf7de16a6cf00e3c8574906d4a90630ad13b3483826e15a4
+  metadata.gz: ab502f4b52e5e5214cca044d4ca450b9c885e63595423161e4ad130f85da6a5eb28fca008c77e49d70b675448ebe54a63bf6dfba465db6f47572b5d9b7fddbf3
+  data.tar.gz: 63a25f77f34251c801ba0f21aa5649988e763c1e8516dc4c1d3fc7976c2bd97c5bbc50d4fe6085b24032780ea7c93203d27c856c1304d681f6d2065a9a60f2f3

data/.github/workflows/ruby.yml

@@ -7,9 +7,21 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        ruby:
+          - '2.7.2'
+          - '3.0.0'
+        activerecord:
+          - '6.0.0'
+          - '6.1.0'
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/activerecord_${{ matrix.activerecord }}.gemfile
+
     services:
       postgres:
-        image: postgres:12.2
+        image: postgres:12.4
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -22,30 +34,18 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Ruby 2.6
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - uses: actions/cache@v1
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
         with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
       - name: Install PostgreSQL client
         run: |
           sudo apt-get -yqq install libpq-dev
 
-      - name: Configure Bundler
-        run: |
-          gem install bundler -v 2.1.4 --no-document
-          bundle config path 'vendor/bundle'
-          bundle install --jobs 4 --retry 3
-
       - name: Run tests with RSpec
-        uses: paambaati/codeclimate-action@v2.5.4
+        uses: paambaati/codeclimate-action@v2.7.5
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         with:

data/.rubocop.yml

@@ -1,7 +1,10 @@
 require: rubocop-rspec
 
 AllCops:
+  NewCops: enable
   TargetRubyVersion: 2.6
+  Exclude:
+    - gemfiles/*
 
 Layout/LineLength:
   Max: 120

data/.ruby-version

@@ -1 +1 @@
-2.6.6
+3.0.0

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.0.2

data/Appraisals

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+appraise 'activerecord-6.0.0' do
+  gem 'activerecord', '~> 6.0', '< 6.1'
+end
+
+appraise 'activerecord-6.1.0' do
+  gem 'activerecord', '~> 6.1', '< 6.2'
+end

data/Gemfile

@@ -4,3 +4,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in table_saw.gemspec
 gemspec
+
+gem 'appraisal'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    table_saw (2.7.0)
+    table_saw (2.10.0)
       activerecord (>= 5.2)
       pg
       thor
@@ -9,132 +9,147 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.4.1)
+      actionview (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.1.4.1)
+      activesupport (= 6.1.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activesupport (6.0.2.2)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    ast (2.4.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    appraisal (2.4.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
     builder (3.2.4)
-    coderay (1.1.2)
-    combustion (1.1.2)
+    coderay (1.1.3)
+    combustion (1.3.1)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    database_cleaner (1.7.0)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    erubi (1.9.0)
-    i18n (1.8.2)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    erubi (1.10.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    json (2.2.0)
-    loofah (2.4.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
+    method_source (1.0.0)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
     pg (1.2.3)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.2.2)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
     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.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.14.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-rspec (1.33.0)
-      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.1)
-    scenic (1.5.2)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-rspec (2.3.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    scenic (1.5.4)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    simplecov (0.16.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal
   bundler (~> 2.0)
-  combustion (~> 1.1)
-  database_cleaner (~> 1.7)
+  combustion (~> 1.3)
+  database_cleaner (~> 2)
   pry
-  rake (~> 13.0)
+  rake (= 13.0.3)
   rspec (~> 3.0)
-  rubocop-rspec (~> 1.33)
+  rubocop-rspec (~> 2.3)
   scenic (~> 1.5)
   simplecov (~> 0.16)
   table_saw!
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

data/exe/table-saw

@@ -25,6 +25,8 @@ class CLI < Thor
   method_option :manifest, aliases: '-m', required: true
   method_option :output, aliases: '-o', default: 'output.dump'
   method_option :format, type: :hash, default: { 'type' => 'copy' }
+  method_option :variables, aliases: '-v', type: :hash, default: {},
+                            desc: 'This option takes a hash to override variables provided in the manifest'
   def dump
     TableSaw.configure(options.to_hash)
     records = TableSaw::DependencyGraph::Build.new(TableSaw::Manifest.instance).call

data/gemfiles/activerecord_6.0.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "~> 6.0", "< 6.1"
+
+gemspec path: "../"

data/gemfiles/activerecord_6.0.0.gemfile.lock

@@ -0,0 +1,159 @@
+PATH
+  remote: ..
+  specs:
+    table_saw (2.10.0)
+      activerecord (>= 5.2)
+      pg
+      thor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.0.4.1)
+      actionview (= 6.0.4.1)
+      activesupport (= 6.0.4.1)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.4.1)
+      activesupport (= 6.0.4.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.0.4.1)
+      activesupport (= 6.0.4.1)
+    activerecord (6.0.4.1)
+      activemodel (= 6.0.4.1)
+      activesupport (= 6.0.4.1)
+    activesupport (6.0.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    appraisal (2.3.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    coderay (1.1.3)
+    combustion (1.3.1)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.1.9)
+    crass (1.0.6)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    erubi (1.10.0)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    loofah (2.12.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    pg (1.2.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.2)
+      loofah (~> 2.3)
+    railties (6.0.4.1)
+      actionpack (= 6.0.4.1)
+      activesupport (= 6.0.4.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    rubocop (1.14.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.5.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-rspec (2.3.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    scenic (1.5.4)
+      activerecord (>= 4.0.0)
+      railties (>= 4.0.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  x86_64-darwin-19
+  x86_64-darwin-20
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 6.0, < 6.1)
+  appraisal
+  bundler (~> 2.0)
+  combustion (~> 1.3)
+  database_cleaner (~> 2)
+  pry
+  rake (= 13.0.3)
+  rspec (~> 3.0)
+  rubocop-rspec (~> 2.3)
+  scenic (~> 1.5)
+  simplecov (~> 0.16)
+  table_saw!
+
+BUNDLED WITH
+   2.2.22

data/gemfiles/activerecord_6.1.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "~> 6.1", "< 6.2"
+
+gemspec path: "../"

data/gemfiles/activerecord_6.1.0.gemfile.lock

@@ -0,0 +1,158 @@
+PATH
+  remote: ..
+  specs:
+    table_saw (2.10.0)
+      activerecord (>= 5.2)
+      pg
+      thor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.1.4.1)
+      actionview (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.1.4.1)
+      activesupport (= 6.1.4.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    appraisal (2.3.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    coderay (1.1.3)
+    combustion (1.3.1)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.1.9)
+    crass (1.0.6)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    erubi (1.10.0)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    loofah (2.12.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    pg (1.2.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.2)
+      loofah (~> 2.3)
+    railties (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      method_source
+      rake (>= 0.13)
+      thor (~> 1.0)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    rubocop (1.14.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.5.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-rspec (2.3.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    scenic (1.5.4)
+      activerecord (>= 4.0.0)
+      railties (>= 4.0.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  x86_64-darwin-19
+  x86_64-darwin-20
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 6.1, < 6.2)
+  appraisal
+  bundler (~> 2.0)
+  combustion (~> 1.3)
+  database_cleaner (~> 2)
+  pry
+  rake (= 13.0.3)
+  rspec (~> 3.0)
+  rubocop-rspec (~> 2.3)
+  scenic (~> 1.5)
+  simplecov (~> 0.16)
+  table_saw!
+
+BUNDLED WITH
+   2.2.22

data/lib/table_saw/configuration.rb

@@ -2,6 +2,7 @@
 
 module TableSaw
   class Configuration
+    attr_writer :variables
     attr_accessor :dbname, :host, :port, :user, :password, :manifest, :output, :format
 
     def connection
@@ -10,12 +11,16 @@ module TableSaw
 
     def url=(value)
       URI.parse(value).tap do |uri|
-        self.dbname = uri.path[1..-1]
+        self.dbname = uri.path[1..]
         self.host = uri.host
         self.port = uri.port
         self.user = uri.user
         self.password = uri.password
       end
     end
+
+    def variables
+      @variables || {}
+    end
   end
 end

data/lib/table_saw/create_dump_file.rb

@@ -49,7 +49,7 @@ module TableSaw
 
         formatter = FORMATS.fetch(format.fetch('type', 'copy'), TableSaw::Formats::Copy).new(name, options: format)
 
-        Array.wrap(formatter.header).each { |line| write_to_file(line) }
+        Array(formatter.header).each { |line| write_to_file(line) }
 
         TableSaw::Connection.with do |conn|
           conn.copy_data "COPY (#{table.copy_statement}) TO STDOUT", formatter.coder do
@@ -59,7 +59,7 @@ module TableSaw
           end
         end
 
-        Array.wrap(formatter.footer).each { |line| write_to_file(line) }
+        Array(formatter.footer).each { |line| write_to_file(line) }
       end
 
       write_to_file 'COMMIT;'

data/lib/table_saw/dependency_graph/add_directive.rb

@@ -6,7 +6,7 @@ module TableSaw
       attr_reader :table_name, :partial, :has_many
       attr_accessor :ids
 
-      def initialize(table_name, ids: [], partial: true, has_many: [])
+      def initialize(table_name, ids: [], partial: true, has_many: {})
         @table_name = table_name
         @ids = ids
         @partial = partial

data/lib/table_saw/dependency_graph/build_has_many_query.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module TableSaw
+  module DependencyGraph
+    class BuildHasManyQuery
+      QUERY = <<~SQL.squish
+        select %{primary_key} from %{table} where %{clause} and %{polymorphic}
+      SQL
+
+      attr_reader :manifest, :directive, :foreign_key
+
+      def initialize(manifest, directive, foreign_key)
+        @manifest = manifest
+        @directive = directive
+        @foreign_key = foreign_key
+      end
+
+      def call
+        build_base_query
+          .then { |query| append_scope(query) }
+          .then { |query| append_limit(query) }
+      end
+
+      private
+
+      # rubocop:disable Metrics/AbcSize
+      def build_base_query
+        format(QUERY, primary_key: TableSaw.schema_cache.primary_keys(foreign_key.from_table),
+                      table: foreign_key.from_table,
+                      clause: TableSaw::Queries::SerializeSqlInClause.new(foreign_key.from_table,
+                                                                          foreign_key.column.primary_key,
+                                                                          directive.ids).call,
+                      polymorphic: foreign_key.type_condition)
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      def append_scope(query)
+        return query unless has_many&.scope
+
+        [query, has_many.scope].join(' and ')
+      end
+
+      def append_limit(query)
+        return query unless has_many&.limit
+
+        [query, "limit #{has_many.limit}"].join(' ')
+      end
+
+      def has_many
+        directive.has_many[foreign_key.from_table] ||
+          manifest.has_many.fetch(directive.table_name, {})[foreign_key.from_table]
+      end
+    end
+  end
+end

data/lib/table_saw/dependency_graph/has_many_directives.rb

@@ -3,10 +3,6 @@
 module TableSaw
   module DependencyGraph
     class HasManyDirectives
-      QUERY = <<~SQL
-        select %{primary_key} from %{table} where %{clause} and %{polymorphic}
-      SQL
-
       attr_reader :manifest, :directive
 
       def initialize(manifest, directive)
@@ -34,25 +30,20 @@ module TableSaw
       def valid_associations
         associations.select do |fk|
           next false if directive.partial? && TableSaw.schema_cache.primary_keys(fk.from_table).nil?
-          next true if directive.has_many.include?(fk.from_table)
+          next true if directive.has_many.key?(fk.from_table)
 
-          manifest.has_many.fetch(directive.table_name, []).include?(fk.from_table)
+          manifest.has_many.fetch(directive.table_name, {}).key?(fk.from_table)
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def query_result(foreign_key)
         return [] unless directive.selectable?
 
         TableSaw::Connection.exec(
-          format(QUERY, primary_key: TableSaw.schema_cache.primary_keys(foreign_key.from_table),
-                        table: foreign_key.from_table,
-                        clause: TableSaw::Queries::SerializeSqlInClause.new(foreign_key.from_table,
-                                                                            foreign_key.column.primary_key,
-                                                                            directive.ids).call,
-                        polymorphic: foreign_key.type_condition)
+          TableSaw::DependencyGraph::BuildHasManyQuery.new(manifest, directive, foreign_key).call
         )
       end
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/table_saw/dependency_graph.rb

@@ -3,5 +3,6 @@
 require 'table_saw/dependency_graph/add_directive'
 require 'table_saw/dependency_graph/belongs_to_directives'
 require 'table_saw/dependency_graph/build'
+require 'table_saw/dependency_graph/build_has_many_query'
 require 'table_saw/dependency_graph/dump_table'
 require 'table_saw/dependency_graph/has_many_directives'

data/lib/table_saw/foreign_key.rb

@@ -36,7 +36,7 @@ module TableSaw
 
     attr_reader :name, :from_table, :from_column, :to_table, :to_column
 
-    def initialize(name: nil, from_table:, from_column:, to_table:, to_column:)
+    def initialize(from_table:, from_column:, to_table:, to_column:, name: nil)
       @name = name
       @from_table = from_table
       @from_column = from_column

data/lib/table_saw/manifest.rb

@@ -5,6 +5,35 @@ require 'table_saw/associations'
 
 module TableSaw
   class Manifest
+    class HasManyEntry
+      def self.build(config)
+        config.each_with_object({}) do |(table, options), memo|
+          case table
+          when String
+            memo[table] = new(table, options)
+          when Hash
+            table, options = table.first
+            memo[table] = new(table, options)
+          end
+        end
+      end
+
+      attr_reader :table, :options
+
+      def initialize(table, options)
+        @table = table
+        @options = options || {}
+      end
+
+      def scope
+        options['scope']
+      end
+
+      def limit
+        options['limit']
+      end
+    end
+
     class Table
       attr_reader :variables, :config
 
@@ -30,7 +59,7 @@ module TableSaw
       end
 
       def has_many
-        config.fetch('has_many', [])
+        config.fetch('has_many', {}).then { |config| HasManyEntry.build(config) }
       end
     end
 
@@ -47,7 +76,8 @@ module TableSaw
     end
 
     def variables
-      config.fetch('variables', {})
+      vars = config.fetch('variables', {})
+      vars.merge(TableSaw.configuration.variables.slice(*vars.keys))
     end
 
     def tables
@@ -57,7 +87,9 @@ module TableSaw
     end
 
     def has_many
-      @has_many ||= config.fetch('has_many', {})
+      @has_many ||= config.fetch('has_many', {}).transform_values do |value|
+        HasManyEntry.build(value)
+      end
     end
 
     def foreign_keys

data/lib/table_saw/queries/prepared_insert_statement.rb

@@ -23,7 +23,7 @@ module TableSaw
       end
 
       def sql
-        [prepare_statement, conflict_statement].compact.join(' ') + ';'
+        "#{[prepare_statement, conflict_statement].compact.join(' ')};"
       end
 
       def column_types

data/lib/table_saw/queries/serialize_sql_in_clause.rb

@@ -23,7 +23,7 @@ module TableSaw
 
       def serialized_values
         values.map do |value|
-          connection.quote(connection.type_cast_from_column(db_column, value))
+          connection.quote_default_expression(value, db_column)
         end
       end
 

data/lib/table_saw/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TableSaw
-  VERSION = '2.7.0'
+  VERSION = '2.10.0'
 end

data/table_saw.gemspec

@@ -23,17 +23,19 @@ Gem::Specification.new do |spec|
   spec.executables   = ['table-saw']
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.6'
+
   spec.add_dependency 'activerecord', '>= 5.2'
   spec.add_dependency 'pg'
   spec.add_dependency 'thor'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'combustion', '~> 1.1'
-  spec.add_development_dependency 'database_cleaner', '~> 1.7'
+  spec.add_development_dependency 'combustion', '~> 1.3'
+  spec.add_development_dependency 'database_cleaner', '~> 2'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rake', '13.0.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.33'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.3'
   spec.add_development_dependency 'scenic', '~> 1.5'
   spec.add_development_dependency 'simplecov', '~> 0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_saw
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Hamed Asghari
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: scenic
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
-description: 
+description:
 email:
 - hasghari@gmail.com
 executables:
@@ -192,6 +192,8 @@ files:
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".tool-versions"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -201,6 +203,10 @@ files:
 - bin/console
 - bin/setup
 - exe/table-saw
+- gemfiles/activerecord_6.0.0.gemfile
+- gemfiles/activerecord_6.0.0.gemfile.lock
+- gemfiles/activerecord_6.1.0.gemfile
+- gemfiles/activerecord_6.1.0.gemfile.lock
 - lib/table_saw.rb
 - lib/table_saw/associations.rb
 - lib/table_saw/configuration.rb
@@ -210,6 +216,7 @@ files:
 - lib/table_saw/dependency_graph/add_directive.rb
 - lib/table_saw/dependency_graph/belongs_to_directives.rb
 - lib/table_saw/dependency_graph/build.rb
+- lib/table_saw/dependency_graph/build_has_many_query.rb
 - lib/table_saw/dependency_graph/dump_table.rb
 - lib/table_saw/dependency_graph/has_many_directives.rb
 - lib/table_saw/foreign_key.rb
@@ -232,7 +239,7 @@ homepage: https://github.com/hasghari/table_saw
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -240,15 +247,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Create a postgres dump file from a subset of tables
 test_files: []