From 99c0692f215892c31b1a9b6d581af241ab41b20d Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 7 Mar 2010 13:34:46 -0800
Subject: [PATCH] Rely on load path for specs.

---
 Rakefile                                               |  1 +
 spec/compiler/and_predicate_spec.rb                    |  4 ++--
 spec/compiler/anything_symbol_spec.rb                  |  4 ++--
 spec/compiler/character_class_spec.rb                  |  2 +-
 spec/compiler/choice_spec.rb                           |  4 ++--
 spec/compiler/circular_compilation_spec.rb             |  3 ++-
 spec/compiler/failure_propagation_functional_spec.rb   |  4 ++--
 spec/compiler/grammar_compiler_spec.rb                 |  2 +-
 spec/compiler/grammar_spec.rb                          |  2 +-
 spec/compiler/multibyte_chars_spec.rb                  | 10 +---------
 spec/compiler/nonterminal_symbol_spec.rb               |  4 ++--
 spec/compiler/not_predicate_spec.rb                    |  4 ++--
 spec/compiler/one_or_more_spec.rb                      |  4 ++--
 spec/compiler/optional_spec.rb                         |  2 +-
 spec/compiler/parenthesized_expression_spec.rb         |  2 +-
 spec/compiler/parsing_rule_spec.rb                     |  2 +-
 spec/compiler/repeated_subrule_spec.rb                 |  2 +-
 spec/compiler/semantic_predicate_spec.rb               |  2 +-
 spec/compiler/sequence_spec.rb                         |  2 +-
 spec/compiler/terminal_spec.rb                         |  2 +-
 spec/compiler/terminal_symbol_spec.rb                  |  2 +-
 spec/compiler/tt_compiler_spec.rb                      |  2 +-
 spec/compiler/zero_or_more_spec.rb                     |  2 +-
 spec/composition/grammar_composition_spec.rb           |  2 +-
 spec/ruby_extensions/string_spec.rb                    |  2 +-
 spec/runtime/compiled_parser_spec.rb                   |  2 +-
 spec/runtime/interval_skip_list/delete_spec.rb         |  4 ++--
 spec/runtime/interval_skip_list/expire_range_spec.rb   |  4 ++--
 spec/runtime/interval_skip_list/insert_spec.rb         |  2 +-
 .../interval_skip_list/interval_skip_list_spec.rb      |  4 ++--
 .../interval_skip_list/palindromic_fixture_spec.rb     |  5 ++---
 spec/runtime/interval_skip_list/spec_helper.rb         |  4 ++--
 spec/runtime/syntax_node_spec.rb                       |  2 +-
 spec/spec_helper.rb                                    |  4 ++--
 spec/spec_suite.rb                                     |  4 ----
 35 files changed, 48 insertions(+), 59 deletions(-)
 delete mode 100644 spec/spec_suite.rb

diff --git a/Rakefile b/Rakefile
index 1373dfd..84658c1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,6 +6,7 @@ require 'spec/rake/spectask'
 task :default => :spec
 Spec::Rake::SpecTask.new do |t|
   t.pattern = 'spec/**/*spec.rb'
+  t.libs << 'spec'
 end
 
 load "./treetop.gemspec"
diff --git a/spec/compiler/and_predicate_spec.rb b/spec/compiler/and_predicate_spec.rb
index 6047683..7cddc53 100644
--- a/spec/compiler/and_predicate_spec.rb
+++ b/spec/compiler/and_predicate_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module AndPredicateSpec
   describe "An &-predicated terminal symbol" do
@@ -33,4 +33,4 @@ module AndPredicateSpec
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/compiler/anything_symbol_spec.rb b/spec/compiler/anything_symbol_spec.rb
index f7e769f..0a41341 100644
--- a/spec/compiler/anything_symbol_spec.rb
+++ b/spec/compiler/anything_symbol_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module AnythingSymbolSpec
   class Foo < Treetop::Runtime::SyntaxNode
@@ -41,4 +41,4 @@ module ModFoo
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/compiler/character_class_spec.rb b/spec/compiler/character_class_spec.rb
index 7c594b3..9b94ab1 100644
--- a/spec/compiler/character_class_spec.rb
+++ b/spec/compiler/character_class_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module CharacterClassSpec
   class Foo < Treetop::Runtime::SyntaxNode
