@@ -80,7 +80,7 @@ Required: Rails 2.3.2.1 or newer, ImageMagick for image handling # Install the core engines and copy the assets rake adva:install:core -R vendor/adva/engines/adva_cms/lib/tasks # install adva-cms to vendor/plugins/ - rake adva:assets:install # copy plugin assets to public/ + rake adva:assets:install # symlinks plugin assets to public/ # Start the server ruby script/server README @@ -42,19 +42,23 @@ namespace :adva do end namespace :assets do - desc "Install public assets from plugins to public/" + if Rake.application.unix? + desc "Symlinks public assets from plugins to public/" + else + desc "Copy public assets from plugins to public/" + end task :install do if Rake.application.unix? - Rake::Task["adva:assets:symlink"].invoke + symlink_plugins elsif Rake.application.windows? - Rake::Task["adva:assets:copy"].invoke + copy_plugins else raise 'unknown system platform' end end - desc "Symlink public assets from plugins to public/" - task :symlink do + def symlink_plugins + puts "Symlinks public assets from plugins to public/" target_dir = "#{Rails.root}/public" sources = Dir["#{Rails.root}/vendor/plugins/{*,*/**}/public/*/*"] + Dir["#{Rails.root}/vendor/plugins/{*,*/**}/vendor/plugins/**/public/*/*"] @@ -66,12 +70,13 @@ namespace :adva do # TODO: is this necessary? it seems so ... FileUtils.rm_rf target if File.exists?(target) || File.symlink?(target) FileUtils.mkdir_p(File.dirname(target)) - FileUtils.ln_s source, target, :force => true # :verbose => true + test = FileUtils.ln_s source, target, :force => true # :verbose => true + print "." end + print "Done\n" end - - desc "Copy public assets from plugins to public/" - task :copy do + + def copy_plugins target = "#{Rails.root}/public/" sources = Dir["#{Rails.root}/vendor/plugins/{*,*/**}/public/*"] + Dir["#{Rails.root}/vendor/plugins/{*,*/**}/vendor/plugins/**/public/*"] @@ -80,25 +85,27 @@ namespace :adva do FileUtils.cp_r sources, target end - desc "Copy assets from public to their respective engines" - task :backport => :environment do - if Rake.application.unix? - raise 'no need to backport on unix - directories are symlinked!' - elsif Rake.application.windows? - sources = Dir["#{Rails.root}/public/{images,javascripts,stylesheets}/*"] - sources.select { |s| File.directory?(s) }.each do |source| - path = source.gsub("#{Rails.root}/public/", '') - # determine asset type and owning plugin - type, plugin_name = path.split('/') - plugin = Rails.plugins[plugin_name.to_sym] - if plugin - target = "#{plugin.directory}/public/#{type}" - FileUtils.mkdir_p(target) unless File.directory?(target) - FileUtils.cp_r source, target + if not Rake.application.unix? + desc "Copy assets from public to their respective engines" + task :backport => :environment do + if Rake.application.unix? + raise 'no need to backport on unix - directories are symlinked!' + elsif Rake.application.windows? + sources = Dir["#{Rails.root}/public/{images,javascripts,stylesheets}/*"] + sources.select { |s| File.directory?(s) }.each do |source| + path = source.gsub("#{Rails.root}/public/", '') + # determine asset type and owning plugin + type, plugin_name = path.split('/') + plugin = Rails.plugins[plugin_name.to_sym] + if plugin + target = "#{plugin.directory}/public/#{type}" + FileUtils.mkdir_p(target) unless File.directory?(target) + FileUtils.cp_r source, target + end end + else + raise 'unknown system platform' end - else - raise 'unknown system platform' end end end engines/adva_cms/lib/tasks/adva_cms.rake @@ -46,7 +46,7 @@ puts <<END Before start, please copy assets and run migrations: - rake adva:assets:install # installs plugin assets to public/ + rake adva:assets:install # symlinks plugin assets to public/ rake db:migrate # copies engine migrations to app, does usual migration and removes # engine migrations after it's done script/setup e59aa46142e98c8640406e347b94f69ba225064f priit.mx.ee priit@mx.ee http://github.com/svenfuchs/adva_cms/commit/c33182270999058f5bc0d9328e4bd9efb46f1c44 c33182270999058f5bc0d9328e4bd9efb46f1c44 2009-05-20T06:44:08-07:00 2009-05-20T06:44:08-07:00 removed rake tasks clutter: when unix then only adva:assets:install 3dede1f2697a1c8d94ee70ac3460b7f23e6083e7 priit.mx.ee priit@mx.ee