Download as
Browse Code »

Commit c42cadeb9b1887ef99435f07abc777f14fff1f49

Authored by Alessandro Beltrão
1 parent f8396db0
Exists in master and in 2 other branches deps_rails4, rails4

Updating Gemfile, Gemfile.lock and Makefile 

Signed-off-by: Ricardo Teixeira   <ricardocdzg@gmail.com>
Signed-off-by: Rodrigo Siqueira   <rodrigosiqueiramelo@gmail.com>
Signed-off-by: Alessandro Caetano <alessandro.caetanob@gmail.com>
Showing 3 changed files with 139 additions and 66 deletions   Show diff stats
Gemfile
  Diff comments   View file @c42cade
1 1 source "https://rubygems.org"
2   -gem 'rails', '~> 3.2.21'
  2 +gem 'rails', '~> 3.2.22'
3 3 gem 'minitest', '~> 3.2.0'
4 4 gem 'fast_gettext', '~> 0.6.8'
5 5 gem 'acts-as-taggable-on', '~> 3.4.2'
... ... @@ -10,7 +10,7 @@ gem &#39;RedCloth&#39;, &#39;~&gt; 4.2.9&#39;
10 10 gem 'will_paginate', '~> 3.0.3'
11 11 gem 'ruby-feedparser', '~> 0.7'
12 12 gem 'daemons', '~> 1.1.5'
13   -gem 'thin', '~> 1.3.1'
  13 +gem 'unicorn', '~> 4.8'
14 14 gem 'nokogiri', '~> 1.5.5'
15 15 gem 'rake', :require => false
16 16 gem 'rest-client', '~> 1.6.7'
... ... @@ -18,16 +18,28 @@ gem &#39;exception_notification&#39;, &#39;~&gt; 4.0.1&#39;
18 18 gem 'gettext', '~> 2.2.1', :require => false
19 19 gem 'locale', '~> 2.0.5'
20 20 gem 'whenever', :require => false
21   -gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
  21 +gem 'eita-jrails', '~> 0.9.5', require: 'jrails'
  22 +
  23 +# API dependencies
  24 +gem 'grape', '~> 0.12'
  25 +gem 'grape-entity'
  26 +gem 'grape_logging'
  27 +gem 'rack-cors'
  28 +gem 'rack-contrib'
  29 +
  30 +# asset pipeline
  31 +gem 'uglifier', '>= 1.0.3'
  32 +gem 'sass-rails'
22 33  
23 34 group :production do
24 35 gem 'dalli', '~> 2.7.0'
25 36 end
26 37  
27 38 group :test do
28   - gem 'rspec', '~> 2.10.0'
29   - gem 'rspec-rails', '~> 2.10.1'
  39 + gem 'rspec', '~> 2.14.0'
  40 + gem 'rspec-rails', '~> 2.14.1'
30 41 gem 'mocha', '~> 1.1.0', :require => false
  42 + gem 'test-unit' if RUBY_VERSION >= '2.2.0'
31 43 end
32 44  
33 45 group :cucumber do
... ...
Gemfile.lock
  Diff comments   View file @c42cade
... ... @@ -2,12 +2,12 @@ GEM
2 2 remote: https://rubygems.org/
3 3 specs:
4 4 RedCloth (4.2.9)
5   - actionmailer (3.2.21)
6   - actionpack (= 3.2.21)
  5 + actionmailer (3.2.22)
  6 + actionpack (= 3.2.22)
7 7 mail (~> 2.5.4)
8   - actionpack (3.2.21)
9   - activemodel (= 3.2.21)
10   - activesupport (= 3.2.21)
  8 + actionpack (3.2.22)
  9 + activemodel (= 3.2.22)
  10 + activesupport (= 3.2.22)
11 11 builder (~> 3.0.0)
12 12 erubis (~> 2.7.0)
13 13 journey (~> 1.0.4)
... ... @@ -15,23 +15,27 @@ GEM
15 15 rack-cache (~> 1.2)
16 16 rack-test (~> 0.6.1)
17 17 sprockets (~> 2.2.1)
18   - activemodel (3.2.21)
19   - activesupport (= 3.2.21)
  18 + activemodel (3.2.22)
  19 + activesupport (= 3.2.22)
