fx 0.1.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 07cc76f1310a1982698708c2022bbfae7853263a
-  data.tar.gz: a598bd9efd102a6d8b2789379c46f865a4319f86
+SHA256:
+  metadata.gz: a1b25361cfa43280f81e493a4eb518864862dad321878048282ce8f9daad6e1a
+  data.tar.gz: ce20ce6b1bb9031b420e78b83ecf23416d50ca44668cf15e0951142e32a0c75e
 SHA512:
-  metadata.gz: b9b0b8012f86bb96300811e6e7f3eaf0ae03f437da774bb8751759cd7c3546556d5bd3ed195410e97db0a808f55e118c88deca1887d570bd6752308aabd254b0
-  data.tar.gz: 022f693c2da994f7204e6320b4bf73b606df63d8d2c5a9f28bce6cb596d035ce949f2c39a3b6111aa6f926079a5b1b67ed73cd989b7ec1567aa5b3d2113a0e74
+  metadata.gz: 2e8d5db85fb283586a9d713cdffb6fc50604e85498eeb2c16ac8f63708fabe01a29e03b4157b32f84fe061d4bedb996f4e44db90f5d53d2b655c730352c7c101
+  data.tar.gz: 70e6670c67e267f383fa7ed3001350fa3c6548d4bf6183625ee10bf1a5c53cfa5c87cbd9bf231b196524f206d96bf638ba16f6b9020f20803f4ae85685fbf44a

data/.github/scripts/check-eol

