Skip to content

Commit c158b2e

Browse files
stevepolitodesignstevepolitodesign
committed
Introduce suspenders:cleanup:organize_gemfile task
Introduce `Suspenders::Cleanup::OrganizeGemfile` class and corresponding task in an effort to reduce duplicate groups in the modified Gemfile. This is because the [gem_group][] method does not modify existing groups. I've opened [#49512][] in an effort to fix this, but until then, this task will suffice. This class is designed to be run after `suspenders:install:web`, and does not account for all edge cases. For example, it assumes gems are grouped by symbols (i.e. :test and not "test"), and does not account for inline syntax: ```ruby gem 'my-gem', group: [:cucumber, :test] ``` We could consider extracting this into a Gem (with a fun name, of course. Maybe "Polish"), but for now, I think this simple procedural code if just fine. Additionally, this commit removes duplicate Rake task that was generated with the plugin. [gem_group]: https://api.rubyonrails.org/classes/Rails/Generators/Actions.html#method-i-gem_group [#49512]: rails/rails#49512
1 parent f76fb25 commit c158b2e

File tree

9 files changed

+331
-4
lines changed

9 files changed

+331
-4
lines changed

‎NEWS.md

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Unreleased
1717
* Introduce `suspenders:testing` generator
1818
* Introduce `suspenders:prerequisites` generator
1919
* Introduce `suspenders:ci` generator
20+
* Introduce `suspenders:cleanup:organize_gemfile` task
2021

2122
20230113.0 (January, 13, 2023)
2223

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ Custom Suspenders tasks
157157
```
158158
bin/rails suspenders:rake
159159
bin/rails suspenders:db:migrate
160+
bin/rails suspenders:cleanup:organize_gemfile
160161
```
161162

162163
### Email

‎lib/suspenders.rb

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
require "suspenders/engine"
33
require "suspenders/railtie"
44
require "suspenders/generators"
5+
require "suspenders/cleanup/organize_gemfile"
56

67
module Suspenders
78
# Your code goes here...

