Namespace corelib under corelib/ to prevent core files being loaded

opal · Nov 6, 2013 · fbf1140 · fbf1140
1 parent 69c96e1
commit fbf1140
Show file tree

Hide file tree

Showing 30 changed files with 29 additions and 28 deletions.
diff --git a/lib/opal.rb b/lib/opal.rb
@@ -16,7 +16,7 @@ def self.gem_dir
   end
 
   def self.core_dir
-    File.expand_path('../../corelib', __FILE__.untaint)
+    File.expand_path('../../opal', __FILE__.untaint)
   end
 
   def self.std_dir

diff --git a/corelib/array.rb → opal/corelib/array.rb b/corelib/array.rb → opal/corelib/array.rb
diff --git a/corelib/basic_object.rb → opal/corelib/basic_object.rb b/corelib/basic_object.rb → opal/corelib/basic_object.rb
diff --git a/corelib/boolean.rb → opal/corelib/boolean.rb b/corelib/boolean.rb → opal/corelib/boolean.rb
diff --git a/corelib/class.rb → opal/corelib/class.rb b/corelib/class.rb → opal/corelib/class.rb
diff --git a/corelib/comparable.rb → opal/corelib/comparable.rb b/corelib/comparable.rb → opal/corelib/comparable.rb
diff --git a/corelib/encoding.rb → opal/corelib/encoding.rb b/corelib/encoding.rb → opal/corelib/encoding.rb
diff --git a/corelib/enumerable.rb → opal/corelib/enumerable.rb b/corelib/enumerable.rb → opal/corelib/enumerable.rb
diff --git a/corelib/enumerator.rb → opal/corelib/enumerator.rb b/corelib/enumerator.rb → opal/corelib/enumerator.rb
diff --git a/corelib/error.rb → opal/corelib/error.rb b/corelib/error.rb → opal/corelib/error.rb
diff --git a/corelib/hash.rb → opal/corelib/hash.rb b/corelib/hash.rb → opal/corelib/hash.rb
diff --git a/corelib/io.rb → opal/corelib/io.rb b/corelib/io.rb → opal/corelib/io.rb
diff --git a/corelib/kernel.rb → opal/corelib/kernel.rb b/corelib/kernel.rb → opal/corelib/kernel.rb
diff --git a/corelib/main.rb → opal/corelib/main.rb b/corelib/main.rb → opal/corelib/main.rb
diff --git a/corelib/match_data.rb → opal/corelib/match_data.rb b/corelib/match_data.rb → opal/corelib/match_data.rb
diff --git a/corelib/method.rb → opal/corelib/method.rb b/corelib/method.rb → opal/corelib/method.rb
diff --git a/corelib/module.rb → opal/corelib/module.rb b/corelib/module.rb → opal/corelib/module.rb
diff --git a/corelib/native.rb → opal/corelib/native.rb b/corelib/native.rb → opal/corelib/native.rb
diff --git a/corelib/nil_class.rb → opal/corelib/nil_class.rb b/corelib/nil_class.rb → opal/corelib/nil_class.rb
diff --git a/corelib/numeric.rb → opal/corelib/numeric.rb b/corelib/numeric.rb → opal/corelib/numeric.rb
diff --git a/corelib/proc.rb → opal/corelib/proc.rb b/corelib/proc.rb → opal/corelib/proc.rb
diff --git a/corelib/range.rb → opal/corelib/range.rb b/corelib/range.rb → opal/corelib/range.rb
diff --git a/corelib/regexp.rb → opal/corelib/regexp.rb b/corelib/regexp.rb → opal/corelib/regexp.rb
diff --git a/corelib/runtime.js → opal/corelib/runtime.js b/corelib/runtime.js → opal/corelib/runtime.js
diff --git a/corelib/string.rb → opal/corelib/string.rb b/corelib/string.rb → opal/corelib/string.rb
diff --git a/corelib/struct.rb → opal/corelib/struct.rb b/corelib/struct.rb → opal/corelib/struct.rb
diff --git a/corelib/time.rb → opal/corelib/time.rb b/corelib/time.rb → opal/corelib/time.rb
diff --git a/corelib/opal.rb → opal/opal.rb b/corelib/opal.rb → opal/opal.rb
@@ -1,29 +1,29 @@
-require 'runtime'
-require 'module'
-require 'class'
-require 'basic_object'
-require 'kernel'
-require 'nil_class'
-require 'boolean'
-require 'error'
-require 'regexp'
-require 'comparable'
-require 'enumerable'
-require 'enumerator'
-require 'array'
-require 'hash'
-require 'string'
-require 'match_data'
-require 'encoding'
-require 'numeric'
-require 'proc'
-require 'method'
-require 'range'
-require 'time'
-require 'struct'
-require 'native'
-require 'io'
-require 'main'
+require 'corelib/runtime'
+require 'corelib/module'
+require 'corelib/class'
+require 'corelib/basic_object'
+require 'corelib/kernel'
+require 'corelib/nil_class'
+require 'corelib/boolean'
+require 'corelib/error'
+require 'corelib/regexp'
+require 'corelib/comparable'
+require 'corelib/enumerable'
+require 'corelib/enumerator'
+require 'corelib/array'
+require 'corelib/hash'
+require 'corelib/string'
+require 'corelib/match_data'
+require 'corelib/encoding'
+require 'corelib/numeric'
+require 'corelib/proc'
+require 'corelib/method'
+require 'corelib/range'
+require 'corelib/time'
+require 'corelib/struct'
+require 'corelib/native'
+require 'corelib/io'
+require 'corelib/main'
 
 # regexp matches
 $& = $~ = $` = $' = nil

diff --git a/spec/corelib/native/initialize_spec.rb b/spec/corelib/native/initialize_spec.rb
@@ -1,4 +1,4 @@
-require 'native'
+require 'corelib/native'
 
 describe "Native::Base#initialize" do
   it "works when Native::Base is included in a BasicObject" do

diff --git a/stdlib/enumerator.rb b/stdlib/enumerator.rb
@@ -0,0 +1 @@
+# stub