Adding a ruby header to all of the tests so that they can now be executed as normal ruby scripts. Using multiple commits because I am having some svn problems.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1791 980ebf18-57e1-0310-9a29-db15c13687c0

41 files changed, 69 insertions, 13 deletions

diff --git a/test/certmgr/certmgr.rb b/test/certmgr/certmgr.rb
index cc95822ee..9036fadee 100755
--- a/test/certmgr/certmgr.rb
+++ b/test/certmgr/certmgr.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppet'
 require 'puppet/sslcertificates.rb'
diff --git a/test/client/client.rb b/test/client/client.rb
index 7d02f7acf..52282d026 100755
--- a/test/client/client.rb
+++ b/test/client/client.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/client'
 require 'puppet/server'
diff --git a/test/client/master.rb b/test/client/master.rb
index 096918918..0258e6997 100755
--- a/test/client/master.rb
+++ b/test/client/master.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/client'
 require 'puppet/server'
diff --git a/test/client/pelement.rb b/test/client/pelement.rb
index d5f8e824a..da0018218 100755
--- a/test/client/pelement.rb
+++ b/test/client/pelement.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/client/pelement'
 require 'puppet/server'
diff --git a/test/language/ast.rb b/test/language/ast.rb
index 731b37cb8..e1924f6f7 100755
--- a/test/language/ast.rb
+++ b/test/language/ast.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppet'
 require 'puppet/rails'
diff --git a/test/language/collector.rb b/test/language/collector.rb
index d7ac059fa..6df0d04e3 100755
--- a/test/language/collector.rb
+++ b/test/language/collector.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppet/rails'
 require 'puppettest'
diff --git a/test/language/functions.rb b/test/language/functions.rb
index accb027cf..692675da7 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppet'
 require 'puppet/parser/interpreter'
diff --git a/test/language/interpreter.rb b/test/language/interpreter.rb
index 6f5b9cc68..5357a5edc 100755
--- a/test/language/interpreter.rb
+++ b/test/language/interpreter.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'facter'
 
diff --git a/test/language/lexer.rb b/test/language/lexer.rb
index 26b85b3b7..84d4c447b 100755
--- a/test/language/lexer.rb
+++ b/test/language/lexer.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/parser/lexer'
 require 'puppettest'
diff --git a/test/language/node.rb b/test/language/node.rb
index 251e4c4aa..4c630dd00 100755
--- a/test/language/node.rb
+++ b/test/language/node.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/parser/parser'
 require 'puppettest'
diff --git a/test/language/parser.rb b/test/language/parser.rb
index dbe48616a..4a976fc57 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/parser/parser'
 require 'puppettest'
diff --git a/test/language/resource.rb b/test/language/resource.rb
index d2ddbb7a4..e0f9fd947 100755
--- a/test/language/resource.rb
+++ b/test/language/resource.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppettest'
 require 'puppettest/resourcetesting'
diff --git a/test/language/scope.rb b/test/language/scope.rb
index b9401e38b..ab789548e 100755
--- a/test/language/scope.rb
+++ b/test/language/scope.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppet'
 require 'puppet/parser/interpreter'
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index f2597c8d0..ac0b4f716 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -w
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppet'
 require 'puppet/parser/interpreter'
diff --git a/test/language/transportable.rb b/test/language/transportable.rb
index a25500ee8..1b3508c1a 100755
--- a/test/language/transportable.rb
+++ b/test/language/transportable.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppet'
 require 'puppet/transportable'
diff --git a/test/other/autoload.rb b/test/other/autoload.rb
index f561a81a9..d4f79668d 100755
--- a/test/other/autoload.rb
+++ b/test/other/autoload.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppet'
 require 'puppet/autoload'
diff --git a/test/other/events.rb b/test/other/events.rb
index a8f062b81..4c3a2872f 100755
--- a/test/other/events.rb
+++ b/test/other/events.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppettest'
 
diff --git a/test/other/filetype.rb b/test/other/filetype.rb
index 6cd749816..02fcd0f71 100755
--- a/test/other/filetype.rb
+++ b/test/other/filetype.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/filetype'
 require 'puppettest'
diff --git a/test/other/inifile.rb b/test/other/inifile.rb
index 113036505..cd8a2e660 100755
--- a/test/other/inifile.rb
+++ b/test/other/inifile.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/inifile'
 require 'puppettest'
diff --git a/test/other/loadedfile.rb b/test/other/loadedfile.rb
index 8ba45bb81..4a1e3ea4e 100755
--- a/test/other/loadedfile.rb
+++ b/test/other/loadedfile.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/loadedfile'
 require 'puppettest'
diff --git a/test/other/log.rb b/test/other/log.rb
index 36b1e163f..e50a20e97 100755
--- a/test/other/log.rb
+++ b/test/other/log.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/log'
 require 'puppettest'
