sendgrid-ruby 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b55be9596fe7e0909a03c49cb9e698d922a1a39
-  data.tar.gz: 06a368c6b3602362d1efd92570797f284c24fd7a
+  metadata.gz: 45c988f70cffd958c9fd2584996418bb298a26af
+  data.tar.gz: e7b1f78db42b513d14d250427fa93751d2042670
 SHA512:
-  metadata.gz: a03a6e57f9ba993d5ca038bb5a270821dde415188f4b0c38bb7454cda68c7b1136b49b8dec624eda22d389e12c2fa9ed7669b40f4c743022d6a6d34927f59702
-  data.tar.gz: ae5d547a542b5ca06b0086407f50ab67cd0b103a956ad77a4d4e9efb0a3e6344651420025db6bd2e8fcb53d293cbecb733d299b1ac201b657ad41e4356806a7e
+  metadata.gz: 9d3620dea68b81957963929757b6d40499956b522f5107c074ea61015977a6a16443411142356a0b95b96b3f2314f1dbb035054a77680eda18e75b088709c340
+  data.tar.gz: e4effa159c2dfe07b658c41c7586491ae562894c20fb46b35d7fd45905b51de8a122d2bf4685a41a82e1530b07d1327084b501701235b7f42cac6f77748446db

data/.travis.yml

@@ -1,6 +1,11 @@
 language: ruby
 rvm:
 - 2.2