20 20 builder (~> 3.0.0)
21   - activerecord (3.2.21)
22   - activemodel (= 3.2.21)
23   - activesupport (= 3.2.21)
  21 + activerecord (3.2.22)
  22 + activemodel (= 3.2.22)
  23 + activesupport (= 3.2.22)
24 24 arel (~> 3.0.2)
25 25 tzinfo (~> 0.3.29)
26   - activeresource (3.2.21)
27   - activemodel (= 3.2.21)
28   - activesupport (= 3.2.21)
29   - activesupport (3.2.21)
  26 + activeresource (3.2.22)
  27 + activemodel (= 3.2.22)
  28 + activesupport (= 3.2.22)
  29 + activesupport (3.2.22)
30 30 i18n (~> 0.6, >= 0.6.4)
31 31 multi_json (~> 1.0)
32 32 acts-as-taggable-on (3.4.4)
33 33 activerecord (>= 3.2, < 5)
34 34 arel (3.0.3)
  35 + axiom-types (0.1.1)
  36 + descendants_tracker (~> 0.0.4)
  37 + ice_nine (~> 0.11.0)
  38 + thread_safe (~> 0.3, >= 0.3.1)
35 39 builder (3.0.4)
36 40 capybara (2.1.0)
37 41 mime-types (>= 1.16)
... ... @@ -39,9 +43,11 @@ GEM
39 43 rack (>= 1.0.0)
40 44 rack-test (>= 0.5.4)
41 45 xpath (~> 2.0)
42   - childprocess (0.5.5)
  46 + childprocess (0.5.6)
43 47 ffi (~> 1.0, >= 1.0.11)
44 48 chronic (0.10.2)
  49 + coercible (1.0.0)
  50 + descendants_tracker (~> 0.0.1)
45 51 cucumber (1.0.6)
46 52 builder (>= 2.1.2)
47 53 diff-lcs (>= 1.1.2)
... ... @@ -53,29 +59,51 @@ GEM
53 59 cucumber (>= 1.0.6)
54 60 nokogiri (>= 1.5.0)
55 61 daemons (1.1.9)
56   - dalli (2.7.2)
  62 + dalli (2.7.4)
57 63 database_cleaner (1.2.0)
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)
  64 + descendants_tracker (0.0.4)
  65 + thread_safe (~> 0.3, >= 0.3.1)
  66 + diff-lcs (1.2.5)
  67 + eita-jrails (0.9.8)
  68 + actionpack (>= 3.1.0)
  69 + activesupport (>= 3.0.0)
  70 + equalizer (0.0.11)
62 71 erubis (2.7.0)
63   - eventmachine (1.0.7)
64 72 exception_notification (4.0.1)
65 73 actionmailer (>= 3.0.4)
66 74 activesupport (>= 3.0.4)
  75 + execjs (2.6.0)
67 76 fast_gettext (0.6.12)
68   - ffi (1.9.6)
  77 + ffi (1.9.10)
69 78 gettext (2.2.1)
70 79 locale
71 80 gherkin (2.4.21)
72 81 json (>= 1.4.6)
  82 + git-version-bump (0.15.1)
  83 + grape (0.13.0)
  84 + activesupport
  85 + builder
  86 + hashie (>= 2.1.0)
  87 + multi_json (>= 1.3.2)
  88 + multi_xml (>= 0.5.2)
  89 + rack (>= 1.3.0)
  90 + rack-accept
  91 + rack-mount
  92 + virtus (>= 1.0.0)
  93 + grape-entity (0.4.8)
  94 + activesupport
  95 + multi_json (>= 1.3.2)
  96 + grape_logging (1.1.2)
  97 + grape
  98 + hashie (3.4.2)
73 99 hike (1.2.3)
74 100 i18n (0.7.0)
  101 + ice_nine (0.11.1)
