use require_relative instead of modifying $LOAD_PATH

- use require_relative in place of require when it relied on $LOAD_PATH manipulation
- configure bin scripts to work with require_relative
- rename ROOT_PATH to ROOT_DIR
- rename DATA_PATH to DATA_DIR
- rename STYLESHEETS_DATA_PATH to STYLESHEETS_DIR
- define LIB_DIR
- simplify test helper require and setup
- add bindir helper to test suite
- remove unneeded constants in test helper
- reorder autoload statements
- require version directly instead of autoloading

2 files changed, 8 insertions, 4 deletions

diff --git a/bin/asciidoctor b/bin/asciidoctor
index fa0b32e2..b01aaefb 100755
--- a/bin/asciidoctor
+++ b/bin/asciidoctor
@@ -1,11 +1,13 @@
 #!/usr/bin/env ruby
 
-if File.exist?(asciidoctor = (File.expand_path '../../lib/asciidoctor', __FILE__))
+asciidoctor = File.absolute_path '../lib/asciidoctor.rb', __dir__
+if File.exist? asciidoctor
   require asciidoctor
+  require File.join Asciidoctor::LIB_DIR, 'asciidoctor/cli'
 else
   require 'asciidoctor'
+  require 'asciidoctor/cli'
 end
-require 'asciidoctor/cli'
 
 invoker = Asciidoctor::Cli::Invoker.new ARGV
 GC.start
diff --git a/bin/asciidoctor-safe b/bin/asciidoctor-safe
index 42053271..8686e378 100755
--- a/bin/asciidoctor-safe
+++ b/bin/asciidoctor-safe
@@ -1,11 +1,13 @@
 #!/usr/bin/env ruby
 
-if File.exist?(asciidoctor = (File.expand_path '../../lib/asciidoctor', __FILE__))
+asciidoctor = File.absolute_path '../lib/asciidoctor.rb', __dir__
+if File.exist? asciidoctor
   require asciidoctor
+  require File.join Asciidoctor::LIB_DIR, 'asciidoctor/cli'
 else
   require 'asciidoctor'
+  require 'asciidoctor/cli'
 end
-require 'asciidoctor/cli'
 
 invoker = Asciidoctor::Cli::Invoker.new(ARGV + ['-S', 'safe'])
 GC.start