Merge branch 'release/0.15.3'

.travis.yml

@@ -4,8 +4,9 @@ before_install:
   - gem install bundler
 rvm:
   - 1.9.3
-  - jruby-19mode
   - 2.0.0
+  - 2.1.5
+  - 2.2.2
 env:
  - RAILS_ENV=test RACK_ENV=test
 notifications:

README.rdoc

@@ -31,9 +31,13 @@ The way WashOut is used is not modified, it just extends its functionality by ge
 
 = Compatibility
 
-Rails >3.0 only. MRI 1.9, 2.0, JRuby (--1.9).
+Rails >3.0 only. MRI 1.9, 2.0, .
 
-Ruby 1.8 is not officially supported since 0.5.3. We will accept further compatibilty pull-requests but no upcoming versions will be tested against it.
+JRuby is not offically supported since 0.15.0. 
+
+Ruby 1.8 is not officially supported since 0.5.3. 
+
+We will accept further compatibilty pull-requests but no upcoming versions will be tested against it.
 
 Rubinius support temporarily dropped since 0.6.2 due to Rails 4 incompatibility.
 

Rakefile

@@ -19,11 +19,12 @@ end
 
 unless ENV['TRAVIS']
   require 'rvm-tester'
+  require 'wwtd/tasks'
   RVM::Tester::TesterTask.new(:suite) do |t|
-    t.rubies = %w(1.9.3 2.0.0 2.1.0) # which versions to test (required!)
+    t.rubies = %w(1.9.3 2.0.0 2.1.5 2.2.2) # which versions to test (required!)
     t.bundle_install = true # updates Gemfile.lock, default is true
     t.use_travis = true # looks for Rubies in .travis.yml (on by default)
-    t.command = 'bundle exec rake' # runs plain "rake" by default
+    t.command = 'gem install bundler && bundle install && bundle exec rake' # runs plain "rake" by default
     t.env = { 'VERBOSE' => '1', 'RAILS_ENV' => 'test', 'RACK_ENV' => 'test' } # set any ENV vars
     t.num_workers = 5 # defaults to 3
     t.verbose = true # shows more output, off by default
@@ -38,6 +39,6 @@ task :all do |_t|
   if ENV['TRAVIS']
     exec(' bundle exec phare &&  bundle exec appraisal install && bundle exec rake appraisal spec && bundle exec rake coveralls:push')
   else
-    exec(' bundle exec phare &&  bundle exec appraisal install && bundle exec rake appraisal spec')
+    exec(' bundle exec rubocop -a . && bundle exec phare &&  bundle exec appraisal install && bundle exec rake appraisal spec')
   end
 end

lib/washout_builder/version.rb

@@ -6,7 +6,7 @@ def self.gem_version
   module VERSION
     MAJOR = 0
     MINOR = 15
-    TINY = 2
+    TINY = 3
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

washout_builder.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   #  s.add_development_dependency 'codeclimate-test-reporter','~> 0.3', '>= 0.3'
   #  s.add_development_dependency 'rubyntlm','~> 0.3.4', '>= 0.3'
   s.add_development_dependency 'rvm-tester','~> 1.1', '>= 1.1'
+  s.add_development_dependency 'wwtd','~> 0.9', '>= 0.9.1'
 
   s.add_development_dependency 'capybara', '~> 2.2', '>= 2.2.1'
   s.add_development_dependency 'selenium-webdriver',  '~> 2.41', '>= 2.41.0'