Skip to content

Commit

Permalink
Upgrade Ruby gems to support Ruby 2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
ysbaddaden committed Nov 14, 2019
1 parent 866eb79 commit 4017a2f
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 21 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
/bin/prax-binary
/.crystal
/.vagrant
/.bundle
/dist
/packages
/test/hosts/_logs
/ssl/server.crt
/ssl/server.csr
/ssl/server.key
/vendor
/test/hosts/bundler/vendor
/test/hosts/bundler/.bundle
54 changes: 37 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,27 +1,47 @@
GEM
remote: https://rubygems.org/
specs:
arr-pm (0.0.9)
arr-pm (0.0.10)
cabin (> 0)
backports (3.6.4)
cabin (0.7.1)
childprocess (0.5.5)
backports (3.15.0)
cabin (0.9.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
clamp (0.6.3)
ffi (1.9.6)
fpm (1.3.3)
arr-pm (~> 0.0.9)
clamp (1.0.1)
dotenv (2.7.5)
ffi (1.11.2)
fpm (1.11.0)
arr-pm (~> 0.0.10)
backports (>= 2.6.2)
cabin (>= 0.6.0)
childprocess
clamp (~> 0.6)
childprocess (= 0.9.0)
clamp (~> 1.0.0)
ffi
json (>= 1.7.7)
json (2.0.3)
minitest (5.5.1)
puma (3.11.0)
rack (1.6.0)
rake (10.4.2)
json (>= 1.7.7, < 2.0)
pleaserun (~> 0.0.29)
ruby-xz (~> 0.2.3)
stud
insist (1.0.0)
io-like (0.3.0)
json (1.8.6)
minitest (5.13.0)
mustache (0.99.8)
nio4r (2.5.2)
pleaserun (0.0.30)
cabin (> 0)
clamp
dotenv
insist
mustache (= 0.99.8)
stud
puma (4.3.0)
nio4r (~> 2.0)
rack (2.0.7)
rake (13.0.1)
ruby-xz (0.2.3)
ffi (~> 1.9)
io-like (~> 0.3)
stud (0.0.23)

PLATFORMS
ruby
Expand All @@ -34,4 +54,4 @@ DEPENDENCIES
rake

BUNDLED WITH
1.16.0
1.17.2
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ require 'rake/testtask'

Rake::TestTask.new do |t|
t.libs << "test"
t.test_files = FileList['test/**/*_test.rb']
t.verbose = true
t.test_files = FileList['test/*_test.rb']
t.verbose = false
end
4 changes: 2 additions & 2 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ class Test
def run
capture_exceptions do
# DNS might have a timeout of 5 so keep this slightly higher.
Timeout.timeout(7) { run_without_timeout }
Timeout.timeout(7) { return run_without_timeout }
end

self
Result.from self
end
end
end

0 comments on commit 4017a2f

Please sign in to comment.