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

Gemfile/Gemspec Tidy (For Master) #631

Merged
merged 5 commits into from
May 31, 2019
Merged

Gemfile/Gemspec Tidy (For Master) #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84dab2e
Direct migration of dependencies from Gemfile to gemspec
luke-hill May 23, 2019
fca9cda
Optimisation of gemspec
luke-hill May 23, 2019
8a9e66c
Auto fix some encoding / path cops in the Gemfile area
luke-hill May 23, 2019
fbecfa6
Install development dependencies on TravisCI
mvz May 30, 2019
59484f1
Lower required Ruby version
mvz May 31, 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
12 changes: 0 additions & 12 deletions .rubocop_todo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,6 @@ Style/Documentation:
- 'lib/aruba/setup.rb'
- 'lib/aruba/tasks/docker_helpers.rb'

# Offense count: 4
# Cop supports --auto-correct.
Style/Encoding:
Exclude:
- 'aruba.gemspec'
- 'fixtures/cli-app/cli-app.gemspec'
- 'fixtures/empty-app/cli-app.gemspec'
- 'spec/spec_helper.rb'

# Offense count: 1
Style/EvalWithLocation:
Exclude:
Expand All @@ -194,8 +185,6 @@ Style/EvalWithLocation:
# Cop supports --auto-correct.
Style/ExpandPathArguments:
Exclude:
- 'Gemfile'
- 'Rakefile'
- 'bin/console'
- 'exe/aruba'
- 'features/support/env.rb'
Expand All @@ -206,7 +195,6 @@ Style/ExpandPathArguments:
- 'fixtures/cli-app/spec/spec_helper.rb'
- 'fixtures/empty-app/cli-app.gemspec'
- 'fixtures/empty-app/lib/cli/app.rb'
- 'fixtures/getting-started-app/Gemfile'

# Offense count: 84
# Configuration parameters: EnforcedStyle.
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: ruby
script: bundle exec rake test
before_install:
- gem install bundler -v '< 2'
bundler_args: --without development debug
bundler_args: --without debug

jobs:
include:
Expand Down
42 changes: 1 addition & 41 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,12 @@ source 'https://rubygems.org'
gemspec

# Load local Gemfile
load File.expand_path('../Gemfile.local', __FILE__) if File.file? File.expand_path('../Gemfile.local', __FILE__)
load File.expand_path('Gemfile.local', __dir__) if File.file? File.expand_path('Gemfile.local', __dir__)

# Debug aruba
group :debug do
unless RUBY_PLATFORM.include?('java')
gem 'byebug', '~> 11.0'
gem 'pry-byebug', '~> 3.4'
end

gem 'pry-doc', '~> 1.0.0'
end

# Tools to run during development
group :development do
# Needed for lint:yard:junk task
gem 'yard-junk', '~> 0.0.7'
end

group :development, :test do
# we use this to demonstrate interactive debugging within our feature tests
gem 'pry', '~> 0.12.2'

# Run development and test tasks
gem 'rake', '~> 12.3'

# Lint travis yaml
gem 'travis-yaml'

# Code Coverage
gem 'simplecov', '~> 0.10'

# API docs generation
gem 'yard', '~>0.9.9'

# Test api
gem 'fuubar', '~> 2.2'
gem 'rspec', '~> 3.4'

# Make aruba compliant to ruby community guide
gem 'rubocop', '~> 0.69.0'
gem 'rubocop-performance', '~> 1.1'

# License compliance
gem 'license_finder', '~> 5.0'

gem 'minitest', '~> 5.8'

gem 'json', '~> 2.1'
end
6 changes: 3 additions & 3 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$LOAD_PATH << File.expand_path('../', __FILE__)
$LOAD_PATH << File.expand_path(__dir__)

require 'aruba/tasks/docker_helpers'
require 'aruba/platform'
Expand Down Expand Up @@ -74,7 +74,7 @@ namespace :docker do
args.with_defaults(version: 'latest')
args.with_defaults(cache: true)

docker_compose_file = Aruba::DockerComposeFile.new(File.expand_path('../docker-compose.yml', __FILE__))
docker_compose_file = Aruba::DockerComposeFile.new(File.expand_path('docker-compose.yml', __dir__))
docker_run_instance = Aruba::DockerRunInstance.new(docker_compose_file, :base)

builder = Aruba::DockerBuildCommandLineBuilder.new(
Expand All @@ -88,7 +88,7 @@ namespace :docker do

desc 'Run docker container'
task :run, :command do |_, args|
docker_compose_file = Aruba::DockerComposeFile.new(File.expand_path('../docker-compose.yml', __FILE__))
docker_compose_file = Aruba::DockerComposeFile.new(File.expand_path('docker-compose.yml', __dir__))
docker_run_instance = Aruba::DockerRunInstance.new(docker_compose_file, :base)

builder = Aruba::DockerRunCommandLineBuilder.new(
Expand Down
16 changes: 13 additions & 3 deletions aruba.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# -*- encoding: utf-8 -*-

lib = ::File.expand_path('../lib', __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'aruba/version'
Expand All @@ -21,7 +19,19 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency 'rspec-expectations', '~> 3.4'
spec.add_runtime_dependency 'thor', '~> 0.19'

spec.add_development_dependency 'bundler', ['>= 1.7.0', '< 3.0']
spec.add_development_dependency 'fuubar', '~> 2.3'
spec.add_development_dependency 'json', '~> 2.1'
spec.add_development_dependency 'license_finder', '~> 5.3'
spec.add_development_dependency 'minitest', '~> 5.10'
spec.add_development_dependency 'pry-doc', '~> 1.0.0'
spec.add_development_dependency 'rake', '~> 12.3'
spec.add_development_dependency 'rspec', '~> 3.6'
spec.add_development_dependency 'rubocop', '~> 0.69'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be ~> 0.69.0 because the set of cops can change with each release.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with this, but I just copied the existing config, all this PR is aimed to be is a tidy up.

spec.add_development_dependency 'rubocop-performance', '~> 1.1'
spec.add_development_dependency 'simplecov', '~> 0.15'
spec.add_development_dependency 'travis-yaml', '~> 0.2'
spec.add_development_dependency 'yard-junk', '~> 0.0.7'

spec.rubygems_version = '>= 1.6.1'
spec.required_ruby_version = '>= 2.3'

Expand Down
2 changes: 0 additions & 2 deletions fixtures/cli-app/cli-app.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# coding: utf-8

lib = File.expand_path('../lib', __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'cli/app/version'
Expand Down
2 changes: 0 additions & 2 deletions fixtures/empty-app/cli-app.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# coding: utf-8

lib = File.expand_path('../lib', __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'cli/app/version'
Expand Down
2 changes: 1 addition & 1 deletion fixtures/getting-started-app/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'https://rubygems.org'

gem 'aruba', path: File.expand_path('../../../../', __FILE__)
gem 'aruba', path: File.expand_path('../../..', __dir__)
gem 'cucumber'
2 changes: 0 additions & 2 deletions spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# encoding: utf-8

$LOAD_PATH << ::File.expand_path('../../lib', __FILE__)

require 'simplecov'
Expand Down