diff --git a/assets/dora-droplet.tgz b/assets/dora-droplet.tgz index 414f49c6..85f3b583 100644 Binary files a/assets/dora-droplet.tgz and b/assets/dora-droplet.tgz differ diff --git a/assets/dora/.cfignore b/assets/dora/.cfignore index 100b5b73..677c4659 100644 --- a/assets/dora/.cfignore +++ b/assets/dora/.cfignore @@ -1,2 +1 @@ .bundle -Dockerfile \ No newline at end of file diff --git a/assets/dora/.gitignore b/assets/dora/.gitignore index ab65d02a..8f304d68 100644 --- a/assets/dora/.gitignore +++ b/assets/dora/.gitignore @@ -1,3 +1 @@ *.cjar -config-server -dora_manifest.yml diff --git a/assets/dora/Gemfile b/assets/dora/Gemfile index 2c22e5cf..72f95013 100644 --- a/assets/dora/Gemfile +++ b/assets/dora/Gemfile @@ -2,6 +2,7 @@ source "http://rubygems.org" gem "sinatra" gem "json" +gem "webrick" group :test, :development do gem "rspec" diff --git a/assets/dora/Gemfile.lock b/assets/dora/Gemfile.lock index ec83523f..035ccc03 100644 --- a/assets/dora/Gemfile.lock +++ b/assets/dora/Gemfile.lock @@ -1,35 +1,36 @@ GEM remote: http://rubygems.org/ specs: - diff-lcs (1.4.4) - json (2.5.1) - mustermann (1.1.1) + diff-lcs (1.5.0) + json (2.6.3) + mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (2.2.3) - rack-protection (2.1.0) + rack (2.2.4) + rack-protection (3.0.5) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rack-test (2.0.2) + rack (>= 1.3) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.1) - ruby2_keywords (0.0.2) - sinatra (2.1.0) - mustermann (~> 1.0) - rack (~> 2.2) - rack-protection (= 2.1.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + ruby2_keywords (0.0.5) + sinatra (3.0.5) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.5) tilt (~> 2.0) - tilt (2.0.10) + tilt (2.0.11) + webrick (1.7.0) PLATFORMS ruby @@ -39,4 +40,4 @@ DEPENDENCIES rack-test rspec sinatra - + webrick diff --git a/assets/dora/vendor/cache/diff-lcs-1.4.4.gem b/assets/dora/vendor/cache/diff-lcs-1.4.4.gem deleted file mode 100644 index 3be4edc1..00000000 Binary files a/assets/dora/vendor/cache/diff-lcs-1.4.4.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/diff-lcs-1.5.0.gem b/assets/dora/vendor/cache/diff-lcs-1.5.0.gem new file mode 100644 index 00000000..3a258520 Binary files /dev/null and b/assets/dora/vendor/cache/diff-lcs-1.5.0.gem differ diff --git a/assets/dora/vendor/cache/ethon-0.12.0.gem b/assets/dora/vendor/cache/ethon-0.12.0.gem deleted file mode 100644 index f3793ff9..00000000 Binary files a/assets/dora/vendor/cache/ethon-0.12.0.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/ffi-1.10.0.gem b/assets/dora/vendor/cache/ffi-1.10.0.gem deleted file mode 100644 index e75b906a..00000000 Binary files a/assets/dora/vendor/cache/ffi-1.10.0.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/json-2.5.1.gem b/assets/dora/vendor/cache/json-2.5.1.gem deleted file mode 100644 index dc2477a1..00000000 Binary files a/assets/dora/vendor/cache/json-2.5.1.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/json-2.6.3.gem b/assets/dora/vendor/cache/json-2.6.3.gem new file mode 100644 index 00000000..f76ee748 Binary files /dev/null and b/assets/dora/vendor/cache/json-2.6.3.gem differ diff --git a/assets/dora/vendor/cache/mustermann-1.1.1.gem b/assets/dora/vendor/cache/mustermann-1.1.1.gem deleted file mode 100644 index 55018660..00000000 Binary files a/assets/dora/vendor/cache/mustermann-1.1.1.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/mustermann-3.0.0.gem b/assets/dora/vendor/cache/mustermann-3.0.0.gem new file mode 100644 index 00000000..aa1582b6 Binary files /dev/null and b/assets/dora/vendor/cache/mustermann-3.0.0.gem differ diff --git a/assets/dora/vendor/cache/rack-2.2.3.gem b/assets/dora/vendor/cache/rack-2.2.3.gem deleted file mode 100644 index 19fa2e9f..00000000 Binary files a/assets/dora/vendor/cache/rack-2.2.3.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/rack-2.2.4.gem b/assets/dora/vendor/cache/rack-2.2.4.gem new file mode 100644 index 00000000..cff677e7 Binary files /dev/null and b/assets/dora/vendor/cache/rack-2.2.4.gem differ diff --git a/assets/dora/vendor/cache/rack-protection-2.1.0.gem b/assets/dora/vendor/cache/rack-protection-2.1.0.gem deleted file mode 100644 index 2a4296e3..00000000 Binary files a/assets/dora/vendor/cache/rack-protection-2.1.0.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/rack-protection-3.0.5.gem b/assets/dora/vendor/cache/rack-protection-3.0.5.gem new file mode 100644 index 00000000..32f3714b Binary files /dev/null and b/assets/dora/vendor/cache/rack-protection-3.0.5.gem differ diff --git a/assets/dora/vendor/cache/rack-test-1.1.0.gem b/assets/dora/vendor/cache/rack-test-1.1.0.gem deleted file mode 100644 index 3fb2d3a8..00000000 Binary files a/assets/dora/vendor/cache/rack-test-1.1.0.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/rack-test-2.0.2.gem b/assets/dora/vendor/cache/rack-test-2.0.2.gem new file mode 100644 index 00000000..b57f15d8 Binary files /dev/null and b/assets/dora/vendor/cache/rack-test-2.0.2.gem differ diff --git a/assets/dora/vendor/cache/rspec-3.10.0.gem b/assets/dora/vendor/cache/rspec-3.10.0.gem deleted file mode 100644 index 8932c9c4..00000000 Binary files a/assets/dora/vendor/cache/rspec-3.10.0.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/rspec-3.12.0.gem b/assets/dora/vendor/cache/rspec-3.12.0.gem new file mode 100644 index 00000000..a28e4c33 Binary files /dev/null and b/assets/dora/vendor/cache/rspec-3.12.0.gem differ diff --git a/assets/dora/vendor/cache/rspec-core-3.10.1.gem b/assets/dora/vendor/cache/rspec-core-3.10.1.gem deleted file mode 100644 index 7c8a2058..00000000 Binary files a/assets/dora/vendor/cache/rspec-core-3.10.1.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/rspec-core-3.12.0.gem b/assets/dora/vendor/cache/rspec-core-3.12.0.gem new file mode 100644 index 00000000..f774c2cc Binary files /dev/null and b/assets/dora/vendor/cache/rspec-core-3.12.0.gem differ diff --git a/assets/dora/vendor/cache/rspec-expectations-3.10.1.gem b/assets/dora/vendor/cache/rspec-expectations-3.10.1.gem deleted file mode 100644 index de1935a9..00000000 Binary files a/assets/dora/vendor/cache/rspec-expectations-3.10.1.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/rspec-expectations-3.12.0.gem b/assets/dora/vendor/cache/rspec-expectations-3.12.0.gem new file mode 100644 index 00000000..aec60791 Binary files /dev/null and b/assets/dora/vendor/cache/rspec-expectations-3.12.0.gem differ diff --git a/assets/dora/vendor/cache/rspec-mocks-3.10.1.gem b/assets/dora/vendor/cache/rspec-mocks-3.10.1.gem deleted file mode 100644 index b53323d6..00000000 Binary files a/assets/dora/vendor/cache/rspec-mocks-3.10.1.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/rspec-mocks-3.12.0.gem b/assets/dora/vendor/cache/rspec-mocks-3.12.0.gem new file mode 100644 index 00000000..04ec3f85 Binary files /dev/null and b/assets/dora/vendor/cache/rspec-mocks-3.12.0.gem differ diff --git a/assets/dora/vendor/cache/rspec-support-3.10.1.gem b/assets/dora/vendor/cache/rspec-support-3.10.1.gem deleted file mode 100644 index 4ba6d167..00000000 Binary files a/assets/dora/vendor/cache/rspec-support-3.10.1.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/rspec-support-3.12.0.gem b/assets/dora/vendor/cache/rspec-support-3.12.0.gem new file mode 100644 index 00000000..1902af69 Binary files /dev/null and b/assets/dora/vendor/cache/rspec-support-3.12.0.gem differ diff --git a/assets/dora/vendor/cache/ruby2_keywords-0.0.2.gem b/assets/dora/vendor/cache/ruby2_keywords-0.0.2.gem deleted file mode 100644 index 075037e4..00000000 Binary files a/assets/dora/vendor/cache/ruby2_keywords-0.0.2.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/ruby2_keywords-0.0.5.gem b/assets/dora/vendor/cache/ruby2_keywords-0.0.5.gem new file mode 100644 index 00000000..d311c5d0 Binary files /dev/null and b/assets/dora/vendor/cache/ruby2_keywords-0.0.5.gem differ diff --git a/assets/dora/vendor/cache/sinatra-2.1.0.gem b/assets/dora/vendor/cache/sinatra-2.1.0.gem deleted file mode 100644 index 6be5a16e..00000000 Binary files a/assets/dora/vendor/cache/sinatra-2.1.0.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/sinatra-3.0.5.gem b/assets/dora/vendor/cache/sinatra-3.0.5.gem new file mode 100644 index 00000000..1d27a04a Binary files /dev/null and b/assets/dora/vendor/cache/sinatra-3.0.5.gem differ diff --git a/assets/dora/vendor/cache/tilt-2.0.10.gem b/assets/dora/vendor/cache/tilt-2.0.10.gem deleted file mode 100644 index b432e159..00000000 Binary files a/assets/dora/vendor/cache/tilt-2.0.10.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/tilt-2.0.11.gem b/assets/dora/vendor/cache/tilt-2.0.11.gem new file mode 100644 index 00000000..fe1fe515 Binary files /dev/null and b/assets/dora/vendor/cache/tilt-2.0.11.gem differ diff --git a/assets/dora/vendor/cache/typhoeus-1.3.1.gem b/assets/dora/vendor/cache/typhoeus-1.3.1.gem deleted file mode 100644 index aa8ad4a0..00000000 Binary files a/assets/dora/vendor/cache/typhoeus-1.3.1.gem and /dev/null differ diff --git a/assets/dora/vendor/cache/webrick-1.7.0.gem b/assets/dora/vendor/cache/webrick-1.7.0.gem new file mode 100644 index 00000000..127b8368 Binary files /dev/null and b/assets/dora/vendor/cache/webrick-1.7.0.gem differ