Download as
Browse Code »

Commit 1c2bea7711bc1d389f365df8dd1f4a6016b6df09

Authored by Antonio Terceiro
1 parent 870f10af
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Don't load the environment it it's not needed

Showing 6 changed files with 14 additions and 9 deletions   Show diff stats
lib/noosfero/core_ext/active_record.rb
  Diff comments   View file @1c2bea7
  1 +require 'active_record'
  2 +
1 3 class ActiveRecord::Base
2 4  
3 5 def self.postgresql?
... ...
lib/tasks/env.rake
View file @870f10a
... ... @@ -1 +0,0 @@
1   -require File.join(File.dirname(__FILE__), '../../config/environment.rb')
lib/tasks/gettext.rake
  Diff comments   View file @1c2bea7
... ... @@ -2,8 +2,6 @@
2 2 # Added for Ruby-GetText-Package
3 3 #
4 4  
5   -require 'noosfero'
6   -
7 5 makemo_stamp = 'tmp/makemo.stamp'
8 6 desc "Create mo-files for L10n"
9 7 task :makemo => makemo_stamp
... ... @@ -40,6 +38,8 @@ end
40 38 desc "Update pot/po files to match new version."
41 39 task :updatepo do
42 40 require 'gettext_rails/tools'
  41 + require 'noosfero'
  42 +
43 43 GetText::RubyParser::ID << '__'
44 44 GetText::RubyParser::PLURAL_ID << 'n__'
45 45 GetText::ActiveRecordParser.init(:use_classname => false)
... ...
lib/tasks/package.rake
  Diff comments   View file @1c2bea7
1   -require 'noosfero'
2 1  
3 2 desc "Generate source tarball"
4 3 task :package => 'package:clobber' do
  4 + require 'noosfero'
5 5 begin
6 6 sh 'test -d .git'
7 7 rescue
... ...
lib/tasks/release.rake
  Diff comments   View file @1c2bea7
... ... @@ -9,7 +9,11 @@ namespace :noosfero do
9 9 end
10 10 end
11 11  
12   - version = Noosfero::VERSION
  12 + def version
  13 + require 'noosfero'
  14 + Noosfero::VERSION
  15 + end
  16 +
13 17 desc 'checks if there is already a tag for the current version'
14 18 task :check_tag do
15 19 sh "git tag | grep '^#{version}$' >/dev/null" do |ok, res|
... ... @@ -23,9 +27,9 @@ namespace :noosfero do
23 27 desc 'checks the version of the Debian package'
24 28 task :check_debian_package do
25 29 debian_version = `dpkg-parsechangelog | grep Version: | cut -d ' ' -f 2`.strip
26   - unless debian_version =~ /^#{Noosfero::VERSION}/
27   - puts "Version mismatch: Debian version = #{debian_version}, Noosfero upstream version = #{Noosfero::VERSION}"
28   - puts "Run `dch -v #{Noosfero::VERSION}` to add a new changelog entry that upgrades the Debian version"
  30 + unless debian_version =~ /^#{version}/
  31 + puts "Version mismatch: Debian version = #{debian_version}, Noosfero upstream version = #{version}"
  32 + puts "Run `dch -v #{version}` to add a new changelog entry that upgrades the Debian version"
29 33 raise "Version mismatch between noosfero version and debian package version"
30 34 end
31 35 end
... ...
lib/tasks/version.rake
  Diff comments   View file @1c2bea7
1   -require 'noosfero'
2 1 desc "shows noosfero version"
3 2 task :version do
  3 + require 'noosfero'
4 4 puts "noosfero, version #{Noosfero::VERSION}"
5 5 end
... ...