From 6ba4d1423fc33002f1ae055de73d3d1e64af2662 Mon Sep 17 00:00:00 2001 From: Walt Jones Date: Fri, 6 Nov 2020 09:50:35 -0500 Subject: [PATCH 1/3] fix: remove travis workarounds for rails test env --- spec/commands/rollbar_rails_runner_spec.rb | 5 ----- spec/dummyapp/config/boot.rb | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/spec/commands/rollbar_rails_runner_spec.rb b/spec/commands/rollbar_rails_runner_spec.rb index 9a300421..66d31c7f 100644 --- a/spec/commands/rollbar_rails_runner_spec.rb +++ b/spec/commands/rollbar_rails_runner_spec.rb @@ -3,13 +3,8 @@ if defined?(RSpecCommand) require 'rails/rollbar_runner' - # rspec_command and/or mixlib/shellout are no longer picking up the - # environment correctly with Ruby 2.6.x on travis. Not sure why yet. describe 'rollbar-rails-runner', :if => RUBY_VERSION < '2.6' do - # We set ENV['CURRENT_GEMFILE'] in the gemfile because Travis doesn't set - # ENV['BUNDLE_GEMFILE'] correctly. command %q[rollbar-rails-runner "puts 'hello'"] - environment :BUNDLE_GEMFILE => ENV['CURRENT_GEMFILE'] its(:stdout) do is_expected.to include('hello') end diff --git a/spec/dummyapp/config/boot.rb b/spec/dummyapp/config/boot.rb index f8f29cd2..d176a3e2 100644 --- a/spec/dummyapp/config/boot.rb +++ b/spec/dummyapp/config/boot.rb @@ -1,8 +1,9 @@ require 'rubygems' -gemfile = File.expand_path('../../../../Gemfile', __FILE__) -if File.exist?(gemfile) - ENV['BUNDLE_GEMFILE'] = gemfile +# If not already set, use the default. +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__) + +if File.exist?(ENV['BUNDLE_GEMFILE']) require 'bundler' Bundler.setup end From feb605c67e82381acc4eac8853dd01c31ad8437d Mon Sep 17 00:00:00 2001 From: Walt Jones Date: Fri, 6 Nov 2020 08:34:39 -0500 Subject: [PATCH 2/3] chore: initial github ci --- .github/workflows/ci.yml | 101 +++++++++++++++ .travis.yml | 268 --------------------------------------- 2 files changed, 101 insertions(+), 268 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..b1736ddc --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,101 @@ +name: Rollbar-gem CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-18.04 + strategy: + matrix: + ruby-version: [2.2.10, 2.3.0, 2.3.8, 2.4.5, 2.5.3, 2.6.0] + gemfile: + - gemfiles/rails42.gemfile + - gemfiles/rails50.gemfile + - gemfiles/rails51.gemfile + - gemfiles/rails52.gemfile + - gemfiles/rails60.gemfile + exclude: + - gemfile: gemfiles/rails42.gemfile + ruby-version: 2.6.0 + - gemfile: gemfiles/rails52.gemfile + ruby-version: 2.2.10 + - gemfile: gemfiles/rails60.gemfile + ruby-version: 2.2.10 + - gemfile: gemfiles/rails60.gemfile + ruby-version: 2.3.0 + - gemfile: gemfiles/rails60.gemfile + ruby-version: 2.3.8 + - gemfile: gemfiles/rails60.gemfile + ruby-version: 2.4.5 + include: + - gemfile: gemfiles/rails41.gemfile + ruby-version: 2.3.0 + - gemfile: gemfiles/rails41.gemfile + ruby-version: 2.2.10 + - gemfile: gemfiles/rails41.gemfile + ruby-version: 2.1.9 + - gemfile: gemfiles/rails40.gemfile + ruby-version: 2.3.0 + - gemfile: gemfiles/rails40.gemfile + ruby-version: 2.2.10 + - gemfile: gemfiles/rails40.gemfile + ruby-version: 2.1.9 + - gemfile: gemfiles/rails32.gemfile + ruby-version: 2.2.10 + - gemfile: gemfiles/rails32.gemfile + ruby-version: 2.1.9 + - gemfile: gemfiles/rails31.gemfile + ruby-version: 2.0.0 + - gemfile: gemfiles/rails30.gemfile + ruby-version: 2.0.0 + + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + + - name: Start Redis + uses: supercharge/redis-github-action@1.1.0 + with: + redis-version: 4 + + - name: Setup Ruby > 2.0 + uses: ruby/setup-ruby@v1 + if: ${{ matrix.ruby-version != '2.0.0' }} + with: + ruby-version: ${{ matrix.ruby-version }} + + - name: Setup Ruby 2.0.0 + if: ${{ matrix.ruby-version == '2.0.0' }} + timeout-minutes: 15 + run: | + sudo apt-get update -y + sudo apt-get install -y libssl1.0-dev + wget http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p648.tar.gz + tar xvfz ruby-2.0.0-p648.tar.gz + cd ruby-2.0.0-p648 + ./configure && make && sudo make install-nodoc + + - name: Ruby 2.0.0, install bundler + if: ${{ matrix.ruby-version == '2.0.0' }} + run: sudo gem install bundler -v 1.17.3 + + - name: Rails 4.2 ensure bundler version + if: ${{ matrix.gemfile == 'gemfiles/rails42.gemfile' }} + run: | + gem uninstall bundler + gem install bundler -v '< 2.0.0' + + - name: Bundle Install + run: | + export BUNDLE_GEMFILE=${{ matrix.gemfile }} + bundle config path vendor/bundle + bundle config gemfile ${{ matrix.gemfile }} + bundle install --jobs 4 --retry 3 + + - name: Rspec + run: bundle exec rspec diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3c20c382..00000000 --- a/.travis.yml +++ /dev/null @@ -1,268 +0,0 @@ -sudo: false -dist: trusty -services: - - redis-server -language: ruby - -rvm: - - 2.0.0 - - 2.1.0 - - 2.2.2 - - 2.3.8 - - 2.4.5 - - 2.5.3 - - 2.6.5 - - 2.7.0 - - rbx - # Travis's own rvm installer is failing on JRuby builds, TODO: reenable when fixed. - # - jruby-9.1.9.0 - - # - # # About legacy JRuby - # - # Legacy JRubies (jruby-18mode, jruby-19mode) have been disabled for some time by - # listing all possible targets in either the exclude or allow_failures sections. - # I have taken a look at getting them running, and have found that no valid - # combination of dependencies is possible for Rails 3.0 and higher. It appears - # Rails 2.2 is meant to work, though I haven't tried it. - # - # For Rails 3.0, it is possible to get a working bundle with all gem dependencies, - # but the JDBC adapter gem needs an earlier version of ActiveSupport, and it will - # fail at runtime. - # - # For Rails 3.1 and 3.2, Rack 1.3.x and higher require Ruby 2.x, while Rails 3.x will - # not accept any 1.2.x version of Rack. Even if this could be resolved, one would - # hit the above runtime issue amyway. - # - # # About current JRuby - # - # While current JRuby builds aim to be Ruby 2.5.x compatible, the JDBC adapter - # gem is constrained to only Rails 5.0, 5.1 and 5.2 at this time. (Old versions - # of the gem allow >= Rails 2.2, but in practice it will not work with Rails 3.0 - # and higher because of the ActiveSupport issue described above.) For as long as - # the test suite relies on Rails and SqlLite, it is not possible to include - # earlier Rails for JRuby. - -jdk: - # These are the JDKs currently supported on Travis (Trusty - Ubuntu 14.04) - - openjdk7 - - openjdk8 - - oraclejdk8 - - oraclejdk9 -gemfile: - - gemfiles/rails30.gemfile - - gemfiles/rails31.gemfile - - gemfiles/rails32.gemfile - - gemfiles/rails40.gemfile - - gemfiles/rails41.gemfile - - gemfiles/rails42.gemfile - - gemfiles/rails50.gemfile - - gemfiles/rails51.gemfile - - gemfiles/rails52.gemfile - - gemfiles/rails60.gemfile -matrix: - include: [] - - allow_failures: - - rvm: ruby-head - - rvm: jruby-head - # oraclejdk9 has a dependency issue that needs to be investigated - - jdk: oraclejdk9 - - exclude: - # Don't run tests for non-jruby environments with the JDK. - # NOTE: openjdk7 is missing from these exclusions so that Travis will run at least 1 build for the given rvm. - - rvm: 2.0.0 - jdk: openjdk8 - - rvm: 2.0.0 - jdk: oraclejdk8 - - rvm: 2.0.0 - jdk: oraclejdk9 - - rvm: 2.1.0 - jdk: openjdk8 - - rvm: 2.1.0 - jdk: oraclejdk8 - - rvm: 2.1.0 - jdk: oraclejdk9 - - rvm: 2.2.2 - jdk: openjdk8 - - rvm: 2.2.2 - jdk: oraclejdk8 - - rvm: 2.2.2 - jdk: oraclejdk9 - - rvm: 2.3.8 - jdk: openjdk8 - - rvm: 2.3.8 - jdk: oraclejdk8 - - rvm: 2.3.8 - jdk: oraclejdk9 - - rvm: 2.4.5 - jdk: openjdk8 - - rvm: 2.4.5 - jdk: oraclejdk8 - - rvm: 2.4.5 - jdk: oraclejdk9 - - rvm: 2.5.3 - jdk: openjdk8 - - rvm: 2.5.3 - jdk: oraclejdk8 - - rvm: 2.5.3 - jdk: oraclejdk9 - - rvm: 2.6.5 - jdk: openjdk8 - - rvm: 2.6.5 - jdk: oraclejdk8 - - rvm: 2.6.5 - jdk: oraclejdk9 - - rvm: 2.7.0 - jdk: openjdk8 - - rvm: 2.7.0 - jdk: oraclejdk8 - - rvm: 2.7.0 - jdk: oraclejdk9 - - - rvm: ruby-head - jdk: openjdk8 - - rvm: ruby-head - jdk: oraclejdk8 - - rvm: ruby-head - jdk: oraclejdk9 - - rvm: rbx - jdk: openjdk8 - - rvm: rbx - jdk: oraclejdk8 - - rvm: rbx - jdk: oraclejdk9 - - # Rails 6.x requires Ruby 2.5.0 or higher - - rvm: 2.2.2 - gemfile: gemfiles/rails60.gemfile - - rvm: 2.3.8 - gemfile: gemfiles/rails60.gemfile - - rvm: 2.4.5 - gemfile: gemfiles/rails60.gemfile - # Rails 5.x requires Ruby 2.2.2 or higher - - rvm: 2.0.0 - gemfile: gemfiles/rails50.gemfile - - rvm: 2.0.0 - gemfile: gemfiles/rails51.gemfile - - rvm: 2.0.0 - gemfile: gemfiles/rails52.gemfile - - rvm: 2.0.0 - gemfile: gemfiles/rails60.gemfile - # Rails 5.x requires Ruby 2.2.2 or higher - - rvm: 2.1.0 - gemfile: gemfiles/rails50.gemfile - - rvm: 2.1.0 - gemfile: gemfiles/rails51.gemfile - - rvm: 2.1.0 - gemfile: gemfiles/rails52.gemfile - - rvm: 2.1.0 - gemfile: gemfiles/rails60.gemfile - # MRI 2.2.2 supports Rails 3.2.x and higher, except Rails 5.2.4 and higher* - # * ActionDispatch 5.2.4 uses Ruby 3.x safe navigation operator. - - rvm: 2.2.2 - gemfile: gemfiles/rails30.gemfile - - rvm: 2.2.2 - gemfile: gemfiles/rails31.gemfile - - rvm: 2.2.2 - gemfile: gemfiles/rails52.gemfile - # MRI 2.3.x supports Rails 4.0.x and higher - - rvm: 2.3.8 - gemfile: gemfiles/rails30.gemfile - - rvm: 2.3.8 - gemfile: gemfiles/rails31.gemfile - - rvm: 2.3.8 - gemfile: gemfiles/rails32.gemfile - - rvm: 2.3.8 - gemfile: gemfiles/rails40.gemfile - - rvm: 2.3.8 - gemfile: gemfiles/rails41.gemfile - # MRI 2.4.x and higher (e.g. 2.5.x, 2.6.x, etc) supports Rails 4.2.8 and higher - # Rails lower than 4.2.8 is incompatible with Ruby 2.4 Integer class - - rvm: 2.4.5 - gemfile: gemfiles/rails30.gemfile - - rvm: 2.4.5 - gemfile: gemfiles/rails31.gemfile - - rvm: 2.4.5 - gemfile: gemfiles/rails32.gemfile - - rvm: 2.4.5 - gemfile: gemfiles/rails40.gemfile - - rvm: 2.4.5 - gemfile: gemfiles/rails41.gemfile - - rvm: 2.5.3 - gemfile: gemfiles/rails30.gemfile - - rvm: 2.5.3 - gemfile: gemfiles/rails31.gemfile - - rvm: 2.5.3 - gemfile: gemfiles/rails32.gemfile - - rvm: 2.5.3 - gemfile: gemfiles/rails40.gemfile - - rvm: 2.5.3 - gemfile: gemfiles/rails41.gemfile - - rvm: 2.6.5 - gemfile: gemfiles/rails30.gemfile - - rvm: 2.6.5 - gemfile: gemfiles/rails31.gemfile - - rvm: 2.6.5 - gemfile: gemfiles/rails32.gemfile - - rvm: 2.6.5 - gemfile: gemfiles/rails40.gemfile - - rvm: 2.6.5 - gemfile: gemfiles/rails41.gemfile - - rvm: 2.6.5 - gemfile: gemfiles/rails42.gemfile - # Rails 6.x tries to be compatible with Ruby 2.7, though - # it still throws a lot of warnings. No point testing earlier - # Rails with Ruby 2.7. - - rvm: 2.7.0 - gemfile: gemfiles/rails30.gemfile - - rvm: 2.7.0 - gemfile: gemfiles/rails31.gemfile - - rvm: 2.7.0 - gemfile: gemfiles/rails32.gemfile - - rvm: 2.7.0 - gemfile: gemfiles/rails40.gemfile - - rvm: 2.7.0 - gemfile: gemfiles/rails41.gemfile - - rvm: 2.7.0 - gemfile: gemfiles/rails42.gemfile - - rvm: 2.7.0 - gemfile: gemfiles/rails50.gemfile - - rvm: 2.7.0 - gemfile: gemfiles/rails51.gemfile - - rvm: 2.7.0 - gemfile: gemfiles/rails52.gemfile - # JRuby JDBC Adapter is only compatible with Rails >= 5.x - - rvm: jruby-9.1.9.0 - gemfile: gemfiles/rails30.gemfile - - rvm: jruby-9.1.9.0 - gemfile: gemfiles/rails31.gemfile - - rvm: jruby-9.1.9.0 - gemfile: gemfiles/rails32.gemfile - - rvm: jruby-9.1.9.0 - gemfile: gemfiles/rails40.gemfile - - rvm: jruby-9.1.9.0 - gemfile: gemfiles/rails41.gemfile - - rvm: jruby-9.1.9.0 - gemfile: gemfiles/rails42.gemfile - - rvm: rbx - gemfile: gemfiles/rails30.gemfile - - rvm: rbx - gemfile: gemfiles/rails31.gemfile - - rvm: rbx - gemfile: gemfiles/rails32.gemfile - - rvm: rbx - gemfile: gemfiles/rails40.gemfile - - rvm: rbx - gemfile: gemfiles/rails41.gemfile - - rvm: rbx - gemfile: gemfiles/rails42.gemfile - - rvm: rbx - gemfile: gemfiles/rails50.gemfile - - rvm: rbx - gemfile: gemfiles/rails51.gemfile - - rvm: rbx - gemfile: gemfiles/rails52.gemfile - - rvm: rbx - gemfile: gemfiles/rails60.gemfile From 4f70bba27def899c95ec8874de1910911486c4b8 Mon Sep 17 00:00:00 2001 From: Walt Jones Date: Fri, 6 Nov 2020 10:27:48 -0500 Subject: [PATCH 3/3] chore: update dependencies for ci builds --- gemfiles/rails30.gemfile | 16 ++++++---------- gemfiles/rails31.gemfile | 19 ++++++++----------- gemfiles/rails32.gemfile | 16 ++++++---------- gemfiles/rails40.gemfile | 16 ++++++---------- gemfiles/rails41.gemfile | 16 ++++++---------- gemfiles/rails42.gemfile | 14 ++++---------- gemfiles/rails50.gemfile | 14 ++++---------- gemfiles/rails51.gemfile | 14 ++++---------- gemfiles/rails52.gemfile | 10 +--------- gemfiles/rails60.gemfile | 8 -------- 10 files changed, 45 insertions(+), 98 deletions(-) diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile index 937d7ff2..a7c3e665 100644 --- a/gemfiles/rails30.gemfile +++ b/gemfiles/rails30.gemfile @@ -2,21 +2,16 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw] gem 'jruby-openssl', :platform => :jruby gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby -gem 'appraisal', '= 1.0.2' gem 'rails', '3.0.20' gem 'hitimes', '< 1.2.2' +gem 'mixlib-shellout', '<= 2.0.0' +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rake', '< 11' gem 'rspec-rails', '>= 2.14.0' @@ -38,11 +33,12 @@ gem 'capistrano', :require => false gem 'sucker_punch', '~> 2.0' gem 'shoryuken' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'sinatra' gem 'delayed_job', :require => false -gem 'redis' +gem 'redis', '<= 3.3.5' +gem 'redis-namespace', '<= 1.5.0' gem 'database_cleaner', '~> 1.0.0' gem 'genspec', '>= 0.2.8' gem 'girl_friday', '>= 0.11.1' diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile index afe0212d..8f145064 100644 --- a/gemfiles/rails31.gemfile +++ b/gemfiles/rails31.gemfile @@ -2,22 +2,17 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw] gem 'jruby-openssl', :platform => :jruby gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby -gem 'appraisal', '= 1.0.2' +gem 'mixlib-shellout', '<= 2.0.0' +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rails', '3.1.12' gem 'rspec-rails', '~> 3.4' -gem 'rake' +gem 'rake', '< 11' if RUBY_VERSION < '2.2.2' gem 'sidekiq', '~> 2.13.0' @@ -37,11 +32,13 @@ gem 'capistrano', :require => false gem 'sucker_punch' gem 'shoryuken' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'sinatra' gem 'delayed_job', :require => false -gem 'redis' +gem 'rack-cache', '<= 1.9.0' +gem 'redis', '<= 3.3.5' +gem 'redis-namespace', '<= 1.5.0' gem 'database_cleaner' gem 'girl_friday' gem 'generator_spec' diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile index 3911f681..cb1c5ca5 100644 --- a/gemfiles/rails32.gemfile +++ b/gemfiles/rails32.gemfile @@ -2,18 +2,13 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'mixlib-shellout', '<= 2.0.0' +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rails', '3.2.22' gem 'rake' gem 'rspec-rails', '~> 3.4' @@ -39,10 +34,11 @@ gem 'capistrano', :require => false gem 'sucker_punch', '~> 2.0' gem 'shoryuken' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'delayed_job', :require => false -gem 'redis' +gem 'redis', '<= 3.3.5' +gem 'redis-namespace', '<= 1.5.0' gem 'sinatra' gem 'database_cleaner', '~> 1.0.0' diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile index 6486d75e..483e4c2d 100644 --- a/gemfiles/rails40.gemfile +++ b/gemfiles/rails40.gemfile @@ -2,18 +2,13 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'mixlib-shellout', '<= 2.0.0' +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rails', '4.0.13' gem 'rake' gem 'rspec-rails', '~> 3.4' @@ -40,10 +35,11 @@ gem 'sucker_punch', '~> 2.0' gem 'json', '~> 2.0' gem 'shoryuken' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'delayed_job', :require => false -gem 'redis' +gem 'redis', '<= 3.3.5' +gem 'redis-namespace', '<= 1.5.0' gem 'resque' gem 'sinatra' diff --git a/gemfiles/rails41.gemfile b/gemfiles/rails41.gemfile index eff34767..463d5599 100644 --- a/gemfiles/rails41.gemfile +++ b/gemfiles/rails41.gemfile @@ -2,18 +2,13 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'mixlib-shellout', '<= 2.0.0' +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rails', '4.1.12' gem 'rake' gem 'rspec-rails', '~> 3.4' @@ -36,10 +31,11 @@ gem 'capistrano', :require => false gem 'sucker_punch', '~> 2.0' gem 'shoryuken' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'delayed_job', :require => false -gem 'redis' +gem 'redis', '<= 3.3.5' +gem 'redis-namespace', '<= 1.5.0' gem 'resque' gem 'sinatra' diff --git a/gemfiles/rails42.gemfile b/gemfiles/rails42.gemfile index 0679a8a2..715d6274 100644 --- a/gemfiles/rails42.gemfile +++ b/gemfiles/rails42.gemfile @@ -2,19 +2,13 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) is_not_jruby = !is_jruby -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rails', '4.2.8' gem 'rake' gem 'rspec-rails', '~> 3.4' @@ -45,7 +39,7 @@ gem 'delayed_job', :require => false gem 'generator_spec' gem 'girl_friday', '>= 0.11.1' gem 'rspec-command' -gem 'redis' +gem 'redis', '<= 3.3.5' gem 'resque' gem 'sinatra' @@ -54,7 +48,7 @@ gem 'nokogiri', '~> 1.6.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new gem 'sucker_punch', '~> 2.0' gem 'webmock', :require => false gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'aws-sdk-sqs' diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile index d2c103cd..01b61c85 100644 --- a/gemfiles/rails50.gemfile +++ b/gemfiles/rails50.gemfile @@ -2,18 +2,12 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 3.1.1' gem 'rails', '~> 5.0.7' gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw] @@ -37,7 +31,7 @@ end gem 'capistrano', :require => false gem 'sucker_punch', '~> 2.0' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3') gem 'rack', '2.1.2' @@ -49,7 +43,7 @@ gem 'database_cleaner' gem 'delayed_job', :require => false gem 'generator_spec' gem 'girl_friday', '>= 0.11.1' -gem 'redis' +gem 'redis', '<= 3.3.5' gem 'resque' unless is_jruby diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails51.gemfile index 43af6c43..5457903f 100644 --- a/gemfiles/rails51.gemfile +++ b/gemfiles/rails51.gemfile @@ -2,18 +2,12 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 3.1.1' gem 'rails', '~> 5.1.7' gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw] @@ -37,7 +31,7 @@ end gem 'capistrano', :require => false gem 'sucker_punch', '~> 2.0' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3') gem 'rack', '2.1.2' @@ -50,7 +44,7 @@ gem 'database_cleaner' gem 'delayed_job', :require => false gem 'generator_spec' gem 'girl_friday', '>= 0.11.1' -gem 'redis' +gem 'redis', '<= 3.3.5' gem 'resque' unless is_jruby diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index 952d5de2..3f434517 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -2,16 +2,8 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby gem 'rails', '~> 5.2.3' @@ -46,7 +38,7 @@ gem 'generator_spec' gem 'girl_friday', '>= 0.11.1' gem 'redis' gem 'resque' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' unless is_jruby # JRuby doesn't support fork, which is required for this test helper. diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile index e4738063..8d209caf 100644 --- a/gemfiles/rails60.gemfile +++ b/gemfiles/rails60.gemfile @@ -3,16 +3,8 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby gem 'rails', '6.0.2.1'