diff --git a/spec/compiler/choice_spec.rb b/spec/compiler/choice_spec.rb
index bcf566d..515036c 100644
--- a/spec/compiler/choice_spec.rb
+++ b/spec/compiler/choice_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module ChoiceSpec
   describe "A choice between terminal symbols" do
@@ -77,4 +77,4 @@ def a_method
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/compiler/circular_compilation_spec.rb b/spec/compiler/circular_compilation_spec.rb
index f0cef5a..431209b 100644
--- a/spec/compiler/circular_compilation_spec.rb
+++ b/spec/compiler/circular_compilation_spec.rb
@@ -1,4 +1,5 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
+
 BENCHMARK = false
 METAGRAMMAR_PATH = File.expand_path('../../../lib/treetop/compiler/metagrammar.treetop', __FILE__)
 
diff --git a/spec/compiler/failure_propagation_functional_spec.rb b/spec/compiler/failure_propagation_functional_spec.rb
index 76fc06e..2636a37 100644
--- a/spec/compiler/failure_propagation_functional_spec.rb
+++ b/spec/compiler/failure_propagation_functional_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 describe "An expression for braces surrounding zero or more letters followed by semicolons" do
   testing_expression "'{' ([a-z] ';')* '}'"
@@ -18,4 +18,4 @@
       failure.expected_string.should == ';'
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/compiler/grammar_compiler_spec.rb b/spec/compiler/grammar_compiler_spec.rb
index 1e1e017..4fe71b9 100755
--- a/spec/compiler/grammar_compiler_spec.rb
+++ b/spec/compiler/grammar_compiler_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 describe Compiler::GrammarCompiler do
   attr_reader :compiler, :source_path_with_treetop_extension, :source_path_with_tt_extension, :target_path, :alternate_target_path
diff --git a/spec/compiler/grammar_spec.rb b/spec/compiler/grammar_spec.rb
index 47d355e..7b8e515 100644
--- a/spec/compiler/grammar_spec.rb
+++ b/spec/compiler/grammar_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module GrammarSpec
   module Bar
diff --git a/spec/compiler/multibyte_chars_spec.rb b/spec/compiler/multibyte_chars_spec.rb
index 615da98..60c0a04 100644
--- a/spec/compiler/multibyte_chars_spec.rb
+++ b/spec/compiler/multibyte_chars_spec.rb
@@ -1,15 +1,7 @@
 #!ruby19
 # encoding: utf-8
 
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
-
-# Require ActiveSupport for multibyte strings
-begin
-  require 'active_support'
-rescue
-  gem 'activesupport'
-  require 'active_support'
-end
+require 'spec_helper'
 
 module MultibyteCharsSpec
   describe "an anything symbol" do
diff --git a/spec/compiler/nonterminal_symbol_spec.rb b/spec/compiler/nonterminal_symbol_spec.rb
index 155508c..c753aae 100644
--- a/spec/compiler/nonterminal_symbol_spec.rb
+++ b/spec/compiler/nonterminal_symbol_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module NonterminalSymbolSpec
   describe "A nonterminal symbol followed by a block" do
@@ -37,4 +37,4 @@ def _nt_foo
       result.should respond_to(:a_method)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/compiler/not_predicate_spec.rb b/spec/compiler/not_predicate_spec.rb
index b9bfce1..0ec689a 100644
--- a/spec/compiler/not_predicate_spec.rb
+++ b/spec/compiler/not_predicate_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module NotPredicateSpec
   describe "A !-predicated terminal symbol" do
@@ -35,4 +35,4 @@ module NotPredicateSpec
       parse('abc').should be_nil
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/compiler/one_or_more_spec.rb b/spec/compiler/one_or_more_spec.rb
index c10faac..39d494b 100644
--- a/spec/compiler/one_or_more_spec.rb
+++ b/spec/compiler/one_or_more_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module OneOrMoreSpec
   class Foo < Treetop::Runtime::SyntaxNode
@@ -32,4 +32,4 @@ class Foo < Treetop::Runtime::SyntaxNode
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/compiler/optional_spec.rb b/spec/compiler/optional_spec.rb
index ebc8147..f98fc3b 100644
--- a/spec/compiler/optional_spec.rb
+++ b/spec/compiler/optional_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module OptionalSpec
   describe "An optional terminal symbol" do
