Sort the required files to fix cases such as this ticket (Closes fcou…

…ry#39) [branch14]
integrum · Dec 26, 2009 · 897be1c · 897be1c
1 parent 67f0543
commit 897be1c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/octopi.rb b/lib/octopi.rb
@@ -12,7 +12,8 @@
 Dir[File.join(File.dirname(__FILE__), "ext/*.rb")].each { |f| require f }
 
 # Octopi stuff
-Dir[File.join(File.dirname(__FILE__), "octopi/*.rb")].each { |f| require f }
+# By sorting them we ensure that api and base are loaded first on all sane operating systems
+(Dir[File.join(File.dirname(__FILE__), "octopi/*.rb")] - [base]).sort.each { |f| require f }
 
 # Include this into your app so you can access the child classes easier.
 # This is the root of all things Octopi.