Commit 640cde0565742dbbf3cf5124219e225031687a07

Authored by Ábner Oliveira
1 parent dc24f49e

versão para produção na CD

Gemfile.lock
... ... @@ -156,10 +156,6 @@ GEM
156 156 actionpack (>= 4.0.0, < 5)
157 157 activerecord (>= 4.0.0, < 5)
158 158 railties (>= 4.0.0, < 5)
159   - activeresource (4.0.0)
160   - activemodel (~> 4.0)
161   - activesupport (~> 4.0)
162   - rails-observers (~> 0.1.1)
163 159 activesupport (4.2.5)
164 160 i18n (~> 0.7)
165 161 json (~> 1.7, >= 1.7.7)
... ... @@ -176,7 +172,6 @@ GEM
176 172 descendants_tracker (~> 0.0.4)
177 173 ice_nine (~> 0.11.0)
178 174 thread_safe (~> 0.3, >= 0.3.1)
179   - buftok (0.2.0)
180 175 builder (3.2.2)
181 176 capybara (2.5.0)
182 177 mime-types (>= 1.16)
... ... @@ -190,8 +185,6 @@ GEM
190 185 coercible (1.0.0)
191 186 descendants_tracker (~> 0.0.1)
192 187 concurrent-ruby (1.0.0)
193   - crack (0.4.3)
194   - safe_yaml (~> 1.0.0)
195 188 cucumber (1.3.20)
196 189 builder (>= 2.1.2)
197 190 diff-lcs (>= 1.1.3)
... ... @@ -218,8 +211,6 @@ GEM
218 211 diffy (3.1.0)
219 212 domain_name (0.5.25)
220 213 unf (>= 0.0.5, < 1.0.0)
221   - doorkeeper (1.4.2)
222   - railties (>= 3.1)
223 214 eita-jrails (0.10.0)
224 215 actionpack (>= 3.1.0)
225 216 activesupport (>= 3.0.0)
... ... @@ -229,8 +220,6 @@ GEM
229 220 actionmailer (>= 3.0.4)
230 221 activesupport (>= 3.0.4)
231 222 execjs (2.6.0)
232   - faraday (0.9.2)
233   - multipart-post (>= 1.2, < 3)
234 223 fast_gettext (0.9.2)
235 224 ffi (1.9.10)
236 225 gettext (3.1.9)
... ... @@ -259,17 +248,12 @@ GEM
259 248 grape-entity
260 249 grape_logging (1.1.2)
261 250 grape
262   - hashdiff (0.3.0)
263 251 hashie (3.4.3)
264   - http (0.5.1)
265   - http_parser.rb
266 252 http-cookie (1.0.2)
267 253 domain_name (~> 0.5)
268   - http_parser.rb (0.6.0)
269 254 i18n (0.7.0)
270 255 ice_nine (0.11.1)
271 256 json (1.8.3)
272   - jwt (1.5.1)
273 257 kgio (2.10.0)
274 258 kramdown (1.9.0)
275 259 launchy (2.4.3)
... ... @@ -282,8 +266,6 @@ GEM
282 266 ffi (>= 0.6.3)
283 267 mail (2.6.3)
284 268 mime-types (>= 1.16, < 3)
285   - memoizable (0.4.2)
286   - thread_safe (~> 0.3, >= 0.3.1)
287 269 metaclass (0.0.4)
288 270 mime-types (2.99)
289 271 mini_portile2 (2.0.0)
... ... @@ -298,37 +280,14 @@ GEM
298 280 multi_json (1.11.2)
299 281 multi_test (0.1.2)
300 282 multi_xml (0.5.5)
301   - multipart-post (2.0.0)
302   - naught (1.1.0)
303 283 netrc (0.11.0)
304 284 nokogiri (1.6.7.1)
305 285 mini_portile2 (~> 2.0.0.rc2)
306   - oauth2 (1.1.0)
307   - faraday (>= 0.8, < 0.10)
308   - jwt (~> 1.0, < 1.5.2)
309   - multi_json (~> 1.3)
310   - multi_xml (~> 0.5)
311   - rack (>= 1.2, < 3)
312   - omniauth (1.2.2)
313   - hashie (>= 1.2, < 4)
314   - rack (~> 1.0)
315   - omniauth-facebook (2.0.1)
316   - omniauth-oauth2 (~> 1.2)
317   - omniauth-google-oauth2 (0.2.10)
318   - addressable (~> 2.3)
319   - jwt (~> 1.0)
320   - multi_json (~> 1.3)
321   - omniauth (>= 1.1.1)
322   - omniauth-oauth2 (~> 1.3.1)
323   - omniauth-oauth2 (1.3.1)
324   - oauth2 (~> 1.0)
325   - omniauth (~> 1.2)
326 286 pg (0.18.4)
327 287 pothoven-attachment_fu (3.2.16)
328 288 power_assert (0.2.6)
329 289 protected_attributes (1.1.3)
330 290 activemodel (>= 4.0.1, < 5.0)
331   - proxifier (1.0.3)
332 291 rack (1.6.4)
333 292 rack-accept (0.4.5)
334 293 rack (>= 0.4)
... ... @@ -370,8 +329,6 @@ GEM
370 329 thor (>= 0.18.1, < 2.0)
371 330 raindrops (0.15.0)
372 331 rake (10.4.2)
373   - responders (2.2.0)
374   - railties (>= 4.2.0, < 5.1)
375 332 rest-client (1.8.0)
376 333 http-cookie (>= 1.0.2, < 2.0)
377 334 mime-types (>= 1.16, < 3.0)
... ... @@ -402,7 +359,6 @@ GEM
402 359 magic
403 360 ruby-progressbar (1.7.5)
404 361 rubyzip (1.2.0)
405   - safe_yaml (1.0.4)
406 362 sass (3.4.20)
407 363 sass-rails (5.0.4)
408 364 railties (>= 4.0.0, < 5.0)
... ... @@ -414,7 +370,6 @@ GEM
414 370 childprocess (~> 0.5)
415 371 rubyzip (~> 1.0)
416 372 websocket (~> 1.0)
417   - simple_oauth (0.2.0)
418 373 slim (3.0.6)
419 374 temple (~> 0.7.3)
420 375 tilt (>= 1.3.3, < 2.1)
... ... @@ -434,17 +389,6 @@ GEM
434 389 thor (0.19.1)
435 390 thread_safe (0.3.5)
436 391 tilt (2.0.1)
437   - twitter (5.8.0)
438   - addressable (~> 2.3)
439   - buftok (~> 0.2.0)
440   - equalizer (~> 0.0.9)
441   - faraday (~> 0.9.0)
442   - http (~> 0.5.0)
443   - http_parser.rb (~> 0.6.0)
444   - json (~> 1.8)
445   - memoizable (~> 0.4.0)
446   - naught (~> 1.0)
447   - simple_oauth (~> 0.2.0)
448 392 tzinfo (1.2.2)
449 393 thread_safe (~> 0.1)
450 394 uglifier (2.7.2)
... ... @@ -457,16 +401,11 @@ GEM
457 401 kgio (~> 2.6)
458 402 rack
459 403 raindrops (~> 0.7)
460   - vcr (3.0.1)
461 404 virtus (1.0.5)
462 405 axiom-types (~> 0.1)
463 406 coercible (~> 1.0)
464 407 descendants_tracker (~> 0.0, >= 0.0.3)
465 408 equalizer (~> 0.0, >= 0.0.9)
466   - webmock (2.0.2)
467   - addressable (>= 2.3.6)
468   - crack (>= 0.3.2)
469   - hashdiff
470 409 websocket (1.2.3)
471 410 whenever (0.9.4)
472 411 chronic (>= 0.6.3)
... ... @@ -487,7 +426,6 @@ DEPENDENCIES
487 426 activerecord-deprecated_finders
488 427 activerecord-jdbcpostgresql-adapter
489 428 activerecord-session_store
490   - activeresource
491 429 acts-as-taggable-on (~> 3.5)
492 430 acts_as_list (= 0.0.0)!
493 431 acts_as_tree (= 0.0.0)!
... ... @@ -505,7 +443,6 @@ DEPENDENCIES
505 443 delayed_job
506 444 delayed_job_active_record
507 445 diffy (~> 3.0)
508   - doorkeeper (~> 1.4.0)
509 446 eita-jrails (~> 0.10.0)
510 447 exception_notification (~> 4.0.1)
511 448 ezcrypto (= 0.0.0)!
... ... @@ -529,14 +466,9 @@ DEPENDENCIES
529 466 monkey_patches (= 0.0.0)!
530 467 nokogiri (~> 1.6.0)
531 468 noosfero_caching (= 0.0.0)!
532   - omniauth (~> 1.2.2)
533   - omniauth-facebook (~> 2.0.0)
534   - omniauth-google-oauth2 (~> 0.2.6)
535   - omniauth-oauth2 (~> 1.3.1)
536 469 pg (~> 0.17)
537 470 pothoven-attachment_fu (~> 3.2.16)
538 471 protected_attributes
539   - proxifier (~> 1.0.3)
540 472 rack-contrib
541 473 rack-cors
542 474 rails (~> 4.2.4)
... ... @@ -545,7 +477,6 @@ DEPENDENCIES
545 477 rails_rcov (= 0.0.0)!
546 478 rake
547 479 recaptcha (> 0.0.0)!
548   - responders (~> 2.0)
549 480 rest-client (~> 1.6)
550 481 rmagick (~> 2.13)
551 482 rmagick4j
... ... @@ -560,13 +491,10 @@ DEPENDENCIES
560 491 sprockets-rails (~> 2.1)
561 492 swagger-ui_rails
562 493 test-unit
563   - twitter (~> 5.8.0)
564 494 uglifier (>= 1.0.3)
565 495 unicorn (~> 4.8)
566 496 validates_as_cnpj (= 0.0.0)!
567 497 validates_multiparameter_assignments (= 0.0.0)!
568   - vcr
569   - webmock
570 498 whenever
571 499 will_paginate (~> 3.0.7)
572 500 xss_terminate (= 0.0.0)!
... ...
plugins/pairwise
1   -Subproject commit 37024235645ce4258b53dc5b8f931a2ebf4d31bb
  1 +Subproject commit 04e64c1b3e7bbfd4033d273c820d06eb7695186e
