Improve interoperability with non-Debian environments

Instead of freezing the Debian-specific dependency tree in Gemfile.lock, let's specify the Debian versions with ~> in Gemfile, and let other systems provide specific versions in the best way they can.

Improve interoperability with non-Debian environments
Instead of freezing the Debian-specific dependency tree in Gemfile.lock, let's specify the Debian versions with ~> in Gemfile, and let other systems provide specific versions in the best way they can.
Antonio Terceiro
1 parent 3698582b
Showing 5 changed files with 29 additions and 224 deletions Show diff stats
Gemfile
Gemfile.lock
debian/noosfero.install
debian/noosfero.links
gitignore.example
 source "https://rubygems.org"
-gem 'rails'
-gem 'fast_gettext'
-gem 'acts-as-taggable-on'
-gem 'prototype-rails'
-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
-gem 'rails_autolink'
-gem 'pg'
-gem 'rmagick'
-gem 'RedCloth'
-gem 'will_paginate'
-gem 'ruby-feedparser'
-gem 'daemons'
-gem 'thin'
-gem 'hpricot'
-gem 'nokogiri'
+gem 'rails',                    '~> 3.2.19'
+gem 'fast_gettext',             '~> 0.6.8'
+gem 'acts-as-taggable-on',      '~> 3.0.2'
+gem 'prototype-rails',          '~> 3.2.1'
+gem 'prototype_legacy_helper',  '0.0.0', :path => 'vendor/prototype_legacy_helper'
+gem 'rails_autolink',           '~> 1.1.5'
+gem 'pg',                       '~> 0.13.2'
+gem 'rmagick',                  '~> 2.13.1'
+gem 'RedCloth',                 '~> 4.2.9'
+gem 'will_paginate',            '~> 3.0.3'
+gem 'ruby-feedparser',          '~> 0.7'
+gem 'daemons',                  '~> 1.1.5'
+gem 'thin',                     '~> 1.3.1'
+gem 'hpricot',                  '~> 0.8.6'
+gem 'nokogiri',                 '~> 1.5.5'
 gem 'rake', :require => false
-gem 'rest-client'
-gem 'exception_notification'
-gem 'gettext', :require => false, :group => :development
+gem 'rest-client',              '~> 1.6.7'
+gem 'exception_notification',   '~> 4.0.1'
+gem 'gettext',                  '~> 2.2.1', :require => false, :group => :development
  
 # 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'
+  gem 'dalli', '~> 2.7.0'
 end
  
 group :test do
-  gem 'rspec'
-  gem 'rspec-rails'
-  gem 'mocha', :require => false
+  gem 'rspec',                  '~> 2.10.0'
+  gem 'rspec-rails',            '~> 2.10.1'
+  gem 'mocha',                  '~> 1.1.0', :require => false
 end
  
 group :cucumber do
-  gem 'cucumber-rails', :require => false
-  gem 'capybara'
-  gem 'cucumber'
-  gem 'database_cleaner'
-  gem 'selenium-webdriver'
+  gem 'cucumber-rails',         '~> 1.0.6', :require => false
+  gem 'capybara',               '~> 2.1.0'
+  gem 'cucumber',               '~> 1.0.6'
+  gem 'database_cleaner',       '~> 1.2.0'
+  gem 'selenium-webdriver',     '~> 2.39.0'
 end
  
 # include plugin gemfiles
