Merge pull request #51 from aws/ruby2.4-refactor

Ruby 2.4 Refactor

.travis.yml

@@ -10,6 +10,9 @@ rvm:
 
 sudo: false
 
+env:
+  - OLD_RAILS=1
+
 script: bundle exec rake
 
 bundler_args: --without docs release repl
@@ -18,3 +21,8 @@ matrix:
   include:
     - rvm: 2.3.0
       env: NEW_RAILS=1
+    - rvm: 2.4.0
+      env: NEW_RAILS=1
+  exclude:
+    - rvm: 2.4.0
+      env: OLD_RAILS=1

Gemfile

@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in aws-record.gemspec
 gemspec
 
-gem 'rake', '< 11.0', require: false
+gem 'rake', require: false
 
 group :test do
-  gem 'rspec', '~> 3.0.0'
+  gem 'rspec', '~> 3'
   gem 'cucumber'
   gem 'simplecov', require: false
   gem 'coveralls', require: false if RUBY_VERSION > '1.9.3'

Rakefile

@@ -1,5 +1,3 @@
-require "rspec/core/rake_task"
-
 $REPO_ROOT = File.dirname(__FILE__)
 $LOAD_PATH.unshift(File.join($REPO_ROOT, 'lib'))
 $VERSION = ENV['VERSION'] || File.read(File.join($REPO_ROOT, 'VERSION')).strip

tasks/test.rake

@@ -11,6 +11,8 @@
 # or implied. See the License for the specific language governing permissions
 # and limitations under the License.
 
+require 'rspec/core/rake_task'
+
 desc "aws-record unit tests"
 RSpec::Core::RakeTask.new('test:unit') do |t|
   t.rspec_opts = "-I #{$REPO_ROOT}/lib"