Commit f323c51dc7d85161b8f2ae67a0a7ee92c6ef774b
1 parent
3698582b
Exists in
master
and in
29 other branches
Improve interoperability with non-Debian environments
Instead of freezing the Debian-specific dependency tree in Gemfile.lock, let's specify the Debian versions with ~> in Gemfile, and let other systems provide specific versions in the best way they can.
Showing
5 changed files
with
29 additions
and
224 deletions
Show diff stats
Gemfile
| 1 | source "https://rubygems.org" | 1 | source "https://rubygems.org" |
| 2 | -gem 'rails' | ||
| 3 | -gem 'fast_gettext' | ||
| 4 | -gem 'acts-as-taggable-on' | ||
| 5 | -gem 'prototype-rails' | ||
| 6 | -gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper' | ||
| 7 | -gem 'rails_autolink' | ||
| 8 | -gem 'pg' | ||
| 9 | -gem 'rmagick' | ||
| 10 | -gem 'RedCloth' | ||
| 11 | -gem 'will_paginate' | ||
| 12 | -gem 'ruby-feedparser' | ||
| 13 | -gem 'daemons' | ||
| 14 | -gem 'thin' | ||
| 15 | -gem 'hpricot' | ||
| 16 | -gem 'nokogiri' | 2 | +gem 'rails', '~> 3.2.19' |
| 3 | +gem 'fast_gettext', '~> 0.6.8' | ||
| 4 | +gem 'acts-as-taggable-on', '~> 3.0.2' | ||
| 5 | +gem 'prototype-rails', '~> 3.2.1' | ||
| 6 | +gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper' | ||
| 7 | +gem 'rails_autolink', '~> 1.1.5' | ||
| 8 | +gem 'pg', '~> 0.13.2' | ||
| 9 | +gem 'rmagick', '~> 2.13.1' | ||
| 10 | +gem 'RedCloth', '~> 4.2.9' | ||
| 11 | +gem 'will_paginate', '~> 3.0.3' | ||
| 12 | +gem 'ruby-feedparser', '~> 0.7' | ||
| 13 | +gem 'daemons', '~> 1.1.5' | ||
| 14 | +gem 'thin', '~> 1.3.1' | ||
| 15 | +gem 'hpricot', '~> 0.8.6' | ||
| 16 | +gem 'nokogiri', '~> 1.5.5' | ||
| 17 | gem 'rake', :require => false | 17 | gem 'rake', :require => false |
| 18 | -gem 'rest-client' | ||
| 19 | -gem 'exception_notification' | ||
| 20 | -gem 'gettext', :require => false, :group => :development | 18 | +gem 'rest-client', '~> 1.6.7' |
| 19 | +gem 'exception_notification', '~> 4.0.1' | ||
| 20 | +gem 'gettext', '~> 2.2.1', :require => false, :group => :development | ||
| 21 | 21 | ||
| 22 | # FIXME list here all actual dependencies (i.e. the ones in debian/control), | 22 | # FIXME list here all actual dependencies (i.e. the ones in debian/control), |
| 23 | # with their GEM names (not the Debian package names) | 23 | # with their GEM names (not the Debian package names) |
| 24 | 24 | ||
| 25 | group :production do | 25 | group :production do |
| 26 | - gem 'dalli' | 26 | + gem 'dalli', '~> 2.7.0' |
| 27 | end | 27 | end |
| 28 | 28 | ||
| 29 | group :test do | 29 | group :test do |
| 30 | - gem 'rspec' | ||
| 31 | - gem 'rspec-rails' | ||
| 32 | - gem 'mocha', :require => false | 30 | + gem 'rspec', '~> 2.10.0' |
| 31 | + gem 'rspec-rails', '~> 2.10.1' | ||
| 32 | + gem 'mocha', '~> 1.1.0', :require => false | ||
| 33 | end | 33 | end |
| 34 | 34 | ||
| 35 | group :cucumber do | 35 | group :cucumber do |
| 36 | - gem 'cucumber-rails', :require => false | ||
| 37 | - gem 'capybara' | ||
| 38 | - gem 'cucumber' | ||
| 39 | - gem 'database_cleaner' | ||
| 40 | - gem 'selenium-webdriver' | 36 | + gem 'cucumber-rails', '~> 1.0.6', :require => false |
| 37 | + gem 'capybara', '~> 2.1.0' | ||
| 38 | + gem 'cucumber', '~> 1.0.6' | ||
| 39 | + gem 'database_cleaner', '~> 1.2.0' | ||
| 40 | + gem 'selenium-webdriver', '~> 2.39.0' | ||
| 41 | end | 41 | end |
| 42 | 42 | ||
| 43 | # include plugin gemfiles | 43 | # include plugin gemfiles |
Gemfile.lock
| @@ -1,196 +0,0 @@ | @@ -1,196 +0,0 @@ | ||
| 1 | -PATH | ||
| 2 | - remote: vendor/prototype_legacy_helper | ||
| 3 | - specs: | ||
| 4 | - prototype_legacy_helper (0.0.0) | ||
| 5 | - | ||
| 6 | -GEM | ||
| 7 | - remote: https://rubygems.org/ | ||
| 8 | - specs: | ||
| 9 | - RedCloth (4.2.9) | ||
| 10 | - actionmailer (3.2.19) | ||
| 11 | - actionpack (= 3.2.19) | ||
| 12 | - mail (~> 2.5.4) | ||
| 13 | - actionpack (3.2.19) | ||
| 14 | - activemodel (= 3.2.19) | ||
| 15 | - activesupport (= 3.2.19) | ||
| 16 | - builder (~> 3.0) | ||
| 17 | - erubis (~> 2.7.0) | ||
| 18 | - journey (~> 1.0.4) | ||
| 19 | - rack (~> 1.4.5) | ||
| 20 | - rack-cache (~> 1.2) | ||
| 21 | - rack-test (~> 0.6.1) | ||
| 22 | - sprockets (~> 2.2) | ||
| 23 | - activemodel (3.2.19) | ||
| 24 | - activesupport (= 3.2.19) | ||
| 25 | - builder (~> 3.0) | ||
| 26 | - activerecord (3.2.19) | ||
| 27 | - activemodel (= 3.2.19) | ||
| 28 | - activesupport (= 3.2.19) | ||
| 29 | - arel (~> 4.0) | ||
| 30 | - tzinfo (~> 1.0) | ||
| 31 | - activeresource (3.2.19) | ||
| 32 | - activemodel (= 3.2.19) | ||
| 33 | - activesupport (= 3.2.19) | ||
| 34 | - activesupport (3.2.19) | ||
| 35 | - i18n (~> 0.6, >= 0.6.4) | ||
| 36 | - multi_json (~> 1.0) | ||
| 37 | - acts-as-taggable-on (3.0.2) | ||
| 38 | - rails (>= 3, < 5) | ||
| 39 | - arel (4.0.0) | ||
| 40 | - builder (3.0.0) | ||
| 41 | - capybara (2.1.0) | ||
| 42 | - mime-types (>= 1.16) | ||
| 43 | - nokogiri (>= 1.3.3) | ||
| 44 | - rack (>= 1.0.0) | ||
| 45 | - rack-test (>= 0.5.4) | ||
| 46 | - xpath (~> 2.0) | ||
| 47 | - childprocess (0.3.3) | ||
| 48 | - ffi (~> 1.0.6) | ||
| 49 | - cucumber (1.0.6) | ||
| 50 | - builder (>= 2.1.2) | ||
| 51 | - diff-lcs (>= 1.1.2) | ||
| 52 | - gherkin (~> 2.4.18) | ||
| 53 | - json (>= 1.4.6) | ||
| 54 | - term-ansicolor (>= 1.0.6) | ||
| 55 | - cucumber-rails (1.0.6) | ||
| 56 | - capybara (>= 1.1.1) | ||
| 57 | - cucumber (>= 1.0.6) | ||
| 58 | - nokogiri (>= 1.5.0) | ||
| 59 | - daemons (1.1.5) | ||
| 60 | - dalli (2.7.0) | ||
| 61 | - database_cleaner (1.2.0) | ||
| 62 | - diff-lcs (1.1.3) | ||
| 63 | - erubis (2.7.0) | ||
| 64 | - eventmachine (0.12.10) | ||
| 65 | - exception_notification (4.0.1) | ||
| 66 | - actionmailer (>= 3.0.4) | ||
| 67 | - activesupport (>= 3.0.4) | ||
| 68 | - fast_gettext (0.6.8) | ||
| 69 | - ffi (1.0.11) | ||
| 70 | - gettext (2.2.1) | ||
| 71 | - locale | ||
| 72 | - gherkin (2.4.21) | ||
| 73 | - json (>= 1.4.6) | ||
| 74 | - hike (1.2.1) | ||
| 75 | - hpricot (0.8.6) | ||
| 76 | - i18n (0.6.9) | ||
| 77 | - journey (1.0.4) | ||
| 78 | - json (1.7.3) | ||
| 79 | - locale (2.0.5) | ||
| 80 | - mail (2.5.4) | ||
| 81 | - mime-types (~> 1.16) | ||
| 82 | - treetop (~> 1.4.8) | ||
| 83 | - metaclass (0.0.1) | ||
| 84 | - mime-types (1.25) | ||
| 85 | - mocha (1.1.0) | ||
| 86 | - metaclass (~> 0.0.1) | ||
| 87 | - multi_json (1.3.6) | ||
| 88 | - nokogiri (1.5.5) | ||
| 89 | - pg (0.13.2) | ||
| 90 | - polyglot (0.3.3) | ||
| 91 | - prototype-rails (3.2.1) | ||
| 92 | - rails (~> 3.2) | ||
| 93 | - rack (1.4.5) | ||
| 94 | - rack-cache (1.2) | ||
| 95 | - rack (>= 0.4) | ||
| 96 | - rack-ssl (1.3.2) | ||
| 97 | - rack | ||
| 98 | - rack-test (0.6.1) | ||
| 99 | - rack (>= 1.0) | ||
| 100 | - rails (3.2.19) | ||
| 101 | - actionmailer (= 3.2.19) | ||
| 102 | - actionpack (= 3.2.19) | ||
| 103 | - activerecord (= 3.2.19) | ||
| 104 | - activeresource (= 3.2.19) | ||
| 105 | - activesupport (= 3.2.19) | ||
| 106 | - bundler (~> 1.0) | ||
| 107 | - railties (= 3.2.19) | ||
| 108 | - rails_autolink (1.1.5) | ||
| 109 | - rails (> 3.1) | ||
| 110 | - railties (3.2.19) | ||
| 111 | - actionpack (= 3.2.19) | ||
| 112 | - activesupport (= 3.2.19) | ||
| 113 | - rack-ssl (~> 1.3.2) | ||
| 114 | - rake (>= 0.8.7) | ||
| 115 | - rdoc (>= 3.4) | ||
| 116 | - thor (>= 0.14.6, < 2.0) | ||
| 117 | - rake (0.9.2.2) | ||
| 118 | - rdoc (3.9.4) | ||
| 119 | - rest-client (1.6.7) | ||
| 120 | - mime-types (>= 1.16) | ||
| 121 | - rmagick (2.13.1) | ||
| 122 | - rspec (2.10.0) | ||
| 123 | - rspec-core (~> 2.10.0) | ||
| 124 | - rspec-expectations (~> 2.10.0) | ||
| 125 | - rspec-mocks (~> 2.10.0) | ||
| 126 | - rspec-core (2.10.1) | ||
| 127 | - rspec-expectations (2.10.0) | ||
| 128 | - diff-lcs (~> 1.1.3) | ||
| 129 | - rspec-mocks (2.10.1) | ||
| 130 | - rspec-rails (2.10.1) | ||
| 131 | - actionpack (>= 3.0) | ||
| 132 | - activesupport (>= 3.0) | ||
| 133 | - railties (>= 3.0) | ||
| 134 | - rspec (~> 2.10.0) | ||
| 135 | - ruby-feedparser (0.7) | ||
| 136 | - rubyzip (1.1.2) | ||
| 137 | - selenium-webdriver (2.39.0) | ||
| 138 | - childprocess (>= 0.2.5) | ||
| 139 | - multi_json (~> 1.0) | ||
| 140 | - rubyzip (~> 1.0) | ||
| 141 | - websocket (~> 1.0.4) | ||
| 142 | - sprockets (2.4.3) | ||
| 143 | - hike (~> 1.2) | ||
| 144 | - multi_json (~> 1.0) | ||
| 145 | - rack (~> 1.0) | ||
| 146 | - tilt (~> 1.1, != 1.3.0) | ||
| 147 | - term-ansicolor (1.0.7) | ||
| 148 | - thin (1.3.1) | ||
| 149 | - daemons (>= 1.0.9) | ||
| 150 | - eventmachine (>= 0.12.6) | ||
| 151 | - rack (>= 1.0.0) | ||
| 152 | - thor (0.15.3) | ||
| 153 | - thread_safe (0.3.3) | ||
| 154 | - tilt (1.3.3) | ||
| 155 | - treetop (1.4.10) | ||
| 156 | - polyglot | ||
| 157 | - polyglot (>= 0.3.1) | ||
| 158 | - tzinfo (1.1.0) | ||
| 159 | - thread_safe (~> 0.1) | ||
| 160 | - websocket (1.0.7) | ||
| 161 | - will_paginate (3.0.3) | ||
| 162 | - xpath (2.0.0) | ||
| 163 | - nokogiri (~> 1.3) | ||
| 164 | - | ||
| 165 | -PLATFORMS | ||
| 166 | - ruby | ||
| 167 | - | ||
| 168 | -DEPENDENCIES | ||
| 169 | - RedCloth | ||
| 170 | - acts-as-taggable-on | ||
| 171 | - capybara | ||
| 172 | - cucumber | ||
| 173 | - cucumber-rails | ||
| 174 | - daemons | ||
| 175 | - dalli | ||
| 176 | - database_cleaner | ||
| 177 | - exception_notification | ||
| 178 | - fast_gettext | ||
| 179 | - gettext | ||
| 180 | - hpricot | ||
| 181 | - mocha | ||
| 182 | - nokogiri | ||
| 183 | - pg | ||
| 184 | - prototype-rails | ||
| 185 | - prototype_legacy_helper (= 0.0.0)! | ||
| 186 | - rails | ||
| 187 | - rails_autolink | ||
| 188 | - rake | ||
| 189 | - rest-client | ||
| 190 | - rmagick | ||
| 191 | - rspec | ||
| 192 | - rspec-rails | ||
| 193 | - ruby-feedparser | ||
| 194 | - selenium-webdriver | ||
| 195 | - thin | ||
| 196 | - will_paginate |
debian/noosfero.install
| @@ -8,7 +8,6 @@ Rakefile usr/share/noosfero | @@ -8,7 +8,6 @@ Rakefile usr/share/noosfero | ||
| 8 | vendor usr/share/noosfero | 8 | vendor usr/share/noosfero |
| 9 | 9 | ||
| 10 | Gemfile usr/share/noosfero | 10 | Gemfile usr/share/noosfero |
| 11 | -Gemfile.lock usr/share/noosfero | ||
| 12 | debian/bundle/config usr/share/noosfero/.bundle | 11 | debian/bundle/config usr/share/noosfero/.bundle |
| 13 | 12 | ||
| 14 | config/application.rb usr/share/noosfero/config | 13 | config/application.rb usr/share/noosfero/config |
debian/noosfero.links
| @@ -15,3 +15,4 @@ var/lib/noosfero-data/public/thumbnails usr/share/noosfero/public/th | @@ -15,3 +15,4 @@ var/lib/noosfero-data/public/thumbnails usr/share/noosfero/public/th | ||
| 15 | usr/share/noosfero/public/designs/themes/noosfero usr/share/noosfero/public/designs/themes/default | 15 | usr/share/noosfero/public/designs/themes/noosfero usr/share/noosfero/public/designs/themes/default |
| 16 | usr/share/noosfero/public/designs/icons/tango usr/share/noosfero/public/designs/icons/default | 16 | usr/share/noosfero/public/designs/icons/tango usr/share/noosfero/public/designs/icons/default |
| 17 | usr/share/noosfero/script/noosfero-plugins usr/sbin/noosfero-plugins | 17 | usr/share/noosfero/script/noosfero-plugins usr/sbin/noosfero-plugins |
| 18 | +usr/share/noosfero/Gemfile.lock /dev/null |
gitignore.example