From 3ab802ae7aa6b338b07486b5f6f0b81f373fd612 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 27 Sep 2016 21:25:44 +0200 Subject: [PATCH 1/3] Travis: Test on 2.4.0-preview2 --- .gitignore | 1 + .travis.yml | 2 ++ Gemfile | 6 +++++- gemfiles/Gemfile.2_4_0 | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 gemfiles/Gemfile.2_4_0 diff --git a/.gitignore b/.gitignore index 3df710d..0ade9b1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ spec/*.lock doc .yardoc Gemfile.lock +gemfiles/Gemfile.2_4_0.lock diff --git a/.travis.yml b/.travis.yml index b3c7858..fcde422 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ matrix: gemfile: gemfiles/Gemfile.with_rack16 - rvm: 2.3.1 gemfile: gemfiles/Gemfile.with_rack2 + - rvm: 2.4.0-preview2 + gemfile: gemfiles/Gemfile.2_4_0 notifications: email: diff --git a/Gemfile b/Gemfile index 37ee7f6..c4d4b6b 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,10 @@ group :test do gem "coveralls", "~>0.8", require: false gem "simplecov", "~>0.10", require: false gem "codeclimate-test-reporter", "~>0.4" - gem "json" + if RUBY_VERSION > "2" + gem "json", "~> 2.0", ">= 2.0.2" + else + gem "json" + end gem "rspec", "< 4" end diff --git a/gemfiles/Gemfile.2_4_0 b/gemfiles/Gemfile.2_4_0 new file mode 100644 index 0000000..f48ce89 --- /dev/null +++ b/gemfiles/Gemfile.2_4_0 @@ -0,0 +1,3 @@ +eval_gemfile File.expand_path('../../Gemfile', __FILE__) +gem 'rack', '>= 2' + From 30ffc0e9451ed8e45698fca12294339f055d06fb Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 27 Sep 2016 21:31:17 +0200 Subject: [PATCH 2/3] Travis: Get rid of Gemfile.lock --- Gemfile.lock | 107 --------------------------------------------------- 1 file changed, 107 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 3c6158a..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,107 +0,0 @@ -PATH - remote: . - specs: - github_changelog_generator (1.13.1) - github_api (>= 0.14) - rainbow (>= 2.1) - rake (>= 10.0) - -GEM - remote: https://rubygems.org/ - specs: - addressable (2.4.0) - ast (2.3.0) - childprocess (0.5.9) - ffi (~> 1.0, >= 1.0.11) - codeclimate-test-reporter (0.6.0) - simplecov (>= 0.7.1, < 1.0.0) - coveralls (0.8.14) - json (>= 1.8, < 3) - simplecov (~> 0.12.0) - term-ansicolor (~> 1.3) - thor (~> 0.19.1) - tins (~> 1.6.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - diff-lcs (1.2.5) - docile (1.1.5) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - ffi (1.9.14) - github_api (0.14.5) - addressable (~> 2.4.0) - descendants_tracker (~> 0.0.4) - faraday (~> 0.8, < 0.10) - hashie (>= 3.4) - oauth2 (~> 1.0) - hashie (3.4.6) - iniparse (1.4.2) - json (1.8.3) - jwt (1.5.6) - multi_json (1.12.1) - multi_xml (0.5.5) - multipart-post (2.0.0) - oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) - jwt (~> 1.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) - overcommit (0.34.2) - childprocess (~> 0.5.8) - iniparse (~> 1.4) - parser (2.3.1.4) - ast (~> 2.2) - powerpack (0.1.1) - rack (2.0.1) - rainbow (2.1.0) - rake (11.2.2) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.1) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) - rubocop (0.43.0) - parser (>= 2.3.1.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) - simplecov (0.12.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - term-ansicolor (1.3.2) - tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) - tins (1.6.0) - unicode-display_width (1.1.1) - -PLATFORMS - ruby - -DEPENDENCIES - bundler - codeclimate-test-reporter (~> 0.4) - coveralls (~> 0.8) - github_changelog_generator! - json - overcommit (>= 0.31) - rake - rspec (< 4) - rubocop (>= 0.43) - simplecov (~> 0.10) - -BUNDLED WITH - 1.13.1 From 725194acc0059fffeff60c54710edf7a4701f263 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 27 Sep 2016 21:40:23 +0200 Subject: [PATCH 3/3] SimpleCov config: Ignore gemfiles folder --- spec/spec_helper.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2137e01..071aad6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -29,7 +29,9 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([ SimpleCov::Formatter::HTMLFormatter, CodeClimate::TestReporter::Formatter ]) -SimpleCov.start +SimpleCov.start do + add_filter "gemfiles/" +end require "github_changelog_generator" require "github_changelog_generator/task"