From: Praveen Arimbrathodiyil Date: Sat, 18 May 2013 00:07:24 +0530 Subject: Executables and tests should take libraries from standard path --- bin/shindo | 8 ++------ bin/shindont | 8 ++------ tests/tests_helper.rb | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) --- a/bin/shindo +++ b/bin/shindo @@ -1,8 +1,4 @@ #!/usr/bin/env ruby @thread_locals = { :interactive => true } -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'verbose')) -if Kernel.respond_to?(:require_relative) - require_relative File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin')) -else - require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin')) -end +require 'shindo/verbose' +require 'shindo/bin' --- a/bin/shindont +++ b/bin/shindont @@ -1,8 +1,4 @@ #!/usr/bin/env ruby @thread_locals = { :interactive => false } -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'taciturn')) -if Kernel.respond_to?(:require_relative) - require_relative File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin')) -else - require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin')) -end +require 'shindo/taciturn' +require 'shindo/bin' --- a/tests/tests_helper.rb +++ b/tests/tests_helper.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo')) +require 'shindo' require 'open3' BIN = File.join(File.dirname(__FILE__), '..', 'bin', 'shindo')