Skip to content

Commit

Permalink
Reformat Ruby files for line length of 120
Browse files Browse the repository at this point in the history
The rubocop community has decided to standardize on 120 characters for
default line length.

rubocop/rubocop#7952

Update rubocop config and reformat ruby files to embrace this
convention.
  • Loading branch information
mattbrictson committed May 24, 2020
1 parent e468c4b commit a45718d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 34 deletions.
3 changes: 1 addition & 2 deletions .rubocop.yml
Expand Up @@ -19,8 +19,7 @@ Layout/HashAlignment:
- key

Layout/LineLength:
Exclude:
- "*.gemspec"
Max: 120

Layout/SpaceAroundEqualsInParameterDefault:
EnforcedStyle: no_space
Expand Down
11 changes: 3 additions & 8 deletions Rakefile
Expand Up @@ -31,12 +31,9 @@ namespace :bump do
lowest_minor = RubyVersions.lowest_supported_minor
latest = RubyVersions.latest

replace_in_file "example.gemspec",
/ruby_version = ">= (.*)"/ => lowest

replace_in_file "example.gemspec", /ruby_version = ">= (.*)"/ => lowest
replace_in_file ".rubocop.yml", /TargetRubyVersion: (.*)/ => lowest_minor
replace_in_file ".circleci/config.yml",
%r{circleci/ruby:([\d\.]+)} => latest
replace_in_file ".circleci/config.yml", %r{circleci/ruby:([\d\.]+)} => latest

travis = YAML.safe_load(open(".travis.yml"))
travis["rvm"] = RubyVersions.latest_supported_patches + ["ruby-head"]
Expand Down Expand Up @@ -87,9 +84,7 @@ module RubyVersions

def versions
@_versions ||= begin
yaml = URI.open(
"https://raw.githubusercontent.com/ruby/www.ruby-lang.org/master/_data/downloads.yml"
)
yaml = URI.open("https://raw.githubusercontent.com/ruby/www.ruby-lang.org/master/_data/downloads.yml")
YAML.safe_load(yaml, symbolize_names: true)
end
end
Expand Down
23 changes: 5 additions & 18 deletions rename_template.rb
Expand Up @@ -10,16 +10,11 @@
gem "octokit", "~> 4.14"
end

# rubocop:disable Metrics/AbcSize
# rubocop:disable Metrics/MethodLength
def main
def main # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
assert_git_repo!
git_meta = read_git_data

plugin_name = ask(
"Plugin name?",
default: git_meta[:origin_repo_name].sub(/^tomo-plugin-/, "")
)
plugin_name = ask("Plugin name?", default: git_meta[:origin_repo_name].sub(/^tomo-plugin-/, ""))
plugin_name.sub!(/^tomo-plugin-/, "")
gem_name = "tomo-plugin-#{plugin_name}"
gem_summary = ask(
Expand Down Expand Up @@ -108,28 +103,22 @@ module Plugin
replace_in_file "lib/tomo/plugin/example/#{file}.rb",
"Example" => as_module(plugin_name),
"example" => plugin_name
git "mv",
"lib/tomo/plugin/example/#{file}.rb",
"lib/#{as_path(gem_name)}/#{file}.rb"
git "mv", "lib/tomo/plugin/example/#{file}.rb", "lib/#{as_path(gem_name)}/#{file}.rb"
end

reindent_module "lib/#{as_path(gem_name)}.rb"
reindent_module "lib/#{as_path(gem_name)}/version.rb"

replace_in_file "test/tomo/plugin/example_test.rb",
"Example" => as_module(plugin_name)
git "mv",
"test/tomo/plugin/example_test.rb",
"test/#{as_path(gem_name)}_test.rb"
git "mv", "test/tomo/plugin/example_test.rb", "test/#{as_path(gem_name)}_test.rb"

%w[helpers_test tasks_test].each do |file|
replace_in_file "test/tomo/plugin/example/#{file}.rb",
"Example" => as_module(plugin_name)
replace_in_file "test/tomo/plugin/example/#{file}.rb",
"example" => plugin_name
git "mv",
"test/tomo/plugin/example/#{file}.rb",
"test/#{as_path(gem_name)}/#{file}.rb"
git "mv", "test/tomo/plugin/example/#{file}.rb", "test/#{as_path(gem_name)}/#{file}.rb"
end

replace_in_file "test/test_helper.rb",
Expand All @@ -149,8 +138,6 @@ module Plugin
MESSAGE
end
# rubocop:enable Metrics/AbcSize
# rubocop:enable Metrics/MethodLength

def assert_git_repo!
return if File.file?(".git/config")
Expand Down
7 changes: 1 addition & 6 deletions test/support/reporters.rb
@@ -1,7 +1,2 @@
require "minitest/reporters"

Minitest::Reporters.use!(
Minitest::Reporters::SpecReporter.new,
ENV,
Minitest.backtrace_filter
)
Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new, ENV, Minitest.backtrace_filter)

0 comments on commit a45718d

Please sign in to comment.