Adds GH Actions and fixes tests (Closes #1)

.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+on:
+   push:
+     branches:
+       - master
+   pull_request:
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ruby: 2.2
+          - ruby: 2.3
+          - ruby: 2.6
+          - ruby: 2.7
+          - ruby: 3
+    runs-on: ubuntu-latest
+    name: RSpec suite with Ruby ${{ matrix.ruby }}
+    env:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      FORCE_COLOR: 1
+      EARTHLY_RUBY_VERSION: ${{ matrix.ruby }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Put back the git branch into git (Earthly uses it for tagging)
+      run: |
+        branch=""
+        if [ -n "$GITHUB_HEAD_REF" ]; then
+          branch="$GITHUB_HEAD_REF"
+        else
+          branch="${GITHUB_REF##*/}"
+        fi
+        git checkout -b "$branch" || true
+    - name: Docker Login
+      run: docker login --username "$DOCKERHUB_USERNAME" --password "$DOCKERHUB_TOKEN"
+    - name: Download latest earthly
+      run: "sudo /bin/sh -c 'wget https://github.com/earthly/earthly/releases/download/v0.6.30/earthly-linux-amd64 -O /usr/local/bin/earthly && chmod +x /usr/local/bin/earthly'"
+    - name: Earthly version
+      run: earthly --version
+    - name: Run build
+      run: earthly --ci --allow-privileged +rspec --EARTHLY_RUBY_VERSION=$EARTHLY_RUBY_VERSION

Earthfile

@@ -1,10 +1,15 @@
-FROM ruby:2.7-slim
-WORKDIR /adapter
+# This allows one to change the running Ruby version with:
+#
+# `earthly --build-arg EARTHLY_RUBY_VERSION=3 --allow-privileged +rspec`
+ARG EARTHLY_RUBY_VERSION=2.7
+
+FROM ruby:$EARTHLY_RUBY_VERSION
+WORKDIR /gem
 
 deps:
-    COPY Gemfile* /adapter/
-    COPY *.gemspec /adapter
-    COPY lib/database_cleaner/nobrainer/version.rb /adapter/lib/database_cleaner/nobrainer/
+    COPY Gemfile /gem
+    COPY *.gemspec /gem
+    COPY lib/database_cleaner/nobrainer/version.rb /gem/lib/database_cleaner/nobrainer/
 
     RUN apt update \
         && apt install --yes \
@@ -14,6 +19,8 @@ deps:
         && bundle install --jobs $(nproc)
 
     SAVE ARTIFACT /usr/local/bundle bundler
+    SAVE ARTIFACT /gem/Gemfile Gemfile
+    SAVE ARTIFACT /gem/Gemfile.lock Gemfile.lock
 
 dev:
     RUN apt update \
@@ -22,57 +29,45 @@ dev:
                        git
 
     COPY +deps/bundler /usr/local/bundle
+    COPY +deps/Gemfile /gem/Gemfile
+    COPY +deps/Gemfile.lock /gem/Gemfile.lock
 
-    COPY *.gemspec /adapter
-    COPY LICENSE.txt /adapter
-    COPY README.md /adapter
-    COPY bin/ /adapter/bin/
-    COPY gemfiles/ /adapter/gemfiles/
-    COPY .rspec /adapter
-    COPY Appraisals /adapter
-    COPY Rakefile /adapter
+    COPY *.gemspec /gem
+    COPY LICENSE.txt /gem
+    COPY README.md /gem
+    COPY bin/ /gem/bin/
+    COPY .rspec /gem
+    COPY Appraisals /gem
+    COPY Rakefile /gem
 
-    COPY Gemfile* /adapter
-    COPY lib/database_cleaner/nobrainer/version.rb /adapter/lib/database_cleaner/nobrainer/
+    COPY Gemfile* /gem
+    COPY lib/database_cleaner/nobrainer/version.rb /gem/lib/database_cleaner/nobrainer/
 
     RUN bundle install --jobs $(nproc)
 
-    COPY lib/ /adapter/lib/
-    COPY spec/ /adapter/spec/
+    COPY lib/ /gem/lib/
+    COPY spec/ /gem/spec/
 
     ENTRYPOINT ["bundle", "exec"]
     CMD ["rake"]
 
-    SAVE IMAGE zedtux/database_cleaner-nobrainer:latest
-
 rspec:
-    FROM docker:19.03.13-dind
-
-    RUN apk --update --no-cache add docker-compose
-
-    COPY docker-compose.yml ./
-
-    RUN pwd
-
-    WITH DOCKER
-        DOCKER PULL rethinkdb:2.4-buster-slim
+    FROM earthly/dind:alpine
 
-        DOCKER LOAD +dev zedtux/database_cleaner-nobrainer:latest
+    COPY docker-compose*.yml ./
 
-        RUN pwd \
-            && docker-compose up -d \
-            && docker run --network=host \
-                          zedtux/database_cleaner-nobrainer:latest \
-            && docker-compose down
+    WITH DOCKER --load zedtux/database_cleaner-nobrainer:latest=+dev \
+                --pull rethinkdb:2.4
+        RUN docker-compose -f docker-compose-earthly.yml run --rm gem
     END
 
 publish:
     FROM +dev
 
     ARG RUBYGEMS_ORG_API_KEY
 
-    RUN rm -f /adapter/.rspec \
-        && rm -rf /adapter/spec \
+    RUN rm -f /gem/.rspec \
+        && rm -rf /gem/spec \
         && mkdir /root/.gem \
         && echo "---" > /root/.gem/credentials \
         && echo ":rubygems_api_key: $RUBYGEMS_ORG_API_KEY" >> /root/.gem/credentials \

database_cleaner-nobrainer.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'database_cleaner-core', '~>2.0.0.beta2'
-  spec.add_dependency 'nobrainer', '~> 0.30'
+  spec.add_dependency 'nobrainer'
 
   spec.add_development_dependency 'appraisal', '~> 2'
   spec.add_development_dependency 'bundler', '~> 2'

docker-compose-earthly.yml

@@ -0,0 +1,19 @@
+version: '3'
+
+services:
+  rethinkdb:
+    extends:
+      file: ./docker-compose.yml
+      service: rethinkdb
+
+  gem:
+    build: .
+    image: zedtux/database_cleaner-nobrainer:latest
+    depends_on:
+      - rethinkdb
+    environment:
+      - RUBY_ENV=test
+      # The nobrainer Rspec config expects the DB_HOST variable
+      # (see spec/spec_helper.rb), that's why we aren't setting the RDB_HOST env
+      # variable here.
+      - DB_HOST=rethinkdb

docker-compose.yml

@@ -2,17 +2,21 @@ version: '3'
 
 services:
   rethinkdb:
-    image: rethinkdb:2.4-buster-slim
-    ports:
-      - 28015:28015
-      - 8080:8080
-  adapter:
+    image: rethinkdb:2.4
+
+  gem:
     build: .
     image: zedtux/database_cleaner-nobrainer:latest
     depends_on:
       - rethinkdb
     environment:
+      # The nobrainer Rspec config expects the DB_HOST variable
+      # (see spec/spec_helper.rb), that's why we aren't setting the RDB_HOST env
+      # variable here.
+      - DB_HOST=rethinkdb
+      # Uncomment this line when you need to see NoBrainer logs while running
+      # the test suite.
+      # - DEBUG=1
       - RUBY_ENV=test
-      - RETHINKDB_HOST=rethinkdb
     volumes:
-      - .:/adapter
+      - .:/gem

lib/database_cleaner/nobrainer/deletion.rb

@@ -6,12 +6,15 @@ module DatabaseCleaner
   module Nobrainer
     class Deletion < Strategy
       def initialize(args = {})
+        raise ArgumentError if (args.keys - %i[only except]).size.positive?
+
         @only = args[:only] || []
         @except = args[:except] || []
       end
 
       def clean
-        collections_to_delete.each do |table_name|
+        res = collections_to_delete
+        res.each do |table_name|
           NoBrainer.run do |r|
             if db == :default
               r.table(table_name).delete

spec/database_cleaner/nobrainer/deletion_spec.rb

@@ -44,7 +44,13 @@
   describe '#db=' do
     def with_other_database(name)
       initial_db = NoBrainer.current_db.split('_')
+
+      database_host = ENV['DB_HOST'] || 'localhost'
+
       NoBrainer.configure do |config|
+        config.reset!
+        config.rethinkdb_url = "rethinkdb://#{database_host}/#{name}_test"
+
         # app_name is the name of your application in lowercase.
         # When using Rails, the application name is automatically inferred.
         config.app_name = name
@@ -53,11 +59,16 @@ def with_other_database(name)
         # variables RUBY_ENV, RAILS_ENV, RACK_ENV, or :production.
         config.environment = 'test'
       end
+
       ret = yield
+
       # Calls once again the `NoBrainer.configure` with the previous `app_name`
       # which will force Nobrainer to manage to re-connect to the server with
       # the previous database name.
       NoBrainer.configure do |config|
+        config.reset!
+        config.rethinkdb_url = "rethinkdb://#{database_host}/#{initial_db.first}_#{initial_db.last}"
+
         # app_name is the name of your application in lowercase.
         # When using Rails, the application name is automatically inferred.
         config.app_name = initial_db.first
@@ -66,6 +77,7 @@ def with_other_database(name)
         # variables RUBY_ENV, RAILS_ENV, RACK_ENV, or :production.
         config.environment = initial_db.last
       end
+
       ret
     end
 
@@ -88,4 +100,3 @@ def with_other_database(name)
     end
   end
 end
-

spec/spec_helper.rb

@@ -17,6 +17,18 @@
 end
 
 require 'database_cleaner-nobrainer'
+require 'nobrainer'
+
+database_host = ENV['DB_HOST'] || 'localhost'
+db_name       = ENV['DB_NAME'] || 'nobrainer_test'
+
+NoBrainer.configure do |config|
+  config.rethinkdb_url = "rethinkdb://#{database_host}/#{db_name}"
+  config.environment = :test
+  config.logger = Logger.new($stderr).tap do |l|
+    l.level = ENV['DEBUG'] ? Logger::DEBUG : Logger::WARN
+  end
+end
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure