Moved lib/nesta/nesta.rb into lib/nesta.rb.

joaotavora · Feb 29, 2012 · e428962 · e428962
1 parent e4196ba
commit e428962
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lib/nesta.rb b/lib/nesta.rb
@@ -1 +1,9 @@
+module Nesta
+  def self.deprecated(name, message)
+    if Nesta::App.environment != :test
+      $stderr.puts "DEPRECATION WARNING: #{name} is deprecated; #{message}"
+    end
+  end
+end
+
 require "nesta/plugin"
diff --git a/lib/nesta/app.rb b/lib/nesta/app.rb
@@ -2,16 +2,15 @@
 require 'haml'
 require 'sass'
 
+require File.expand_path('../nesta', File.dirname(__FILE__))
 require File.expand_path('env', File.dirname(__FILE__))
-require File.expand_path('nesta', File.dirname(__FILE__))
 require File.expand_path('cache', File.dirname(__FILE__))
 require File.expand_path('config', File.dirname(__FILE__))
 require File.expand_path('models', File.dirname(__FILE__))
 require File.expand_path('helpers', File.dirname(__FILE__))
 require File.expand_path('navigation', File.dirname(__FILE__))
 require File.expand_path('overrides', File.dirname(__FILE__))
 require File.expand_path('path', File.dirname(__FILE__))
-require File.expand_path('plugin', File.dirname(__FILE__))
 
 Encoding.default_external = 'utf-8' if RUBY_VERSION =~ /^1.9/
 

diff --git a/lib/nesta/nesta.rb b/lib/nesta/nesta.rb