diff --git a/.travis.yml b/.travis.yml index a25471c9e0afb6975c4b8cf9d5517e5d4c2718c0..c8a860dfc82386c36bd9eda9eec60c21b20828dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,3 +8,9 @@ rvm: - "1.9.3" - "2.1.6" - "2.2.2" + +addons: + code_climate: + repo_token: 521d341f3320acda1902d0db0a3a92fb16b11ebfe3d5ab730218d4fc0fb3db13 + +sudo: false diff --git a/Gemfile b/Gemfile index fc8d855ac3d006ceaa21301b9469bdc357c3dc54..62c369109f966d592a29700d8007bdb2cbe53fe9 100644 --- a/Gemfile +++ b/Gemfile @@ -4,9 +4,4 @@ gemspec :name => "brakeman" gem "rake", "< 10.2.0" -# Slim v3.0.0 dropped support for Ruby <1.9.2. -if RUBY_VERSION < "1.9.2" - gem "slim", ">=1.3.6", "< 3.0" -else - gem "slim", ">=1.3.6" -end +gem "codeclimate-test-reporter", group: :test, require: nil diff --git a/README.md b/README.md index 1521acd3a78165da3024bfd9a7bd55a073548052..a4f313e0e28aa322514d9e6d0b3ba5af9314fde6 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ [![Brakeman Logo](http://brakemanscanner.org/images/logo_medium.png)](http://brakemanscanner.org/) -[![Travis CI -Status](https://secure.travis-ci.org/presidentbeef/brakeman.png)](https://travis-ci.org/presidentbeef/brakeman) -[![Code -Climate](https://codeclimate.com/github/presidentbeef/brakeman.png)](https://codeclimate.com/github/presidentbeef/brakeman) +[![Build Status](https://travis-ci.org/presidentbeef/brakeman.svg?branch=master)](https://travis-ci.org/presidentbeef/brakeman) +[![Code Climate](https://codeclimate.com/github/presidentbeef/brakeman/badges/gpa.svg)](https://codeclimate.com/github/presidentbeef/brakeman) +[![Test Coverage](https://codeclimate.com/github/presidentbeef/brakeman/badges/coverage.svg)](https://codeclimate.com/github/presidentbeef/brakeman/coverage) # Brakeman diff --git a/test/test.rb b/test/test.rb index 8aba573ffd2ec33b1b3bd02130dd42001a0340fc..c4b09dfc5d27c6a428cd63c04ee3a0f0257dbde3 100644 --- a/test/test.rb +++ b/test/test.rb @@ -5,16 +5,18 @@ $LOAD_PATH.unshift "#{TEST_PATH}/../lib" begin require 'simplecov' - SimpleCov.start do - add_filter 'lib/ruby_parser/ruby18_parser.rb' - add_filter 'lib/ruby_parser/ruby19_parser.rb' - add_filter 'lib/ruby_parser/ruby_lexer.rb' - add_filter 'lib/ruby_parser/ruby_parser_extras.rb' - end + SimpleCov.start rescue LoadError => e $stderr.puts "Install simplecov for test coverage report" end +begin + require "codeclimate-test-reporter" + CodeClimate::TestReporter.start +rescue LoadError => e + $stderr.puts "Skipping Code Climate test reporting" +end + require 'brakeman' require 'brakeman/scanner' require 'test/unit'