Modernize rspec integration.

.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+.rspec_status
+.tags

.rspec

@@ -1,3 +1,4 @@
 --format documentation
---color
+--backtrace
 --warnings
+--require spec_helper

Rakefile

@@ -1,12 +1,9 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec) do |task|
-	begin
-		require('simplecov/version')
-		task.rspec_opts = %w{--require simplecov} if ENV['COVERAGE']
-	rescue LoadError
-	end
-end
+# Load all rake tasks:
+import(*Dir.glob('tasks/**/*.rake'))
 
-task :default => :spec
+RSpec::Core::RakeTask.new(:test)
+
+task :default => :test

samovar.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
 
 	spec.add_development_dependency "bundler", "~> 1.11"
 	spec.add_development_dependency "rake", "~> 10.0"
-	spec.add_development_dependency "rspec", "~> 3.0"
+	spec.add_development_dependency "rspec", "~> 3.6"
 end

spec/spec_helper.rb

@@ -0,0 +1,29 @@
+
+if ENV['COVERAGE'] || ENV['TRAVIS']
+	begin
+		require 'simplecov'
+
+		SimpleCov.start do
+			add_filter "/spec/"
+		end
+
+		if ENV['TRAVIS']
+			require 'coveralls'
+			Coveralls.wear!
+		end
+	rescue LoadError
+		warn "Could not load simplecov: #{$!}"
+	end
+end
+
+require "bundler/setup"
+require "samovar"
+
+RSpec.configure do |config|
+	# Enable flags like --only-failures and --next-failure
+	config.example_status_persistence_file_path = ".rspec_status"
+
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
+end