... ...
script/noosfero-plugins
... ... @@ -111,25 +111,26 @@ _enable(){
111 111 fi
112 112 installation_ok=true
113 113 installation_file="$source/install.rb"
  114 + dependencies_ok=true
114 115 if ! run $installation_file; then
115 116 installation_ok=false
116   - else
117   - dependencies_ok=true
118   - dependencies_file="$source/dependencies.rb"
119   - if [ -e $source/Gemfile ]; then
120   - gemfile=$(mktemp --tmpdir=.)
121   - cat $NOOSFERO_DIR/Gemfile $source/Gemfile > $gemfile
122   - if [ -z "$BUNDLE_OPTS" ]; then BUNDLE_OPTS="--local"; fi
123   - if ! RUBYOPT='' BUNDLE_GEMFILE="$gemfile" bundle $BUNDLE_OPTS --quiet; then
124   - dependencies_ok=false
125   - else
126   - mv "$gemfile".lock Gemfile.lock
127   - fi
128   - rm -f $gemfile
129   - fi
130   - if ! run $dependencies_file; then
131   - dependencies_ok=false
132   - fi
  117 + #else
  118 + # dependencies_ok=true
  119 + # dependencies_file="$source/dependencies.rb"
  120 + # if [ -e $source/Gemfile ]; then
  121 + # gemfile=$(mktemp --tmpdir=.)
  122 + # cat $NOOSFERO_DIR/Gemfile $source/Gemfile > $gemfile
  123 + # if [ -z "$BUNDLE_OPTS" ]; then BUNDLE_OPTS="--local"; fi
  124 + # if ! RUBYOPT='' BUNDLE_GEMFILE="$gemfile" bundle $BUNDLE_OPTS --quiet; then
  125 + # dependencies_ok=false
  126 + # else
  127 + # mv "$gemfile".lock Gemfile.lock
  128 + # fi
  129 + # rm -f $gemfile
  130 + # fi
  131 + # if ! run $dependencies_file; then
  132 + # dependencies_ok=false
  133 + #fi
133 134 fi
134 135 if [ "$installation_ok" = true ] && [ "$dependencies_ok" = true ]; then
135 136 ln -s "$source" "$target"
... ...
script/prepare-deploy 0 → 100755
... ... @@ -0,0 +1,35 @@
  1 +#!/bin/bash
  2 +NOOSFERO_PROJECT_PATH=$HOME/git/projetos/rails/noosfero
  3 +NOOSFERO_DEPLOY_PATH=$HOME/git/projetos/rails/noosfero_deploy
  4 +NOOSFERO_DEPLOY_APP_PATH=$NOOSFERO_DEPLOY_PATH/noosfero
  5 +
  6 +cd $NOOSFERO_PROJECT_PATH
  7 +
  8 +# Os submodulos já devem ter sido inicializados
  9 +# git submodule init
  10 +# git submodule updatedd
  11 +
  12 +# Os plugins já devem ter sido habilitados
  13 +# script/enable_participa_plugins # consertar script/noosfero_plugins enable para não checar se as dependências de gem estão instaladas
  14 +
  15 +# e os pacotes do noosfero e dos plugins devem ter sido instalados e empacotados
  16 +
  17 +# bundle install
  18 +
  19 +# bundle package
  20 +
  21 +# Pega a commit mais recente
  22 +REV=$(git --git-dir=$NOOSFERO_PROJECT_PATH/.git rev-parse HEAD)
  23 +
  24 +# exporta os arquivos do index (incluindo submodulos para a pasta de deploy
  25 +git checkout-index -a -f --prefix=$NOOSFERO_DEPLOY_APP_PATH/
  26 +
  27 +# navega para a pasta com a copia da app em NOOSFERO_DEPLOY_PATH
  28 +cd $NOOSFERO_DEPLOY_APP_PATH
  29 +
  30 +# compacta o arquivo de deploy
  31 +tar -czvf ../noosfero-$REV.tar.gz ./**/*.*
  32 +
  33 +
  34 +
  35 +
... ...
vendor/cache/activeresource-4.0.0.gem
No preview for this file type
vendor/cache/buftok-0.2.0.gem
No preview for this file type
vendor/cache/crack-0.4.3.gem
No preview for this file type
vendor/cache/doorkeeper-1.4.2.gem
No preview for this file type
vendor/cache/faraday-0.9.2.gem
No preview for this file type
vendor/cache/hashdiff-0.3.0.gem
No preview for this file type
vendor/cache/http-0.5.1.gem
No preview for this file type
vendor/cache/http_parser.rb-0.6.0.gem
No preview for this file type
vendor/cache/jwt-1.5.1.gem
No preview for this file type
vendor/cache/memoizable-0.4.2.gem
No preview for this file type
vendor/cache/multipart-post-2.0.0.gem
No preview for this file type
vendor/cache/naught-1.1.0.gem
No preview for this file type
vendor/cache/oauth2-1.1.0.gem
No preview for this file type
vendor/cache/omniauth-1.2.2.gem
No preview for this file type
vendor/cache/omniauth-facebook-2.0.1.gem
No preview for this file type
vendor/cache/omniauth-google-oauth2-0.2.10.gem
No preview for this file type
vendor/cache/omniauth-oauth2-1.3.1.gem
No preview for this file type
vendor/cache/proxifier-1.0.3.gem
No preview for this file type
vendor/cache/responders-2.2.0.gem
No preview for this file type
vendor/cache/safe_yaml-1.0.4.gem
No preview for this file type
vendor/cache/simple_oauth-0.2.0.gem
No preview for this file type
vendor/cache/twitter-5.8.0.gem
No preview for this file type
vendor/cache/vcr-3.0.1.gem
No preview for this file type
vendor/cache/webmock-2.0.2.gem
No preview for this file type