Skip to content

Commit

Permalink
Bump v0.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
nepalez committed Oct 13, 2019
1 parent 564c4ff commit 90c85f4
Show file tree
Hide file tree
Showing 22 changed files with 93 additions and 738 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/.bundle/
/.yardoc
/Gemfile.lock
/gemfiles/*.gemfile.lock
/_yardoc/
/coverage/
/doc/
/pkg/
/spec/reports/
/tmp/
/spec/dummy/db/*.sqlite3
*.gem
.rspec_status
.idea/
7 changes: 4 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@ AllCops:
DisplayCopNames: true
DisplayStyleGuide: true
StyleGuideCopsOnly: true
TargetRubyVersion: 2.3
TargetRubyVersion: 2.6
Exclude:
- spec/dummy/db/schema.rb

- vendor/bundle/**/*
- gemfiles/vendor/**/*
Metrics/ParameterLists:
Max: 5

Style/Alias:
Enabled: false

Style/ClassAndModuleChildren:
EnforcedStyle: compact
Enabled: false

Style/FileName:
Enabled: false
Expand Down
15 changes: 13 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,27 @@
sudo: false
language: ruby
cache: bundler
before_install:
- gem update --system
- gem uninstall -v '>= 1' -i $(rvm gemdir)@global -ax bundler || true
- gem install bundler -v 1.3.0
- gem update --system
script:
- bundle exec rake
rvm:
- 2.3.0
- 2.3
- 2.6
- ruby-head
gemfile:
- gemfiles/rails_4.2.gemfile
- gemfiles/rails_5.0.gemfile
- gemfiles/rails_5.1.gemfile
before_install: gem install bundler
- gemfiles/rails_6.0.gemfile
matrix:
exclude:
- rvm: 2.3
gemfile: gemfiles/rails_6.0.gemfile
- rvm: ruby-head
gemfile: gemfiles/rails_4.2.gemfile
allow_failures:
- rvm: ruby-head
21 changes: 12 additions & 9 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@

appraise 'rails-4.2' do
gem 'rails', '~> 4.2.0'
appraise "rails-4.2" do
gem "rails", "~> 4.2.0"
gem "sqlite3", "~> 1.3.0"
end

appraise 'rails-5.0' do
gem 'rails', '~> 5.0.0'
appraise "rails-5.0" do
gem "rails", "~> 5.0.0"
gem "sqlite3", "~> 1.3.0"
end

appraise 'rails-5.1' do
gem 'rails', '~> 5.1.0'
appraise "rails-5.1" do
gem "rails", "~> 5.1.0"
gem "sqlite3", "~> 1.3.0"
end

appraise 'rails-6.0' do
gem 'rails', '~> 6.0.0'
appraise "rails-6.0" do
gem "rails", "~> 6.0.0"
gem "sqlite3", "~> 1.4"
end
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [0.0.3] - [2019-10-02]

### Added
- Support of Rails 6 (@quikly)
- Cached queries are ignored (@tyok)

## [0.0.2] - [2017-05-17]

### Added
Expand All @@ -16,3 +22,4 @@ This is a first public release (@nepalez)
[Unreleased]: https://github.com/tram-rb/tram-policy
[0.0.1]: https://github.com/nepalez/rspec-sqlimit/releases/tag/v0.0.1
[0.0.2]: https://github.com/nepalez/rspec-sqlimit/compare/v0.0.1...v0.0.2
[0.0.3]: https://github.com/nepalez/rspec-sqlimit/compare/v0.0.2...v0.0.3
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ source "https://rubygems.org"
# Specify your gem's dependencies in tram-form.gemspec
gemspec

gem "rails"
gem "sqlite3"

group :test, :development do
gem "pry"
gem "pry-byebug"
Expand Down
9 changes: 6 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ load "spec/dummy/Rakefile"
# Declares gem's own tasks.
desc "Runs test suite over all rails versions."
task :default do
if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
if ENV["BUNDLE_GEMFILE"] =~ /gemfiles/
Rake::Task["dummy:db:create"].reenable
Rake::Task["dummy:db:migrate"].reenable
Rake::Task[:spec].invoke
else
Rake::Task[:appraise].invoke
end
end

desc "Runs test suite."
task spec: %w(dummy:db:create dummy:db:migrate) do
task default: %w[dummy:db:create dummy:db:migrate] do
exec "bundle exec rspec spec"
exec "bundle exec rubocop"
end

task :appraise do
exec 'appraisal install && appraisal rake'
exec "appraisal install && appraisal rake"
end
1 change: 1 addition & 0 deletions gemfiles/rails_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
source "https://rubygems.org"

gem "rails", "~> 4.2.0"
gem "sqlite3", "~> 1.3.0"

group :test, :development do
gem "pry"
Expand Down
164 changes: 0 additions & 164 deletions gemfiles/rails_4.2.gemfile.lock

This file was deleted.

1 change: 1 addition & 0 deletions gemfiles/rails_5.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
source "https://rubygems.org"

gem "rails", "~> 5.0.0"
gem "sqlite3", "~> 1.3.0"

group :test, :development do
gem "pry"
Expand Down
Loading

0 comments on commit 90c85f4

Please sign in to comment.