Skip to content

Commit

Permalink
Merge 9e8c8ff into 3014360
Browse files Browse the repository at this point in the history
  • Loading branch information
olleolleolle committed Apr 7, 2017
2 parents 3014360 + 9e8c8ff commit 11a7679
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 10 deletions.
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
AllCops:
DisplayCopNames: true

Lint/NestedMethodDefinition:
Enabled: false

Expand Down
14 changes: 8 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
before_install: gem update bundler
before_install:
- gem install bundler
- gem update --system
bundler_args: --without development --retry=3 --jobs=3
cache: bundler
env:
Expand All @@ -9,16 +11,16 @@ rvm:
- 1.8.7
- 1.9.3
- 2.0.0
- 2.1
- 2.2
- jruby-9000
- 2.1.10
- 2.2.7
- 2.3.4
- 2.4.1
- jruby-9.1.8.0
- jruby-head
- rbx-2
- ruby-head
matrix:
allow_failures:
- rvm: jruby-head
- rvm: rbx-2
- rvm: ruby-head
fast_finish: true
sudo: false
15 changes: 11 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
source 'https://rubygems.org'

# Specify your gem's dependencies in naught.gemspec
ruby RUBY_VERSION

gemspec

gem 'rake'
gem 'rake', '< 12'

group :development do
platforms :ruby_19, :ruby_20, :ruby_21, :ruby_22 do
Expand All @@ -20,6 +21,12 @@ group :test do
gem 'libnotify'
gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18]
gem 'rspec', '>= 2.14'
gem 'rubocop', '~> 0.34.0', :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22]
gem 'rspec', '~> 2.99'

gem 'rubocop', '~> 0.34.0', :platforms => [:ruby_19,
:ruby_20,
:ruby_21,
:ruby_22,
:ruby_23,
:ruby_24] if RUBY_VERSION > '1.9'
end
1 change: 1 addition & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:spec)

begin
fail LoadError if RUBY_VERSION < '1.9.3'
require 'rubocop/rake_task'
RuboCop::RakeTask.new
rescue LoadError
Expand Down

0 comments on commit 11a7679

Please sign in to comment.