5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Merge branch 'master' into stable

Browse Source
This commit is contained in:
Greg Karékinian 2017-07-05 23:59:32 +02:00
commit 29c0d58c2a
3 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,7 +1,7 @@
language: ruby language: ruby
cache: bundler cache: bundler
rvm: rvm:
- 2.2.5 - 2.4.1
services: services:
- redis-server - redis-server
before_install: before_install:

7
Gemfile
View File

@ -1,11 +1,11 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "sinatra", '~> 1.4' gem "sinatra"
gem "sinatra-contrib" gem "sinatra-contrib"
gem "activesupport" gem "activesupport"
gem "riak-client", :github => "5apps/riak-ruby-client", :branch => "invalid_uri_error" gem "riak-client", git: "https://github.com/5apps/riak-ruby-client", branch: "invalid_uri_error"
gem "fog-aws" gem "fog-aws"
gem "rest-client" gem "rest-client", "~> 2.1.0.rc1" # Fixes a memory leak in Ruby 2.4
gem "redis" gem "redis"
# Remove require when we can update to 3.0, which sets the new storage # Remove require when we can update to 3.0, which sets the new storage
# format to columnar by default. Increases performance # format to columnar by default. Increases performance
@ -13,6 +13,7 @@ gem "mime-types"
group :test do group :test do
gem 'rake' gem 'rake'
gem 'rack-test'
gem 'purdytest', :require => false gem 'purdytest', :require => false
gem 'm' gem 'm'
gem 'minitest-stub_any_instance' gem 'minitest-stub_any_instance'

101
Gemfile.lock
View File

@ -1,5 +1,5 @@
GIT GIT
remote: git://github.com/5apps/riak-ruby-client.git remote: https://github.com/5apps/riak-ruby-client
revision: 5f21df86b14339aeb252374851d29ad813cca1dd revision: 5f21df86b14339aeb252374851d29ad813cca1dd
branch: invalid_uri_error branch: invalid_uri_error
specs: specs:
@ -13,98 +13,100 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (5.0.0) activesupport (5.1.2)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7) i18n (~> 0.7)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
backports (3.6.8) backports (3.8.0)
beefcake (0.3.7) beefcake (0.3.7)
builder (3.2.2) builder (3.2.3)
concurrent-ruby (1.0.2) concurrent-ruby (1.0.5)
domain_name (0.5.20160615) domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
excon (0.51.0) excon (0.57.1)
faraday (0.9.2) faraday (0.12.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
fog-aws (0.10.0) fog-aws (1.4.0)
fog-core (~> 1.38) fog-core (~> 1.38)
fog-json (~> 1.0) fog-json (~> 1.0)
fog-xml (~> 0.1) fog-xml (~> 0.1)
ipaddress (~> 0.8) ipaddress (~> 0.8)
fog-core (1.42.0) fog-core (1.44.3)
builder builder
excon (~> 0.49) excon (~> 0.49)
formatador (~> 0.2) formatador (~> 0.2)
fog-json (1.0.2) fog-json (1.0.2)
fog-core (~> 1.0) fog-core (~> 1.0)
multi_json (~> 1.10) multi_json (~> 1.10)
fog-xml (0.1.2) fog-xml (0.1.3)
fog-core fog-core
nokogiri (~> 1.5, >= 1.5.11) nokogiri (>= 1.5.11, < 2.0.0)
formatador (0.2.5) formatador (0.2.5)
http-cookie (1.0.2) http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (0.7.0) i18n (0.8.4)
innertube (1.0.2) innertube (1.0.2)
ipaddress (0.8.3) ipaddress (0.8.3)
kgio (2.10.0) kgio (2.11.0)
m (1.5.0) m (1.5.1)
method_source (>= 0.6.7) method_source (>= 0.6.7)
rake (>= 0.9.2.2) rake (>= 0.9.2.2)
method_source (0.8.2) method_source (0.8.2)
mime-types (3.1) mime-types (3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mini_portile2 (2.1.0) mini_portile2 (2.2.0)
minitest (5.9.0) minitest (5.10.2)
minitest-stub_any_instance (1.0.1) minitest-stub_any_instance (1.0.1)
multi_json (1.12.1) multi_json (1.12.1)
multipart-post (2.0.0) multipart-post (2.0.0)
mustermann (1.0.0)
netrc (0.11.0) netrc (0.11.0)
nokogiri (1.6.8) nokogiri (1.8.0)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.2.0)
pkg-config (~> 1.1.7)
pkg-config (1.1.7)
purdytest (2.0.0) purdytest (2.0.0)
minitest (~> 5.5) minitest (~> 5.5)
rack (1.6.4) rack (2.0.3)
rack-protection (1.5.3) rack-protection (2.0.0)
rack rack
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rainbows (5.0.0) rainbows (5.1.1)
kgio (~> 2.5) kgio (~> 2.5)
rack (~> 1.1) rack (>= 1.1, < 3.0)
unicorn (~> 5.0) unicorn (~> 5.1)
raindrops (0.16.0) raindrops (0.18.0)
rake (11.2.2) rake (12.0.0)
redis (3.3.1) redis (3.3.3)
rest-client (2.0.0) rest-client (2.1.0.rc1)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0) http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0) mime-types (>= 1.16, < 4.0)
netrc (~> 0.8) netrc (~> 0.8)
sentry-raven (1.2.0) sentry-raven (2.5.3)
faraday (>= 0.7.6, < 0.10.x) faraday (>= 0.7.6, < 1.0)
sinatra (1.4.7) sinatra (2.0.0)
rack (~> 1.5) mustermann (~> 1.0)
rack-protection (~> 1.4) rack (~> 2.0)
tilt (>= 1.3, < 3) rack-protection (= 2.0.0)
sinatra-contrib (1.4.7) tilt (~> 2.0)
sinatra-contrib (2.0.0)
backports (>= 2.0) backports (>= 2.0)
multi_json multi_json
rack-protection mustermann (~> 1.0)
rack-test rack-protection (= 2.0.0)
sinatra (~> 1.4.0) sinatra (= 2.0.0)
tilt (>= 1.3, < 3) tilt (>= 1.3, < 3)
thread_safe (0.3.5) thread_safe (0.3.6)
tilt (2.0.5) tilt (2.0.7)
tzinfo (1.2.2) tzinfo (1.2.3)
thread_safe (~> 0.1) thread_safe (~> 0.1)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.2) unf_ext (0.0.7.4)
unicorn (5.1.0) unicorn (5.3.0)
kgio (~> 2.6) kgio (~> 2.6)
raindrops (~> 0.7) raindrops (~> 0.7)
@ -118,14 +120,15 @@ DEPENDENCIES
mime-types mime-types
minitest-stub_any_instance minitest-stub_any_instance
purdytest purdytest
rack-test
rainbows rainbows
rake rake
redis redis
rest-client rest-client (~> 2.1.0.rc1)
riak-client! riak-client!
sentry-raven sentry-raven
sinatra (~> 1.4) sinatra
sinatra-contrib sinatra-contrib
BUNDLED WITH BUNDLED WITH
1.11.2 1.15.1