diff --git a/spec/compiler/parenthesized_expression_spec.rb b/spec/compiler/parenthesized_expression_spec.rb
index a83f9f3..db60854 100644
--- a/spec/compiler/parenthesized_expression_spec.rb
+++ b/spec/compiler/parenthesized_expression_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module ParenthesizedExpressionSpec
   describe "An unadorned expression inside of parentheses" do
diff --git a/spec/compiler/parsing_rule_spec.rb b/spec/compiler/parsing_rule_spec.rb
index 2a92cf8..78eeae3 100755
--- a/spec/compiler/parsing_rule_spec.rb
+++ b/spec/compiler/parsing_rule_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module ParsingRuleSpec
   describe "a grammar with one parsing rule" do
diff --git a/spec/compiler/repeated_subrule_spec.rb b/spec/compiler/repeated_subrule_spec.rb
index 9d7b756..705265f 100644
--- a/spec/compiler/repeated_subrule_spec.rb
+++ b/spec/compiler/repeated_subrule_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module RepeatedSubruleSpec
   describe "a repeated subrule" do
diff --git a/spec/compiler/semantic_predicate_spec.rb b/spec/compiler/semantic_predicate_spec.rb
index cc5263c..f5625fb 100644
--- a/spec/compiler/semantic_predicate_spec.rb
+++ b/spec/compiler/semantic_predicate_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module SemanticPredicateSpec
   describe "An &-predicate block" do
diff --git a/spec/compiler/sequence_spec.rb b/spec/compiler/sequence_spec.rb
index e51562f..54a29a0 100644
--- a/spec/compiler/sequence_spec.rb
+++ b/spec/compiler/sequence_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module SequenceSpec
   class Foo < Treetop::Runtime::SyntaxNode
diff --git a/spec/compiler/terminal_spec.rb b/spec/compiler/terminal_spec.rb
index e430e5b..12b67af 100644
--- a/spec/compiler/terminal_spec.rb
+++ b/spec/compiler/terminal_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module TerminalSymbolSpec
   class Foo < Treetop::Runtime::SyntaxNode
diff --git a/spec/compiler/terminal_symbol_spec.rb b/spec/compiler/terminal_symbol_spec.rb
index 68f6c5c..c33660d 100644
--- a/spec/compiler/terminal_symbol_spec.rb
+++ b/spec/compiler/terminal_symbol_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module TerminalSymbolSpec
   class Foo < Treetop::Runtime::SyntaxNode
diff --git a/spec/compiler/tt_compiler_spec.rb b/spec/compiler/tt_compiler_spec.rb
index d49dfa6..3066e40 100644
--- a/spec/compiler/tt_compiler_spec.rb
+++ b/spec/compiler/tt_compiler_spec.rb
@@ -4,7 +4,7 @@
 # Treetop library versions, not a previously installed gem
 ENV['PATH'] = File.expand_path(File.dirname(__FILE__) + '../../../bin' +
                               File::PATH_SEPARATOR + ENV['PATH'])
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '../../../lib'))
+$LOAD_PATH.unshift(File.expand_path('../../../../lib', __FILE__))
 
 describe "The 'tt' comand line compiler" do
 
diff --git a/spec/compiler/zero_or_more_spec.rb b/spec/compiler/zero_or_more_spec.rb
index 14d83ba..261bf5c 100644
--- a/spec/compiler/zero_or_more_spec.rb
+++ b/spec/compiler/zero_or_more_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module ZeroOrMoreSpec
   class Foo < Treetop::Runtime::SyntaxNode
diff --git a/spec/composition/grammar_composition_spec.rb b/spec/composition/grammar_composition_spec.rb
index 2b7ffd7..3445497 100755
--- a/spec/composition/grammar_composition_spec.rb
+++ b/spec/composition/grammar_composition_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module GrammarCompositionSpec
   describe "several composed grammars" do
diff --git a/spec/ruby_extensions/string_spec.rb b/spec/ruby_extensions/string_spec.rb
index 1b293f5..8cb74c5 100755
--- a/spec/ruby_extensions/string_spec.rb
+++ b/spec/ruby_extensions/string_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 describe String do
   before do
diff --git a/spec/runtime/compiled_parser_spec.rb b/spec/runtime/compiled_parser_spec.rb
index 296a390..663cffa 100644
--- a/spec/runtime/compiled_parser_spec.rb
+++ b/spec/runtime/compiled_parser_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module CompiledParserSpec
   describe Runtime::CompiledParser, "for a grammar with two rules" do
