From 509683a0a209d967cdda065467032f920500307d Mon Sep 17 00:00:00 2001 From: Rada Bogdan Raul Date: Wed, 22 Mar 2017 09:25:04 +0200 Subject: [PATCH] update and fix for ruby 2.4 --- .travis.yml | 3 +++ Appraisals | 38 +++++++++++++++++++++----------- gemfiles/rails_5.0.1.gemfile | 9 ++++++++ gemfiles/rails_5.0.2.gemfile | 9 ++++++++ gemfiles/rails_5.1.0.rc1.gemfile | 9 ++++++++ lib/washout_builder/version.rb | 2 +- washout_builder.gemspec | 1 + 7 files changed, 57 insertions(+), 14 deletions(-) create mode 100755 gemfiles/rails_5.0.1.gemfile create mode 100644 gemfiles/rails_5.0.2.gemfile create mode 100644 gemfiles/rails_5.1.0.rc1.gemfile diff --git a/.travis.yml b/.travis.yml index e5af5c9..eb46469 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,13 @@ gemfile: - gemfiles/rails_5.0.0.gemfile - gemfiles/rails_5.0.0.1.gemfile - gemfiles/rails_5.0.1.gemfile + - gemfiles/rails_5.0.2.gemfile + - gemfiles/rails_5.1.0.rc1.gemfile rvm: - 2.2.5 - 2.3.1 - 2.3.2 - 2.3.3 + - 2.4.0 notifications: email: false diff --git a/Appraisals b/Appraisals index 7aa28f7..842560b 100644 --- a/Appraisals +++ b/Appraisals @@ -1,19 +1,21 @@ -appraise "rails-4.0.0" do - gem "rails", "4.0.0" -end +if RUBY_VERSION < "2.4.0" + appraise "rails-4.0.0" do + gem "rails", "4.0.0" + end -appraise "rails-4.1.1" do - gem "rails", "4.1.1" -end + appraise "rails-4.1.1" do + gem "rails", "4.1.1" + end -appraise "rails-4.2.0" do - gem "rails", "4.2.0" -end + appraise "rails-4.2.0" do + gem "rails", "4.2.0" + end -appraise "rails-api-4.2.7" do - gem 'rails', '4.2.7.1' - gem 'rails-api', '0.4.0' - gem 'actionpack' , '4.2.7.1' + appraise "rails-api-4.2.7" do + gem 'rails', '4.2.7.1' + gem 'rails-api', '0.4.0' + gem 'actionpack' , '4.2.7.1' + end end appraise "rails-5.0.0" do @@ -31,3 +33,13 @@ appraise "rails-5.0.1" do gem "rails", "5.0.1" gem 'rails-controller-testing' end + +appraise "rails-5.0.2" do + gem "rails", "5.0.2" + gem 'rails-controller-testing' +end + +appraise "rails-5.1.0.rc1" do + gem "rails", "5.1.0.rc1" + gem 'rails-controller-testing' +end diff --git a/gemfiles/rails_5.0.1.gemfile b/gemfiles/rails_5.0.1.gemfile new file mode 100755 index 0000000..6c0ba7b --- /dev/null +++ b/gemfiles/rails_5.0.1.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "wash_out", :github => "inossidabile/wash_out" +gem "rails", "5.0.1" +gem "rails-controller-testing" + +gemspec :path => "../" diff --git a/gemfiles/rails_5.0.2.gemfile b/gemfiles/rails_5.0.2.gemfile new file mode 100644 index 0000000..f946df1 --- /dev/null +++ b/gemfiles/rails_5.0.2.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "wash_out", :github => "inossidabile/wash_out" +gem "rails", "5.0.2" +gem "rails-controller-testing" + +gemspec :path => "../" diff --git a/gemfiles/rails_5.1.0.rc1.gemfile b/gemfiles/rails_5.1.0.rc1.gemfile new file mode 100644 index 0000000..42ef234 --- /dev/null +++ b/gemfiles/rails_5.1.0.rc1.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "wash_out", :github => "inossidabile/wash_out" +gem "rails", "5.1.0.rc1" +gem "rails-controller-testing" + +gemspec :path => "../" diff --git a/lib/washout_builder/version.rb b/lib/washout_builder/version.rb index 5cdf60d..f736e1d 100644 --- a/lib/washout_builder/version.rb +++ b/lib/washout_builder/version.rb @@ -12,7 +12,7 @@ module VERSION # the minor version of the gem MINOR = 7 # the tiny version of the gem - TINY = 2 + TINY = 3 # if the version should be a prerelease PRE = nil diff --git a/washout_builder.gemspec b/washout_builder.gemspec index 56026d2..de47c28 100644 --- a/washout_builder.gemspec +++ b/washout_builder.gemspec @@ -1,3 +1,4 @@ +require 'date' require File.expand_path("../lib/washout_builder/version", __FILE__) Gem::Specification.new do |s|