rails4: upgrade dependencies to rails4

vendor/plugins load was removed from rails4. Now we required theses plugins inside the Gemfile, automatically. init.rb files are loaded in config/initializers/dependencies.rb

rails4: upgrade dependencies to rails4
vendor/plugins load was removed from rails4. Now we required theses plugins inside the Gemfile, automatically. init.rb files are loaded in config/initializers/dependencies.rb
Braulio Bhavamitra
1 parent 922b8c6f
Showing 4 changed files with 38 additions and 14 deletions Show diff stats
Gemfile
config/initializers/action_tracker.rb
config/initializers/dependencies.rb
vendor/plugins/ruby_bosh/ruby_bosh.gemspec
 source "https://rubygems.org"
-gem 'rails',                    '~> 3.2.22'
+gem 'rails',                    '~> 4.0'
 gem 'minitest',                 '~> 3.2.0'
 gem 'fast_gettext',             '~> 0.6.8'
 gem 'acts-as-taggable-on',      '~> 3.4.2'
@@ -24,6 +24,17 @@ gem &#39;eita-jrails&#39;, &#39;~&gt; 0.9.5&#39;, require: &#39;jrails&#39;
 gem 'uglifier', '>= 1.0.3'
 gem 'sass-rails'
+# gems to enable rails3 behaviour
+gem 'protected_attributes'
+gem 'rails-observers'
+gem 'actionpack-page_caching'
+gem 'actionpack-action_caching'
+gem 'activerecord-session_store'
+
+
+# FIXME list here all actual dependencies (i.e. the ones in debian/control),
+# with their GEM names (not the Debian package names)
+
 group :production do
   gem 'dalli', '~> 2.7.0'
 end
@@ -46,6 +57,14 @@ end
 # Requires custom dependencies
 eval(File.read('config/Gemfile'), binding) rescue nil
+vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
+vendor.each do |dir|
+  plugin = File.basename dir
+  version = if Dir.glob("#{dir}/*.gemspec").length > 0 then '> 0.0.0' else '0.0.0' end
+
+  gem plugin, version, path: dir
+end
+
 # include gemfiles from enabled plugins
 # plugins in baseplugins/ are not included on purpose. They should not have any
 # dependencies.
 require 'noosfero/i18n'
+require 'action_tracker_config'
 # ActionTracker plugin stuff
