Skip to content

Commit

Permalink
Merge pull request #113 from resque/rails5
Browse files Browse the repository at this point in the history 
Rails 5 support
  • Loading branch information
@kirillplatonov
kirillplatonov authored Jul 17, 2016
2 parents 15b6b35 + 5e945dd commit 4af9c33
Show file tree
Hide file tree
Showing 12 changed files with 180 additions and 113 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
language: ruby
sudo: false
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
- 2.2.0
- jruby-19mode
- 2.2.5
- 2.3.1
- jruby-9.0.5.0
- rbx
services: redis
before_script:
Expand Down
16 changes: 9 additions & 7 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
source 'https://rubygems.org'

gemspec
gem 'rails', '~> 4.0.3'
gem 'resque', :git => 'https://github.com/resque/resque.git', :branch => "1-x-stable"
gem 'rails', '~> 5.0.0'
gem 'resque', github: 'resque'

gem 'sqlite3', :platforms => :ruby
gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5', :platforms => :jruby

group :development, :test do
gem "dotenv-rails"
gem "rdoc"
gem 'listen', '~> 3.0.5'
end

group :test do
gem 'minitest-spec-rails', "~> 4.7.6"
gem 'minitest-spec-rails'
gem 'coveralls', :require => false
gem 'redcard'
gem "mocha", :require => false
gem 'rails-controller-testing'
end


gem 'uglifier', '>= 1.0.3'

gem 'libv8', '~> 3.16.14.3', :platforms => :ruby
gem 'therubyracer', '~> 0.12.1', :platforms => :ruby
gem 'therubyrhino', '2.0.2', :platforms => :jruby
gem 'libv8', '~> 3.16.14.15', :platforms => :ruby
gem 'therubyracer', '~> 0.12.2', :platforms => :ruby
gem 'therubyrhino', '2.0.4', :platforms => :jruby

platforms :rbx do
# These are the ruby standard library
Expand Down
233 changes: 147 additions & 86 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
GIT
remote: https://github.com/resque/resque.git
revision: 68b43a3a01006abb0aabf0d564967f546ec1e134
branch: 1-x-stable
remote: git://github.com/jruby/activerecord-jdbc-adapter.git
revision: c3570ce730ae013df6644b2d4d6c68080e09ee6a
branch: rails-5
specs:
resque (1.25.2)
activerecord-jdbc-adapter (1.3.20)
activerecord (>= 2.2)
activerecord-jdbcsqlite3-adapter (1.3.20)
activerecord-jdbc-adapter (~> 1.3.20)
jdbc-sqlite3 (>= 3.7.2, < 3.9)

