Skip to content

Commit 3608649

Browse files
authored
refactor: reuse existing content in Capfile (#618)
Currently we effectively repeat what Capistrano already puts in the `Capfile` which looks a bit weird, so this has us instead reuse the existing lines
1 parent 320dfc8 commit 3608649

File tree

2 files changed

+8
-32
lines changed

2 files changed

+8
-32
lines changed

variants/deploy_with_ackama_ec2_capistrano/template.rb

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -145,22 +145,10 @@
145145

146146
gsub_file!("config/deploy.rb", old_generated_cap_config_snippet, new_ackama_cap_config_snippet)
147147

148-
insert_into_file! "Capfile", after: /install_plugin Capistrano::SCM::Git/ do
149-
<<~EO_RUBY
150-
# Include tasks from other gems included in your Gemfile
151-
#
152-
# For documentation on these, see for example:
153-
#
154-
# https://github.com/capistrano/rbenv
155-
# https://github.com/capistrano/bundler
156-
# https://github.com/capistrano/rails
157-
#
158-
require "capistrano/rbenv"
159-
require "capistrano/bundler"
160-
require "capistrano/rails/assets"
161-
require "capistrano/rails/migrations"
162-
EO_RUBY
163-
end
148+
gsub_file!("Capfile", '# require "capistrano/rbenv"', 'require "capistrano/rbenv"')
149+
gsub_file!("Capfile", '# require "capistrano/bundler"', 'require "capistrano/bundler"')
150+
gsub_file!("Capfile", '# require "capistrano/rails/assets"', 'require "capistrano/rails/assets"')
151+
gsub_file!("Capfile", '# require "capistrano/rails/migrations"', 'require "capistrano/rails/migrations"')
164152

165153
# Example:
166154
# deploy_envs = {"production"=>"config/deploy/production.rb", "staging"=>"config/deploy/staging.rb"}

variants/deploy_with_capistrano/template.rb

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,10 @@
133133

134134
gsub_file!("config/deploy.rb", old_generated_cap_config_snippet, new_ackama_cap_config_snippet)
135135

136-
insert_into_file! "Capfile", after: /install_plugin Capistrano::SCM::Git/ do
137-
<<~EO_RUBY
138-
# Include tasks from other gems included in your Gemfile
139-
#
140-
# For documentation on these, see for example:
141-
#
142-
# https://github.com/capistrano/rbenv
143-
# https://github.com/capistrano/bundler
144-
# https://github.com/capistrano/rails
145-
#
146-
require "capistrano/rbenv"
147-
require "capistrano/bundler"
148-
require "capistrano/rails/assets"
149-
require "capistrano/rails/migrations"
150-
EO_RUBY
151-
end
136+
gsub_file!("Capfile", '# require "capistrano/rbenv"', 'require "capistrano/rbenv"')
137+
gsub_file!("Capfile", '# require "capistrano/bundler"', 'require "capistrano/bundler"')
138+
gsub_file!("Capfile", '# require "capistrano/rails/assets"', 'require "capistrano/rails/assets"')
139+
gsub_file!("Capfile", '# require "capistrano/rails/migrations"', 'require "capistrano/rails/migrations"')
152140

153141
# Example:
154142
# deploy_envs = {"production"=>"config/deploy/production.rb", "staging"=>"config/deploy/staging.rb"}

0 commit comments

Comments
 (0)