diff --git a/Gemfile.lock b/Gemfile.lock index b43f9e4..80c1b28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -156,10 +156,6 @@ GEM actionpack (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) railties (>= 4.0.0, < 5) - activeresource (4.0.0) - activemodel (~> 4.0) - activesupport (~> 4.0) - rails-observers (~> 0.1.1) activesupport (4.2.5) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) @@ -176,7 +172,6 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - buftok (0.2.0) builder (3.2.2) capybara (2.5.0) mime-types (>= 1.16) @@ -190,8 +185,6 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) concurrent-ruby (1.0.0) - crack (0.4.3) - safe_yaml (~> 1.0.0) cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -218,8 +211,6 @@ GEM diffy (3.1.0) domain_name (0.5.25) unf (>= 0.0.5, < 1.0.0) - doorkeeper (1.4.2) - railties (>= 3.1) eita-jrails (0.10.0) actionpack (>= 3.1.0) activesupport (>= 3.0.0) @@ -229,8 +220,6 @@ GEM actionmailer (>= 3.0.4) activesupport (>= 3.0.4) execjs (2.6.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) fast_gettext (0.9.2) ffi (1.9.10) gettext (3.1.9) @@ -259,17 +248,12 @@ GEM grape-entity grape_logging (1.1.2) grape - hashdiff (0.3.0) hashie (3.4.3) - http (0.5.1) - http_parser.rb http-cookie (1.0.2) domain_name (~> 0.5) - http_parser.rb (0.6.0) i18n (0.7.0) ice_nine (0.11.1) json (1.8.3) - jwt (1.5.1) kgio (2.10.0) kramdown (1.9.0) launchy (2.4.3) @@ -282,8 +266,6 @@ GEM ffi (>= 0.6.3) mail (2.6.3) mime-types (>= 1.16, < 3) - memoizable (0.4.2) - thread_safe (~> 0.3, >= 0.3.1) metaclass (0.0.4) mime-types (2.99) mini_portile2 (2.0.0) @@ -298,37 +280,14 @@ GEM multi_json (1.11.2) multi_test (0.1.2) multi_xml (0.5.5) - multipart-post (2.0.0) - naught (1.1.0) netrc (0.11.0) nokogiri (1.6.7.1) mini_portile2 (~> 2.0.0.rc2) - oauth2 (1.1.0) - faraday (>= 0.8, < 0.10) - jwt (~> 1.0, < 1.5.2) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) - omniauth (1.2.2) - hashie (>= 1.2, < 4) - rack (~> 1.0) - omniauth-facebook (2.0.1) - omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.2.10) - addressable (~> 2.3) - jwt (~> 1.0) - multi_json (~> 1.3) - omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) - omniauth-oauth2 (1.3.1) - oauth2 (~> 1.0) - omniauth (~> 1.2) pg (0.18.4) pothoven-attachment_fu (3.2.16) power_assert (0.2.6) protected_attributes (1.1.3) activemodel (>= 4.0.1, < 5.0) - proxifier (1.0.3) rack (1.6.4) rack-accept (0.4.5) rack (>= 0.4) @@ -370,8 +329,6 @@ GEM thor (>= 0.18.1, < 2.0) raindrops (0.15.0) rake (10.4.2) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) @@ -402,7 +359,6 @@ GEM magic ruby-progressbar (1.7.5) rubyzip (1.2.0) - safe_yaml (1.0.4) sass (3.4.20) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) @@ -414,7 +370,6 @@ GEM childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) - simple_oauth (0.2.0) slim (3.0.6) temple (~> 0.7.3) tilt (>= 1.3.3, < 2.1) @@ -434,17 +389,6 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (2.0.1) - twitter (5.8.0) - addressable (~> 2.3) - buftok (~> 0.2.0) - equalizer (~> 0.0.9) - faraday (~> 0.9.0) - http (~> 0.5.0) - http_parser.rb (~> 0.6.0) - json (~> 1.8) - memoizable (~> 0.4.0) - naught (~> 1.0) - simple_oauth (~> 0.2.0) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.7.2) @@ -457,16 +401,11 @@ GEM kgio (~> 2.6) rack raindrops (~> 0.7) - vcr (3.0.1) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) - webmock (2.0.2) - addressable (>= 2.3.6) - crack (>= 0.3.2) - hashdiff websocket (1.2.3) whenever (0.9.4) chronic (>= 0.6.3) @@ -487,7 +426,6 @@ DEPENDENCIES activerecord-deprecated_finders activerecord-jdbcpostgresql-adapter activerecord-session_store - activeresource acts-as-taggable-on (~> 3.5) acts_as_list (= 0.0.0)! acts_as_tree (= 0.0.0)! @@ -505,7 +443,6 @@ DEPENDENCIES delayed_job delayed_job_active_record diffy (~> 3.0) - doorkeeper (~> 1.4.0) eita-jrails (~> 0.10.0) exception_notification (~> 4.0.1) ezcrypto (= 0.0.0)! @@ -529,14 +466,9 @@ DEPENDENCIES monkey_patches (= 0.0.0)! nokogiri (~> 1.6.0) noosfero_caching (= 0.0.0)! - omniauth (~> 1.2.2) - omniauth-facebook (~> 2.0.0) - omniauth-google-oauth2 (~> 0.2.6) - omniauth-oauth2 (~> 1.3.1) pg (~> 0.17) pothoven-attachment_fu (~> 3.2.16) protected_attributes - proxifier (~> 1.0.3) rack-contrib rack-cors rails (~> 4.2.4) @@ -545,7 +477,6 @@ DEPENDENCIES rails_rcov (= 0.0.0)! rake recaptcha (> 0.0.0)! - responders (~> 2.0) rest-client (~> 1.6) rmagick (~> 2.13) rmagick4j @@ -560,13 +491,10 @@ DEPENDENCIES sprockets-rails (~> 2.1) swagger-ui_rails test-unit - twitter (~> 5.8.0) uglifier (>= 1.0.3) unicorn (~> 4.8) validates_as_cnpj (= 0.0.0)! validates_multiparameter_assignments (= 0.0.0)! - vcr - webmock whenever will_paginate (~> 3.0.7) xss_terminate (= 0.0.0)! diff --git a/plugins/pairwise b/plugins/pairwise index 3702423..04e64c1 160000 --- a/plugins/pairwise +++ b/plugins/pairwise @@ -1 +1 @@ -Subproject commit 37024235645ce4258b53dc5b8f931a2ebf4d31bb +Subproject commit 04e64c1b3e7bbfd4033d273c820d06eb7695186e diff --git a/script/noosfero-plugins b/script/noosfero-plugins index 28d3bc2..11eb404 100755 --- a/script/noosfero-plugins +++ b/script/noosfero-plugins @@ -111,25 +111,26 @@ _enable(){ fi installation_ok=true installation_file="$source/install.rb" + dependencies_ok=true if ! run $installation_file; then installation_ok=false - else - dependencies_ok=true - dependencies_file="$source/dependencies.rb" - if [ -e $source/Gemfile ]; then - gemfile=$(mktemp --tmpdir=.) - cat $NOOSFERO_DIR/Gemfile $source/Gemfile > $gemfile - if [ -z "$BUNDLE_OPTS" ]; then BUNDLE_OPTS="--local"; fi - if ! RUBYOPT='' BUNDLE_GEMFILE="$gemfile" bundle $BUNDLE_OPTS --quiet; then - dependencies_ok=false - else - mv "$gemfile".lock Gemfile.lock - fi - rm -f $gemfile - fi - if ! run $dependencies_file; then - dependencies_ok=false - fi + #else + # dependencies_ok=true + # dependencies_file="$source/dependencies.rb" + # if [ -e $source/Gemfile ]; then + # gemfile=$(mktemp --tmpdir=.) + # cat $NOOSFERO_DIR/Gemfile $source/Gemfile > $gemfile + # if [ -z "$BUNDLE_OPTS" ]; then BUNDLE_OPTS="--local"; fi + # if ! RUBYOPT='' BUNDLE_GEMFILE="$gemfile" bundle $BUNDLE_OPTS --quiet; then + # dependencies_ok=false + # else + # mv "$gemfile".lock Gemfile.lock + # fi + # rm -f $gemfile + # fi + # if ! run $dependencies_file; then + # dependencies_ok=false + #fi fi if [ "$installation_ok" = true ] && [ "$dependencies_ok" = true ]; then ln -s "$source" "$target" diff --git a/script/prepare-deploy b/script/prepare-deploy new file mode 100755 index 0000000..3a55a86 --- /dev/null +++ b/script/prepare-deploy @@ -0,0 +1,35 @@ +#!/bin/bash +NOOSFERO_PROJECT_PATH=$HOME/git/projetos/rails/noosfero +NOOSFERO_DEPLOY_PATH=$HOME/git/projetos/rails/noosfero_deploy +NOOSFERO_DEPLOY_APP_PATH=$NOOSFERO_DEPLOY_PATH/noosfero + +cd $NOOSFERO_PROJECT_PATH + +# Os submodulos já devem ter sido inicializados +# git submodule init +# git submodule updatedd + +# Os plugins já devem ter sido habilitados +# script/enable_participa_plugins # consertar script/noosfero_plugins enable para não checar se as dependências de gem estão instaladas + +# e os pacotes do noosfero e dos plugins devem ter sido instalados e empacotados + +# bundle install + +# bundle package + +# Pega a commit mais recente +REV=$(git --git-dir=$NOOSFERO_PROJECT_PATH/.git rev-parse HEAD) + +# exporta os arquivos do index (incluindo submodulos para a pasta de deploy +git checkout-index -a -f --prefix=$NOOSFERO_DEPLOY_APP_PATH/ + +# navega para a pasta com a copia da app em NOOSFERO_DEPLOY_PATH +cd $NOOSFERO_DEPLOY_APP_PATH + +# compacta o arquivo de deploy +tar -czvf ../noosfero-$REV.tar.gz ./**/*.* + + + + diff --git a/vendor/cache/activeresource-4.0.0.gem b/vendor/cache/activeresource-4.0.0.gem deleted file mode 100644 index cae16ef..0000000 Binary files a/vendor/cache/activeresource-4.0.0.gem and /dev/null differ diff --git a/vendor/cache/buftok-0.2.0.gem b/vendor/cache/buftok-0.2.0.gem deleted file mode 100644 index 2c3d94b..0000000 Binary files a/vendor/cache/buftok-0.2.0.gem and /dev/null differ diff --git a/vendor/cache/crack-0.4.3.gem b/vendor/cache/crack-0.4.3.gem deleted file mode 100644 index 12e5937..0000000 Binary files a/vendor/cache/crack-0.4.3.gem and /dev/null differ diff --git a/vendor/cache/doorkeeper-1.4.2.gem b/vendor/cache/doorkeeper-1.4.2.gem deleted file mode 100644 index bf13a44..0000000 Binary files a/vendor/cache/doorkeeper-1.4.2.gem and /dev/null differ diff --git a/vendor/cache/faraday-0.9.2.gem b/vendor/cache/faraday-0.9.2.gem deleted file mode 100644 index 35a1675..0000000 Binary files a/vendor/cache/faraday-0.9.2.gem and /dev/null differ diff --git a/vendor/cache/hashdiff-0.3.0.gem b/vendor/cache/hashdiff-0.3.0.gem deleted file mode 100644 index 7e99463..0000000 Binary files a/vendor/cache/hashdiff-0.3.0.gem and /dev/null differ diff --git a/vendor/cache/http-0.5.1.gem b/vendor/cache/http-0.5.1.gem deleted file mode 100644 index 5c1d3f6..0000000 Binary files a/vendor/cache/http-0.5.1.gem and /dev/null differ diff --git a/vendor/cache/http_parser.rb-0.6.0.gem b/vendor/cache/http_parser.rb-0.6.0.gem deleted file mode 100644 index 3d3d508..0000000 Binary files a/vendor/cache/http_parser.rb-0.6.0.gem and /dev/null differ diff --git a/vendor/cache/jwt-1.5.1.gem b/vendor/cache/jwt-1.5.1.gem deleted file mode 100644 index da00001..0000000 Binary files a/vendor/cache/jwt-1.5.1.gem and /dev/null differ diff --git a/vendor/cache/memoizable-0.4.2.gem b/vendor/cache/memoizable-0.4.2.gem deleted file mode 100644 index 41d1f5b..0000000 Binary files a/vendor/cache/memoizable-0.4.2.gem and /dev/null differ diff --git a/vendor/cache/multipart-post-2.0.0.gem b/vendor/cache/multipart-post-2.0.0.gem deleted file mode 100644 index abfff3d..0000000 Binary files a/vendor/cache/multipart-post-2.0.0.gem and /dev/null differ diff --git a/vendor/cache/naught-1.1.0.gem b/vendor/cache/naught-1.1.0.gem deleted file mode 100644 index 2316b88..0000000 Binary files a/vendor/cache/naught-1.1.0.gem and /dev/null differ diff --git a/vendor/cache/oauth2-1.1.0.gem b/vendor/cache/oauth2-1.1.0.gem deleted file mode 100644 index 86772d2..0000000 Binary files a/vendor/cache/oauth2-1.1.0.gem and /dev/null differ diff --git a/vendor/cache/omniauth-1.2.2.gem b/vendor/cache/omniauth-1.2.2.gem deleted file mode 100644 index b8e4571..0000000 Binary files a/vendor/cache/omniauth-1.2.2.gem and /dev/null differ diff --git a/vendor/cache/omniauth-facebook-2.0.1.gem b/vendor/cache/omniauth-facebook-2.0.1.gem deleted file mode 100644 index e3e23b9..0000000 Binary files a/vendor/cache/omniauth-facebook-2.0.1.gem and /dev/null differ diff --git a/vendor/cache/omniauth-google-oauth2-0.2.10.gem b/vendor/cache/omniauth-google-oauth2-0.2.10.gem deleted file mode 100644 index 14c073e..0000000 Binary files a/vendor/cache/omniauth-google-oauth2-0.2.10.gem and /dev/null differ diff --git a/vendor/cache/omniauth-oauth2-1.3.1.gem b/vendor/cache/omniauth-oauth2-1.3.1.gem deleted file mode 100644 index 4ef5d78..0000000 Binary files a/vendor/cache/omniauth-oauth2-1.3.1.gem and /dev/null differ diff --git a/vendor/cache/proxifier-1.0.3.gem b/vendor/cache/proxifier-1.0.3.gem deleted file mode 100644 index 87c7058..0000000 Binary files a/vendor/cache/proxifier-1.0.3.gem and /dev/null differ diff --git a/vendor/cache/responders-2.2.0.gem b/vendor/cache/responders-2.2.0.gem deleted file mode 100644 index faa0128..0000000 Binary files a/vendor/cache/responders-2.2.0.gem and /dev/null differ diff --git a/vendor/cache/safe_yaml-1.0.4.gem b/vendor/cache/safe_yaml-1.0.4.gem deleted file mode 100644 index 7da49f5..0000000 Binary files a/vendor/cache/safe_yaml-1.0.4.gem and /dev/null differ diff --git a/vendor/cache/simple_oauth-0.2.0.gem b/vendor/cache/simple_oauth-0.2.0.gem deleted file mode 100644 index 5901361..0000000 Binary files a/vendor/cache/simple_oauth-0.2.0.gem and /dev/null differ diff --git a/vendor/cache/twitter-5.8.0.gem b/vendor/cache/twitter-5.8.0.gem deleted file mode 100644 index 585278c..0000000 Binary files a/vendor/cache/twitter-5.8.0.gem and /dev/null differ diff --git a/vendor/cache/vcr-3.0.1.gem b/vendor/cache/vcr-3.0.1.gem deleted file mode 100644 index 7acf444..0000000 Binary files a/vendor/cache/vcr-3.0.1.gem and /dev/null differ diff --git a/vendor/cache/webmock-2.0.2.gem b/vendor/cache/webmock-2.0.2.gem deleted file mode 100644 index 4a7bda0..0000000 Binary files a/vendor/cache/webmock-2.0.2.gem and /dev/null differ -- libgit2 0.21.2