diff --git a/.travis.yml b/.travis.yml index d154e7b..4d3c0af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ cache: install: - bundle install - - nvm install node + - nvm install 10 - node -v - npm i -g yarn - yarn @@ -33,7 +33,8 @@ script: - bundle exec rake test matrix: allow_failures: - - gemfile: gemfiles/Gemfile-rails-edge + - gemfile: gemfiles/Gemfile-rails-edge + - rvm: ruby-head exclude: - rvm: 2.3.8 gemfile: gemfiles/Gemfile-rails-edge diff --git a/Gemfile b/Gemfile index 280caa9..f458293 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,6 @@ gemspec gem "rails" gem "rake", ">= 11.1" -gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false gem "rack-proxy", require: false group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 73355d4..86296aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,3 @@ -GIT - remote: https://github.com/rubocop-hq/rubocop.git - revision: dc69686abf10d9f38ed3a39037fab76ae8874138 - specs: - rubocop (0.65.0) - jaro_winkler (~> 1.5.1) - parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) - psych (>= 3.1.0) - rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) - PATH remote: . specs: @@ -91,11 +77,9 @@ GEM nio4r (2.3.1) nokogiri (1.10.1) mini_portile2 (~> 2.4.0) - parallel (1.14.0) - parser (2.6.0.0) + parallel (1.17.0) + parser (2.6.3.0) ast (~> 2.4.0) - powerpack (0.1.2) - psych (3.1.0) rack (2.0.6) rack-proxy (0.6.5) rack @@ -127,6 +111,13 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.0.0) rake (12.3.2) + rubocop (0.68.1) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.5, != 2.5.1.1) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.6) ruby-progressbar (1.10.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) @@ -139,7 +130,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.4.1) + unicode-display_width (1.5.0) websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) @@ -154,7 +145,7 @@ DEPENDENCIES rack-proxy rails rake (>= 11.1) - rubocop! + rubocop (< 0.69) webpacker! BUNDLED WITH diff --git a/gemfiles/Gemfile-rails-edge b/gemfiles/Gemfile-rails-edge index 0e3b150..b679637 100644 --- a/gemfiles/Gemfile-rails-edge +++ b/gemfiles/Gemfile-rails-edge @@ -7,7 +7,6 @@ gem "webpacker", path: ".." gem "rails", github: "rails/rails" gem "arel", github: "rails/arel" gem "rake", ">= 11.1" -gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false gem "rack-proxy", require: false gem "minitest", "~> 5.0" gem "byebug" diff --git a/gemfiles/Gemfile-rails.4.2.x b/gemfiles/Gemfile-rails.4.2.x index 0585b6b..3a1c09c 100644 --- a/gemfiles/Gemfile-rails.4.2.x +++ b/gemfiles/Gemfile-rails.4.2.x @@ -1,10 +1,9 @@ source "https://rubygems.org" -gem "webpacker", path: ".." +gemspec path: "../" gem "rails", "~> 4.2.0" gem "rake", ">= 11.1" -gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false gem "rack-proxy", require: false gem "minitest", "~> 5.0" gem "byebug" diff --git a/gemfiles/Gemfile-rails.5.0.x b/gemfiles/Gemfile-rails.5.0.x index b2894ca..d4a2e9a 100644 --- a/gemfiles/Gemfile-rails.5.0.x +++ b/gemfiles/Gemfile-rails.5.0.x @@ -1,10 +1,9 @@ source "https://rubygems.org" -gem "webpacker", path: ".." +gemspec path: "../" gem "rails", "~> 5.0.0" gem "rake", ">= 11.1" -gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false gem "rack-proxy", require: false gem "minitest", "~> 5.0" gem "byebug" diff --git a/gemfiles/Gemfile-rails.5.1.x b/gemfiles/Gemfile-rails.5.1.x index 17bcfcb..f0dee13 100644 --- a/gemfiles/Gemfile-rails.5.1.x +++ b/gemfiles/Gemfile-rails.5.1.x @@ -1,10 +1,9 @@ source "https://rubygems.org" -gem "webpacker", path: ".." +gemspec path: "../" gem "rails", "~> 5.1.0" gem "rake", ">= 11.1" -gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false gem "rack-proxy", require: false gem "minitest", "~> 5.0" gem "byebug" diff --git a/gemfiles/Gemfile-rails.5.2.x b/gemfiles/Gemfile-rails.5.2.x index 2de647f..71d42c3 100644 --- a/gemfiles/Gemfile-rails.5.2.x +++ b/gemfiles/Gemfile-rails.5.2.x @@ -1,10 +1,9 @@ source "https://rubygems.org" -gem "webpacker", path: ".." +gemspec path: "../" gem "rails", "~> 5.2.0" gem "rake", ">= 11.1" -gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false gem "rack-proxy", require: false gem "minitest", "~> 5.0" gem "byebug" diff --git a/webpacker.gemspec b/webpacker.gemspec index 8896f30..3c017b6 100644 --- a/webpacker.gemspec +++ b/webpacker.gemspec @@ -22,6 +22,7 @@ Gem::Specification.new do |s| s.add_dependency "rack-proxy", ">= 0.6.1" s.add_development_dependency "bundler", "~> 1.12" + s.add_development_dependency "rubocop", "< 0.69" s.files = `git ls-files`.split("\n") s.test_files = `git ls-files -- test/*`.split("\n")