Only import extensions/kernel if require_relative not defined [#200]

ucla-oarc-web · Jan 8, 2013 · 99cd11b · 99cd11b
1 parent a93e5f4
commit 99cd11b
Show file tree

Hide file tree

Showing 32 changed files with 32 additions and 32 deletions.
diff --git a/lib/Build/Adapter/Bootstrap.rb b/lib/Build/Adapter/Bootstrap.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../../Path'
 require_relative '../Submodule'
 require_relative '../Utilities'

diff --git a/lib/Build/Core/Adapter.rb b/lib/Build/Core/Adapter.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../../Path'
 require_relative '../Module'
 require_relative '../Utilities'

diff --git a/lib/Build/Core/Definitions.rb b/lib/Build/Core/Definitions.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../../Path'
 require_relative '../Module'
 require_relative '../../Logger'

diff --git a/lib/Build/Core/Extensions.rb b/lib/Build/Core/Extensions.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../../Path'
 require_relative '../Module'
 require_relative '../../Logger'

diff --git a/lib/Build/Manager.rb b/lib/Build/Manager.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'observer'
 require_relative 'WebBlocks'
 require_relative '../Path'

diff --git a/lib/Build/Module.rb b/lib/Build/Module.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../Path'
 require_relative 'Utilities'
 

diff --git a/lib/Build/Package/Efx.rb b/lib/Build/Package/Efx.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../../Path'
 require_relative '../Submodule'
 require_relative '../Utilities'

diff --git a/lib/Build/Package/Jquery.rb b/lib/Build/Package/Jquery.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'net/http'
 require_relative '../../Path'
 require_relative '../Submodule'

diff --git a/lib/Build/Package/Lettering.rb b/lib/Build/Package/Lettering.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../../Path'
 require_relative '../Submodule'
 require_relative '../Utilities'

diff --git a/lib/Build/Package/Modernizr.rb b/lib/Build/Package/Modernizr.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../../Path'
 require_relative '../Submodule'
 require_relative '../Utilities'

diff --git a/lib/Build/Package/Respond.rb b/lib/Build/Package/Respond.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../../Path'
 require_relative '../Submodule'
 require_relative '../Utilities'

diff --git a/lib/Build/Package/Selectivizr.rb b/lib/Build/Package/Selectivizr.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../../Path'
 require_relative '../Submodule'
 require_relative '../Utilities'

diff --git a/lib/Build/Submodule.rb b/lib/Build/Submodule.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'systemu'
 require 'fileutils'
 require_relative '../Path.rb'

diff --git a/lib/Build/Utilities.rb b/lib/Build/Utilities.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'systemu'
 require 'fileutils'
 require_relative '../Path'

diff --git a/lib/Build/WebBlocks.rb b/lib/Build/WebBlocks.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'systemu'
 require 'fileutils'
 require_relative '../Path'

diff --git a/lib/Path.rb b/lib/Path.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'pathname'
 
 module WebBlocks

diff --git a/lib/Path/Build.rb b/lib/Path/Build.rb
@@ -1,7 +1,7 @@
 # DO NOT INCLUDE DIRECTLY -- use /lib/Path instead
 
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative 'Root'
 
 module WebBlocks

diff --git a/lib/Path/Source.rb b/lib/Path/Source.rb
@@ -1,7 +1,7 @@
 # DO NOT INCLUDE DIRECTLY -- use /lib/Path instead
 
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative 'Root'
 
 module WebBlocks

diff --git a/lib/Path/Temporary_Build.rb b/lib/Path/Temporary_Build.rb
@@ -1,7 +1,7 @@
 # DO NOT INCLUDE DIRECTLY -- use /lib/Path instead
 
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative 'Root'
 
 module WebBlocks

diff --git a/lib/Rake.rb b/lib/Rake.rb
@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'rake'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 
 require 'pathname'
 require 'fileutils'

diff --git a/lib/Rake/Manager.rb b/lib/Rake/Manager.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 
 module WebBlocks
 

diff --git a/lib/Test.rb b/lib/Test.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'systemu'
 require 'test/unit'
 require 'pathname'

diff --git a/test/build/Defaults.rb b/test/build/Defaults.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../../lib/Test.rb'
 
 class TestBuildDefaults < ::Test::Unit::TestCase 

diff --git a/test/build/ModulesBootstrapAdapter.rb b/test/build/ModulesBootstrapAdapter.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative 'ModulesCoreAdapter.rb'
 
 class TestModulesBootstrapAdapter < TestModulesCoreAdapter

diff --git a/test/build/ModulesCoreAdapter.rb b/test/build/ModulesCoreAdapter.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require_relative '../../lib/Test.rb'
 
 class TestModulesCoreAdapter < ::Test::Unit::TestCase

diff --git a/test/unit/BuildManager.rb b/test/unit/BuildManager.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'fileutils'
 require_relative '../../lib/Test.rb'
 

diff --git a/test/unit/Dispatcher.rb b/test/unit/Dispatcher.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'fileutils'
 require_relative '../../lib/Test.rb'
 

diff --git a/test/unit/Module.rb b/test/unit/Module.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'fileutils'
 require_relative '../../lib/Test.rb'
 require_relative '../../lib/Build/Module.rb'

diff --git a/test/unit/Path.rb b/test/unit/Path.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'fileutils'
 require_relative '../../lib/Test.rb'
 

diff --git a/test/unit/RakeDSL.rb b/test/unit/RakeDSL.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'fileutils'
 require_relative '../../lib/Test.rb'
 

diff --git a/test/unit/Utilities.rb b/test/unit/Utilities.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'fileutils'
 require_relative '../../lib/Test.rb'
 require_relative '../../lib/Build/Utilities.rb'

diff --git a/test/unit/WebBlocks.rb b/test/unit/WebBlocks.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'extensions/kernel'
+require 'extensions/kernel' if defined?(require_relative).nil?
 require 'fileutils'
 require_relative '../../lib/Test.rb'
 require_relative '../../lib/Build/WebBlocks.rb'