@@ -0,0 +1,95 @@
+#!/bin/sh
+#
+# Check if minimum supported dependency versions are at or approaching EOL.
+# Uses the endoflife.date API. Outputs GitHub Actions annotations and opens
+# an issue when action is needed.
+#
+# Environment:
+#   WARN_DAYS - days before EOL to start warning (default: 90)
+#   GH_TOKEN  - GitHub token for creating issues (optional)
+
+set -e
+
+WARN_DAYS="${WARN_DAYS:-90}"
+
+ruby_min=$(ruby -e "
+  spec = Gem::Specification.load('fx.gemspec')
+  puts spec.required_ruby_version.requirements
+    .select { |op, _| op == '>=' }
+    .map { |_, v| v.segments[0..1].join('.') }
+    .first
+")
+
+rails_min=$(ruby -e "
+  spec = Gem::Specification.load('fx.gemspec')
+  dep = spec.dependencies.find { |d| d.name == 'activerecord' }
+  puts dep.requirement.requirements
+    .select { |op, _| op == '>=' }
+    .map { |_, v| v.segments[0..1].join('.') }
+    .first
+")
+
+postgres_min=$(ruby -ryaml -e "
+  ci = YAML.load_file('.github/workflows/ci.yml')
+  versions = ci.dig('jobs', 'tests', 'strategy', 'matrix', 'postgres')
+  puts versions.map(&:to_i).min
+")
+
+echo "Ruby minimum: $ruby_min"
+echo "Rails minimum: $rails_min"
+echo "PostgreSQL minimum: $postgres_min"
+
+alerts=""
+
+check_eol() {
+  product="$1"
+  version="$2"
+
+  eol_date=$(curl -sf "https://endoflife.date/api/${product}/${version}.json" \
+    | ruby -rjson -e '
+      data = JSON.parse($stdin.read)
+      eol = data["eol"]
+      if eol == true
+        puts "1970-01-01"
+      elsif eol == false
+        exit
+      else
+        puts eol
+      end
+    ') || return 0
+
+  if [ -z "$eol_date" ]; then
+    echo "$product $version: no EOL date set (still supported)"
+    return
+  fi
+
+  today=$(date -u +%Y-%m-%d)
+  warn_date=$(date -u -d "$today + ${WARN_DAYS} days" +%Y-%m-%d 2>/dev/null \
+    || date -u -v+"${WARN_DAYS}"d +%Y-%m-%d)
+
+  if [ "$eol_date" \< "$today" ] || [ "$eol_date" = "$today" ]; then
+    echo "::error::$product $version reached EOL on $eol_date"
+    alerts="$alerts- **$product $version** reached EOL on $eol_date\n"
+  elif [ "$eol_date" \< "$warn_date" ]; then
+    echo "::warning::$product $version reaches EOL on $eol_date (within ${WARN_DAYS} days)"
+    alerts="$alerts- **$product $version** reaches EOL on $eol_date (within ${WARN_DAYS} days)\n"
+  else
+    echo "$product $version: EOL on $eol_date (no action needed)"
+  fi
+}
+
+check_eol "ruby" "$ruby_min"
+check_eol "rails" "$rails_min"
+check_eol "postgresql" "$postgres_min"
+
+if [ -n "$alerts" ]; then
+  title="Dependency EOL alert"
+  body=$(printf "The following minimum supported versions are at or approaching end-of-life:\n\n%b\n\nConsider bumping the minimum version in \`fx.gemspec\` and updating the CI matrix." "$alerts")
+
+  existing=$(gh issue list --state open --search "$title" --json number --jq '.[0].number' 2>/dev/null || true)
+  if [ -n "$existing" ]; then
+    echo "Issue #$existing already open, skipping creation"
+  else
+    gh issue create --title "$title" --body "$body"
+  fi
+fi

data/.github/workflows/ci.yml

@@ -0,0 +1,61 @@
+name: CI
+
+on:
+  push:
+    branches: master
+  pull_request:
+    branches: "*"
+
+jobs:
+  tests:
+    name: "ruby ${{ matrix.ruby }} / rails ${{ matrix.rails }} / postgres ${{ matrix.postgres }}"
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["3.3", "4.0"]
+        rails: ["7.2", "8.1"]
+        postgres: ["14", "18"]
+        include:
+          - ruby: "4.0"
+            rails: "main"
+            postgres: "18"
+            allow-failure: true
+
+    continue-on-error: ${{ matrix.allow-failure || false }}
+
+    services:
+      postgres:
+        image: postgres:${{ matrix.postgres }}
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_HOST_AUTH_METHOD: trust
+        ports:
+          - 5432:5432
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    env:
+      POSTGRES_USER: postgres
+      RAILS_VERSION: ${{ matrix.rails }}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          rubygems: latest
+
+      - name: Setup environment
+        run: bin/setup
+
+      - name: Run tests
+        run: bundle exec rake

data/.github/workflows/eol-check.yml

@@ -0,0 +1,30 @@
+name: EOL Check
+
+on:
+  schedule:
+    - cron: "0 9 1 * *" # 1st of each month at 09:00 UTC
+  workflow_dispatch:
+    inputs:
+      warn_days:
+        description: "Days before EOL to start warning"
+        required: false
+        default: "90"
+
+permissions:
+  issues: write
+
+env:
+  WARN_DAYS: ${{ inputs.warn_days || '90' }}
+
+jobs:
+  check:
+    name: Check dependency EOL status
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Check EOL status
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: .github/scripts/check-eol

data/.rspec

@@ -1,2 +1,2 @@
---color
+--no-color
 --require spec_helper

data/.standard.yml

@@ -0,0 +1,3 @@
+ignore:
+  - 'spec/dummy/db/schema.rb'
+  - '**/tmp/*'

data/CHANGELOG.md

@@ -0,0 +1,186 @@
+# Changelog
+
+The noteworthy changes for each version are included here. For a complete
+changelog, see the [commits] for each version via the version links.
+
+[commits]: https://github.com/teoljungberg/fx/commits/master
+
+## [0.11.0]
+
+[0.11.0]: https://github.com/teoljungberg/fx/compare/v0.10.2...v0.11.0
+
+- Drop EOL Ruby 3.2 (#212)
+- Add `Function#signature` for PostgreSQL function identity (#207)
+- Add PostgreSQL versioning policy, officially supporting PostgreSQL 14-18 (#194)
+- Refactor Statements module to use explicit keyword arguments instead of `**options` hash (#186)
+- Internal refactorings / improvements
+  - Add scheduled EOL check for Ruby, Rails, and PostgreSQL (#205)
+  - Add GitHub release creation to release task (#209)
+  - Add PostgreSQL 18 to CI test matrix (#194)
+  - Default `support_drop_function_without_args` to `true` (#194)
+  - Document adapter subclass pattern for custom schema dump ordering (#211)
+  - Remove duplicate command recorder specs (#202)
+
+## [0.10.2]
+
+[0.10.2]: https://github.com/teoljungberg/fx/compare/v0.10.1...v0.10.2
+
+- Remove upper bound on Rails dependency (#198)
+- Internal refactorings / improvements
+  - Add Rails main to CI matrix
+
+## [0.10.1]
+
+[0.10.1]: https://github.com/teoljungberg/fx/compare/v0.10.0...v0.10.1
+
+- Fix spacing between functions and triggers in schema.rb (#195)
+- Remove `database_cleaner` dependency (#190)
+- Internal refactorings / improvements
+  - Improve schema dumper test coverage
+  - Use methods over instance variables (#192)
+  - Write out fully qualified path in definitions (#189)
+  - Improve test isolation with schema reset (#190)
+  - Rewrite shell command chains (#188)
+  - Inline `active_record_migration_class` (#187)
+  - Add Ruby 4.0 to CI matrix (#193)
+  - Minimize CI matrix to boundary versions (#196)
+
+## [0.10.0]
+
+[0.10.0]: https://github.com/teoljungberg/fx/compare/v0.9.0...v0.10.0
+
+- Scope functions and triggers to schema search path (#168)
+- Ensure multi-schema dumping in Rails 8.1.0 does not dump the same objects for
+  all schemas (#177)
+- Require Ruby >= 3.2 (#166)
+- Require Ruby >= 3.1 (#162)
+- New version support
+  - Add Rails 8.1 to the test matrix (#175)
+  - Add Ruby 3.4 to the test matrix (#161)
+- Removed version support
+  - Drop Rails 7.1 due to EOL (#176)
+  - Drop EOL Ruby versions (3.0) (#162)
+  - Drop EOL Rails versions (7.0) (#162)
+- Internal refactorings / improvements
+  - Extract validation methods in `Statements` module (#184)
+  - Refactor generators with helper classes and improvements (#183)
+  - Extract `QueryExecutor` to remove duplication (#182)
+  - Extract PostgreSQL version constants (#181)
+  - YARD documentation improvements (#179)
+  - Ensure fx has been loaded (#173)
+  - Replace ammeter (#172)
+  - Remove teardown phase (#171)
+
+## [0.9.0]
+
+[0.9.0]: https://github.com/teoljungberg/fx/compare/v0.8.0...v0.9.0
+
+- Drop EOL Rails versions (6.2)
+- Add Ruby 3.4.0 preview's to the test matrix (#152)
+- Add Rails 8.0.0 to the test matrix (#152)
+- Add Rails 7.2 to the test matrix (#150)
+- Fix deprecation warnings in Rails (#148)
+- Mark `Fx::CommandRecorder::Arguments` as private.
+- Add Ruby 3.3 to the test matrix (#144)
+- Internal refactorings:
+  - Move development dependencies to Gemfile (#145)
+  - Inline `Fx::CommandRecorder::Arguments`
+  - Inline `Fx::{CommandRecorder,SchemaDumper,Statements}::{Function,Trigger}`
+  - Move configuration methods to `Fx`
+- Add `Fx::Definition.{function,trigger}` (#119)
+- Add Rails 7.1 to the test matrix (#136)
+- Add Rubygems metadata to gemspec (#132)
+- Disable RSpec's monkey patching (#121)
+- Raise on warnings (#124)
+- Require Ruby >= 3.0 (#128)
+- Require Rails >= 6.1 (#127)
+
+## [0.8.0]
+
+[0.8.0]: https://github.com/teoljungberg/fx/compare/v0.7.0...v0.8.0
+
+- Replace Travis CI with GitHub Actions.
+- Bump minimum Ruby version to 2.7.
+   - Ruby 2.7 will be dropped in end of March 2023, so a release to drop it will
+     happen afterwards.
+- Bump minimum Rails version to 6.0.0
+   - Rails 6.0 will be dropped in June 2023, so a release to drop it will happen
+     afterwards
+- Adopt standard.rb
+- Contributing improvements
+- Test-suite improvements
+
+## [0.7.0]
+
+[0.7.0]: https://github.com/teoljungberg/fx/compare/v0.6.2...v0.7.0
+
+- Support Ruby 3 (#76)
+- Preserve backslashes when dumping the schema (#71)
+- Add a link to F(x) SqlServer Adapter in the README (#80)
+
+## [0.6.2]
+
+[0.6.2]: https://github.com/teoljungberg/fx/compare/v0.6.1...v0.6.2
+
+- Add support for Ruby 3
+
+## [0.6.1]
+
+[0.6.1]: https://github.com/teoljungberg/fx/compare/v0.6.0...v0.6.1
+
+- Fix: Support --no-migration generator flag (#62)
+
+## [0.6.0]
+
+[0.6.0]: https://github.com/teoljungberg/fx/compare/v0.5.0...v0.6.0
+
+- Support unique functions with parameters (#27)
+- Use db connection provided by Rails (#49)
+- Support `--no-migration` generator flag (#60)
+- Use current ActiveRecord version in migrations (#59)
+- Does not include aggregates when dumping schema (#50)
+- Dump functions in the beginning of the schema (#53)
+
+## [0.5.0]
+
+[0.5.0]: https://github.com/teoljungberg/fx/compare/v0.4.0...v0.5.0
+
+- Drop EOL Ruby versions.
+- Drop EOL Rails versions.
+
+## [0.4.0]
+
+[0.4.0]: https://github.com/teoljungberg/fx/compare/v0.3.1...v0.4.0
+
+- Add table_name to README (#15)
+- Reverse function/trigger order in README (#17)
+- Split up Trigger#definition test (#19)
+- Find definitions in engines (#18)
+
+## [0.3.1]
+
+[0.3.1]: https://github.com/teoljungberg/fx/compare/v0.3.0...v0.3.1
+
+- Strip shared leading whitespace from sql_definitions (#13)
+- Update documentation for `drop_function`
+- Document `Fx::Adapters::Postgres#initialize`
+- Fix test suite issues:
+   - Add unit test coverage for `Fx::Adapters::Triggers`
+   - Add unit test coverage for `Fx::Adapters::Functions`
+   - Add unit test coverage for `Fx::Trigger`
+   - Add unit test coverage for `Fx::Function`
+
+## [0.3.0]
+
+[0.3.0]: https://github.com/teoljungberg/fx/compare/v0.2.0...v0.3.0
+
+## [0.2.0]
+
+[0.2.0]: https://github.com/teoljungberg/fx/compare/v0.1.0...v0.2.0
+
+## [0.1.0]
+
+F(x) adds methods to `ActiveRecord::Migration` to create and manage database
+functions and triggers in Rails.
+
+[0.1.0]: https://github.com/teoljungberg/fx/compare/4ccf986643d9de82038977eff8c6b1a4a716d698...v0.1.0

data/CONTRIBUTING.md

@@ -1,15 +1,24 @@
 # Contributing
 
+We love contributions from everyone. By participating in this project, you
+agree to abide by our [code of conduct].
+
+[code of conduct]: https://thoughtbot.com/open-source-code-of-conduct
+
+## Contributing Code
+
 1. Fork the repository.
 2. Run `bin/setup`, which will install dependencies and create the dummy
    application database.
-3. Run `bin/appraisal rake` to verify that the tests pass against all
-   supported versions of Rails.
-4. Make your change with new passing tests, following the existing style.
+3. Run `rake` to verify that the tests pass against the version of Rails you are
+   running locally.
+4. Make your change with new passing tests, following existing style.
 5. Write a [good commit message], push your fork, and submit a pull request.
+6. CI will run the test suite on all configured versions of Ruby and Rails.
+   Address any failures.
 
 [good commit message]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 
-Others will give constructive feedback.  This is a time for discussion and
+Others will give constructive feedback. This is a time for discussion and
 improvements, and making the necessary changes will be required before we can
 merge the contribution.

data/Gemfile

@@ -1,4 +1,23 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+
+rails_version = ENV.fetch("RAILS_VERSION", "8.1")
 
-# Specify your gem's dependencies in fx.gemspec
 gemspec
+
+if rails_version == "main"
+  gem "activerecord", github: "rails/rails", branch: "main"
+  gem "railties", github: "rails/rails", branch: "main"
+else
+  gem "activerecord", "~> #{rails_version}.0"
+  gem "railties", "~> #{rails_version}.0"
+end
+
+gem "bundler", ">= 1.5"
+gem "pg"
+gem "pry"
+gem "rake"
+gem "redcarpet"
+gem "rspec", ">= 3.3"
+gem "standardrb"
+gem "yard"
+gem "warning"

data/LICENSE

@@ -0,0 +1,18 @@
+Copyright 2016 Teo Ljungberg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,5 +1,7 @@
 # F(x)
 
+[![Build Status](https://github.com/teoljungberg/fx/actions/workflows/ci.yml/badge.svg)](https://github.com/teoljungberg/fx/actions/workflows/ci.yml)
+
 F(x) adds methods to `ActiveRecord::Migration` to create and manage database
 functions and triggers in Rails.
 
@@ -18,33 +20,35 @@ F(x) ships with support for PostgreSQL. The adapter is configurable (see
 
 ## Great, how do I create a trigger and a function?
 
-You've got this great idea for a trigger you'd like to call
+You've got this great idea for a function you'd like to call
 `uppercase_users_name`. You can create the migration and the corresponding
 definition file with the following command:
 
 ```sh
-% rails generate fx:trigger uppercase_users_name
+% rails generate fx:function uppercase_users_name
+      create  db/functions/uppercase_users_name_v01.sql
+      create  db/migrate/[TIMESTAMP]_create_function_uppercase_users_name.rb
+```
+
+Edit the `db/functions/uppercase_users_name_v01.sql` file with the SQL statement
+that defines your function.
+
+Next, let's add a trigger called `uppercase_users_name` to call our new
+function each time we `INSERT` on the `users` table.
+
+```sh
+% rails generate fx:trigger uppercase_users_name table_name:users
       create  db/triggers/uppercase_users_name_v01.sql
       create  db/migrate/[TIMESTAMP]_create_trigger_uppercase_users_name.rb
 ```
 
-Edit the `db/triggers/uppercase_users_name_v01.sql` file with the SQL statement
-that defines your trigger. In our example, this might look something like this:
+In our example, this might look something like this:
 
 ```sql
 CREATE TRIGGER uppercase_users_name
     BEFORE INSERT ON users
     FOR EACH ROW
-    EXECUTE PROCEDURE uppercase_users_name();
-```
-
-As you see, we execute a function called `uppercase_users_name` before each
-`INSERT` on the `users` table, which is a function we don't have yet.
-
-```sh
-% rails generate fx:function uppercase_users_name
-      create  db/functions/uppercase_users_name_v01.sql
-      create  db/migrate/[TIMESTAMP]_create_function_uppercase_users_name.rb
+    EXECUTE FUNCTION uppercase_users_name();
 ```
 
 The generated migrations contains `create_function` and `create_trigger`
@@ -79,3 +83,84 @@ def change
   drop_function :uppercase_users_name, revert_to_version: 2
 end
 ```
+
+## What if I need to use a function as the default value of a column?
+
+You need to set F(x) to dump the functions in the beginning of db/schema.rb in a
+initializer:
+
+```ruby
+# config/initializers/fx.rb
+Fx.configure do |config|
+  config.dump_functions_at_beginning_of_schema = true
+end
+```
+
+And then you can use a lambda in your migration file:
+
+```ruby
+create_table :my_table do |t|
+  t.string :my_column, default: -> { "my_function()" }
+end
+```
+
+That's how you tell Rails to use the default as a literal SQL for the default
+column value instead of a plain string.
+
+## Customizing Schema Dump Order
+
+By default, functions and triggers are dumped to `schema.rb` in the order
+returned by the database. If you need a specific ordering (e.g., alphabetical
+for deterministic diffs), subclass the adapter and override `#functions` or
+`#triggers`. These methods are part of the adapter's public API and will remain
+stable across releases:
+
+```ruby
+# config/initializers/fx.rb
+class SortedPostgresAdapter < Fx::Adapters::Postgres
+  def functions
+    super.sort_by(&:name)
+  end
+
+  def triggers
+    super.sort_by(&:name)
+  end
+end
+
+Fx.configure do |config|
+  config.database = SortedPostgresAdapter.new
+end
+```
+
+The same approach works for more advanced ordering. For example, if your
+functions depend on each other and need to be dumped in dependency order, you
+could use Ruby's built-in `TSort` to topologically sort them.
+
+## Plugins/Adapters
+
+- [MySQL](https://github.com/f-mer/fx-adapters-mysql/)
+- [Oracle](https://github.com/zygotecnologia/fx-oracle-adapter)
+- [SQLserver](https://github.com/tarellel/fx-sqlserver-adapter)
+
+## Version Support
+
+F(x) follows the maintenance policies of Ruby, Rails, and PostgreSQL, supporting
+versions within their official maintenance windows.
+
+**Ruby:** 3.3+ ([maintenance branches])
+
+**Rails:** 7.2, 8.0, 8.1 ([maintenance policy])
+
+**PostgreSQL:** 14, 15, 16, 17, 18 ([versioning policy])
+
+When a version reaches end-of-life, support will be dropped in the next minor
+release of F(x). Older versions may continue to work but are not tested or
+guaranteed.
+
+[maintenance branches]: https://www.ruby-lang.org/en/downloads/branches/
+[maintenance policy]: https://rubyonrails.org/maintenance
+[versioning policy]: https://www.postgresql.org/support/versioning/
+
+## Contributing
+
+See [contributing](CONTRIBUTING.md) for more details.

data/Rakefile

@@ -1,5 +1,15 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "standard/rake"
+
+Rake::Task["release"].enhance do
+  unless system("which gh > /dev/null 2>&1")
+    abort "gh CLI is not installed. Install it to create GitHub releases."
+  end
+
+  tag = "v#{Fx::VERSION}"
+  sh "gh release create #{tag} --verify-tag -t #{tag} --generate-notes"
+end
 
 namespace :dummy do
   require_relative "spec/dummy/config/application"
@@ -20,4 +30,4 @@ RSpec::Core::RakeTask.new("spec:acceptance") do |task|
 end
 
 desc "Run the specs and acceptance tests"
-task default: %w(spec spec:acceptance)
+task default: %w[spec spec:acceptance standard]

data/bin/rake

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -7,9 +8,7 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
 require "rubygems"
 require "bundler/setup"

data/bin/rspec

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -7,9 +8,18 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
 
 require "rubygems"
 require "bundler/setup"