GIT
remote: git://github.com/resque/resque.git
revision: 5338646b6c19ed5f290fbf16a95e80cb4a33155d
specs:
resque (1.27.0)
mono_logger (~> 1.0)
multi_json (~> 1.0)
redis-namespace (~> 1.3)
Expand All @@ -23,45 +33,55 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.13)
actionpack (= 4.0.13)
actioncable (5.0.0)
actionpack (= 5.0.0)
nio4r (~> 1.2)
websocket-driver (~> 0.6.1)
actionmailer (5.0.0)
actionpack (= 5.0.0)
actionview (= 5.0.0)
activejob (= 5.0.0)
mail (~> 2.5, >= 2.5.4)
actionpack (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
rails-dom-testing (~> 2.0)
actionpack (5.0.0)
actionview (= 5.0.0)
activesupport (= 5.0.0)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.0)
activesupport (= 5.0.0)
builder (~> 3.1)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
activerecord (4.0.13)
activemodel (= 4.0.13)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.13)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.4)
activerecord-jdbc-adapter (1.3.16)
activerecord (>= 2.2)
activerecord-jdbcsqlite3-adapter (1.3.16)
activerecord-jdbc-adapter (~> 1.3.16)
jdbc-sqlite3 (>= 3.7.2, < 3.9)
activesupport (4.0.13)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.2)
builder (3.1.4)
coffee-rails (4.1.1)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (5.0.0)
activesupport (= 5.0.0)
globalid (>= 0.3.6)
activemodel (5.0.0)
activesupport (= 5.0.0)
activerecord (5.0.0)
activemodel (= 5.0.0)
activesupport (= 5.0.0)
arel (~> 7.0)
activesupport (5.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (7.0.0)
builder (3.2.2)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
railties (>= 4.0.0, < 5.2.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
commonjs (0.2.7)
concurrent-ruby (1.0.2)
concurrent-ruby (1.0.2-java)
coveralls (0.8.1)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
Expand All @@ -76,60 +96,94 @@ GEM
dotenv (= 2.0.1)
erubis (2.7.0)
execjs (2.5.2)
ffi (1.9.14)
ffi (1.9.14-java)
ffi2-generators (0.1.1)
globalid (0.3.6)
activesupport (>= 4.1.0)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.7.0)
jdbc-sqlite3 (3.8.10.1)
jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
jdbc-sqlite3 (3.8.11.2)
jquery-rails (4.1.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.2)
json (1.8.2-java)
json (1.8.3)
json (1.8.3-java)
less (2.6.0)
commonjs (~> 0.2.7)
less-rails (2.7.1)
actionpack (>= 4.0)
less (~> 2.6.0)
sprockets (> 2, < 4)
tilt
libv8 (3.16.14.7)
mail (2.6.3)
mime-types (>= 1.16, < 3)
libv8 (3.16.14.15)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
metaclass (0.0.4)
mime-types (2.5)
minitest (4.7.5)
minitest-spec-rails (4.7.8)
minitest (~> 4.7)
rails (>= 3.0, < 4.1)
method_source (0.8.2)
mime-types (2.99.2)
mini_portile2 (2.1.0)
minitest (5.9.0)
minitest-spec-rails (5.3.0)
minitest (~> 5.0)
rails (>= 4.1)
mocha (1.1.0)
metaclass (~> 0.0.1)
mono_logger (1.1.0)
multi_json (1.11.0)
multi_json (1.12.1)
netrc (0.10.3)
nio4r (1.2.1)
nio4r (1.2.1-java)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
nokogiri (1.6.8-java)
pkg-config (1.1.7)
racc (1.4.12)
rack (1.5.3)
rack-protection (1.5.3)
rack
rack (2.0.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.0.13)
actionmailer (= 4.0.13)
actionpack (= 4.0.13)
activerecord (= 4.0.13)
activesupport (= 4.0.13)
rails (5.0.0)
actioncable (= 5.0.0)
actionmailer (= 5.0.0)
actionpack (= 5.0.0)
actionview (= 5.0.0)
activejob (= 5.0.0)
activemodel (= 5.0.0)
activerecord (= 5.0.0)
activesupport (= 5.0.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.13)
sprockets-rails (~> 2.0)
railties (4.0.13)
actionpack (= 4.0.13)
activesupport (= 4.0.13)
railties (= 5.0.0)
sprockets-rails (>= 2.0.0)
rails-controller-testing (0.1.1)
actionpack (~> 5.x)
actionview (~> 5.x)
activesupport (~> 5.x)
rails-dom-testing (2.0.1)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6.0)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.0.0)
actionpack (= 5.0.0)
activesupport (= 5.0.0)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rake (11.2.2)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rdoc (4.2.0)
redcard (1.1.0)
redis (3.2.1)
redis (3.3.0)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
ref (1.0.5)
Expand Down Expand Up @@ -339,8 +393,8 @@ GEM
rubysl-yaml (2.1.0)
rubysl-zlib (2.0.1)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass-rails (5.0.5)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
Expand All @@ -350,36 +404,36 @@ GEM
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
sinatra (1.4.6)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sprockets (3.1.0)
rack (~> 1.0)
sprockets-rails (2.3.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sinatra (1.0)
rack (>= 1.0)
sprockets (3.6.3)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.1.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.10)
term-ansicolor (1.3.0)
tins (~> 1.0)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
therubyrhino (2.0.2)
therubyrhino (2.0.4)
therubyrhino_jar (>= 1.7.3)
therubyrhino_jar (1.7.6)
thor (0.19.1)
thread_safe (0.3.5)
thread_safe (0.3.5-java)
tilt (1.4.1)
tilt (2.0.5)
tins (1.5.1)
twitter-bootstrap-rails (3.2.2)
actionpack (>= 3.1)
execjs (>= 2.2.2, >= 2.2)
less-rails (>= 2.5.0)
railties (>= 3.1)
tzinfo (0.3.44)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
Expand All @@ -389,20 +443,27 @@ GEM
unf_ext (0.0.7.1)
vegas (0.1.11)
rack (>= 1.0.0)
websocket-driver (0.6.4)
websocket-extensions (>= 0.1.0)
websocket-driver (0.6.4-java)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)

PLATFORMS
java
ruby

DEPENDENCIES
activerecord-jdbcsqlite3-adapter
activerecord-jdbcsqlite3-adapter!
coveralls
dotenv-rails
libv8 (~> 3.16.14.3)
minitest-spec-rails (~> 4.7.6)
libv8 (~> 3.16.14.15)
listen (~> 3.0.5)
minitest-spec-rails
mocha
racc
rails (~> 4.0.3)
rails (~> 5.0.0)
rails-controller-testing
rdoc
redcard
resque!
Expand All @@ -411,9 +472,9 @@ DEPENDENCIES
rubinius-profiler
rubysl (~> 2.0)
sqlite3
therubyracer (~> 0.12.1)
therubyrhino (= 2.0.2)
therubyracer (~> 0.12.2)
therubyrhino (= 2.0.4)
uglifier (>= 1.0.3)

BUNDLED WITH
1.11.2
1.12.5
Loading

0 comments on commit 4af9c33

Please sign in to comment.