DEV: Allow annotations to work in symlinked plugins, add binstub (#13635)

This commit is contained in:
David Taylor 2021-07-05 15:43:10 +01:00 committed by GitHub
parent 04ec5439f3
commit 2955d64703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions

29
bin/annotate Executable file
View File

@ -0,0 +1,29 @@
#!/usr/bin/env ruby
# frozen_string_literal: true
#
# This file was generated by Bundler.
#
# The application 'annotate' is installed as part of a gem, and
# this file is here to facilitate running it.
#
require "pathname"
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
Pathname.new(__FILE__).realpath)
bundle_binstub = File.expand_path("../bundle", __FILE__)
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"
load Gem.bin_path("annotate", "annotate")

View File

@ -15,7 +15,7 @@ if (Rails.env.development? || Rails.env.test?)
'position_in_factory' => "before", 'position_in_factory' => "before",
'show_indexes' => "true", 'show_indexes' => "true",
'simple_indexes' => "false", 'simple_indexes' => "false",
'model_dir' => ["app/models"] + Dir.glob("plugins/**/app/models"), 'model_dir' => ["app/models"] + Dir.glob("plugins/*/app/models"),
'include_version' => "false", 'include_version' => "false",
'require' => "", 'require' => "",
'exclude_tests' => "true", 'exclude_tests' => "true",