diff --git a/spec/runtime/interval_skip_list/delete_spec.rb b/spec/runtime/interval_skip_list/delete_spec.rb
index 7ed0494..e039040 100644
--- a/spec/runtime/interval_skip_list/delete_spec.rb
+++ b/spec/runtime/interval_skip_list/delete_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require 'runtime/interval_skip_list/spec_helper'
 
 class IntervalSkipList
   public :insert_node, :delete_node, :head, :nodes
@@ -144,4 +144,4 @@ class IntervalSkipList
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/runtime/interval_skip_list/expire_range_spec.rb b/spec/runtime/interval_skip_list/expire_range_spec.rb
index 9b4dda8..f4b5c95 100644
--- a/spec/runtime/interval_skip_list/expire_range_spec.rb
+++ b/spec/runtime/interval_skip_list/expire_range_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require 'runtime/interval_skip_list/spec_helper'
 
 describe IntervalSkipList do
   it_should_behave_like "the palindromic fixture"
@@ -346,4 +346,4 @@
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/runtime/interval_skip_list/insert_spec.rb b/spec/runtime/interval_skip_list/insert_spec.rb
index 2deda69..9e236c2 100644
--- a/spec/runtime/interval_skip_list/insert_spec.rb
+++ b/spec/runtime/interval_skip_list/insert_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require 'runtime/interval_skip_list/spec_helper'
 
 describe IntervalSkipList, " when #next_node_height returns 1, 3, 2, 3, 1 in order" do
   include IntervalSkipListSpecHelper
diff --git a/spec/runtime/interval_skip_list/interval_skip_list_spec.rb b/spec/runtime/interval_skip_list/interval_skip_list_spec.rb
index 1fc0fec..8b9c170 100644
--- a/spec/runtime/interval_skip_list/interval_skip_list_spec.rb
+++ b/spec/runtime/interval_skip_list/interval_skip_list_spec.rb
@@ -1,4 +1,4 @@
-#require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+#require 'runtime/interval_skip_list/spec_helper'
 #
 #MAX_INTERVAL = 100000
 #
@@ -55,4 +55,4 @@
 #      end
 #    end
 #  end
-#end
\ No newline at end of file
+#end
diff --git a/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb b/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb
index d30847f..4376b7f 100644
--- a/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb
+++ b/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb
@@ -1,5 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper")
-require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require 'runtime/interval_skip_list/spec_helper'
 
 describe "The palindromic fixture" do
   it_should_behave_like "the palindromic fixture"
@@ -161,4 +160,4 @@
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/runtime/interval_skip_list/spec_helper.rb b/spec/runtime/interval_skip_list/spec_helper.rb
index b484c57..d5734a8 100644
--- a/spec/runtime/interval_skip_list/spec_helper.rb
+++ b/spec/runtime/interval_skip_list/spec_helper.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper")
+require 'spec_helper'
 
 class IntervalSkipList
   public :insert_node, :delete_node, :nodes, :head, :next_node_height
@@ -81,4 +81,4 @@ def failure_message
   end
 end
 
-require "#{File.dirname(__FILE__)}/palindromic_fixture"
+require 'runtime/interval_skip_list/palindromic_fixture'
diff --git a/spec/runtime/syntax_node_spec.rb b/spec/runtime/syntax_node_spec.rb
index 54dabea..47179b6 100644
--- a/spec/runtime/syntax_node_spec.rb
+++ b/spec/runtime/syntax_node_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module SyntaxNodeSpec
   describe "A new terminal syntax node" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5ec65df..1894cd2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,9 @@
-dir = File.dirname(__FILE__)
 require 'rubygems'
 require 'benchmark'
 require 'spec'
 
-require File.join(dir, '..', 'lib', 'treetop')
+$LOAD_PATH.unshift File.expand_path('../../lib')
+require 'treetop'
 include Treetop
 
 Spec::Runner.configure do |config|
diff --git a/spec/spec_suite.rb b/spec/spec_suite.rb
deleted file mode 100644
index 74d2a57..0000000
--- a/spec/spec_suite.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-dir = File.dirname(__FILE__)
-Dir.glob("#{dir}/**/*_spec.rb") do |spec_file|
-  require spec_file
-end