[DRE-commits] [SCM] ruby-treetop.git branch, master, updated. upstream/1.4.10-22-g9fb36ef

[Carl Worth]

The following commit has been merged in the master branch:
commit 1b152746931ef35499265104c02bb04aabbcf8fb
Author: Carl Worth <cworth at debian.org>
Date:   Thu Mar 1 13:33:54 2012 -0800

    Revert "Remove all uses of "require 'rubygems'""
    
    This reverts commit 09718dd04fe7bd35549aeb33558561bbd60c92fe.
    
    I'm reverting this only because the same functionality already exists
    as a patch within debian/patches, (and gbp-pq doesn't expect such a
    change to also be applied in the current branch).

diff --git a/README.md b/README.md
index e89a758..52ea59e 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ Next, you start filling your grammar with rules. Each rule associates a name wit
 The first rule becomes the *root* of the grammar, causing its expression to be matched when a parser for the grammar is fed a string. The above grammar can now be used in a Ruby program. Notice how a string matching the first rule parses successfully, but a second nonmatching string does not.
 
     # use_grammar.rb
+    require 'rubygems'
     require 'treetop'
     Treetop.load 'my_grammar'
     # or just:
diff --git a/bin/tt b/bin/tt
index 1dcf278..f0f8113 100755
--- a/bin/tt
+++ b/bin/tt
@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'optparse'
+require 'rubygems'
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'treetop'
diff --git a/doc/site.rb b/doc/site.rb
index 1220624..c65f5b1 100644
--- a/doc/site.rb
+++ b/doc/site.rb
@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'erector'
 require "#{File.dirname(__FILE__)}/sitegen"
 require 'fileutils'
@@ -108,4 +109,4 @@ class Contribute < Layout
 end
 
 
-Layout.generate_site
+Layout.generate_site
\ No newline at end of file
diff --git a/examples/lambda_calculus/test_helper.rb b/examples/lambda_calculus/test_helper.rb
index cbb56d4..bfdb7ad 100644
--- a/examples/lambda_calculus/test_helper.rb
+++ b/examples/lambda_calculus/test_helper.rb
@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'rubygems'
 require 'treetop'
 
 module ParserTestHelper
@@ -14,4 +15,4 @@ module ParserTestHelper
     assert !result.nil?
     result
   end
-end
+end
\ No newline at end of file
diff --git a/lib/treetop/bootstrap_gen_1_metagrammar.rb b/lib/treetop/bootstrap_gen_1_metagrammar.rb
index e86a421..eeea9ab 100644
--- a/lib/treetop/bootstrap_gen_1_metagrammar.rb
+++ b/lib/treetop/bootstrap_gen_1_metagrammar.rb
@@ -1,6 +1,8 @@
 # This file's job is to load a Treetop::Compiler::Metagrammar and Treetop::Compiler::MetagrammarParser
 # into the environment by compiling the current metagrammar.treetop using a trusted version of Treetop.
 
+require 'rubygems'
+
 TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP = '>= 1.1.5'
 
 # Loading trusted version of Treetop to compile the compiler
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 450e5cf..8870005 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'benchmark'
 require 'rspec'
 require 'polyglot'

-- 
ruby-treetop.git