Skip to content

Commit

Permalink
Update to require ruby2.5+
Browse files Browse the repository at this point in the history
  • Loading branch information
jfarrell committed May 6, 2020
1 parent 15c5efe commit 3e83152
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 12 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/moonshot-*.gem
/.bundle
/Gemfile.lock
/vendor
/coverage
/cc-test-reporter
site/
sample/gems
sample/gems
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.3
2.5
22 changes: 16 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,32 @@
language: ruby

cache: bundler
# This will enable the container-based infrastructure for
# travis tests. It should result in faster test vm load times.
# @see http://docs.travis-ci.com/user/workers/container-based-infrastructure/
sudo: false

rvm:
- 2.5

addons:
apt:
sources:
- kalakris-cmake
packages:
- cmake

env:
global:
- COVERAGE=1

before_install:
- gem install rubygems-update -v '<3' --no-document && update_rubygems
- gem update bundler

rvm:
- 2.2
- 2.3.3
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build

after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
- ./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.json coverage/.resultset.json
- if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter upload-coverage -i coverage/codeclimate.json; fi
18 changes: 18 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM ubuntu:xenial

RUN apt-get update \
&& apt-get install -y \
build-essential \
cmake \
git \
software-properties-common

RUN apt-add-repository -y ppa:brightbox/ruby-ng \
&& apt-get update \
&& apt-get install -y \
ruby2.6 \
ruby2.6-dev

RUN gem install rubygems-update -v '<3' --no-document && update_rubygems \
&& gem update bundler

1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ gemspec
gem 'rake', require: false

group :test do
gem 'codeclimate-test-reporter'
gem 'pry'
gem 'rubocop', '~> 0.49.0'
end
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ We also want to [help you contribute and answer all your questions](http://moons

## Requirements

- Ruby 2.2 or higher
- Ruby 2.5 or higher

## Attributions

Expand Down
7 changes: 5 additions & 2 deletions moonshot.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'moonshot'
s.version = '2.0.0.beta6'
s.version = '2.1.0.beta1'
s.licenses = ['Apache-2.0']
s.summary = 'A library and CLI tool for launching services into AWS'
s.description = 'A library and CLI tool for launching services into AWS.'
Expand Down Expand Up @@ -37,7 +37,10 @@ Gem::Specification.new do |s|
s.add_dependency('require_all', '~> 1.5.0')

s.add_development_dependency('rspec')
s.add_development_dependency('simplecov')
# Workaround for cc-test-reporter with SimpleCov 0.18.
# Stop upgrading SimpleCov until the following issue will be resolved.
# https://github.com/codeclimate/test-reporter/issues/418
s.add_development_dependency('simplecov', '~> 0.17.1')
# fakefs requires < 0.14.0 for ruby 2.2
s.add_development_dependency('fakefs', '< 0.14.0')
end

0 comments on commit 3e83152

Please sign in to comment.