Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into issue_19
Browse files Browse the repository at this point in the history
* upstream/master: (153 commits)
  #84 typo
  #84 async ops with Futex
  #81 more html
  #81 more html
  #81 more html
  #81 show mtime
  #81 chat
  #81 zold 0.18.7
  #81 typo
  #81 more tests and logs
  #82 sell ZLD feature is back ON
  #81 explained
  #80 validate by weight
  #81 better logging
  #77 disable selling
  #77 no winners msg
  #77 consistent_read
  #77 zold 0.18.5
  #77 zold 0.18.4
  #77 zold 0.18.2
  ...
  • Loading branch information
emilianodellacasa committed Dec 14, 2018
2 parents 8e0db3c + 069b1df commit a0ba133
Show file tree
Hide file tree
Showing 43 changed files with 1,372 additions and 693 deletions.
3 changes: 2 additions & 1 deletion .gitignore
@@ -1,10 +1,11 @@
.zold-wts/
coverage/
target/
Gemfile.lock
.idea/
.sass-cache/
*.gem
.bundle/
.DS_Store
rdoc/
farm
.zoldata/
12 changes: 7 additions & 5 deletions .rubocop.yml
Expand Up @@ -3,7 +3,7 @@ AllCops:
- 'bin/**/*'
- 'assets/**/*'
DisplayCopNames: true
TargetRubyVersion: 2.3
TargetRubyVersion: 2.5.1

Naming/UncommunicativeMethodParamName:
MinNameLength: 1
Expand All @@ -20,13 +20,13 @@ Layout/EndAlignment:
Lint/RescueException:
Enabled: false
Metrics/MethodLength:
Max: 50
Max: 100
Metrics/ClassLength:
Max: 200
Max: 300
Metrics/AbcSize:
Max: 80
Metrics/BlockLength:
Max: 100
Metrics/BlockLength:
Max: 120
Layout/MultilineMethodCallIndentation:
Enabled: false
Metrics/CyclomaticComplexity:
Expand All @@ -37,3 +37,5 @@ Metrics/LineLength:
Max: 120
Metrics/ParameterLists:
Max: 10
Layout/EmptyLineAfterGuardClause:
Enabled: false
8 changes: 4 additions & 4 deletions .rultor.yml
Expand Up @@ -8,8 +8,11 @@ release:
sensitive:
- config.yml
script: |-
export GEM_HOME=~/.ruby
export GEM_PATH=$GEM_HOME:$GEM_PATH
bundle install --no-color
pdd -f /dev/null
bundle install
bundle install --no-color
ruby -v
rake
git remote add heroku git@heroku.com:zold-wts.git
Expand All @@ -18,9 +21,6 @@ release:
mv ../id_rsa ../id_rsa.pub ~/.ssh
chmod -R 600 ~/.ssh/*
echo -e "Host *\n StrictHostKeyChecking no\n UserKnownHostsFile=/dev/null" > ~/.ssh/config
sed -i -s 's|Gemfile.lock||g' .gitignore
git add Gemfile.lock
git add .gitignore
git fetch
sed -i "s/0\.0\.0/${tag}/g" ./version.rb
git add ./version.rb
Expand Down
2 changes: 1 addition & 1 deletion .simplecov
Expand Up @@ -33,6 +33,6 @@ else
SimpleCov.start do
add_filter "/test/"
add_filter "/features/"
minimum_coverage 30
# minimum_coverage 30
end
end
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,7 +1,7 @@
language: ruby
sudo: required
rvm:
- 2.3.3
- 2.5.1
cache: bundler
branches:
only:
Expand Down
51 changes: 29 additions & 22 deletions Gemfile
Expand Up @@ -18,26 +18,33 @@
# SOFTWARE.

source 'https://rubygems.org'
ruby '2.3.3'
ruby '2.5.1'

gem 'aws-sdk-dynamodb', '~>1.6'
gem 'aws-sdk-s3', '~>1.13'
gem 'backports', '~>3.11'
gem 'codecov', '~>0.1'
gem 'concurrent-ruby', '~>1.0'
gem 'glogin', '~>0.2'
gem 'haml', '~>5.0'
gem 'minitest', '~>5.11'
gem 'rack', '~>2.0'
gem 'rack-ssl', '~>1.4'
gem 'rack-test', '~>1.0'
gem 'rake', '~>12.3', require: false
gem 'rerun', '~>0.11', require: false
gem 'rubocop', '~>0.52', require: false
gem 'rubocop-rspec', '~>1.25', require: false
gem 'sass', '~>3.5'
gem 'sentry-raven', '~>2.7'
gem 'sinatra', '~>2.0'
gem 'sinatra-contrib', '~>2.0'
gem 'xcop', '~>0.6'
gem 'zold', '~>0.14'
gem 'aws-sdk-dynamodb', '1.15.0'
gem 'aws-sdk-s3', '1.23.1'
gem 'backports', '3.11.4'
gem 'backtrace', '0.3.0'
gem 'codecov', '0.1.13'
gem 'coinbase', '4.1.0'
gem 'concurrent-ruby', '1.1.3'
gem 'futex', '0.7.0'
gem 'geocoder', '1.5.0'
gem 'glogin', '0.4.7'
gem 'haml', '5.0.4'
gem 'minitest', '5.11.3'
gem 'rack', '2.0.6'
gem 'rack-ssl', '1.4.1'
gem 'rack-test', '1.1.0'
gem 'rake', '12.3.1', require: false
gem 'random-port', '0.3.0', require: false
gem 'rerun', '0.13.0', require: false
gem 'rubocop', '0.60.0', require: false
gem 'rubocop-rspec', '1.30.1', require: false
gem 'sass', '3.6.0'
gem 'sentry-raven', '2.7.4'
gem 'sinatra', '2.0.4'
gem 'sinatra-contrib', '2.0.4'
gem 'telepost', '0.2.1'
gem 'webmock', '3.4.2'
gem 'xcop', '0.6'
gem 'zold', '0.18.8'

0 comments on commit a0ba133

Please sign in to comment.