From c42cadeb9b1887ef99435f07abc777f14fff1f49 Mon Sep 17 00:00:00 2001 From: Alessandro Caetano Date: Fri, 11 Sep 2015 17:08:16 -0400 Subject: [PATCH] Updating Gemfile, Gemfile.lock and Makefile --- Gemfile | 22 +++++++++++++++++----- Gemfile.lock | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------ Makefile | 2 +- 3 files changed, 139 insertions(+), 66 deletions(-) diff --git a/Gemfile b/Gemfile index 5de65c8..e6e0b31 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -gem 'rails', '~> 3.2.21' +gem 'rails', '~> 3.2.22' gem 'minitest', '~> 3.2.0' gem 'fast_gettext', '~> 0.6.8' gem 'acts-as-taggable-on', '~> 3.4.2' @@ -10,7 +10,7 @@ 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 'unicorn', '~> 4.8' gem 'nokogiri', '~> 1.5.5' gem 'rake', :require => false gem 'rest-client', '~> 1.6.7' @@ -18,16 +18,28 @@ gem 'exception_notification', '~> 4.0.1' gem 'gettext', '~> 2.2.1', :require => false gem 'locale', '~> 2.0.5' gem 'whenever', :require => false -gem 'eita-jrails', '>= 0.9.5', :require => 'jrails' +gem 'eita-jrails', '~> 0.9.5', require: 'jrails' + +# API dependencies +gem 'grape', '~> 0.12' +gem 'grape-entity' +gem 'grape_logging' +gem 'rack-cors' +gem 'rack-contrib' + +# asset pipeline +gem 'uglifier', '>= 1.0.3' +gem 'sass-rails' group :production do gem 'dalli', '~> 2.7.0' end group :test do - gem 'rspec', '~> 2.10.0' - gem 'rspec-rails', '~> 2.10.1' + gem 'rspec', '~> 2.14.0' + gem 'rspec-rails', '~> 2.14.1' gem 'mocha', '~> 1.1.0', :require => false + gem 'test-unit' if RUBY_VERSION >= '2.2.0' end group :cucumber do diff --git a/Gemfile.lock b/Gemfile.lock index b9aa06b..2e7f095 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (3.2.21) - actionpack (= 3.2.21) + actionmailer (3.2.22) + actionpack (= 3.2.22) mail (~> 2.5.4) - actionpack (3.2.21) - activemodel (= 3.2.21) - activesupport (= 3.2.21) + actionpack (3.2.22) + activemodel (= 3.2.22) + activesupport (= 3.2.22) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -15,23 +15,27 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.21) - activesupport (= 3.2.21) + activemodel (3.2.22) + activesupport (= 3.2.22) builder (~> 3.0.0) - activerecord (3.2.21) - activemodel (= 3.2.21) - activesupport (= 3.2.21) + activerecord (3.2.22) + activemodel (= 3.2.22) + activesupport (= 3.2.22) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.21) - activemodel (= 3.2.21) - activesupport (= 3.2.21) - activesupport (3.2.21) + activeresource (3.2.22) + activemodel (= 3.2.22) + activesupport (= 3.2.22) + activesupport (3.2.22) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) acts-as-taggable-on (3.4.4) activerecord (>= 3.2, < 5) arel (3.0.3) + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) builder (3.0.4) capybara (2.1.0) mime-types (>= 1.16) @@ -39,9 +43,11 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - childprocess (0.5.5) + childprocess (0.5.6) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) cucumber (1.0.6) builder (>= 2.1.2) diff-lcs (>= 1.1.2) @@ -53,29 +59,51 @@ GEM cucumber (>= 1.0.6) nokogiri (>= 1.5.0) daemons (1.1.9) - dalli (2.7.2) + dalli (2.7.4) database_cleaner (1.2.0) - diff-lcs (1.1.3) - eita-jrails (0.9.5) - actionpack (~> 3.2, >= 3.1.0) - activesupport (~> 3.2, >= 3.0.0) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + diff-lcs (1.2.5) + eita-jrails (0.9.8) + actionpack (>= 3.1.0) + activesupport (>= 3.0.0) + equalizer (0.0.11) erubis (2.7.0) - eventmachine (1.0.7) exception_notification (4.0.1) actionmailer (>= 3.0.4) activesupport (>= 3.0.4) + execjs (2.6.0) fast_gettext (0.6.12) - ffi (1.9.6) + ffi (1.9.10) gettext (2.2.1) locale gherkin (2.4.21) json (>= 1.4.6) + git-version-bump (0.15.1) + grape (0.13.0) + activesupport + builder + hashie (>= 2.1.0) + multi_json (>= 1.3.2) + multi_xml (>= 0.5.2) + rack (>= 1.3.0) + rack-accept + rack-mount + virtus (>= 1.0.0) + grape-entity (0.4.8) + activesupport + multi_json (>= 1.3.2) + grape_logging (1.1.2) + grape + hashie (3.4.2) hike (1.2.3) i18n (0.7.0) + ice_nine (0.11.1) journey (1.0.4) - json (1.8.2) + json (1.8.3) + kgio (2.10.0) locale (2.0.9) - magic (0.2.8) + magic (0.2.9) ffi (>= 0.6.3) mail (2.5.4) mime-types (~> 1.16) @@ -85,57 +113,74 @@ GEM minitest (3.2.0) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.11.0) + multi_json (1.11.2) + multi_xml (0.5.5) nokogiri (1.5.11) pg (0.13.2) polyglot (0.3.5) - rack (1.4.5) + rack (1.4.7) + rack-accept (0.4.5) + rack (>= 0.4) rack-cache (1.2) rack (>= 0.4) + rack-contrib (1.4.0) + git-version-bump (~> 0.15) + rack (~> 1.4) + rack-cors (0.4.0) + rack-mount (0.8.3) + rack (>= 1.0.0) rack-ssl (1.3.4) rack rack-test (0.6.3) rack (>= 1.0) - rails (3.2.21) - actionmailer (= 3.2.21) - actionpack (= 3.2.21) - activerecord (= 3.2.21) - activeresource (= 3.2.21) - activesupport (= 3.2.21) + rails (3.2.22) + actionmailer (= 3.2.22) + actionpack (= 3.2.22) + activerecord (= 3.2.22) + activeresource (= 3.2.22) + activesupport (= 3.2.22) bundler (~> 1.0) - railties (= 3.2.21) + railties (= 3.2.22) rails_autolink (1.1.6) rails (> 3.1) - railties (3.2.21) - actionpack (= 3.2.21) - activesupport (= 3.2.21) + railties (3.2.22) + actionpack (= 3.2.22) + activesupport (= 3.2.22) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) + raindrops (0.15.0) rake (10.4.2) rdoc (3.12.2) json (~> 1.4) - rest-client (1.6.8) + rest-client (1.6.9) mime-types (~> 1.16) - rdoc (>= 2.4.2) rmagick (2.13.4) - 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) + rspec (2.14.1) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + rspec-core (2.14.8) + rspec-expectations (2.14.5) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.14.6) + rspec-rails (2.14.2) actionpack (>= 3.0) + activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.10.0) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) ruby-feedparser (0.9.3) magic rubyzip (1.1.7) + sass (3.4.18) + sass-rails (3.2.6) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) selenium-webdriver (2.39.0) childprocess (>= 0.2.5) multi_json (~> 1.0) @@ -146,19 +191,28 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - term-ansicolor (1.3.0) + term-ansicolor (1.3.2) tins (~> 1.0) - thin (1.3.1) - daemons (>= 1.0.9) - eventmachine (>= 0.12.6) - rack (>= 1.0.0) thor (0.19.1) + thread_safe (0.3.5) tilt (1.4.1) - tins (1.3.5) + tins (1.6.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.43) + tzinfo (0.3.44) + uglifier (2.7.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + unicorn (4.9.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + virtus (1.0.5) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) + equalizer (~> 0.0, >= 0.0.9) websocket (1.0.7) whenever (0.9.4) chronic (>= 0.6.3) @@ -178,24 +232,31 @@ DEPENDENCIES daemons (~> 1.1.5) dalli (~> 2.7.0) database_cleaner (~> 1.2.0) - eita-jrails (>= 0.9.5) + eita-jrails (~> 0.9.5) exception_notification (~> 4.0.1) fast_gettext (~> 0.6.8) gettext (~> 2.2.1) + grape (~> 0.12) + grape-entity + grape_logging locale (~> 2.0.5) minitest (~> 3.2.0) mocha (~> 1.1.0) nokogiri (~> 1.5.5) pg (~> 0.13.2) - rails (~> 3.2.21) + rack-contrib + rack-cors + rails (~> 3.2.22) rails_autolink (~> 1.1.5) rake rest-client (~> 1.6.7) rmagick (~> 2.13.1) - rspec (~> 2.10.0) - rspec-rails (~> 2.10.1) + rspec (~> 2.14.0) + rspec-rails (~> 2.14.1) ruby-feedparser (~> 0.7) + sass-rails selenium-webdriver (~> 2.39.0) - thin (~> 1.3.1) + uglifier (>= 1.0.3) + unicorn (~> 4.8) whenever will_paginate (~> 3.0.3) diff --git a/Makefile b/Makefile index bea39b5..c1cb35c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 1.1 +VERSION = 1.3 TARBALL = noosfero-deps-$(VERSION).tar.gz PREFIX = /usr WGET = wget -- libgit2 0.21.2