diff --git a/test/other/metrics.rb b/test/other/metrics.rb
index 380ee30bd..8f487e200 100755
--- a/test/other/metrics.rb
+++ b/test/other/metrics.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet/metric'
 require 'puppet'
 require 'puppettest'
diff --git a/test/other/overrides.rb b/test/other/overrides.rb
index 92f4068ef..035987e18 100755
--- a/test/other/overrides.rb
+++ b/test/other/overrides.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppettest'
 
diff --git a/test/other/provider.rb b/test/other/provider.rb
index 771c54bf9..f886e6c58 100755
--- a/test/other/provider.rb
+++ b/test/other/provider.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/provider'
 require 'puppettest'
diff --git a/test/other/relationships.rb b/test/other/relationships.rb
index e2d65beb1..59d81796a 100755
--- a/test/other/relationships.rb
+++ b/test/other/relationships.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppettest'
 
diff --git a/test/other/report.rb b/test/other/report.rb
index 68381adfa..16af66dde 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/transaction/report'
 require 'puppettest'
diff --git a/test/other/storage.rb b/test/other/storage.rb
index 2b8dca5e6..7fcf82756 100755
--- a/test/other/storage.rb
+++ b/test/other/storage.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppettest'
 
diff --git a/test/other/transactions.rb b/test/other/transactions.rb
index 82b2bc768..492043ffa 100755
--- a/test/other/transactions.rb
+++ b/test/other/transactions.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppettest'
 
diff --git a/test/providers/group.rb b/test/providers/group.rb
index 1948dbdc4..0f3886a66 100755
--- a/test/providers/group.rb
+++ b/test/providers/group.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'etc'
 require 'puppet/type'
 require 'puppettest'
diff --git a/test/providers/nameservice.rb b/test/providers/nameservice.rb
index dafc8dcf0..8260f6fa9 100755
--- a/test/providers/nameservice.rb
+++ b/test/providers/nameservice.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppettest'
 require 'puppet'
 require 'facter'
diff --git a/test/providers/package.rb b/test/providers/package.rb
index 64c443c00..638de489e 100755
--- a/test/providers/package.rb
+++ b/test/providers/package.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'etc'
 require 'puppet/type'
 require 'puppettest'
diff --git a/test/providers/provider.rb b/test/providers/provider.rb
index 28d92e3d6..dc6158566 100755
--- a/test/providers/provider.rb
+++ b/test/providers/provider.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppettest'
 require 'puppet'
 require 'facter'
diff --git a/test/providers/user.rb b/test/providers/user.rb
index 1244f6acd..c8dc3e2e3 100755
--- a/test/providers/user.rb
+++ b/test/providers/user.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppettest'
 require 'puppet'
 require 'facter'
diff --git a/test/puppet/conffiles.rb b/test/puppet/conffiles.rb
index 9234e2dfd..ba9a74bd3 100755
--- a/test/puppet/conffiles.rb
+++ b/test/puppet/conffiles.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppet/config'
 require 'puppettest'
diff --git a/test/puppet/defaults.rb b/test/puppet/defaults.rb
index 250fd29c0..0ba217216 100755
--- a/test/puppet/defaults.rb
+++ b/test/puppet/defaults.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppettest'
 
diff --git a/test/puppet/errortest.rb b/test/puppet/errortest.rb
index 264cde857..5e35a8358 100755
--- a/test/puppet/errortest.rb
+++ b/test/puppet/errortest.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppettest'
 
diff --git a/test/puppet/tc_suidmanager.rb b/test/puppet/tc_suidmanager.rb
index c9b843147..b157080ca 100755
--- a/test/puppet/tc_suidmanager.rb
+++ b/test/puppet/tc_suidmanager.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppettest'
 require 'test/unit'
diff --git a/test/rails/rails.rb b/test/rails/rails.rb
index c780d7698..ed9a5bf3f 100755
--- a/test/rails/rails.rb
+++ b/test/rails/rails.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppet'
 require 'puppet/rails'
diff --git a/test/rails/railsparameter.rb b/test/rails/railsparameter.rb
index 7dc7ef5dd..a418633aa 100755
--- a/test/rails/railsparameter.rb
+++ b/test/rails/railsparameter.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppet'
 require 'puppet/rails'
diff --git a/test/rails/railsresource.rb b/test/rails/railsresource.rb
index 86c3b4908..c9c178811 100755
--- a/test/rails/railsresource.rb
+++ b/test/rails/railsresource.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby -I../lib -I../../lib
 
 require 'puppet'
 require 'puppet/rails'
diff --git a/test/tagging/tagging.rb b/test/tagging/tagging.rb
index 3044992d5..aebf943f7 100755
--- a/test/tagging/tagging.rb
+++ b/test/tagging/tagging.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby -I../lib -I../../lib
+
 require 'puppet'
 require 'puppettest'
 require 'puppettest/parsertesting'