aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml7
-rw-r--r--Gemfile42
-rw-r--r--Gemfile.lock85
3 files changed, 63 insertions, 71 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a153ec7..cc9f55e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,9 +9,10 @@ test:jessie: &test
variables:
DISTRO: jessie
before_script:
- - apt-get install libpq-dev postgresql-server-dev-9.4 libsqlite3-dev rake ruby-log4r ruby-ipaddress ruby-json ruby-sanitize ruby-rubymail thin ruby-haml ruby-haml-contrib ruby-redcloth ruby-rack ruby-rack-protection ruby-rack-flash3 ruby-tilt ruby-sinatra ruby-locale ruby-rack-test ruby-webmock ruby-timecop ruby-test-unit
+ - apt install libpq-dev postgresql-server-dev-9.4
script:
- - bundle install -j $(nproc) --path vendor/bundle --without development,test
+ - apt install libsqlite3-dev rake ruby-log4r ruby-ipaddress ruby-json ruby-sanitize ruby-rubymail thin ruby-haml ruby-haml-contrib ruby-redcloth ruby-rack ruby-rack-protection ruby-rack-flash3 ruby-tilt ruby-sinatra ruby-locale ruby-rack-test ruby-webmock ruby-timecop ruby-test-unit
+ - bundle install -j $(nproc) --path vendor/bundle --without development
- bundle exec rake test
test:stretch:
@@ -19,7 +20,7 @@ test:stretch:
variables:
DISTRO: stretch
before_script:
- - apt-get install libpq-dev postgresql-server-dev-9.6 libsqlite3-dev rake ruby-log4r ruby-ipaddress ruby-json ruby-sanitize ruby-rubymail thin ruby-haml ruby-haml-contrib ruby-redcloth ruby-rack ruby-rack-protection ruby-rack-flash3 ruby-tilt ruby-sinatra ruby-locale ruby-rack-test ruby-webmock ruby-timecop ruby-test-unit
+ - apt install libpq-dev postgresql-server-dev-9.6
package:jessie: &package
image: $CI_REGISTRY/docker-images/layers:$DISTRO-deb
diff --git a/Gemfile b/Gemfile
index 62192c7..7d58599 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,5 @@
source "https://rubygems.org"
-gem "bcrypt-ruby", "= 3.1.5"
gem "ruby_protobuf", "= 0.4.11"
gem "datamapper"
gem "dm-aggregates"
@@ -12,27 +11,30 @@ gem "dm-transactions"
gem "dm-types"
gem "dm-validations"
-group :devlopment do
- gem "log4r"
- gem "ipaddress"
- gem "json"
- gem "sanitize"
- gem "rmail"
- gem "thin"
- gem "haml"
- gem "haml-contrib"
- gem "RedCloth"
- gem "rack"
- gem "rack-protection"
- gem "rack-flash3"
- gem "tilt"
- gem "sinatra"
- gem "locale"
+#
+# The versions here are to match Jessie
+#
+group :development do
+ gem "log4r", "= 1.1.10"
+ gem "ipaddress", "= 0.8.0"
+ gem "json", "= 1.8.1"
+ gem "sanitize", "= 2.1.0"
+ gem "rmail", "= 1.1.0"
+ gem "thin", "= 1.6.3"
+ gem "haml", "= 4.0.5"
+ gem "haml-contrib", "= 1.0.0"
+ gem "RedCloth", "= 4.2.9"
+ gem "rack", "= 1.5.2"
+ gem "rack-protection", "= 1.5.2"
+ gem "rack-flash3", "= 1.0.5"
+ gem "tilt", "= 1.4.1"
+ gem "sinatra", "= 1.4.5"
+ gem "locale", "= 2.1.0"
end
group :test do
gem "simplecov", :require => false
- gem "rack-test"
- gem "webmock"
- gem "timecop"
+ gem "rack-test", "= 0.6.3"
+ gem "webmock", "= 1.19.0"
+ gem "timecop", "= 0.7.1"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index ad8b5fd..1067023 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- RedCloth (4.3.2)
+ RedCloth (4.2.9)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
bcrypt (3.1.11)
@@ -9,7 +9,6 @@ GEM
bcrypt (>= 3.1.3)
crack (0.4.3)
safe_yaml (~> 1.0.0)
- crass (1.0.2)
daemons (1.2.4)
data_objects (0.10.17)
addressable (~> 2.1)
@@ -67,65 +66,58 @@ GEM
docile (1.1.5)
eventmachine (1.2.3)
fastercsv (1.5.5)
- haml (4.0.7)
+ haml (4.0.5)
tilt
- haml-contrib (1.0.0.1)
+ haml-contrib (1.0.0)
haml (>= 3.2.0.alpha.13)
- hashdiff (0.3.2)
- ipaddress (0.8.3)
- json (1.8.6)
+ ipaddress (0.8.0)
+ json (1.8.1)
json_pure (1.8.6)
- locale (2.1.2)
+ locale (2.1.0)
log4r (1.1.10)
mini_portile2 (2.1.0)
multi_json (1.12.1)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
- nokogumbo (1.4.10)
- nokogiri
public_suffix (2.0.5)
- rack (1.6.5)
+ rack (1.5.2)
rack-flash3 (1.0.5)
rack
- rack-protection (1.5.3)
+ rack-protection (1.5.2)
rack
rack-test (0.6.3)
rack (>= 1.0)
- rmail (1.1.2)
+ rmail (1.1.0)
ruby_protobuf (0.4.11)
safe_yaml (1.0.4)
- sanitize (4.4.0)
- crass (~> 1.0.2)
+ sanitize (2.1.0)
nokogiri (>= 1.4.4)
- nokogumbo (~> 1.4.1)
simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
- sinatra (1.4.8)
- rack (~> 1.5)
+ sinatra (1.4.5)
+ rack (~> 1.4)
rack-protection (~> 1.4)
- tilt (>= 1.3, < 3)
+ tilt (~> 1.3, >= 1.3.4)
stringex (1.5.1)
- thin (1.7.0)
+ thin (1.6.3)
daemons (~> 1.0, >= 1.0.9)
- eventmachine (~> 1.0, >= 1.0.4)
- rack (>= 1, < 3)
- tilt (2.0.7)
- timecop (0.8.1)
+ eventmachine (~> 1.0)
+ rack (~> 1.0)
+ tilt (1.4.1)
+ timecop (0.7.1)
uuidtools (2.1.5)
- webmock (2.3.2)
+ webmock (1.19.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
- hashdiff
PLATFORMS
ruby
DEPENDENCIES
- RedCloth
- bcrypt-ruby (= 3.1.5)
+ RedCloth (= 4.2.9)
datamapper
dm-aggregates
dm-do-adapter
@@ -135,25 +127,22 @@ DEPENDENCIES
dm-transactions
dm-types
dm-validations
- haml
- haml-contrib
- ipaddress
- json
- locale
- log4r
- rack
- rack-flash3
- rack-protection
- rack-test
- rmail
+ haml (= 4.0.5)
+ haml-contrib (= 1.0.0)
+ ipaddress (= 0.8.0)
+ json (= 1.8.1)
+ locale (= 2.1.0)
+ log4r (= 1.1.10)
+ rack (= 1.5.2)
+ rack-flash3 (= 1.0.5)
+ rack-protection (= 1.5.2)
+ rack-test (= 0.6.3)
+ rmail (= 1.1.0)
ruby_protobuf (= 0.4.11)
- sanitize
+ sanitize (= 2.1.0)
simplecov
- sinatra
- thin
- tilt
- timecop
- webmock
-
-BUNDLED WITH
- 1.13.6
+ sinatra (= 1.4.5)
+ thin (= 1.6.3)
+ tilt (= 1.4.1)
+ timecop (= 0.7.1)
+ webmock (= 1.19.0)