From 124e2cd752223e1fcf93f9ed12248f1b75f349a3 Mon Sep 17 00:00:00 2001
From: Elmer Thomas <elmer@thinkingserious.com>
Date: Fri, 3 Jan 2020 09:56:42 -0800
Subject: [PATCH 1/2] Update for Twilio consistency and automation

---
 .travis.yml | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f2c0336e..ab3742df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,33 @@
 language: ruby
 rvm:
-- 2.2.6
-- 2.3.4
-- 2.4.1
+- ruby-head
+- 2.6
+- 2.5
+- 2.4
+- jruby
+
 gemfile:
 - gemfiles/Sinatra_1.gemfile
 - gemfiles/Sinatra_2.gemfile
+
 before_script:
 - mkdir prism
 - mkdir prism/bin
 - export PATH=$PATH:$PWD/prism/bin/
 - ./test/prism.sh
-notifications:
-  hipchat:
-    rooms:
-      secure: gYBEwOGBTxHE2nrxsHQqp2UdjRtCX04wVLYEimeT9RG/0LClS4nzJF7DaXLWlAwgLPmk+KV2+nXuLO5oausBr9ODmWhho8G0F90RPR47NupcvT1RM+I2ZbxSjHCUICL22mdnZd8ye/mrk/YtFWYmgmH7ILRK3BuYovXFoKoRnLg=
-    template:
-    - '<a href="https://travis-ci.org/%{repository}/builds/%{build_id}">%{repository}
-      Build %{build_number}</a> on branch <i>%{branch}</i> by %{author}: <strong>%{message}</strong>
-      <a href="https://github.com/sendgrid/%{repository}/commits/%{commit}">View on GitHub</a>'
-    format: html
-    notify: false
-script:
-    - rake test
-    - rake spec
-before_install:
-    - gem update bundler
 
+install: make install
+
+script: make test
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  fast_finish: true
+
+deploy:
+  - provider: rubygems
+    api_key: $RUBYGEMS_APIKEY
+    on:
+      tags: true
+      rvm: "2.4"

From c704d244b63cebafef6694a8be27dc16be3d1eca Mon Sep 17 00:00:00 2001
From: Elmer Thomas <elmer@thinkingserious.com>
Date: Fri, 3 Jan 2020 10:52:00 -0800
Subject: [PATCH 2/2] Use travis command line auto-generation

---
 .travis.yml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ab3742df..5a783a18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,29 +5,25 @@ rvm:
 - 2.5
 - 2.4
 - jruby
-
 gemfile:
 - gemfiles/Sinatra_1.gemfile
 - gemfiles/Sinatra_2.gemfile
-
 before_script:
 - mkdir prism
 - mkdir prism/bin
 - export PATH=$PATH:$PWD/prism/bin/
-- ./test/prism.sh
-
+- "./test/prism.sh"
 install: make install
-
 script: make test
-
 matrix:
   allow_failures:
-    - rvm: ruby-head
+  - rvm: ruby-head
   fast_finish: true
-
 deploy:
-  - provider: rubygems
-    api_key: $RUBYGEMS_APIKEY
-    on:
-      tags: true
-      rvm: "2.4"
+  provider: rubygems
+  api_key:
+    secure: CWlfN170i/fHPrIufHHLWQ0utjuhxf4ELSxKeypIuO2CNTqNMzocDAa2vxMt4XfO6d2wFPV/LC+IHR7i+sp7PKvjRoa4BLUUxjfBNDboc0gGESeUYlAxwsJo0tOVCNmpxgjQKqtPLz/19A/v/xpxLv2Im/9Idqa5ATd06sMDdM8=
+  gem: sendgrid-ruby
+  on:
+    tags: true
+    rvm: '2.4'