mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
Update dev files - .travis.yml, .rubocop.yml, Gemfile
This commit is contained in:
parent
a3ac7b9c27
commit
f94db8d3b7
4 changed files with 19 additions and 49 deletions
40
.rubocop.yml
40
.rubocop.yml
|
@ -1,6 +1,6 @@
|
||||||
AllCops:
|
AllCops:
|
||||||
DisabledByDefault: true
|
DisabledByDefault: true
|
||||||
TargetRubyVersion: 1.9.3
|
TargetRubyVersion: 2.2
|
||||||
DisplayCopNames: true
|
DisplayCopNames: true
|
||||||
StyleGuideCopsOnly: false
|
StyleGuideCopsOnly: false
|
||||||
Exclude:
|
Exclude:
|
||||||
|
@ -51,41 +51,5 @@ Style/MethodDefParentheses:
|
||||||
Style/TrailingCommaInArguments:
|
Style/TrailingCommaInArguments:
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
|
||||||
Performance/Count:
|
Performance:
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/Detect:
|
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/EndWith:
|
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/FlatMap:
|
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/HashEachMethods:
|
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/RangeInclude:
|
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/RedundantMerge:
|
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/RedundantSortBy:
|
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/ReverseEach:
|
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/Sample:
|
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/Size:
|
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/StartWith:
|
|
||||||
Enabled: true
|
|
||||||
|
|
||||||
Performance/TimesMap:
|
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
|
22
.travis.yml
22
.travis.yml
|
@ -5,30 +5,36 @@ language: ruby
|
||||||
cache: bundler
|
cache: bundler
|
||||||
before_install:
|
before_install:
|
||||||
# https://github.com/travis-ci/travis-ci/issues/9383#issuecomment-377680108
|
# https://github.com/travis-ci/travis-ci/issues/9383#issuecomment-377680108
|
||||||
- gem install bundler
|
# recent versions of RubyGems include bundler
|
||||||
branches:
|
- gem update --system
|
||||||
only:
|
|
||||||
- "master"
|
|
||||||
rvm:
|
rvm:
|
||||||
- 2.2.10
|
- 2.2.10
|
||||||
- 2.3.7
|
- 2.3.7
|
||||||
- 2.4.4
|
- 2.4.4
|
||||||
- 2.5.1
|
- 2.5.1
|
||||||
- ruby-head
|
- ruby-head
|
||||||
- jruby-9.1.17.0
|
- jruby-9.2.0.0
|
||||||
- jruby-head
|
|
||||||
- rbx-3
|
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
include:
|
include:
|
||||||
- rvm: ruby-head
|
- rvm: ruby-head
|
||||||
env: RUBYOPT="--jit"
|
env: RUBYOPT="--jit"
|
||||||
allow_failures:
|
- rvm: 2.3.7
|
||||||
|
os: osx
|
||||||
|
- rvm: 2.5
|
||||||
|
os: osx
|
||||||
- rvm: jruby-head
|
- rvm: jruby-head
|
||||||
- rvm: rbx-3
|
- rvm: rbx-3
|
||||||
|
|
||||||
|
allow_failures:
|
||||||
- rvm: ruby-head
|
- rvm: ruby-head
|
||||||
- rvm: ruby-head
|
- rvm: ruby-head
|
||||||
env: RUBYOPT="--jit"
|
env: RUBYOPT="--jit"
|
||||||
|
- rvm: jruby-head
|
||||||
|
- rvm: rbx-3
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
- TESTOPTS="-v"
|
- TESTOPTS="-v"
|
||||||
|
|
4
Gemfile
4
Gemfile
|
@ -6,12 +6,12 @@ gem "rdoc"
|
||||||
gem "rake-compiler"
|
gem "rake-compiler"
|
||||||
|
|
||||||
gem "rack", "< 3.0"
|
gem "rack", "< 3.0"
|
||||||
gem "minitest", "~> 5.9"
|
gem "minitest", "~> 5.11"
|
||||||
gem "minitest-retry"
|
gem "minitest-retry"
|
||||||
|
|
||||||
gem "jruby-openssl", :platform => "jruby"
|
gem "jruby-openssl", :platform => "jruby"
|
||||||
|
|
||||||
gem "rubocop", "~> 0.50.0"
|
gem "rubocop", "~> 0.58.0"
|
||||||
|
|
||||||
if %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
|
if %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
|
||||||
gem "stopgap_13632", "~> 1.0", :platforms => ["mri", "mingw", "x64_mingw"]
|
gem "stopgap_13632", "~> 1.0", :platforms => ["mri", "mingw", "x64_mingw"]
|
||||||
|
|
|
@ -19,7 +19,7 @@ end
|
||||||
DISABLE_SSL = begin
|
DISABLE_SSL = begin
|
||||||
Puma::Server.class
|
Puma::Server.class
|
||||||
Puma::MiniSSL.check
|
Puma::MiniSSL.check
|
||||||
puts "", RUBY_REVISION
|
puts "", RUBY_DESCRIPTION
|
||||||
puts "Puma::MiniSSL OPENSSL_LIBRARY_VERSION: #{Puma::MiniSSL::OPENSSL_LIBRARY_VERSION}",
|
puts "Puma::MiniSSL OPENSSL_LIBRARY_VERSION: #{Puma::MiniSSL::OPENSSL_LIBRARY_VERSION}",
|
||||||
" OPENSSL_VERSION: #{Puma::MiniSSL::OPENSSL_VERSION}", ""
|
" OPENSSL_VERSION: #{Puma::MiniSSL::OPENSSL_VERSION}", ""
|
||||||
rescue
|
rescue
|
||||||
|
|
Loading…
Add table
Reference in a new issue