Renaming helper functions in usage

This commit is contained in:
Parker Moore 2013-01-05 23:47:28 -05:00
parent 03b5e79e18
commit 7076cb0feb
1 changed files with 17 additions and 17 deletions

View File

@ -25,8 +25,8 @@ end
begin
# Make local copy of imathis/octopress
FileUtils.rm_rf tmp_octo_dir
system "git clone #{OCTO_GIT} #{tmp_octo_dir}"
FileUtils.rm_rf new_octo_dir
# Make local copy of octopress/sample-octopress-configuration
FileUtils.rm_rf OCTO_CONFIG_DEST
@ -34,20 +34,20 @@ begin
FileUtils.rm_rf File.join(OCTO_CONFIG_DEST, ".git")
# copy new theme to current directory
FileUtils.rm_rf curr_octo_dir('.themes', 'classic')
FileUtils.cp_r tmp_octo_dir('.themes', 'classic'), curr_octo_dir('.themes')
FileUtils.rm_rf old_octo_dir('.themes', 'classic')
FileUtils.cp_r new_octo_dir('.themes', 'classic'), old_octo_dir('.themes')
# migrate configuration
local_config = YAML.load(File.read(curr_octo_dir("_config.yml")))
local_config = YAML.load(File.read(old_octo_dir("_config.yml")))
FileUtils.mkdir_p curr_octo_dir('_config')
FileUtils.cp_r File.join(OCTO_CONFIG_DEST, 'defaults'), curr_octo_dir('_config'), :verbose => true, :remove_destination => true
FileUtils.mkdir_p old_octo_dir('_config')
FileUtils.cp_r File.join(OCTO_CONFIG_DEST, 'defaults'), old_octo_dir('_config'), :verbose => true, :remove_destination => true
# build site configs
site_config = {}
%w(classic.yml disqus.yml gauges_analytics.yml github_repos_sidebar.yml google_analytics.yml
google_plus.yml jekyll.yml share_posts.yml tweets_sidebar.yml).each do |yaml_file|
this_yaml = YAML.load(File.read(File.join(curr_octo_dir('defaults', yaml_file))))
this_yaml = YAML.load(File.read(File.join(old_octo_dir('defaults', yaml_file))))
this_yaml.each_key do |key|
if local_config.has_key?(key) and this_yaml[key] != local_config[key]
site_config[key] = local_config[key]
@ -56,35 +56,35 @@ begin
# write deploy configs
deploy_configs = {}
rakefile = File.read(curr_octo_dir('Rakefile'))
rakefile = File.read(old_octo_dir('Rakefile'))
default_deploy = rakefile.match(/deploy_default\s*=\s*["']([\w-]*)["']/)[1]
defaults_deploy_file = curr_octo_dir('_config', 'defaults', 'deploy', (default_deploy == 'push' ? 'gh_pages.yml' : 'rsync.yml'))
defaults_deploy_file = old_octo_dir('_config', 'defaults', 'deploy', (default_deploy == 'push' ? 'gh_pages.yml' : 'rsync.yml'))
deploy_configs = YAML.load(File.read(defaults_deploy_file))
rakefile.match(/deploy_branch\s*=\s*["']([\w-]*)["'])[1]/)
# TODO extract deploy configs from Rakefile
# write configs
File.open(curr_octo_dir('_config', 'site.yml'), 'w') do |f|
File.open(old_octo_dir('_config', 'site.yml'), 'w') do |f|
f.write(site_config.to_yaml)
end
File.open(curr_octo_dir('_config', 'deploy.yml'), 'w') do |f|
File.open(old_octo_dir('_config', 'deploy.yml'), 'w') do |f|
f.write(deploy_configs.to_yaml)
end
# migrate Rakefile
FileUtils.mv curr_octo_dir("Rakefile"), curr_octo_dir("Rakefile-old")
FileUtils.cp tmp_octo_dir("Rakefile"), curr_octo_dir("Rakefile")
FileUtils.mv old_octo_dir("Rakefile"), old_octo_dir("Rakefile-old")
FileUtils.cp new_octo_dir("Rakefile"), old_octo_dir("Rakefile")
# migrate Gemfile
FileUtils.rm curr_octo_dir("Gemfile")
FileUtils.cp tmp_octo_dir("Gemfile"), curr_octo_dir("Gemfile")
FileUtils.rm old_octo_dir("Gemfile")
FileUtils.cp new_octo_dir("Gemfile"), old_octo_dir("Gemfile")
# migrate updated plugins (but leave deprecated ones)
FileUtils.cp_r tmp_octo_dir("plugins"), curr_octo_dir("plugins")
FileUtils.cp_r new_octo_dir("plugins"), old_octo_dir("plugins")
# cleanup
FileUtils.rm_rf tmp_octo_dir
FileUtils.rm_rf new_octo_dir
puts "Your Octopress site has been successfully upgraded."
puts "Happy blogging!"