Skip to content

Commit

Permalink
Upgrader: Do not keep installing config.yml files
Browse files Browse the repository at this point in the history
The configuration objects should be able to give good upgrade
information by just using them, as shown in the previous commit.
  • Loading branch information
mamhoff committed Jan 31, 2025
1 parent db7b85c commit 4626d14
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 28 deletions.
19 changes: 0 additions & 19 deletions lib/alchemy/upgrader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,5 @@ class Upgrader
extend Alchemy::Shell

Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].sort.each { |f| require f }

class << self
def copy_new_config_file
desc "Copy configuration file."
config_file = Rails.root.join("config/alchemy/config.yml")
default_config = File.join(File.dirname(__FILE__), "../../config/alchemy/config.yml")
if !File.exist? config_file
log "No configuration file found. Creating it."
FileUtils.cp default_config, Rails.root.join("config/alchemy/config.yml")
elsif FileUtils.identical? default_config, config_file
log "Configuration file already present.", :skip
else
log "Custom configuration file found."
FileUtils.cp default_config, Rails.root.join("config/alchemy/config.yml.defaults")
log "Copied new default configuration file."
todo "Check the default configuration file (./config/alchemy/config.yml.defaults) for new configuration options and insert them into your config file.", "Configuration has changed"
end
end
end
end
end
4 changes: 0 additions & 4 deletions lib/generators/alchemy/install/install_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ def mount
install_tasks.inject_routes(options[:auto_accept])
end

def copy_config
copy_file "#{gem_config_path}/config.yml", app_config_path.join("alchemy", "config.yml")
end

def copy_yml_files
%w[elements page_layouts menus].each do |file|
template "#{__dir__}/templates/#{file}.yml.tt", app_config_path.join("alchemy", "#{file}.yml")
Expand Down
5 changes: 0 additions & 5 deletions lib/tasks/alchemy/upgrade.rake
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,5 @@ namespace :alchemy do
"alchemy:install:migrations",
"db:migrate"
]

desc "Alchemy Upgrader: Copy configuration file."
task config: [:environment] do
Alchemy::Upgrader.copy_new_config_file
end
end
end

0 comments on commit 4626d14

Please sign in to comment.