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

[Carl Worth]

The following commit has been merged in the master branch:
commit 09718dd04fe7bd35549aeb33558561bbd60c92fe
Author: Carl Worth <cworth at debian.org>
Date:   Tue Feb 28 16:59:40 2012 -0800

    Remove all uses of "require 'rubygems'"
    
    Since we're packaging treetop for Debian, the treetop code itself
    should not require rubygems, (nor should it instruct the user to
    require rubygems when using treetop).

diff --git a/README.md b/README.md
index 52ea59e..e89a758 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,6 @@ 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 f0f8113..1dcf278 100755
--- a/bin/tt
+++ b/bin/tt
@@ -1,6 +1,5 @@
 #!/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 c65f5b1..1220624 100644
--- a/doc/site.rb
+++ b/doc/site.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'erector'
 require "#{File.dirname(__FILE__)}/sitegen"
 require 'fileutils'
@@ -109,4 +108,4 @@ class Contribute < Layout
 end
 
 
-Layout.generate_site
\ No newline at end of file
+Layout.generate_site
diff --git a/examples/lambda_calculus/test_helper.rb b/examples/lambda_calculus/test_helper.rb
index bfdb7ad..cbb56d4 100644
--- a/examples/lambda_calculus/test_helper.rb
+++ b/examples/lambda_calculus/test_helper.rb
@@ -1,5 +1,4 @@
 require 'test/unit'
-require 'rubygems'
 require 'treetop'
 
 module ParserTestHelper
@@ -15,4 +14,4 @@ module ParserTestHelper
     assert !result.nil?
     result
   end
-end
\ No newline at end of file
+end
diff --git a/lib/treetop/bootstrap_gen_1_metagrammar.rb b/lib/treetop/bootstrap_gen_1_metagrammar.rb
index eeea9ab..e86a421 100644
--- a/lib/treetop/bootstrap_gen_1_metagrammar.rb
+++ b/lib/treetop/bootstrap_gen_1_metagrammar.rb
@@ -1,8 +1,6 @@
 # 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 8870005..450e5cf 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'benchmark'
 require 'rspec'
 require 'polyglot'

-- 
ruby-treetop.git