Skip to content

Commit

Permalink
Upgrade devtools and other dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
backus committed Jan 19, 2016
1 parent 9c5a5d8 commit 11309f3
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 85 deletions.
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ before_install: gem install bundler
bundler_args: --without yard guard benchmarks
script: "bundle exec rake ci"
rvm:
- 1.9.3
- 2.0.0
- 2.3.0
- ruby-head
- rbx-19mode
matrix:
Expand All @@ -15,3 +14,5 @@ matrix:
env: JRUBY_OPTS="$JRUBY_OPTS --debug"
allow_failures:
- rvm: rbx-19mode
- rvm: jruby-19mode
- rvm: jruby-head
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ source 'https://rubygems.org'
gemspec

group :development do
gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
gem 'devtools', git: 'https://github.com/mbj/devtools.git'
end

# added by devtools
eval_gemfile 'Gemfile.devtools'
group :test do
gem 'coveralls', '~> 0.8.9'
end
71 changes: 0 additions & 71 deletions Gemfile.devtools

This file was deleted.

2 changes: 1 addition & 1 deletion config/reek.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FeatureEnvy:
enabled: true
exclude: []
IrresponsibleModule:
enabled: true
enabled: false
exclude: []
LongParameterList:
enabled: true
Expand Down
12 changes: 6 additions & 6 deletions config/rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
AllCops:
Includes:
Include:
- '**/*.rake'
- 'Gemfile'
- 'Gemfile.devtools'
Excludes:
Exclude:
- '**/vendor/**'
- '**/benchmarks/**'

Expand Down Expand Up @@ -57,10 +57,6 @@ ConstantName:
TrivialAccessors:
Enabled: false

# Do not prefer do/end over {} for multiline blocks
Blocks:
Enabled: false

# Do not favor aligned parameters in method calls
AlignParameters:
Enabled: false
Expand All @@ -76,3 +72,7 @@ Lambda:

AndOr:
Enabled: false # we agree to use and/or for control flow

# Allow code to be aligned more nicely
SingleSpaceBeforeFirstArg:
Enabled: false
2 changes: 1 addition & 1 deletion procto.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ Gem::Specification.new do |gem|
gem.extra_rdoc_files = %w[LICENSE README.md CONTRIBUTING.md]
gem.license = 'MIT'

gem.add_development_dependency 'bundler', '~> 1.6.1'
gem.add_development_dependency 'bundler', '~> 1.11.2'
end

0 comments on commit 11309f3

Please sign in to comment.