From f323c51dc7d85161b8f2ae67a0a7ee92c6ef774b Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Mon, 29 Sep 2014 12:43:48 -0300 Subject: [PATCH] Improve interoperability with non-Debian environments --- Gemfile | 54 +++++++++++++++++++++++++++--------------------------- Gemfile.lock | 196 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- debian/noosfero.install | 1 - debian/noosfero.links | 1 + gitignore.example | 1 + 5 files changed, 29 insertions(+), 224 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile index 9265979..73a3cdc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,43 +1,43 @@ source "https://rubygems.org" -gem 'rails' -gem 'fast_gettext' -gem 'acts-as-taggable-on' -gem 'prototype-rails' -gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper' -gem 'rails_autolink' -gem 'pg' -gem 'rmagick' -gem 'RedCloth' -gem 'will_paginate' -gem 'ruby-feedparser' -gem 'daemons' -gem 'thin' -gem 'hpricot' -gem 'nokogiri' +gem 'rails', '~> 3.2.19' +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 'rails_autolink', '~> 1.1.5' +gem 'pg', '~> 0.13.2' +gem 'rmagick', '~> 2.13.1' +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 'hpricot', '~> 0.8.6' +gem 'nokogiri', '~> 1.5.5' gem 'rake', :require => false -gem 'rest-client' -gem 'exception_notification' -gem 'gettext', :require => false, :group => :development +gem 'rest-client', '~> 1.6.7' +gem 'exception_notification', '~> 4.0.1' +gem 'gettext', '~> 2.2.1', :require => false, :group => :development # FIXME list here all actual dependencies (i.e. the ones in debian/control), # with their GEM names (not the Debian package names) group :production do - gem 'dalli' + gem 'dalli', '~> 2.7.0' end group :test do - gem 'rspec' - gem 'rspec-rails' - gem 'mocha', :require => false + gem 'rspec', '~> 2.10.0' + gem 'rspec-rails', '~> 2.10.1' + gem 'mocha', '~> 1.1.0', :require => false end group :cucumber do - gem 'cucumber-rails', :require => false - gem 'capybara' - gem 'cucumber' - gem 'database_cleaner' - gem 'selenium-webdriver' + gem 'cucumber-rails', '~> 1.0.6', :require => false + gem 'capybara', '~> 2.1.0' + gem 'cucumber', '~> 1.0.6' + gem 'database_cleaner', '~> 1.2.0' + gem 'selenium-webdriver', '~> 2.39.0' end # include plugin gemfiles diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index aae1b60..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,196 +0,0 @@ -PATH - remote: vendor/prototype_legacy_helper - specs: - prototype_legacy_helper (0.0.0) - -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.2.9) - actionmailer (3.2.19) - actionpack (= 3.2.19) - mail (~> 2.5.4) - actionpack (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) - builder (~> 3.0) - erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2) - activemodel (3.2.19) - activesupport (= 3.2.19) - builder (~> 3.0) - activerecord (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) - arel (~> 4.0) - tzinfo (~> 1.0) - activeresource (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) - activesupport (3.2.19) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) - acts-as-taggable-on (3.0.2) - rails (>= 3, < 5) - arel (4.0.0) - builder (3.0.0) - capybara (2.1.0) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - childprocess (0.3.3) - ffi (~> 1.0.6) - cucumber (1.0.6) - builder (>= 2.1.2) - diff-lcs (>= 1.1.2) - gherkin (~> 2.4.18) - json (>= 1.4.6) - term-ansicolor (>= 1.0.6) - cucumber-rails (1.0.6) - capybara (>= 1.1.1) - cucumber (>= 1.0.6) - nokogiri (>= 1.5.0) - daemons (1.1.5) - dalli (2.7.0) - database_cleaner (1.2.0) - diff-lcs (1.1.3) - erubis (2.7.0) - eventmachine (0.12.10) - exception_notification (4.0.1) - actionmailer (>= 3.0.4) - activesupport (>= 3.0.4) - fast_gettext (0.6.8) - ffi (1.0.11) - gettext (2.2.1) - locale - gherkin (2.4.21) - json (>= 1.4.6) - hike (1.2.1) - hpricot (0.8.6) - i18n (0.6.9) - journey (1.0.4) - json (1.7.3) - locale (2.0.5) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - metaclass (0.0.1) - mime-types (1.25) - mocha (1.1.0) - metaclass (~> 0.0.1) - multi_json (1.3.6) - nokogiri (1.5.5) - pg (0.13.2) - polyglot (0.3.3) - prototype-rails (3.2.1) - rails (~> 3.2) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) - rack (>= 1.0) - rails (3.2.19) - actionmailer (= 3.2.19) - actionpack (= 3.2.19) - activerecord (= 3.2.19) - activeresource (= 3.2.19) - activesupport (= 3.2.19) - bundler (~> 1.0) - railties (= 3.2.19) - rails_autolink (1.1.5) - rails (> 3.1) - railties (3.2.19) - actionpack (= 3.2.19) - activesupport (= 3.2.19) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (>= 3.4) - thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.9.4) - rest-client (1.6.7) - mime-types (>= 1.16) - rmagick (2.13.1) - 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) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec (~> 2.10.0) - ruby-feedparser (0.7) - rubyzip (1.1.2) - selenium-webdriver (2.39.0) - childprocess (>= 0.2.5) - multi_json (~> 1.0) - rubyzip (~> 1.0) - websocket (~> 1.0.4) - sprockets (2.4.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - term-ansicolor (1.0.7) - thin (1.3.1) - daemons (>= 1.0.9) - eventmachine (>= 0.12.6) - rack (>= 1.0.0) - thor (0.15.3) - thread_safe (0.3.3) - tilt (1.3.3) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - tzinfo (1.1.0) - thread_safe (~> 0.1) - websocket (1.0.7) - will_paginate (3.0.3) - xpath (2.0.0) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth - acts-as-taggable-on - capybara - cucumber - cucumber-rails - daemons - dalli - database_cleaner - exception_notification - fast_gettext - gettext - hpricot - mocha - nokogiri - pg - prototype-rails - prototype_legacy_helper (= 0.0.0)! - rails - rails_autolink - rake - rest-client - rmagick - rspec - rspec-rails - ruby-feedparser - selenium-webdriver - thin - will_paginate diff --git a/debian/noosfero.install b/debian/noosfero.install index 3cb133a..6c2b432 100644 --- a/debian/noosfero.install +++ b/debian/noosfero.install @@ -8,7 +8,6 @@ Rakefile usr/share/noosfero vendor usr/share/noosfero Gemfile usr/share/noosfero -Gemfile.lock usr/share/noosfero debian/bundle/config usr/share/noosfero/.bundle config/application.rb usr/share/noosfero/config diff --git a/debian/noosfero.links b/debian/noosfero.links index 251b87c..f0fde89 100644 --- a/debian/noosfero.links +++ b/debian/noosfero.links @@ -15,3 +15,4 @@ var/lib/noosfero-data/public/thumbnails usr/share/noosfero/public/th usr/share/noosfero/public/designs/themes/noosfero usr/share/noosfero/public/designs/themes/default usr/share/noosfero/public/designs/icons/tango usr/share/noosfero/public/designs/icons/default usr/share/noosfero/script/noosfero-plugins usr/sbin/noosfero-plugins +usr/share/noosfero/Gemfile.lock /dev/null diff --git a/gitignore.example b/gitignore.example index c616c36..0bd3947 100644 --- a/gitignore.example +++ b/gitignore.example @@ -43,3 +43,4 @@ debian/noosfero-apache/ features/plugins/* plugins/solr/config/solr.yml /solr +/Gemfile.lock -- libgit2 0.21.2