diff --git a/Gemfile b/Gemfile index 59e60b2..a504149 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,8 @@ source "https://rubygems.org" -gem 'rails', '~> 3.2.19' +gem 'rails', '~> 3.2.21' +gem 'minitest', '~> 3.2.0' gem 'fast_gettext', '~> 0.6.8' -gem 'acts-as-taggable-on', '~> 3.0.2' -gem 'prototype-rails', '~> 3.2.1' -gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper' +gem 'acts-as-taggable-on', '~> 3.4.2' gem 'rails_autolink', '~> 1.1.5' gem 'pg', '~> 0.13.2' gem 'rmagick', '~> 2.13.1' @@ -12,16 +11,14 @@ gem 'will_paginate', '~> 3.0.3' gem 'ruby-feedparser', '~> 0.7' gem 'daemons', '~> 1.1.5' gem 'thin', '~> 1.3.1' -gem 'hpricot', '~> 0.8.6' gem 'nokogiri', '~> 1.5.5' gem 'rake', :require => false gem 'rest-client', '~> 1.6.7' gem 'exception_notification', '~> 4.0.1' gem 'gettext', '~> 2.2.1', :require => false, :group => :development gem 'locale', '~> 2.0.5' - -# FIXME list here all actual dependencies (i.e. the ones in debian/control), -# with their GEM names (not the Debian package names) +gem 'whenever', :require => false +gem 'eita-jrails', '>= 0.9.5', :require => 'jrails' group :production do gem 'dalli', '~> 2.7.0' @@ -41,6 +38,9 @@ group :cucumber do gem 'selenium-webdriver', '~> 2.39.0' end +# Requires custom dependencies +eval(File.read('config/Gemfile'), binding) rescue nil + # include gemfiles from enabled plugins # plugins in baseplugins/ are not included on purpose. They should not have any # dependencies. diff --git a/Gemfile.lock b/Gemfile.lock index e5ad8fa..b9aa06b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,3 @@ -PATH - remote: vendor/prototype_legacy_helper - specs: - prototype_legacy_helper (0.0.0) - GEM remote: https://rubygems.org/ specs: @@ -34,8 +29,8 @@ GEM activesupport (3.2.21) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - acts-as-taggable-on (3.0.2) - rails (>= 3, < 5) + acts-as-taggable-on (3.4.4) + activerecord (>= 3.2, < 5) arel (3.0.3) builder (3.0.4) capybara (2.1.0) @@ -46,6 +41,7 @@ GEM xpath (~> 2.0) childprocess (0.5.5) ffi (~> 1.0, >= 1.0.11) + chronic (0.10.2) cucumber (1.0.6) builder (>= 2.1.2) diff-lcs (>= 1.1.2) @@ -60,8 +56,11 @@ GEM dalli (2.7.2) 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) erubis (2.7.0) - eventmachine (1.0.4) + eventmachine (1.0.7) exception_notification (4.0.1) actionmailer (>= 3.0.4) activesupport (>= 3.0.4) @@ -72,7 +71,6 @@ GEM gherkin (2.4.21) json (>= 1.4.6) hike (1.2.3) - hpricot (0.8.6) i18n (0.7.0) journey (1.0.4) json (1.8.2) @@ -84,14 +82,13 @@ GEM treetop (~> 1.4.8) metaclass (0.0.4) mime-types (1.25.1) + minitest (3.2.0) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.10.1) + multi_json (1.11.0) nokogiri (1.5.11) pg (0.13.2) polyglot (0.3.5) - prototype-rails (3.2.1) - rails (~> 3.2) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) @@ -138,7 +135,7 @@ GEM rspec (~> 2.10.0) ruby-feedparser (0.9.3) magic - rubyzip (1.1.6) + rubyzip (1.1.7) selenium-webdriver (2.39.0) childprocess (>= 0.2.5) multi_json (~> 1.0) @@ -157,12 +154,14 @@ GEM rack (>= 1.0.0) thor (0.19.1) tilt (1.4.1) - tins (1.3.3) + tins (1.3.5) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.42) + tzinfo (0.3.43) websocket (1.0.7) + whenever (0.9.4) + chronic (>= 0.6.3) will_paginate (3.0.7) xpath (2.0.0) nokogiri (~> 1.3) @@ -172,24 +171,23 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.2.9) - acts-as-taggable-on (~> 3.0.2) + acts-as-taggable-on (~> 3.4.2) capybara (~> 2.1.0) cucumber (~> 1.0.6) cucumber-rails (~> 1.0.6) daemons (~> 1.1.5) dalli (~> 2.7.0) database_cleaner (~> 1.2.0) + eita-jrails (>= 0.9.5) exception_notification (~> 4.0.1) fast_gettext (~> 0.6.8) gettext (~> 2.2.1) - hpricot (~> 0.8.6) locale (~> 2.0.5) + minitest (~> 3.2.0) mocha (~> 1.1.0) nokogiri (~> 1.5.5) pg (~> 0.13.2) - prototype-rails (~> 3.2.1) - prototype_legacy_helper (= 0.0.0)! - rails (~> 3.2.19) + rails (~> 3.2.21) rails_autolink (~> 1.1.5) rake rest-client (~> 1.6.7) @@ -199,4 +197,5 @@ DEPENDENCIES ruby-feedparser (~> 0.7) selenium-webdriver (~> 2.39.0) thin (~> 1.3.1) + whenever will_paginate (~> 3.0.3) diff --git a/Makefile b/Makefile index c44b43b..9627911 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,6 @@ $(TARBALL): install: all mkdir -p $(DESTDIR)$(PREFIX)/lib/noosfero/vendor - mkdir -p $(DESTDIR)$(PREFIX)/vendor/prototype_legacy_helper install -m 0644 Gemfile $(DESTDIR)$(PREFIX)/lib/noosfero install -m 0644 Gemfile.lock $(DESTDIR)$(PREFIX)/lib/noosfero cp -r .bundle $(DESTDIR)$(PREFIX)/lib/noosfero/.bundle diff --git a/vendor/cache/acts-as-taggable-on-3.0.2.gem b/vendor/cache/acts-as-taggable-on-3.0.2.gem deleted file mode 100644 index cd1c7e1..0000000 Binary files a/vendor/cache/acts-as-taggable-on-3.0.2.gem and /dev/null differ diff --git a/vendor/cache/acts-as-taggable-on-3.4.4.gem b/vendor/cache/acts-as-taggable-on-3.4.4.gem new file mode 100644 index 0000000..719762a Binary files /dev/null and b/vendor/cache/acts-as-taggable-on-3.4.4.gem differ diff --git a/vendor/cache/chronic-0.10.2.gem b/vendor/cache/chronic-0.10.2.gem new file mode 100644 index 0000000..235d975 Binary files /dev/null and b/vendor/cache/chronic-0.10.2.gem differ diff --git a/vendor/cache/eita-jrails-0.9.5.gem b/vendor/cache/eita-jrails-0.9.5.gem new file mode 100644 index 0000000..322a6c4 Binary files /dev/null and b/vendor/cache/eita-jrails-0.9.5.gem differ diff --git a/vendor/cache/eventmachine-1.0.4.gem b/vendor/cache/eventmachine-1.0.4.gem deleted file mode 100644 index 1533ac7..0000000 Binary files a/vendor/cache/eventmachine-1.0.4.gem and /dev/null differ diff --git a/vendor/cache/eventmachine-1.0.7.gem b/vendor/cache/eventmachine-1.0.7.gem new file mode 100644 index 0000000..47332a7 Binary files /dev/null and b/vendor/cache/eventmachine-1.0.7.gem differ diff --git a/vendor/cache/hpricot-0.8.6.gem b/vendor/cache/hpricot-0.8.6.gem deleted file mode 100644 index cf4ae19..0000000 Binary files a/vendor/cache/hpricot-0.8.6.gem and /dev/null differ diff --git a/vendor/cache/minitest-3.2.0.gem b/vendor/cache/minitest-3.2.0.gem new file mode 100644 index 0000000..9d80dec Binary files /dev/null and b/vendor/cache/minitest-3.2.0.gem differ diff --git a/vendor/cache/multi_json-1.10.1.gem b/vendor/cache/multi_json-1.10.1.gem deleted file mode 100644 index 7647b55..0000000 Binary files a/vendor/cache/multi_json-1.10.1.gem and /dev/null differ diff --git a/vendor/cache/multi_json-1.11.0.gem b/vendor/cache/multi_json-1.11.0.gem new file mode 100644 index 0000000..6d687e3 Binary files /dev/null and b/vendor/cache/multi_json-1.11.0.gem differ diff --git a/vendor/cache/prototype-rails-3.2.1.gem b/vendor/cache/prototype-rails-3.2.1.gem deleted file mode 100644 index 237a358..0000000 Binary files a/vendor/cache/prototype-rails-3.2.1.gem and /dev/null differ diff --git a/vendor/cache/rubyzip-1.1.6.gem b/vendor/cache/rubyzip-1.1.6.gem deleted file mode 100644 index 9fb7b83..0000000 Binary files a/vendor/cache/rubyzip-1.1.6.gem and /dev/null differ diff --git a/vendor/cache/tins-1.3.3.gem b/vendor/cache/tins-1.3.3.gem deleted file mode 100644 index a3b0527..0000000 Binary files a/vendor/cache/tins-1.3.3.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-0.3.42.gem b/vendor/cache/tzinfo-0.3.42.gem deleted file mode 100644 index 84aafff..0000000 Binary files a/vendor/cache/tzinfo-0.3.42.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-0.3.43.gem b/vendor/cache/tzinfo-0.3.43.gem new file mode 100644 index 0000000..7505653 Binary files /dev/null and b/vendor/cache/tzinfo-0.3.43.gem differ diff --git a/vendor/cache/whenever-0.9.4.gem b/vendor/cache/whenever-0.9.4.gem new file mode 100644 index 0000000..54a2a73 Binary files /dev/null and b/vendor/cache/whenever-0.9.4.gem differ -- libgit2 0.21.2