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

Fix up approx 20% of the rubocop issues in aruba #654

Merged
merged 9 commits into from
Jul 19, 2019
Merged

Fix up approx 20% of the rubocop issues in aruba #654

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb91715
AutoFix some positional cops
luke-hill Jul 1, 2019
48bb49c
Fixed up the names of a couple of constants/memos
luke-hill Jul 1, 2019
a057d4e
Don't need to fully determine namespace when it's identical to the lo…
luke-hill Jul 1, 2019
9359aa5
When using expand path, use a slightly cleaner reference according to…
luke-hill Jul 1, 2019
8942d11
Fix issue where method_missing is defined without respond_to_missing?
luke-hill Jul 1, 2019
f0be290
Regenerated todo config - Approx 25% fewer lines
luke-hill Jul 1, 2019
bc8fc13
Revert tweaks to aruba/platform.rb
luke-hill Jul 12, 2019
32538a7
Merge branch 'master' into refactor/fix_up_more_cops
luke-hill Jul 12, 2019
48890a0
Revert memoized iVar name
luke-hill Jul 15, 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
Prev Previous commit
Next Next commit
When using expand path, use a slightly cleaner reference according to… 
… rubocop
  • Loading branch information
@luke-hill
luke-hill committed Jul 1, 2019
commit 9359aa5d139dcc2976187e4bd36196e1c9f24f84
2 changes: 1 addition & 1 deletion bin/console
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby

$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
$LOAD_PATH.unshift File.expand_path('../lib', __dir__)

require 'aruba/console'

Expand Down
2 changes: 1 addition & 1 deletion exe/aruba
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby

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

require 'aruba/cli'

Expand Down
2 changes: 1 addition & 1 deletion features/support/env.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
$LOAD_PATH.unshift File.expand_path('../../lib', __dir__)

# Has to be the first file required so that all other files show coverage information
require 'simplecov'
Expand Down
2 changes: 1 addition & 1 deletion features/support/simplecov_setup.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @note this file is loaded in env.rb to setup simplecov using RUBYOPTs for child processes and @in-process
require 'simplecov'

root = File.expand_path('../../../', __FILE__)
root = File.expand_path('../..', __dir__)

SimpleCov.command_name(ENV['SIMPLECOV_COMMAND_NAME'])
SimpleCov.root(root)
Expand Down
2 changes: 1 addition & 1 deletion fixtures/cli-app/bin/aruba-test-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby

$LOAD_PATH << File.expand_path('../../lib', __FILE__)
$LOAD_PATH << File.expand_path('../lib', __dir__)
require 'cli/app'

exit 0
2 changes: 1 addition & 1 deletion fixtures/cli-app/cli-app.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lib = File.expand_path('../lib', __FILE__)
lib = File.expand_path('lib', __dir__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'cli/app/version'

Expand Down
2 changes: 1 addition & 1 deletion fixtures/cli-app/lib/cli/app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'cli/app/version'

::Dir.glob(File.expand_path('../**/*.rb', __FILE__)).each { |f| require_relative f }
::Dir.glob(File.expand_path('**/*.rb', __dir__)).each { |f| require_relative f }

module Cli
module App
Expand Down
2 changes: 1 addition & 1 deletion fixtures/cli-app/spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
$LOAD_PATH.unshift File.expand_path('../lib', __dir__)

require 'cli/app'

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

Expand Down