From bde6189eb223d904b79e730df3bb700f2424fdd5 Mon Sep 17 00:00:00 2001
From: jfarrell <jfarrell@apache.org>
Date: Wed, 6 May 2020 14:45:59 -0400
Subject: [PATCH] Update to require ruby2.5+

---
 .gitignore       |  5 ++++-
 .ruby-version    |  2 +-
 .travis.yml      | 22 ++++++++++++++++------
 Dockerfile       | 18 ++++++++++++++++++
 Gemfile          |  1 -
 README.md        |  2 +-
 moonshot.gemspec |  7 +++++--
 7 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 Dockerfile

diff --git a/.gitignore b/.gitignore
index 926950e2..816dd2a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
+/moonshot-*.gem
+/.bundle
 /Gemfile.lock
 /vendor
 /coverage
+/cc-test-reporter
 site/
-sample/gems
\ No newline at end of file
+sample/gems
diff --git a/.ruby-version b/.ruby-version
index 6b4d1577..95e3ba81 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.2.3
\ No newline at end of file
+2.5
diff --git a/.travis.yml b/.travis.yml
index ff6583bd..d938c191 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,11 @@
 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:
@@ -14,10 +14,20 @@ addons:
     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 --id $CODECLIMATE_REPO_TOKEN --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 --id $CODECLIMATE_REPO_TOKEN -i coverage/codeclimate.json; fi
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..0cbc6959
--- /dev/null
+++ b/Dockerfile
@@ -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
+
diff --git a/Gemfile b/Gemfile
index 43bb6d2d..f91427d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,6 @@ gemspec
 gem 'rake', require: false
 
 group :test do
-  gem 'codeclimate-test-reporter'
   gem 'pry'
   gem 'rubocop', '~> 0.49.0'
 end
diff --git a/README.md b/README.md
index 2356b7a6..872593ed 100644
--- a/README.md
+++ b/README.md
@@ -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
 
diff --git a/moonshot.gemspec b/moonshot.gemspec
index b7d75f66..7e5ad2c1 100644
--- a/moonshot.gemspec
+++ b/moonshot.gemspec
@@ -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.'
@@ -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