Skip to content

Commit

Permalink
Merge pull request #15 from civisanalytics/maintenance-july-2020
Browse files Browse the repository at this point in the history
Maintenance and creating the 1.3.0 release
  • Loading branch information
mikesaelim committed Jul 1, 2020
2 parents 5a6a7f0 + b1e2217 commit 081ae6f
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.5
2.7.1
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: ruby
cache: bundler
rvm:
- 2.4.9
- 2.5.7
- 2.6.5
- 2.5.8
- 2.6.6
- 2.7.1
branches:
only:
- master
20 changes: 12 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,28 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [1.3.0] - 2020-07-01

### Added

* Added 2.5 and 2.6 to the Travis matrix
* Added Ruby 2.5, 2.6, and 2.7 to the Travis matrix
* Added the ability to ignore an advisory by its GHSA identifier

### Changed

* Bumped the Ruby version for development to 2.6.5
* Bumped the Travis matrix to 2.4.9
* Bumped the Bundler version for development to 1.17 or 2.0
* Bumped the Pry version for development to 0.12
* Bumped the bundler-audit version to 0.7
* Bumped the Ruby version for development to 2.7.1
* Bumped the Pry version for development to 0.13
* Bumped the Rake version for development to 13
* Bumped the Rspec version for development to 3.9
* Bumped the RuboCop version for development to 0.76
* Bumped the RuboCop version for development to 0.86
* Bumped the Timecop verison for development to 0.9
* RuboCop fixes

### Removed

* Removed 2.1, 2.2, and 2.3 from the Travis matrix
* Removed Ruby 2.1 through 2.4 from the Travis matrix
* Removed the explicit Bundler dependency for development, since it is now included with RubyGems

## [1.2.0] - 2017-09-21

Expand Down Expand Up @@ -63,7 +66,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).

* Initial Release

[Unreleased]: https://github.com/civisanalytics/ruby_audit/compare/v1.2.0...HEAD
[Unreleased]: https://github.com/civisanalytics/ruby_audit/compare/v1.3.0...HEAD
[1.3.0]: https://github.com/civisanalytics/ruby_audit/compare/v1.2.0...v1.3.0
[1.2.0]: https://github.com/civisanalytics/ruby_audit/compare/v1.1.0...v1.2.0
[1.1.0]: https://github.com/civisanalytics/ruby_audit/compare/v1.0.1...v1.1.0
[1.0.1]: https://github.com/civisanalytics/ruby_audit/compare/v1.0.0...v1.0.1
Expand Down
4 changes: 1 addition & 3 deletions lib/ruby_audit/scanner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ def scan_inner(specs, type, options = {})

specs.each do |spec|
@database.send("check_#{type}".to_sym, spec) do |advisory|
unless ignore.intersect?(advisory.identifiers.to_set)
yield UnpatchedGem.new(spec, advisory)
end
yield UnpatchedGem.new(spec, advisory) unless ignore.intersect?(advisory.identifiers.to_set)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/ruby_audit/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module RubyAudit
VERSION = '1.2.0'.freeze
VERSION = '1.3.0'.freeze
end
5 changes: 2 additions & 3 deletions ruby_audit.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ Gem::Specification.new do |spec|
spec.require_paths = ['lib']

spec.add_dependency 'bundler-audit', '~> 0.7.0'
spec.add_development_dependency 'bundler', '>= 1.17', '< 2.1'
spec.add_development_dependency 'pry', '~> 0.12.2'
spec.add_development_dependency 'pry', '~> 0.13.0'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rspec', '~> 3.9'
spec.add_development_dependency 'rubocop', '~> 0.76.0'
spec.add_development_dependency 'rubocop', '~> 0.86.0'
spec.add_development_dependency 'timecop', '~> 0.9.1'
end

0 comments on commit 081ae6f

Please sign in to comment.