75 102 journey (1.0.4)
76   - json (1.8.2)
  103 + json (1.8.3)
  104 + kgio (2.10.0)
77 105 locale (2.0.9)
78   - magic (0.2.8)
  106 + magic (0.2.9)
79 107 ffi (>= 0.6.3)
80 108 mail (2.5.4)
81 109 mime-types (~> 1.16)
... ... @@ -85,57 +113,74 @@ GEM
85 113 minitest (3.2.0)
86 114 mocha (1.1.0)
87 115 metaclass (~> 0.0.1)
88   - multi_json (1.11.0)
  116 + multi_json (1.11.2)
  117 + multi_xml (0.5.5)
89 118 nokogiri (1.5.11)
90 119 pg (0.13.2)
91 120 polyglot (0.3.5)
92   - rack (1.4.5)
  121 + rack (1.4.7)
  122 + rack-accept (0.4.5)
  123 + rack (>= 0.4)
93 124 rack-cache (1.2)
94 125 rack (>= 0.4)
  126 + rack-contrib (1.4.0)
  127 + git-version-bump (~> 0.15)
  128 + rack (~> 1.4)
  129 + rack-cors (0.4.0)
  130 + rack-mount (0.8.3)
  131 + rack (>= 1.0.0)
95 132 rack-ssl (1.3.4)
96 133 rack
97 134 rack-test (0.6.3)
98 135 rack (>= 1.0)
99   - rails (3.2.21)
100   - actionmailer (= 3.2.21)
101   - actionpack (= 3.2.21)
102   - activerecord (= 3.2.21)
103   - activeresource (= 3.2.21)
104   - activesupport (= 3.2.21)
  136 + rails (3.2.22)
  137 + actionmailer (= 3.2.22)
  138 + actionpack (= 3.2.22)
  139 + activerecord (= 3.2.22)
  140 + activeresource (= 3.2.22)
  141 + activesupport (= 3.2.22)
105 142 bundler (~> 1.0)
106   - railties (= 3.2.21)
  143 + railties (= 3.2.22)
107 144 rails_autolink (1.1.6)
108 145 rails (> 3.1)
109   - railties (3.2.21)
110   - actionpack (= 3.2.21)
111   - activesupport (= 3.2.21)
  146 + railties (3.2.22)
  147 + actionpack (= 3.2.22)
  148 + activesupport (= 3.2.22)
112 149 rack-ssl (~> 1.3.2)
113 150 rake (>= 0.8.7)
114 151 rdoc (~> 3.4)
115 152 thor (>= 0.14.6, < 2.0)
  153 + raindrops (0.15.0)
116 154 rake (10.4.2)
117 155 rdoc (3.12.2)
118 156 json (~> 1.4)
119   - rest-client (1.6.8)
  157 + rest-client (1.6.9)
120 158 mime-types (~> 1.16)
121   - rdoc (>= 2.4.2)
122 159 rmagick (2.13.4)
123   - rspec (2.10.0)
124   - rspec-core (~> 2.10.0)
125   - rspec-expectations (~> 2.10.0)
126   - rspec-mocks (~> 2.10.0)
127   - rspec-core (2.10.1)
128   - rspec-expectations (2.10.0)
129   - diff-lcs (~> 1.1.3)
130   - rspec-mocks (2.10.1)
131   - rspec-rails (2.10.1)
  160 + rspec (2.14.1)
  161 + rspec-core (~> 2.14.0)
  162 + rspec-expectations (~> 2.14.0)
  163 + rspec-mocks (~> 2.14.0)
  164 + rspec-core (2.14.8)
  165 + rspec-expectations (2.14.5)
  166 + diff-lcs (>= 1.1.3, < 2.0)
  167 + rspec-mocks (2.14.6)
  168 + rspec-rails (2.14.2)
132 169 actionpack (>= 3.0)
  170 + activemodel (>= 3.0)