‎lib/suspenders/cleanup/organize_gemfile.rb

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
module Suspenders
2+
module Cleanup
3+
class OrganizeGemfile
4+
def self.perform(gemfile)
5+
new(gemfile).perform
6+
end
7+
8+
attr_reader :gemfile, :lines, :current_group, :gem_groups, :new_lines,
9+
:new_lines_markers
10+
11+
def initialize(gemfile)
12+
@gemfile = gemfile
13+
@lines = File.read(gemfile).lines
14+
@current_group = nil
15+
@gem_groups = {}
16+
@new_lines = []
17+
@new_lines_markers = []
18+
end
19+
20+
def perform
21+
lines.each do |line|
22+
if line.starts_with?(/group/)
23+
@current_group = line
24+
end
25+
26+
# Consolidate gem groups
27+
if current_group && !line.starts_with?(/\n/)
28+
if line.starts_with?(/end/)
29+
@current_group = nil
30+
elsif !line.starts_with?(/group/)
31+
gem_groups[current_group] ||= []
32+
gem_groups[current_group] << line
33+
end
34+
# Add non-grouped gems
35+
elsif !line.starts_with?(/\n/)
36+
new_lines << line
37+
@current_group = nil
38+
end
39+
end
40+
41+
# Add consolidated gem groups to new Gemfile
42+
gem_groups.keys.each do |group|
43+
gems = gem_groups[group]
44+
45+
gems.each_with_index do |gem, index|
46+
if index == 0
47+
new_lines << group
48+
end
49+
50+
new_lines << gem
51+
52+
if gems.size == (index + 1)
53+
new_lines << "end\n"
54+
end
55+
end
56+
end
57+
58+
# Conditionally add line breaks
59+
new_lines.each_with_index do |line, index|
60+
previous_line = new_lines[index - 1] if index > 0
61+
next_line = new_lines[index + 1]
62+
marker = index + 1
63+
64+
# Add line break if it's a gem and the next line is commented out
65+
if (line.starts_with?(/\s*gem/) || line.starts_with?(/\s*\#\s*gem/)) && next_line&.starts_with?(/\s*\#/)
66+
new_lines_markers << marker
67+
end
68+
69+
# Add line break if it's a commented out gem and the next line is a gem
70+
if line.starts_with?(/\s*\#\s*gem/) && next_line&.starts_with?(/\s*gem/)
71+
new_lines_markers << marker
72+
end
73+
74+
# Add line break if it's a gem with a comment and the next line is a gem
75+
if previous_line&.starts_with?(/\s*\#/) \
76+
&& line.starts_with?(/\s*gem/) \
77+
&& next_line&.starts_with?(/\s*gem/) \
78+
&& !previous_line.starts_with?(/\s*\#\s*gem/)
79+
new_lines_markers << marker
80+
end
81+
82+
# Add a line break if it's /end/
83+
if line.starts_with?(/end/)
84+
new_lines_markers << marker
85+
end
86+
87+
# Add a line break if it's a gem and the next line is a group
88+
if line.starts_with?(/gem/) && next_line&.starts_with?(/group/)
89+
new_lines_markers << marker
90+
end
91+
92+
# Add line break if it's /source/ or /ruby/
93+
if line.starts_with?(/\w/) && !line.starts_with?(/\s*(gem|group|end)/)
94+
new_lines_markers << marker
95+
end
96+
end
97+
98+
new_lines_markers.each_with_index do |marker, index|
99+
# Each time we insert, the original marker if off by 1
100+
marker_offset = marker + index
101+
102+
new_lines.insert(marker_offset, "\n")
103+
end
104+
105+
# Remove last line
106+
if /\n/.match?(new_lines.last)
107+
new_lines.pop
108+
end
109+
110+
File.open(gemfile, "w+") { _1.write new_lines.join }
111+
end
112+
end
113+
end
114+
end

‎lib/tasks/suspenders.rake

+7
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,11 @@ namespace :suspenders do
2222
Rake::Task["db:test:prepare"].invoke
2323
end
2424
end
25+
26+
namespace :cleanup do
27+
desc "Organizes Gemfile"
28+
task :organize_gemfile do
29+
Suspenders::Cleanup::OrganizeGemfile.perform(Rails.root.join("Gemfile"))
30+
end
31+
end
2532
end

‎lib/tasks/suspenders_tasks.rake

-4
This file was deleted.

‎test/fixtures/files/gemfile_clean

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
source "https://rubygems.org"
2+
3+
ruby "3.3.0"
4+
5+
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
6+
gem "rails", "~> 7.1.3", ">= 7.1.3.2"
7+
8+
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
9+
gem "sprockets-rails"
10+
11+
# Use postgresql as the database for Active Record
12+
gem "pg", "~> 1.1"
13+
14+
# Use the Puma web server [https://github.com/puma/puma]
15+
gem "puma", ">= 5.0"
16+
17+
# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
18+
gem "importmap-rails"
19+
20+
# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
21+
gem "turbo-rails"
22+
23+
# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
24+
gem "stimulus-rails"
25+
26+
# Build JSON APIs with ease [https://github.com/rails/jbuilder]
27+
gem "jbuilder"
28+
29+
# Use Redis adapter to run Action Cable in production
30+
gem "redis", ">= 4.0.1"
31+
32+
# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
33+
# gem "kredis"
34+
35+
# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
36+
# gem "bcrypt", "~> 3.1.7"
37+
38+
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
39+
gem "tzinfo-data", platforms: %i[windows jruby]
40+
41+
# Reduces boot times through caching; required in config/boot.rb
42+
gem "bootsnap", require: false
43+
44+
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
45+
# gem "image_processing", "~> 1.2"
46+
47+
gem "cssbundling-rails"
48+
gem "inline_svg"
49+
gem "sidekiq"
50+
gem "title"
51+
52+
group :development, :test do
53+
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
54+
gem "debug", platforms: %i[mri windows]
55+
56+
gem "suspenders", github: "thoughtbot/suspenders", branch: "suspenders-3-0-0-web-generator"
57+
gem "bundler-audit", ">= 0.7.0", require: false
58+
gem "factory_bot_rails"
59+
gem "rspec-rails", "~> 6.1.0"
60+
gem "better_html", require: false
61+
gem "erb_lint", require: false
62+
gem "erblint-github", require: false
63+
gem "standard"
64+
end
65+
66+
group :development do
67+
# Use console on exceptions pages [https://github.com/rails/web-console]
68+
gem "web-console"
69+
70+
# Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
71+
# gem "rack-mini-profiler"
72+
73+
# Speed up commands on slow machines / big apps [https://github.com/rails/spring]
74+
# gem "spring"
75+
end
76+
77+
group :test do
78+
gem "capybara_accessibility_audit"
79+
gem "capybara_accessible_selectors", github: "citizensadvice/capybara_accessible_selectors"
80+
gem "capybara"
81+
gem "action_dispatch-testing-integration-capybara", github: "thoughtbot/action_dispatch-testing-integration-capybara", tag: "v0.1.1", require: "action_dispatch/testing/integration/capybara/rspec"
82+
gem "selenium-webdriver"
83+
gem "shoulda-matchers", "~> 6.0"
84+
gem "webmock"
85+
end

‎test/fixtures/files/gemfile_messy

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
source "https://rubygems.org"
2+
3+
ruby "3.3.0"
4+
5+
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
6+
gem "rails", "~> 7.1.3", ">= 7.1.3.2"
7+
8+
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
9+
gem "sprockets-rails"
10+
11+
# Use postgresql as the database for Active Record
12+
gem "pg", "~> 1.1"
13+
14+
# Use the Puma web server [https://github.com/puma/puma]
15+
gem "puma", ">= 5.0"
16+
17+
# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
18+
gem "importmap-rails"
19+
20+
# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
21+
gem "turbo-rails"
22+
23+
# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
24+
gem "stimulus-rails"
25+
26+
# Build JSON APIs with ease [https://github.com/rails/jbuilder]
27+
gem "jbuilder"
28+
29+
# Use Redis adapter to run Action Cable in production
30+
gem "redis", ">= 4.0.1"
31+
32+
# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
33+
# gem "kredis"
34+
35+
# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
36+
# gem "bcrypt", "~> 3.1.7"
37+
38+
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
39+
gem "tzinfo-data", platforms: %i[windows jruby]
40+
41+
# Reduces boot times through caching; required in config/boot.rb
42+
gem "bootsnap", require: false
43+
44+
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
45+
# gem "image_processing", "~> 1.2"
46+
47+
group :development, :test do
48+
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
49+
gem "debug", platforms: %i[mri windows]
50+
end
51+
52+
group :development do
53+
# Use console on exceptions pages [https://github.com/rails/web-console]
54+
gem "web-console"
55+
56+
# Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
57+
# gem "rack-mini-profiler"
58+
59+
# Speed up commands on slow machines / big apps [https://github.com/rails/spring]
60+
# gem "spring"
61+
end
62+
63+
group :development, :test do
64+
gem "suspenders", github: "thoughtbot/suspenders", branch: "suspenders-3-0-0-web-generator"
65+
end
66+
67+
group :test do
68+
gem "capybara_accessibility_audit"
69+
gem "capybara_accessible_selectors", github: "citizensadvice/capybara_accessible_selectors"
70+
end
71+
gem "cssbundling-rails"
72+
73+
group :development, :test do
74+
gem "bundler-audit", ">= 0.7.0", require: false
75+
end
76+
gem "inline_svg"
77+
78+
group :development, :test do
79+
gem "factory_bot_rails"
80+
end
81+
gem "sidekiq"
82+
gem "title"
83+
84+
group :development, :test do
85+
gem "rspec-rails", "~> 6.1.0"
86+
end
87+
88+
group :test do
89+
gem "capybara"
90+
gem "action_dispatch-testing-integration-capybara", github: "thoughtbot/action_dispatch-testing-integration-capybara", tag: "v0.1.1", require: "action_dispatch/testing/integration/capybara/rspec"
91+
gem "selenium-webdriver"
92+
gem "shoulda-matchers", "~> 6.0"
93+
gem "webmock"
94+
end
95+
96+
group :development, :test do
97+
gem "better_html", require: false
98+
gem "erb_lint", require: false
99+
gem "erblint-github", require: false
100+
gem "standard"
101+
end

‎test/suspenders/cleanup/organize_gemfile_test.rb

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
require "test_helper"
2+
require_relative "../../../lib/suspenders/cleanup/organize_gemfile"
3+
4+
module Suspenders
5+
module Cleanup
6+
class OrganizeGemfileTest < ActiveSupport::TestCase
7+
test "organizes Gemfile by group" do
8+
original = file_fixture("gemfile_messy").read
9+
modified = file_fixture("gemfile_clean").read
10+
File.open("tmp/Gemfile", "w+") { _1.write original }
11+
12+
Suspenders::Cleanup::OrganizeGemfile.perform("tmp/Gemfile")
13+
14+
gemfile = File.read("tmp/Gemfile")
15+
assert_equal modified, gemfile
16+
ensure
17+
File.delete("tmp/Gemfile")
18+
end
19+
end
20+
end
21+
end

0 commit comments

Comments
 (0)