Merge pull request #63 from skoba/to_catch_up_rails6_ruby3

To catch up rails6 ruby3

.ruby-version

@@ -0,0 +1 @@
+2.5.8

.travis.yml

@@ -2,16 +2,15 @@ language: ruby
 sudo: false
 
 rvm:
-  - 2.3.0
-  - 2.2
-  - 2.1.2
-  - 2.0.0
+  - 2.6
+  - 2.7
+  - 3.0
   - ruby-head
-  - jruby-9.1.2.0
+  - jruby-9.2.14
 
 env:
   - RSPEC_VERSION=master
-  - RSPEC_VERSION='~> 3.0'
+  - RSPEC_VERSION='~> 3.10'
 
 bundler_args: "--retry=3 --jobs=3"
 
@@ -20,4 +19,4 @@ script: "bundle exec rake ci --trace"
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.2.14.0

Rakefile

@@ -35,7 +35,7 @@ def create_gem(gem_name)
   sh "mkdir -p tmp/#{gem_name}/spec"
   sh "cp '#{template_folder}/spec/spec_helper.rb' tmp/#{gem_name}/spec"
   Dir.chdir("./tmp/#{gem_name}") do
-    Bundler.clean_system 'bundle install'
+    Bundler.unbundled_system 'bundle install'
   end
 end
 
@@ -45,10 +45,10 @@ namespace :generate do
     sh "bundle exec rails new ./tmp/example_app -m 'features/templates/generate_example_app.rb' --skip-test-unit"
     sh "cp 'features/templates/rspec.rake' ./tmp/example_app/lib/tasks"
     Dir.chdir("./tmp/example_app/") do
-      Bundler.clean_system 'bundle install'
-      Bundler.clean_system 'rake db:migrate'
-      Bundler.clean_system 'rails g rspec:install'
-      Bundler.clean_system 'spring stop'
+      Bundler.unbundled_system 'bundle install'
+      Bundler.unbundled_system 'rake db:migrate'
+      Bundler.unbundled_system 'rails g rspec:install'
+      Bundler.unbundled_system 'spring stop'
     end
   end
 

ammeter.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activesupport', '>= 3.0'
   s.add_runtime_dependency 'rspec-rails',   '>= 2.2'
 
+  s.add_runtime_dependency 'bootsnap'
+
   s.add_development_dependency 'rspec',        '>= 2.2'
   s.add_development_dependency 'rails',        '>= 3.1'
   s.add_development_dependency 'uglifier',     '>= 1.2.4'

lib/ammeter/rspec/generator/matchers/have_correct_syntax.rb

@@ -30,7 +30,7 @@
     require 'ostruct'
 
     begin
-      view = ActionView::Template::Handlers::ERB.call(OpenStruct.new(:source => code))
+      view = ActionView::Template::Handlers::ERB.call(OpenStruct.new({:source => code}), code)
       eval('__crash_me__; ' + view)
     rescue SyntaxError
       false