133 171 activesupport (>= 3.0)
134 172 railties (>= 3.0)
135   - rspec (~> 2.10.0)
  173 + rspec-core (~> 2.14.0)
  174 + rspec-expectations (~> 2.14.0)
  175 + rspec-mocks (~> 2.14.0)
136 176 ruby-feedparser (0.9.3)
137 177 magic
138 178 rubyzip (1.1.7)
  179 + sass (3.4.18)
  180 + sass-rails (3.2.6)
  181 + railties (~> 3.2.0)
  182 + sass (>= 3.1.10)
  183 + tilt (~> 1.3)
139 184 selenium-webdriver (2.39.0)
140 185 childprocess (>= 0.2.5)
141 186 multi_json (~> 1.0)
... ... @@ -146,19 +191,28 @@ GEM
146 191 multi_json (~> 1.0)
147 192 rack (~> 1.0)
148 193 tilt (~> 1.1, != 1.3.0)
149   - term-ansicolor (1.3.0)
  194 + term-ansicolor (1.3.2)
150 195 tins (~> 1.0)
151   - thin (1.3.1)
152   - daemons (>= 1.0.9)
153   - eventmachine (>= 0.12.6)
154   - rack (>= 1.0.0)
155 196 thor (0.19.1)
  197 + thread_safe (0.3.5)
156 198 tilt (1.4.1)
157   - tins (1.3.5)
  199 + tins (1.6.0)
158 200 treetop (1.4.15)
159 201 polyglot
160 202 polyglot (>= 0.3.1)
161   - tzinfo (0.3.43)
  203 + tzinfo (0.3.44)
  204 + uglifier (2.7.2)
  205 + execjs (>= 0.3.0)
  206 + json (>= 1.8.0)
  207 + unicorn (4.9.0)
  208 + kgio (~> 2.6)
  209 + rack
  210 + raindrops (~> 0.7)
  211 + virtus (1.0.5)
  212 + axiom-types (~> 0.1)
  213 + coercible (~> 1.0)
  214 + descendants_tracker (~> 0.0, >= 0.0.3)
  215 + equalizer (~> 0.0, >= 0.0.9)
162 216 websocket (1.0.7)
163 217 whenever (0.9.4)
164 218 chronic (>= 0.6.3)
... ... @@ -178,24 +232,31 @@ DEPENDENCIES
178 232 daemons (~> 1.1.5)
179 233 dalli (~> 2.7.0)
180 234 database_cleaner (~> 1.2.0)
181   - eita-jrails (>= 0.9.5)
  235 + eita-jrails (~> 0.9.5)
182 236 exception_notification (~> 4.0.1)
183 237 fast_gettext (~> 0.6.8)
184 238 gettext (~> 2.2.1)
  239 + grape (~> 0.12)
  240 + grape-entity
  241 + grape_logging
185 242 locale (~> 2.0.5)
186 243 minitest (~> 3.2.0)
187 244 mocha (~> 1.1.0)
188 245 nokogiri (~> 1.5.5)
189 246 pg (~> 0.13.2)
190   - rails (~> 3.2.21)
  247 + rack-contrib
  248 + rack-cors
  249 + rails (~> 3.2.22)
191 250 rails_autolink (~> 1.1.5)
192 251 rake
193 252 rest-client (~> 1.6.7)
194 253 rmagick (~> 2.13.1)
195   - rspec (~> 2.10.0)
196   - rspec-rails (~> 2.10.1)
  254 + rspec (~> 2.14.0)
  255 + rspec-rails (~> 2.14.1)
197 256 ruby-feedparser (~> 0.7)
  257 + sass-rails
198 258 selenium-webdriver (~> 2.39.0)
199   - thin (~> 1.3.1)
  259 + uglifier (>= 1.0.3)
  260 + unicorn (~> 4.8)
200 261 whenever
201 262 will_paginate (~> 3.0.3)
... ...
Makefile
  Diff comments   View file @c42cade
1   -VERSION = 1.1
  1 +VERSION = 1.3
2 2 TARBALL = noosfero-deps-$(VERSION).tar.gz
3 3 PREFIX = /usr
4 4 WGET = wget
... ...