diff --git a/config/environment.rb b/config/environment.rb index 97376af..73540f9 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -120,7 +120,8 @@ Noosfero.default_locale = nil Tag.hierarchical = true # several local libraries -require 'noosfero' + +require_dependency 'noosfero' require 'sqlite_extension' # load a local configuration if present, but not under test environment. diff --git a/config/routes.rb b/config/routes.rb index 68ed94e..7f3c819 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ -require 'noosfero' +require_dependency 'noosfero' ActionController::Routing::Routes.draw do |map| # The priority is based upon order of creation: first created -> highest priority. diff --git a/lib/noosfero/plugin.rb b/lib/noosfero/plugin.rb index 4927c87..bce6670 100644 --- a/lib/noosfero/plugin.rb +++ b/lib/noosfero/plugin.rb @@ -1,4 +1,4 @@ -require 'noosfero' +require_dependency 'noosfero' include ActionView::Helpers::AssetTagHelper class Noosfero::Plugin diff --git a/lib/tasks/doc.rake b/lib/tasks/doc.rake index 54a843f..d1952e1 100644 --- a/lib/tasks/doc.rake +++ b/lib/tasks/doc.rake @@ -92,7 +92,7 @@ namespace :noosfero do po4a_conf = 'tmp/po4a.conf' file po4a_conf => english_xhtml do - require 'noosfero' + require_dependency 'noosfero' begin File.open(po4a_conf, 'w') do |file| file.puts "[po4a_langs] #{(Noosfero.locales.keys - ['en']).join(' ')}" @@ -136,7 +136,7 @@ namespace :noosfero do desc "Translates Noosfero online documentation (does not touch PO files)" task :translate => [:link_plugins_textiles, :do_translation] task :do_translation => english_xhtml do - require 'noosfero' + require_dependency 'noosfero' languages = Noosfero.locales.keys - ['en'] languages.each do |lang| po = "po/#{lang}/noosfero-doc.po" diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake index f53cd64..f9d736f 100644 --- a/lib/tasks/gettext.rake +++ b/lib/tasks/gettext.rake @@ -39,7 +39,7 @@ end desc "Update pot/po files to match new version." task :updatepo do require 'gettext_rails/tools' - require 'noosfero' + require_dependency 'noosfero' GetText::RubyParser::ID << '__' GetText::RubyParser::PLURAL_ID << 'n__' diff --git a/lib/tasks/package.rake b/lib/tasks/package.rake index 106906d..8b85024 100644 --- a/lib/tasks/package.rake +++ b/lib/tasks/package.rake @@ -1,7 +1,7 @@ desc "Generate source tarball" task :package => 'package:clobber' do - require 'noosfero' + require_dependency 'noosfero' begin sh 'test -d .git' rescue diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake index 4663379..3421b80 100644 --- a/lib/tasks/release.rake +++ b/lib/tasks/release.rake @@ -39,7 +39,7 @@ namespace :noosfero do end def version - require 'noosfero' + require_dependency 'noosfero' Noosfero::VERSION end diff --git a/lib/tasks/version.rake b/lib/tasks/version.rake index 43cbaeb..49f84db 100644 --- a/lib/tasks/version.rake +++ b/lib/tasks/version.rake @@ -1,5 +1,5 @@ desc "shows noosfero version" task :version do - require 'noosfero' + require_dependency 'noosfero' puts "noosfero, version #{Noosfero::VERSION}" end -- libgit2 0.21.2