@@ -6,25 +7,25 @@ require &#39;noosfero/i18n&#39;
 ActionTrackerConfig.verbs = {
-  :create_article => { 
+  :create_article => {
     :description => proc { _('published an article: %{title}') % { :title => '{{link_to(truncate(ta.get_name), ta.get_url)}}' } }
   },
-  :new_friendship => { 
+  :new_friendship => {
     :description => proc { n_('has made 1 new friend:<br />%{name}', 'has made %{num} new friends:<br />%{name}', get_friend_name.size) % { :num => get_friend_name.size, :name => '{{ta.collect_group_with_index(:friend_name){ |n,i| link_to(image_tag(ta.get_friend_profile_custom_icon[i] || default_or_themed_icon("/images/icons-app/person-icon.png")), ta.get_friend_url[i], :title => n)}.join}}' } },
     :type => :groupable
   },
-  :join_community => { 
+  :join_community => {
     :description => proc { n_('has joined 1 community:<br />%{name}', 'has joined %{num} communities:<br />%{name}', get_resource_name.size) % { :num => get_resource_name.size, :name => '{{ta.collect_group_with_index(:resource_name){ |n,i| link_to(image_tag(ta.get_resource_profile_custom_icon[i] || default_or_themed_icon("/images/icons-app/community-icon.png")), ta.get_resource_url[i], :title => n)}.join}}' } },
     :type => :groupable
   },
-  :add_member_in_community => { 
+  :add_member_in_community => {
     :description => proc { _('has joined the community.') },
   },
-  :upload_image => { 
+  :upload_image => {
     :description => proc do
       total = get_view_url.size
       n_('uploaded 1 image', 'uploaded %d images', total) % total +
+# third-party libraries
+require 'will_paginate'
+require 'will_paginate/array'
+require 'nokogiri'
+
+# dependencies at vendor, firstly loaded on Gemfile
+vendor = (Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins'])
+vendor.each do |dir|
+  init_rb = "#{Rails.root}/#{dir}/init.rb"
+  require init_rb if File.file? init_rb
+end
+
 # locally-developed modules
 require 'acts_as_filesystem'
 require 'acts_as_having_settings'
@@ -10,8 +22,3 @@ require &#39;set_profile_region_from_city_state&#39;
 require 'authenticated_system'
 require 'needs_profile'
 require 'white_list_filter'
-
-# third-party libraries
-require 'will_paginate'
-require 'will_paginate/array'
-require 'nokogiri'
@@ -24,15 +24,12 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<builder>, [">= 0"])
       s.add_runtime_dependency(%q<adamwiggins-rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<SystemTimer>, [">= 0"])
     else
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<adamwiggins-rest-client>, [">= 0"])
-      s.add_dependency(%q<SystemTimer>, [">= 0"])
     end
   else
     s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<adamwiggins-rest-client>, [">= 0"])
-    s.add_dependency(%q<SystemTimer>, [">= 0"])
   end
 end
1	source "https://rubygems.org"	1	source "https://rubygems.org"
2	-gem 'rails', '~> 3.2.22'	2	+gem 'rails', '~> 4.0'
3	gem 'minitest', '~> 3.2.0'	3	gem 'minitest', '~> 3.2.0'
4	gem 'fast_gettext', '~> 0.6.8'	4	gem 'fast_gettext', '~> 0.6.8'
5	gem 'acts-as-taggable-on', '~> 3.4.2'	5	gem 'acts-as-taggable-on', '~> 3.4.2'
	@@ -24,6 +24,17 @@ gem 'eita-jrails', '~> 0.9.5', require: 'jrails'		@@ -24,6 +24,17 @@ gem 'eita-jrails', '~> 0.9.5', require: 'jrails'
24	gem 'uglifier', '>= 1.0.3'	24	gem 'uglifier', '>= 1.0.3'
25	gem 'sass-rails'	25	gem 'sass-rails'
26		26
		27	+# gems to enable rails3 behaviour
		28	+gem 'protected_attributes'
		29	+gem 'rails-observers'
		30	+gem 'actionpack-page_caching'
		31	+gem 'actionpack-action_caching'
		32	+gem 'activerecord-session_store'
		33	+
		34	+
		35	+# FIXME list here all actual dependencies (i.e. the ones in debian/control),
		36	+# with their GEM names (not the Debian package names)
		37	+
27	group :production do	38	group :production do
28	gem 'dalli', '~> 2.7.0'	39	gem 'dalli', '~> 2.7.0'
29	end	40	end
	@@ -46,6 +57,14 @@ end		@@ -46,6 +57,14 @@ end
46	# Requires custom dependencies	57	# Requires custom dependencies
47	eval(File.read('config/Gemfile'), binding) rescue nil	58	eval(File.read('config/Gemfile'), binding) rescue nil
48		59
		60	+vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
		61	+vendor.each do \|dir\|
		62	+ plugin = File.basename dir
		63	+ version = if Dir.glob("#{dir}/*.gemspec").length > 0 then '> 0.0.0' else '0.0.0' end
		64	+
		65	+ gem plugin, version, path: dir
		66	+end
		67	+
49	# include gemfiles from enabled plugins	68	# include gemfiles from enabled plugins
50	# plugins in baseplugins/ are not included on purpose. They should not have any	69	# plugins in baseplugins/ are not included on purpose. They should not have any
51	# dependencies.	70	# dependencies.
		1	+# third-party libraries
		2	+require 'will_paginate'
		3	+require 'will_paginate/array'
		4	+require 'nokogiri'
		5	+
		6	+# dependencies at vendor, firstly loaded on Gemfile
		7	+vendor = (Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins'])
		8	+vendor.each do \|dir\|
		9	+ init_rb = "#{Rails.root}/#{dir}/init.rb"
		10	+ require init_rb if File.file? init_rb
		11	+end
		12	+
1	# locally-developed modules	13	# locally-developed modules
2	require 'acts_as_filesystem'	14	require 'acts_as_filesystem'
3	require 'acts_as_having_settings'	15	require 'acts_as_having_settings'
	@@ -10,8 +22,3 @@ require 'set_profile_region_from_city_state'		@@ -10,8 +22,3 @@ require 'set_profile_region_from_city_state'
10	require 'authenticated_system'	22	require 'authenticated_system'
11	require 'needs_profile'	23	require 'needs_profile'
12	require 'white_list_filter'	24	require 'white_list_filter'
13	-
14	-# third-party libraries
15	-require 'will_paginate'
16	-require 'will_paginate/array'
17	-require 'nokogiri'