+before_script:
+- mkdir prism
+- mkdir prism/bin
+- export PATH=$PATH:$PWD/prism/bin/
+- ./test/prism.sh
 notifications:
   hipchat:
     rooms:

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [4.0.5] - 2016-10-17 ##
+### Added
+- Pull #110, fixed Issue #109
+- Automates StopLight.io Prism mock server locally & on Travis CI
+- Thanks to [KY](https://github.com/tkbky) for the pull request!
+
 ## [4.0.4] - 2016-09-15 ##
 ### Fixed
 - Pull #72: [remove unnecessary ruby 2.2 requirement](https://github.com/sendgrid/sendgrid-ruby/pull/72)

data/CONTRIBUTING.md

@@ -83,19 +83,6 @@ We welcome direct contributions to the sendgrid-ruby code base. Thank you!
    bundle install
    ```
 
-1. Download [prism](https://stoplight.io/prism/) for your platform ([Mac OS X](https://github.com/stoplightio/prism/releases/download/v0.1.5/prism_darwin_amd64)) and save the binary to the sendgrid-ruby directory (or any directory you would like. The sendgrid-ruby directory is chosen mostly for convenience.)
-1. Add execute permissions
-
-   ```bash
-   chmod +x prism
-   ```
-1. Download the [prism spec for sendgrid](https://api.stoplight.io/v1/versions/563a5309daad691100fb05af/export/stoplight.json) and save it to the same directory
-1. In a separate terminal, cd into the directory you chose for prism and start the sendgrid local server which the tests will use. 
-
-   ```bash
-   ./prism run --mock --list --spec stoplight.json
-   ```
-
 ## Environment Variables
 
 First, get your free SendGrid account [here](https://sendgrid.com/free?source=sendgrid-ruby).

data/lib/sendgrid/version.rb

@@ -1,3 +1,3 @@
 module SendGrid
-  VERSION = '4.0.4'
+  VERSION = '4.0.5'
 end

data/test/prism.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+install () {
+
+set -eu
+
+UNAME=$(uname)
+ARCH=$(uname -m)
+if [ "$UNAME" != "Linux" ] && [ "$UNAME" != "Darwin" ] && [ "$ARCH" != "x86_64" ] && [ "$ARCH" != "i686" ]; then
+    echo "Sorry, OS/Architecture not supported: ${UNAME}/${ARCH}. Download binary from https://github.com/stoplightio/prism/releases"
+    exit 1
+fi
+
+if [ "$UNAME" = "Darwin" ] ; then
+  OSX_ARCH=$(uname -m)
+  if [ "${OSX_ARCH}" = "x86_64" ] ; then
+    PLATFORM="darwin_amd64"
+  fi
+elif [ "$UNAME" = "Linux" ] ; then
+  LINUX_ARCH=$(uname -m)
+  if [ "${LINUX_ARCH}" = "i686" ] ; then
+    PLATFORM="linux_386"
+  elif [ "${LINUX_ARCH}" = "x86_64" ] ; then
+    PLATFORM="linux_amd64"
+  fi
+fi
+
+#LATEST=$(curl -s https://api.github.com/repos/stoplightio/prism/tags | grep -Eo '"name":.*?[^\\]",'  | head -n 1 | sed 's/[," ]//g' | cut -d ':' -f 2)
+LATEST="v0.2.7"
+URL="https://github.com/stoplightio/prism/releases/download/$LATEST/prism_$PLATFORM"
+DEST=./prism/bin/prism
+
+if [ -z $LATEST ] ; then
+  echo "Error requesting. Download binary from ${URL}"
+  exit 1
+else
+  curl -L $URL -o $DEST
+  chmod +x $DEST
+fi
+}
+
+install

data/test/sendgrid/test_sendgrid-ruby.rb

@@ -4,6 +4,27 @@ require 'minitest/autorun'
 require 'minitest/unit'
 
 class TestAPI < MiniTest::Test
+
+    unless File.exists?('/usr/local/bin/prism') || File.exists?(File.join(Dir.pwd, 'prism/bin/prism'))
+      if RUBY_PLATFORM =~ /mswin|mingw/
+        puts 'Please download the Windows binary (https://github.com/stoplightio/prism/releases) and place it in your /usr/local/bin directory'
+      else
+        puts 'Installing Prism'
+        IO.popen(['curl', '-s', 'https://raw.githubusercontent.com/stoplightio/prism/master/install.sh']) do |io|
+          out = io.read
+          unless system(out)
+            puts "Error downloading the prism binary, you can try downloading directly here (https://github.com/stoplightio/prism/releases) and place in your /user/local/bin directory, #{out}"
+            exit
+          end
+        end
+      end
+    end
+
+    puts 'Activating Prism (~20 seconds)'
+    @@prism_pid = spawn('prism run --mock --list --spec https://raw.githubusercontent.com/sendgrid/sendgrid-oai/master/oai_stoplight.json', [:out, :err] => '/dev/null')
+    sleep(15)
+    puts 'Prism started'
+
     def setup
         if ENV['TRAVIS']
             host = ENV['MOCK_HOST']
@@ -13,6 +34,11 @@ class TestAPI < MiniTest::Test
         @sg = SendGrid::API.new(api_key: "SENDGRID_API_KEY", host: host)
     end
 
+    Minitest.after_run do
+      Process.kill('TERM', @@prism_pid)
+      puts 'Prism shut down'
+    end
+
     def test_init
         headers = JSON.parse('
             {
@@ -31,7 +57,7 @@ class TestAPI < MiniTest::Test
             ')
         assert_equal(test_headers, sg.request_headers)
         assert_equal("v3", sg.version)
-        assert_equal("4.0.4", SendGrid::VERSION)
+        assert_equal("4.0.5", SendGrid::VERSION)
         assert_instance_of(SendGrid::Client, sg.client)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-ruby
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Elmer Thomas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_http_client
@@ -104,6 +104,7 @@ files:
 - lib/sendgrid/helpers/mail/mail.rb
 - lib/sendgrid/version.rb
 - sendgrid-ruby.gemspec
+- test/prism.sh
 - test/sendgrid/helpers/mail/test_mail.rb
 - test/sendgrid/test_sendgrid-ruby.rb
 homepage: http://github.com/sendgrid/sendgrid-ruby
@@ -131,5 +132,6 @@ signing_key:
 specification_version: 4
 summary: Official SendGrid Gem
 test_files:
+- test/prism.sh
 - test/sendgrid/helpers/mail/test_mail.rb
 - test/sendgrid/test_sendgrid-ruby.rb