@@ -1,196 +0,0 @@
-PATH
-  remote: vendor/prototype_legacy_helper
-  specs:
-    prototype_legacy_helper (0.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    actionmailer (3.2.19)
-      actionpack (= 3.2.19)
-      mail (~> 2.5.4)
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-      builder (~> 3.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2)
-    activemodel (3.2.19)
-      activesupport (= 3.2.19)
-      builder (~> 3.0)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-      arel (~> 4.0)
-      tzinfo (~> 1.0)
-    activeresource (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-    activesupport (3.2.19)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    acts-as-taggable-on (3.0.2)
-      rails (>= 3, < 5)
-    arel (4.0.0)
-    builder (3.0.0)
-    capybara (2.1.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    childprocess (0.3.3)
-      ffi (~> 1.0.6)
-    cucumber (1.0.6)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.18)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.0.6)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.0.6)
-      nokogiri (>= 1.5.0)
-    daemons (1.1.5)
-    dalli (2.7.0)
-    database_cleaner (1.2.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    eventmachine (0.12.10)
-    exception_notification (4.0.1)
-      actionmailer (>= 3.0.4)
-      activesupport (>= 3.0.4)
-    fast_gettext (0.6.8)
-    ffi (1.0.11)
-    gettext (2.2.1)
-      locale
-    gherkin (2.4.21)
-      json (>= 1.4.6)
-    hike (1.2.1)
-    hpricot (0.8.6)
-    i18n (0.6.9)
-    journey (1.0.4)
-    json (1.7.3)
-    locale (2.0.5)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.25)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
-    pg (0.13.2)
-    polyglot (0.3.3)
-    prototype-rails (3.2.1)
-      rails (~> 3.2)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.19)
-      actionmailer (= 3.2.19)
-      actionpack (= 3.2.19)
-      activerecord (= 3.2.19)
-      activeresource (= 3.2.19)
-      activesupport (= 3.2.19)
-      bundler (~> 1.0)
-      railties (= 3.2.19)
-    rails_autolink (1.1.5)
-      rails (> 3.1)
-    railties (3.2.19)
-      actionpack (= 3.2.19)
-      activesupport (= 3.2.19)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (>= 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.9.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rmagick (2.13.1)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rspec-rails (2.10.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (~> 2.10.0)
-    ruby-feedparser (0.7)
-    rubyzip (1.1.2)
-    selenium-webdriver (2.39.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
-    sprockets (2.4.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.0.7)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.15.3)
-    thread_safe (0.3.3)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (1.1.0)
-      thread_safe (~> 0.1)
-    websocket (1.0.7)
-    will_paginate (3.0.3)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  acts-as-taggable-on
-  capybara
-  cucumber
-  cucumber-rails
-  daemons
-  dalli
-  database_cleaner
-  exception_notification
-  fast_gettext
-  gettext
-  hpricot
-  mocha
-  nokogiri
-  pg
-  prototype-rails
-  prototype_legacy_helper (= 0.0.0)!
-  rails
-  rails_autolink
-  rake
-  rest-client
-  rmagick
-  rspec
-  rspec-rails
-  ruby-feedparser
-  selenium-webdriver
-  thin
-  will_paginate
@@ -8,7 +8,6 @@ Rakefile                          usr/share/noosfero
 vendor                            usr/share/noosfero
  
 Gemfile                           usr/share/noosfero
-Gemfile.lock                      usr/share/noosfero
 debian/bundle/config              usr/share/noosfero/.bundle
  
 config/application.rb             usr/share/noosfero/config
@@ -15,3 +15,4 @@ var/lib/noosfero-data/public/thumbnails             usr/share/noosfero/public/th
 usr/share/noosfero/public/designs/themes/noosfero   usr/share/noosfero/public/designs/themes/default
 usr/share/noosfero/public/designs/icons/tango       usr/share/noosfero/public/designs/icons/default
 usr/share/noosfero/script/noosfero-plugins          usr/sbin/noosfero-plugins
+usr/share/noosfero/Gemfile.lock                     /dev/null
@@ -43,3 +43,4 @@ debian/noosfero-apache/
 features/plugins/*
 plugins/solr/config/solr.yml
 /solr
+/Gemfile.lock
1	1	source "https://rubygems.org"
2		-gem 'rails'
3		-gem 'fast_gettext'
4		-gem 'acts-as-taggable-on'
5		-gem 'prototype-rails'
6		-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
7		-gem 'rails_autolink'
8		-gem 'pg'
9		-gem 'rmagick'
10		-gem 'RedCloth'
11		-gem 'will_paginate'
12		-gem 'ruby-feedparser'
13		-gem 'daemons'
14		-gem 'thin'
15		-gem 'hpricot'
16		-gem 'nokogiri'
	2	+gem 'rails', '~> 3.2.19'
	3	+gem 'fast_gettext', '~> 0.6.8'
	4	+gem 'acts-as-taggable-on', '~> 3.0.2'
	5	+gem 'prototype-rails', '~> 3.2.1'
	6	+gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
	7	+gem 'rails_autolink', '~> 1.1.5'
	8	+gem 'pg', '~> 0.13.2'
	9	+gem 'rmagick', '~> 2.13.1'
	10	+gem 'RedCloth', '~> 4.2.9'
	11	+gem 'will_paginate', '~> 3.0.3'
	12	+gem 'ruby-feedparser', '~> 0.7'
	13	+gem 'daemons', '~> 1.1.5'
	14	+gem 'thin', '~> 1.3.1'
	15	+gem 'hpricot', '~> 0.8.6'
	16	+gem 'nokogiri', '~> 1.5.5'
17	17	gem 'rake', :require => false
18		-gem 'rest-client'
19		-gem 'exception_notification'
20		-gem 'gettext', :require => false, :group => :development
	18	+gem 'rest-client', '~> 1.6.7'
	19	+gem 'exception_notification', '~> 4.0.1'
	20	+gem 'gettext', '~> 2.2.1', :require => false, :group => :development
21	21
22	22	# FIXME list here all actual dependencies (i.e. the ones in debian/control),
23	23	# with their GEM names (not the Debian package names)
24	24
25	25	group :production do
26		- gem 'dalli'
	26	+ gem 'dalli', '~> 2.7.0'
27	27	end
28	28
29	29	group :test do
30		- gem 'rspec'
31		- gem 'rspec-rails'
32		- gem 'mocha', :require => false
	30	+ gem 'rspec', '~> 2.10.0'
	31	+ gem 'rspec-rails', '~> 2.10.1'
	32	+ gem 'mocha', '~> 1.1.0', :require => false
33	33	end
34	34
35	35	group :cucumber do
36		- gem 'cucumber-rails', :require => false
37		- gem 'capybara'
38		- gem 'cucumber'
39		- gem 'database_cleaner'
40		- gem 'selenium-webdriver'
	36	+ gem 'cucumber-rails', '~> 1.0.6', :require => false
	37	+ gem 'capybara', '~> 2.1.0'
	38	+ gem 'cucumber', '~> 1.0.6'
	39	+ gem 'database_cleaner', '~> 1.2.0'
	40	+ gem 'selenium-webdriver', '~> 2.39.0'
41	41	end
42	42
43	43	# include plugin gemfiles
...	...
...	...	@@ -1,196 +0,0 @@
1		-PATH
2		- remote: vendor/prototype_legacy_helper
3		- specs:
4		- prototype_legacy_helper (0.0.0)
5		-
6		-GEM
7		- remote: https://rubygems.org/
8		- specs:
9		- RedCloth (4.2.9)
10		- actionmailer (3.2.19)
11		- actionpack (= 3.2.19)
12		- mail (~> 2.5.4)
13		- actionpack (3.2.19)
14		- activemodel (= 3.2.19)
15		- activesupport (= 3.2.19)
16		- builder (~> 3.0)
17		- erubis (~> 2.7.0)
18		- journey (~> 1.0.4)
19		- rack (~> 1.4.5)
20		- rack-cache (~> 1.2)
21		- rack-test (~> 0.6.1)
22		- sprockets (~> 2.2)
23		- activemodel (3.2.19)
24		- activesupport (= 3.2.19)
25		- builder (~> 3.0)
26		- activerecord (3.2.19)
27		- activemodel (= 3.2.19)
28		- activesupport (= 3.2.19)
29		- arel (~> 4.0)
30		- tzinfo (~> 1.0)
31		- activeresource (3.2.19)
32		- activemodel (= 3.2.19)
33		- activesupport (= 3.2.19)
34		- activesupport (3.2.19)
35		- i18n (~> 0.6, >= 0.6.4)
36		- multi_json (~> 1.0)
37		- acts-as-taggable-on (3.0.2)
38		- rails (>= 3, < 5)
39		- arel (4.0.0)
40		- builder (3.0.0)
41		- capybara (2.1.0)
42		- mime-types (>= 1.16)
43		- nokogiri (>= 1.3.3)
44		- rack (>= 1.0.0)
45		- rack-test (>= 0.5.4)
46		- xpath (~> 2.0)
47		- childprocess (0.3.3)
48		- ffi (~> 1.0.6)
49		- cucumber (1.0.6)
50		- builder (>= 2.1.2)
51		- diff-lcs (>= 1.1.2)
52		- gherkin (~> 2.4.18)
53		- json (>= 1.4.6)
54		- term-ansicolor (>= 1.0.6)
55		- cucumber-rails (1.0.6)
56		- capybara (>= 1.1.1)
57		- cucumber (>= 1.0.6)
58		- nokogiri (>= 1.5.0)
59		- daemons (1.1.5)
60		- dalli (2.7.0)
61		- database_cleaner (1.2.0)
62		- diff-lcs (1.1.3)
63		- erubis (2.7.0)
64		- eventmachine (0.12.10)
65		- exception_notification (4.0.1)
66		- actionmailer (>= 3.0.4)
67		- activesupport (>= 3.0.4)
68		- fast_gettext (0.6.8)
69		- ffi (1.0.11)
70		- gettext (2.2.1)
71		- locale
72		- gherkin (2.4.21)
73		- json (>= 1.4.6)
74		- hike (1.2.1)
75		- hpricot (0.8.6)
76		- i18n (0.6.9)
77		- journey (1.0.4)
78		- json (1.7.3)
79		- locale (2.0.5)
80		- mail (2.5.4)
81		- mime-types (~> 1.16)
82		- treetop (~> 1.4.8)
83		- metaclass (0.0.1)
84		- mime-types (1.25)
85		- mocha (1.1.0)
86		- metaclass (~> 0.0.1)
87		- multi_json (1.3.6)
88		- nokogiri (1.5.5)
89		- pg (0.13.2)
90		- polyglot (0.3.3)
91		- prototype-rails (3.2.1)
92		- rails (~> 3.2)
93		- rack (1.4.5)
94		- rack-cache (1.2)
95		- rack (>= 0.4)
96		- rack-ssl (1.3.2)
97		- rack
98		- rack-test (0.6.1)
99		- rack (>= 1.0)
100		- rails (3.2.19)
101		- actionmailer (= 3.2.19)
102		- actionpack (= 3.2.19)
103		- activerecord (= 3.2.19)
104		- activeresource (= 3.2.19)
105		- activesupport (= 3.2.19)
106		- bundler (~> 1.0)
107		- railties (= 3.2.19)
108		- rails_autolink (1.1.5)
109		- rails (> 3.1)
110		- railties (3.2.19)
111		- actionpack (= 3.2.19)
112		- activesupport (= 3.2.19)
113		- rack-ssl (~> 1.3.2)
114		- rake (>= 0.8.7)
115		- rdoc (>= 3.4)
116		- thor (>= 0.14.6, < 2.0)
117		- rake (0.9.2.2)
118		- rdoc (3.9.4)
119		- rest-client (1.6.7)
120		- mime-types (>= 1.16)
121		- rmagick (2.13.1)
122		- rspec (2.10.0)
123		- rspec-core (~> 2.10.0)
124		- rspec-expectations (~> 2.10.0)
125		- rspec-mocks (~> 2.10.0)
126		- rspec-core (2.10.1)
127		- rspec-expectations (2.10.0)
128		- diff-lcs (~> 1.1.3)
129		- rspec-mocks (2.10.1)
130		- rspec-rails (2.10.1)
131		- actionpack (>= 3.0)
132		- activesupport (>= 3.0)
133		- railties (>= 3.0)
134		- rspec (~> 2.10.0)
135		- ruby-feedparser (0.7)
136		- rubyzip (1.1.2)
137		- selenium-webdriver (2.39.0)
138		- childprocess (>= 0.2.5)
139		- multi_json (~> 1.0)
140		- rubyzip (~> 1.0)
141		- websocket (~> 1.0.4)
142		- sprockets (2.4.3)
143		- hike (~> 1.2)
144		- multi_json (~> 1.0)
145		- rack (~> 1.0)
146		- tilt (~> 1.1, != 1.3.0)
147		- term-ansicolor (1.0.7)
148		- thin (1.3.1)
149		- daemons (>= 1.0.9)
150		- eventmachine (>= 0.12.6)
151		- rack (>= 1.0.0)
152		- thor (0.15.3)
153		- thread_safe (0.3.3)
154		- tilt (1.3.3)
155		- treetop (1.4.10)
156		- polyglot
157		- polyglot (>= 0.3.1)
158		- tzinfo (1.1.0)
159		- thread_safe (~> 0.1)
160		- websocket (1.0.7)
161		- will_paginate (3.0.3)
162		- xpath (2.0.0)
163		- nokogiri (~> 1.3)
164		-
165		-PLATFORMS
166		- ruby
167		-
168		-DEPENDENCIES
169		- RedCloth
170		- acts-as-taggable-on
171		- capybara
172		- cucumber
173		- cucumber-rails
174		- daemons
175		- dalli
176		- database_cleaner
177		- exception_notification
178		- fast_gettext
179		- gettext
180		- hpricot
181		- mocha
182		- nokogiri
183		- pg
184		- prototype-rails
185		- prototype_legacy_helper (= 0.0.0)!
186		- rails
187		- rails_autolink
188		- rake
189		- rest-client
190		- rmagick
191		- rspec
192		- rspec-rails
193		- ruby-feedparser
194		- selenium-webdriver
195		- thin
196		- will_paginate
...	...	@@ -8,7 +8,6 @@ Rakefile usr/share/noosfero
8	8	vendor usr/share/noosfero
9	9
10	10	Gemfile usr/share/noosfero
11		-Gemfile.lock usr/share/noosfero
12	11	debian/bundle/config usr/share/noosfero/.bundle
13	12
14	13	config/application.rb usr/share/noosfero/config
...	...
...	...	@@ -15,3 +15,4 @@ var/lib/noosfero-data/public/thumbnails usr/share/noosfero/public/th
15	15	usr/share/noosfero/public/designs/themes/noosfero usr/share/noosfero/public/designs/themes/default
16	16	usr/share/noosfero/public/designs/icons/tango usr/share/noosfero/public/designs/icons/default
17	17	usr/share/noosfero/script/noosfero-plugins usr/sbin/noosfero-plugins
	18	+usr/share/noosfero/Gemfile.lock /dev/null
...	...
...	...	@@ -43,3 +43,4 @@ debian/noosfero-apache/
43	43	features/plugins/*
44	44	plugins/solr/config/solr.yml
45	45	/solr
	46	+/Gemfile.lock
...	...