Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies and travis matrix #446

Merged
merged 6 commits into from
Jun 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ bundle
.rvmrc
.vagrant
Gemfile.lock
Gemfile.ruby_dep.lock
spec/.fixtures
coverage
.ruby-version
Expand Down
20 changes: 11 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
language: ruby
bundler_args: --without development
bundler_args: --without development --path vendor/bundle
before_install:
- gem update --system
- gem install bundler
- gem update bundler
- bundle install --gemfile=Gemfile.ruby_dep --path vendor/bundle
- bundle install
rvm:
- 2.2.7
- 2.3.4
- 2.4.1
- 2.2
- 2.3
- 2.4
- 2.5
- ruby-head
- jruby-head
- rbx-2
- jruby-9.1.2.0
- rbx-3
- jruby-9.2.0.0
matrix:
allow_failures:
- rvm: ruby-head
- rvm: jruby-head
- rvm: rbx-2
- rvm: rbx-3
exclude:
- rvm: 2.3.4
os: osx
- rvm: 2.4.1
os: osx
- rvm: jruby-head
os: osx
- rvm: rbx-2
- rvm: rbx-3
os: osx
fast_finish: true
os:
Expand Down
3 changes: 0 additions & 3 deletions Gemfile.ruby_dep

This file was deleted.

4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
## IMPORTANT: [Ruby 2.1 is officially outdated and unsupported!](https://www.ruby-lang.org/en/news/2016/03/30/ruby-2-1-9-released/) Please upgrade to Ruby 2.2.5 before installing Listen!

## IMPORTANT: If you cannot upgrade to Ruby >= 2.2.5 [solutions are listed here](https://github.com/e2/ruby_dep#important--how-to-correctly-solve-issues)

## IMPORTANT: If you cannot install Listen (e.g. on Travis/CI builds), [a workaround is here](https://github.com/guard/listen/wiki/Ruby-version-requirements)

:exclamation: Listen is currently accepting more maintainers. Please [read this](https://github.com/guard/guard/wiki/Maintainers) if you're interested in joining the team.
Expand Down
5 changes: 0 additions & 5 deletions lib/listen.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@

require 'listen/internals/thread_pool'

# Show warnings about vulnerabilities, bugs and outdated Rubies, since previous
# versions aren't tested or officially supported.
require 'ruby_dep/warning'
RubyDep::Warning.new.show_warnings

# Always set up logging by default first time file is required
#
# NOTE: If you need to clear the logger completely, do so *after*
Expand Down
11 changes: 1 addition & 10 deletions listen.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,10 @@ Gem::Specification.new do |s|
s.executable = 'listen'
s.require_path = 'lib'

begin
# TODO: should this be vendored instead?
require 'ruby_dep/travis'
s.required_ruby_version = RubyDep::Travis.new.version_constraint
rescue LoadError
abort "Install 'ruby_dep' gem before building this gem"
end
s.required_ruby_version = ['~> 2.2', '>= 2.2.7']

s.add_dependency 'rb-fsevent', '~> 0.10', '>= 0.10.3'
s.add_dependency 'rb-inotify', '~> 0.9', '>= 0.9.10'

# Used to show warnings at runtime
s.add_dependency 'ruby_dep', '~> 1.2'

s.add_development_dependency 'bundler', '~> 1.12'
end
2 changes: 1 addition & 1 deletion spec/lib/listen/event/loop_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
let(:blocks) do
{
thread_block: proc { fail 'thread block stub called' },
timer_block: proc { fail 'thread block stub called' },
timer_block: proc { fail 'thread block stub called' }
}
end

Expand Down
22 changes: 14 additions & 8 deletions vendor/hound/config/style_guides/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ Style/CollectionMethods:
find: detect
find_all: select
reduce: inject
Style/DotPosition:
Layout/DotPosition:
Description: Checks the position of the dot in multi-line method calls.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains
Enabled: true
EnforcedStyle: trailing
SupportedStyles:
- leading
- trailing
Style/FileName:
Naming/FileName:
Description: Use snake_case for source file names.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files
Enabled: false
Expand All @@ -35,7 +35,6 @@ Style/IfUnlessModifier:
Description: Favor modifier if/unless usage when you have a single-line body.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
Enabled: false
MaxLineLength: 80
Style/OptionHash:
Description: Don't use option hashes when you can use keyword arguments.
Enabled: false
Expand All @@ -53,7 +52,7 @@ Style/PercentLiteralDelimiters:
"%w": "()"
"%W": "()"
"%x": "()"
Style/PredicateName:
Naming/PredicateName:
Description: Check the names of predicate methods.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark
Enabled: true
Expand Down Expand Up @@ -123,9 +122,16 @@ Style/TrailingCommaInArguments:
- comma
- consistent_comma
- no_comma
Style/TrailingCommaInLiteral:
Description: 'Checks for trailing comma in array and hash literals.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
Style/TrailingCommaInArrayLiteral:
Description: 'Checks for trailing comma in array literals.'
Enabled: false
EnforcedStyleForMultiline: no_comma
SupportedStyles:
- comma
- consistent_comma
- no_comma
Style/TrailingCommaInHashLiteral:
Description: 'Checks for trailing comma in hash literals.'
Enabled: false
EnforcedStyleForMultiline: no_comma
SupportedStyles:
Expand Down Expand Up @@ -177,7 +183,7 @@ Lint/AssignmentInCondition:
Style/InlineComment:
Description: Avoid inline comments.
Enabled: false
Style/AccessorMethodName:
Naming/AccessorMethodName:
Description: Check the naming of accessor methods for get_/set_.
Enabled: false
Style/Alias:
Expand Down