From 57185bc856b6cb2d76ae38cf625469107605ef71 Mon Sep 17 00:00:00 2001
From: Isaac Betesh <iybetesh@gmail.com>
Date: Thu, 18 Jun 2015 09:54:31 -0400
Subject: [PATCH] configured Travis and Appraisal to make sure we're testing
 with both aws-sdk v1 and aws-sdk v2

---
 .travis.yml                |  3 +++
 Appraisals                 | 18 ++++++++++++++++++
 gemfiles/3.2.awsv1.gemfile | 20 ++++++++++++++++++++
 gemfiles/3.2.gemfile       |  1 +
 gemfiles/4.1.awsv1.gemfile | 20 ++++++++++++++++++++
 gemfiles/4.1.gemfile       |  1 +
 gemfiles/4.2.awsv1.gemfile | 20 ++++++++++++++++++++
 gemfiles/4.2.gemfile       |  1 +
 8 files changed, 84 insertions(+)
 create mode 100644 gemfiles/3.2.awsv1.gemfile
 create mode 100644 gemfiles/4.1.awsv1.gemfile
 create mode 100644 gemfiles/4.2.awsv1.gemfile

diff --git a/.travis.yml b/.travis.yml
index 2ecced23f..4388dd3b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,9 @@ gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
+  - gemfiles/3.2.awsv1.gemfile
+  - gemfiles/4.1.awsv1.gemfile
+  - gemfiles/4.2.awsv1.gemfile
 
 matrix:
   fast_finish: true
diff --git a/Appraisals b/Appraisals
index 153c8f6e3..d8ec05c9e 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,11 +1,29 @@
 appraise "3.2" do
   gem "rails", "~> 3.2.0"
+  gem "aws-sdk", "~> 2.0"
 end
 
 appraise "4.1" do
   gem "rails", "~> 4.1.0"
+  gem "aws-sdk", "~> 2.0"
 end
 
 appraise "4.2" do
   gem "rails", "~> 4.2.0"
+  gem "aws-sdk", "~> 2.0"
+end
+
+appraise "3.2.awsv1" do
+  gem "rails", "~> 3.2.0"
+  gem "aws-sdk", "~> 1.5"
+end
+
+appraise "4.1.awsv1" do
+  gem "rails", "~> 4.1.0"
+  gem "aws-sdk", "~> 1.5"
+end
+
+appraise "4.2.awsv1" do
+  gem "rails", "~> 4.2.0"
+  gem "aws-sdk", "~> 1.5"
 end
diff --git a/gemfiles/3.2.awsv1.gemfile b/gemfiles/3.2.awsv1.gemfile
new file mode 100644
index 000000000..b79f2906c
--- /dev/null
+++ b/gemfiles/3.2.awsv1.gemfile
@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
+gem "jruby-openssl", :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "rubysl", :platforms => :rbx
+gem "racc", :platforms => :rbx
+gem "pry"
+gem "rails", "~> 3.2.0"
+gem "aws-sdk", "~> 1.5"
+
+group :development, :test do
+  gem "mime-types", "~> 1.16"
+  gem "builder"
+  gem "rubocop", :require => false
+end
+
+gemspec :path => "../"
diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile
index 4e7c4bcc7..5d861102e 100644
--- a/gemfiles/3.2.gemfile
+++ b/gemfiles/3.2.gemfile
@@ -9,6 +9,7 @@ gem "rubysl", :platforms => :rbx
 gem "racc", :platforms => :rbx
 gem "pry"
 gem "rails", "~> 3.2.0"
+gem "aws-sdk", "~> 2.0"
 
 group :development, :test do
   gem "mime-types", "~> 1.16"
diff --git a/gemfiles/4.1.awsv1.gemfile b/gemfiles/4.1.awsv1.gemfile
new file mode 100644
index 000000000..d3bab0bed
--- /dev/null
+++ b/gemfiles/4.1.awsv1.gemfile
@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
+gem "jruby-openssl", :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "rubysl", :platforms => :rbx
+gem "racc", :platforms => :rbx
+gem "pry"
+gem "rails", "~> 4.1.0"
+gem "aws-sdk", "~> 1.5"
+
+group :development, :test do
+  gem "mime-types", "~> 1.16"
+  gem "builder"
+  gem "rubocop", :require => false
+end
+
+gemspec :path => "../"
diff --git a/gemfiles/4.1.gemfile b/gemfiles/4.1.gemfile
index 68fd6a752..609f8bec4 100644
--- a/gemfiles/4.1.gemfile
+++ b/gemfiles/4.1.gemfile
@@ -9,6 +9,7 @@ gem "rubysl", :platforms => :rbx
 gem "racc", :platforms => :rbx
 gem "pry"
 gem "rails", "~> 4.1.0"
+gem "aws-sdk", "~> 2.0"
 
 group :development, :test do
   gem "mime-types", "~> 1.16"
diff --git a/gemfiles/4.2.awsv1.gemfile b/gemfiles/4.2.awsv1.gemfile
new file mode 100644
index 000000000..d521bb363
--- /dev/null
+++ b/gemfiles/4.2.awsv1.gemfile
@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
+gem "jruby-openssl", :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "rubysl", :platforms => :rbx
+gem "racc", :platforms => :rbx
+gem "pry"
+gem "rails", "~> 4.2.0"
+gem "aws-sdk", "~> 1.5"
+
+group :development, :test do
+  gem "mime-types", "~> 1.16"
+  gem "builder"
+  gem "rubocop", :require => false
+end
+
+gemspec :path => "../"
diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile
index 0fdd126c1..3ac60abcd 100644
--- a/gemfiles/4.2.gemfile
+++ b/gemfiles/4.2.gemfile
@@ -9,6 +9,7 @@ gem "rubysl", :platforms => :rbx
 gem "racc", :platforms => :rbx
 gem "pry"
 gem "rails", "~> 4.2.0"
+gem "aws-sdk", "~> 2.0"
 
 group :development, :test do
   gem "mime-types", "~> 1.16"