Commit 278ea6dea61b1e3088209ca3f19b26e395bac58a
1 parent
013b22a0
Exists in
master
and in
3 other branches
Updated dependencies of new Gemfile
Showing
19 changed files
with
27 additions
and
29 deletions
Show diff stats
Gemfile
1 | source "https://rubygems.org" | 1 | source "https://rubygems.org" |
2 | -gem 'rails', '~> 3.2.19' | 2 | +gem 'rails', '~> 3.2.21' |
3 | +gem 'minitest', '~> 3.2.0' | ||
3 | gem 'fast_gettext', '~> 0.6.8' | 4 | 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' | 5 | +gem 'acts-as-taggable-on', '~> 3.4.2' |
7 | gem 'rails_autolink', '~> 1.1.5' | 6 | gem 'rails_autolink', '~> 1.1.5' |
8 | gem 'pg', '~> 0.13.2' | 7 | gem 'pg', '~> 0.13.2' |
9 | gem 'rmagick', '~> 2.13.1' | 8 | gem 'rmagick', '~> 2.13.1' |
@@ -12,16 +11,14 @@ gem 'will_paginate', '~> 3.0.3' | @@ -12,16 +11,14 @@ gem 'will_paginate', '~> 3.0.3' | ||
12 | gem 'ruby-feedparser', '~> 0.7' | 11 | gem 'ruby-feedparser', '~> 0.7' |
13 | gem 'daemons', '~> 1.1.5' | 12 | gem 'daemons', '~> 1.1.5' |
14 | gem 'thin', '~> 1.3.1' | 13 | gem 'thin', '~> 1.3.1' |
15 | -gem 'hpricot', '~> 0.8.6' | ||
16 | gem 'nokogiri', '~> 1.5.5' | 14 | gem 'nokogiri', '~> 1.5.5' |
17 | gem 'rake', :require => false | 15 | gem 'rake', :require => false |
18 | gem 'rest-client', '~> 1.6.7' | 16 | gem 'rest-client', '~> 1.6.7' |
19 | gem 'exception_notification', '~> 4.0.1' | 17 | gem 'exception_notification', '~> 4.0.1' |
20 | gem 'gettext', '~> 2.2.1', :require => false, :group => :development | 18 | gem 'gettext', '~> 2.2.1', :require => false, :group => :development |
21 | gem 'locale', '~> 2.0.5' | 19 | gem 'locale', '~> 2.0.5' |
22 | - | ||
23 | -# FIXME list here all actual dependencies (i.e. the ones in debian/control), | ||
24 | -# with their GEM names (not the Debian package names) | 20 | +gem 'whenever', :require => false |
21 | +gem 'eita-jrails', '>= 0.9.5', :require => 'jrails' | ||
25 | 22 | ||
26 | group :production do | 23 | group :production do |
27 | gem 'dalli', '~> 2.7.0' | 24 | gem 'dalli', '~> 2.7.0' |
@@ -41,6 +38,9 @@ group :cucumber do | @@ -41,6 +38,9 @@ group :cucumber do | ||
41 | gem 'selenium-webdriver', '~> 2.39.0' | 38 | gem 'selenium-webdriver', '~> 2.39.0' |
42 | end | 39 | end |
43 | 40 | ||
41 | +# Requires custom dependencies | ||
42 | +eval(File.read('config/Gemfile'), binding) rescue nil | ||
43 | + | ||
44 | # include gemfiles from enabled plugins | 44 | # include gemfiles from enabled plugins |
45 | # plugins in baseplugins/ are not included on purpose. They should not have any | 45 | # plugins in baseplugins/ are not included on purpose. They should not have any |
46 | # dependencies. | 46 | # dependencies. |
Gemfile.lock
1 | -PATH | ||
2 | - remote: vendor/prototype_legacy_helper | ||
3 | - specs: | ||
4 | - prototype_legacy_helper (0.0.0) | ||
5 | - | ||
6 | GEM | 1 | GEM |
7 | remote: https://rubygems.org/ | 2 | remote: https://rubygems.org/ |
8 | specs: | 3 | specs: |
@@ -34,8 +29,8 @@ GEM | @@ -34,8 +29,8 @@ GEM | ||
34 | activesupport (3.2.21) | 29 | activesupport (3.2.21) |
35 | i18n (~> 0.6, >= 0.6.4) | 30 | i18n (~> 0.6, >= 0.6.4) |
36 | multi_json (~> 1.0) | 31 | multi_json (~> 1.0) |
37 | - acts-as-taggable-on (3.0.2) | ||
38 | - rails (>= 3, < 5) | 32 | + acts-as-taggable-on (3.4.4) |
33 | + activerecord (>= 3.2, < 5) | ||
39 | arel (3.0.3) | 34 | arel (3.0.3) |
40 | builder (3.0.4) | 35 | builder (3.0.4) |
41 | capybara (2.1.0) | 36 | capybara (2.1.0) |
@@ -46,6 +41,7 @@ GEM | @@ -46,6 +41,7 @@ GEM | ||
46 | xpath (~> 2.0) | 41 | xpath (~> 2.0) |
47 | childprocess (0.5.5) | 42 | childprocess (0.5.5) |
48 | ffi (~> 1.0, >= 1.0.11) | 43 | ffi (~> 1.0, >= 1.0.11) |
44 | + chronic (0.10.2) | ||
49 | cucumber (1.0.6) | 45 | cucumber (1.0.6) |
50 | builder (>= 2.1.2) | 46 | builder (>= 2.1.2) |
51 | diff-lcs (>= 1.1.2) | 47 | diff-lcs (>= 1.1.2) |
@@ -60,8 +56,11 @@ GEM | @@ -60,8 +56,11 @@ GEM | ||
60 | dalli (2.7.2) | 56 | dalli (2.7.2) |
61 | database_cleaner (1.2.0) | 57 | database_cleaner (1.2.0) |
62 | diff-lcs (1.1.3) | 58 | diff-lcs (1.1.3) |
59 | + eita-jrails (0.9.5) | ||
60 | + actionpack (~> 3.2, >= 3.1.0) | ||
61 | + activesupport (~> 3.2, >= 3.0.0) | ||
63 | erubis (2.7.0) | 62 | erubis (2.7.0) |
64 | - eventmachine (1.0.4) | 63 | + eventmachine (1.0.7) |
65 | exception_notification (4.0.1) | 64 | exception_notification (4.0.1) |
66 | actionmailer (>= 3.0.4) | 65 | actionmailer (>= 3.0.4) |
67 | activesupport (>= 3.0.4) | 66 | activesupport (>= 3.0.4) |
@@ -72,7 +71,6 @@ GEM | @@ -72,7 +71,6 @@ GEM | ||
72 | gherkin (2.4.21) | 71 | gherkin (2.4.21) |
73 | json (>= 1.4.6) | 72 | json (>= 1.4.6) |
74 | hike (1.2.3) | 73 | hike (1.2.3) |
75 | - hpricot (0.8.6) | ||
76 | i18n (0.7.0) | 74 | i18n (0.7.0) |
77 | journey (1.0.4) | 75 | journey (1.0.4) |
78 | json (1.8.2) | 76 | json (1.8.2) |
@@ -84,14 +82,13 @@ GEM | @@ -84,14 +82,13 @@ GEM | ||
84 | treetop (~> 1.4.8) | 82 | treetop (~> 1.4.8) |
85 | metaclass (0.0.4) | 83 | metaclass (0.0.4) |
86 | mime-types (1.25.1) | 84 | mime-types (1.25.1) |
85 | + minitest (3.2.0) | ||
87 | mocha (1.1.0) | 86 | mocha (1.1.0) |
88 | metaclass (~> 0.0.1) | 87 | metaclass (~> 0.0.1) |
89 | - multi_json (1.10.1) | 88 | + multi_json (1.11.0) |
90 | nokogiri (1.5.11) | 89 | nokogiri (1.5.11) |
91 | pg (0.13.2) | 90 | pg (0.13.2) |
92 | polyglot (0.3.5) | 91 | polyglot (0.3.5) |
93 | - prototype-rails (3.2.1) | ||
94 | - rails (~> 3.2) | ||
95 | rack (1.4.5) | 92 | rack (1.4.5) |
96 | rack-cache (1.2) | 93 | rack-cache (1.2) |
97 | rack (>= 0.4) | 94 | rack (>= 0.4) |
@@ -138,7 +135,7 @@ GEM | @@ -138,7 +135,7 @@ GEM | ||
138 | rspec (~> 2.10.0) | 135 | rspec (~> 2.10.0) |
139 | ruby-feedparser (0.9.3) | 136 | ruby-feedparser (0.9.3) |
140 | magic | 137 | magic |
141 | - rubyzip (1.1.6) | 138 | + rubyzip (1.1.7) |
142 | selenium-webdriver (2.39.0) | 139 | selenium-webdriver (2.39.0) |
143 | childprocess (>= 0.2.5) | 140 | childprocess (>= 0.2.5) |
144 | multi_json (~> 1.0) | 141 | multi_json (~> 1.0) |
@@ -157,12 +154,14 @@ GEM | @@ -157,12 +154,14 @@ GEM | ||
157 | rack (>= 1.0.0) | 154 | rack (>= 1.0.0) |
158 | thor (0.19.1) | 155 | thor (0.19.1) |
159 | tilt (1.4.1) | 156 | tilt (1.4.1) |
160 | - tins (1.3.3) | 157 | + tins (1.3.5) |
161 | treetop (1.4.15) | 158 | treetop (1.4.15) |
162 | polyglot | 159 | polyglot |
163 | polyglot (>= 0.3.1) | 160 | polyglot (>= 0.3.1) |
164 | - tzinfo (0.3.42) | 161 | + tzinfo (0.3.43) |
165 | websocket (1.0.7) | 162 | websocket (1.0.7) |
163 | + whenever (0.9.4) | ||
164 | + chronic (>= 0.6.3) | ||
166 | will_paginate (3.0.7) | 165 | will_paginate (3.0.7) |
167 | xpath (2.0.0) | 166 | xpath (2.0.0) |
168 | nokogiri (~> 1.3) | 167 | nokogiri (~> 1.3) |
@@ -172,24 +171,23 @@ PLATFORMS | @@ -172,24 +171,23 @@ PLATFORMS | ||
172 | 171 | ||
173 | DEPENDENCIES | 172 | DEPENDENCIES |
174 | RedCloth (~> 4.2.9) | 173 | RedCloth (~> 4.2.9) |
175 | - acts-as-taggable-on (~> 3.0.2) | 174 | + acts-as-taggable-on (~> 3.4.2) |
176 | capybara (~> 2.1.0) | 175 | capybara (~> 2.1.0) |
177 | cucumber (~> 1.0.6) | 176 | cucumber (~> 1.0.6) |
178 | cucumber-rails (~> 1.0.6) | 177 | cucumber-rails (~> 1.0.6) |
179 | daemons (~> 1.1.5) | 178 | daemons (~> 1.1.5) |
180 | dalli (~> 2.7.0) | 179 | dalli (~> 2.7.0) |
181 | database_cleaner (~> 1.2.0) | 180 | database_cleaner (~> 1.2.0) |
181 | + eita-jrails (>= 0.9.5) | ||
182 | exception_notification (~> 4.0.1) | 182 | exception_notification (~> 4.0.1) |
183 | fast_gettext (~> 0.6.8) | 183 | fast_gettext (~> 0.6.8) |
184 | gettext (~> 2.2.1) | 184 | gettext (~> 2.2.1) |
185 | - hpricot (~> 0.8.6) | ||
186 | locale (~> 2.0.5) | 185 | locale (~> 2.0.5) |
186 | + minitest (~> 3.2.0) | ||
187 | mocha (~> 1.1.0) | 187 | mocha (~> 1.1.0) |
188 | nokogiri (~> 1.5.5) | 188 | nokogiri (~> 1.5.5) |
189 | pg (~> 0.13.2) | 189 | pg (~> 0.13.2) |
190 | - prototype-rails (~> 3.2.1) | ||
191 | - prototype_legacy_helper (= 0.0.0)! | ||
192 | - rails (~> 3.2.19) | 190 | + rails (~> 3.2.21) |
193 | rails_autolink (~> 1.1.5) | 191 | rails_autolink (~> 1.1.5) |
194 | rake | 192 | rake |
195 | rest-client (~> 1.6.7) | 193 | rest-client (~> 1.6.7) |
@@ -199,4 +197,5 @@ DEPENDENCIES | @@ -199,4 +197,5 @@ DEPENDENCIES | ||
199 | ruby-feedparser (~> 0.7) | 197 | ruby-feedparser (~> 0.7) |
200 | selenium-webdriver (~> 2.39.0) | 198 | selenium-webdriver (~> 2.39.0) |
201 | thin (~> 1.3.1) | 199 | thin (~> 1.3.1) |
200 | + whenever | ||
202 | will_paginate (~> 3.0.3) | 201 | will_paginate (~> 3.0.3) |
Makefile
@@ -16,7 +16,6 @@ $(TARBALL): | @@ -16,7 +16,6 @@ $(TARBALL): | ||
16 | 16 | ||
17 | install: all | 17 | install: all |
18 | mkdir -p $(DESTDIR)$(PREFIX)/lib/noosfero/vendor | 18 | mkdir -p $(DESTDIR)$(PREFIX)/lib/noosfero/vendor |
19 | - mkdir -p $(DESTDIR)$(PREFIX)/vendor/prototype_legacy_helper | ||
20 | install -m 0644 Gemfile $(DESTDIR)$(PREFIX)/lib/noosfero | 19 | install -m 0644 Gemfile $(DESTDIR)$(PREFIX)/lib/noosfero |
21 | install -m 0644 Gemfile.lock $(DESTDIR)$(PREFIX)/lib/noosfero | 20 | install -m 0644 Gemfile.lock $(DESTDIR)$(PREFIX)/lib/noosfero |
22 | cp -r .bundle $(DESTDIR)$(PREFIX)/lib/noosfero/.bundle | 21 | cp -r .bundle $(DESTDIR)$(PREFIX)/lib/noosfero/.bundle |
vendor/cache/acts-as-taggable-on-3.0.2.gem
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
vendor/cache/eventmachine-1.0.4.gem
No preview for this file type
No preview for this file type
vendor/cache/hpricot-0.8.6.gem
No preview for this file type
No preview for this file type
vendor/cache/multi_json-1.10.1.gem
No preview for this file type
No preview for this file type
vendor/cache/prototype-rails-3.2.1.gem
No preview for this file type
vendor/cache/rubyzip-1.1.6.gem
No preview for this file type
vendor/cache/tins-1.3.3.gem
No preview for this file type
vendor/cache/tzinfo-0.3.42.gem
No preview for this file type
No preview for this file type
No preview for this file type