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.

Sign up for GitHub

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 #581

Merged
merged 9 commits into from
Jan 8, 2019
Merged

Update dependencies #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0f3780
Loosen dependency on ffi
mvz Jan 7, 2019
096336f
Update development dependencies for modern Rubies
mvz Jan 7, 2019
327e838
Do not install Bundler if already installed
mvz Jan 7, 2019
34b7633
Loosen development dependency on Bundler
mvz Jan 7, 2019
db7d4be
Ensure compatible version of Bundler is installed
mvz Jan 7, 2019
1e48628
Ensure compatible versions of rake on older Rubies
mvz Jan 7, 2019
65d568b
Skip license_finder on Ruby 1.9
mvz Jan 7, 2019
1c91b68
Do not install license_finder on Travis CI
mvz Jan 7, 2019
07a1dda
Only install rubocop where parser installs
mvz Jan 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,36 @@ group :debug do
if RUBY_VERSION < '2'
gem 'pry-doc', '~> 0.8.0'
else
gem 'pry-doc', '~> 0.13.1'
gem 'pry-doc', '~> 1.0.0'
end
end

# Tools to run during development
group :development do
# License compliance
if RUBY_VERSION >= '2.3'
gem 'license_finder', '~> 5.0'
elsif RUBY_VERSION >= '2.0.0'
gem 'license_finder', '~> 2.0.4'
end
end

group :development, :test do
# we use this to demonstrate interactive debugging within our feature tests
if RUBY_VERSION >= '2'
gem 'pry', '~> 0.11.2'
gem 'pry', '~> 0.12.2'
else
gem 'pry', '~> 0.9.12'
end

# Run development tasks
gem 'rake', '>= 10.0', '< 13.0'
# Run development and test tasks
if RUBY_VERSION >= '2.0.0'
gem 'rake', '~> 12.3'
elsif RUBY_VERSION >= '1.9.3'
gem 'rake', '~> 12.2.0'
else
gem 'rake', '~> 10.5.0'
end

if RUBY_VERSION >= '2.0.0'
# Lint travis yaml
Expand Down Expand Up @@ -66,7 +82,7 @@ group :development, :test do
gem 'contracts', '~> 0.16.0'
end

if RUBY_VERSION >= '1.9.3'
if RUBY_VERSION >= '2.0.0'
# Make aruba compliant to ruby community guide
gem 'rubocop', '~> 0.32', '< 0.41.1'
end
Expand All @@ -75,12 +91,5 @@ group :development, :test do
gem 'cucumber-pro', '~> 0.0'
end

# License compliance
if RUBY_VERSION >= '2.3'
gem 'license_finder', '~> 5.0.3'
elsif RUBY_VERSION >= '1.9.3'
gem 'license_finder', '~> 2.0.4'
end

gem 'minitest', '~> 5.8'
end
4 changes: 2 additions & 2 deletions aruba.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ Gem::Specification.new do |s|

s.add_runtime_dependency 'cucumber', '>= 1.3.19'
s.add_runtime_dependency 'childprocess', ['>= 0.6.3', '< 0.10.0']
s.add_runtime_dependency 'ffi', '~> 1.9.10'
s.add_runtime_dependency 'ffi', '~> 1.9'
s.add_runtime_dependency 'rspec-expectations', '>= 2.99'
s.add_runtime_dependency 'contracts', '~> 0.9'
s.add_runtime_dependency 'thor', '~> 0.19'

s.add_development_dependency 'bundler', '~> 1.11'
s.add_development_dependency 'bundler', ['>= 1.7', '< 3.0']

s.rubygems_version = ">= 1.6.1"

Expand Down
2 changes: 1 addition & 1 deletion script/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ which 'zsh' >/dev/null 2>error.log || ( echo -e "$error_msg\n\nCould not find \`
echo OK

echo -e "$info_msg rubygem \"bundler\" "
gem install bundler
which bundle > /dev/null || gem install bundler --version '~> 1.17.3'

echo -e "$info_msg \"bundle install\" "
bundle install $*