@@ -14,6 +14,15 @@ virtual host by running: $ cap capinatra:vhost +You can also choose to copy the Rack configuration +template to your directory by running: + + $ cap capinatra:copy_config + +This is useful if you want to override the defaults we've +set for you. This copied file will take precedence over +the Capinatra-supplied template. + Then it's the usual drill: $ cap deploy:setup README @@ -4,6 +4,12 @@ Capistrano::Configuration.instance(:must_exist).load do after "deploy:update_code", "capinatra:config" namespace :capinatra do + desc "Copies the Rack configuration template to the current directory (useful if you want to override behavior)" + task :copy_config do + require 'fileutils' + FileUtils.cp File.join(File.dirname(__FILE__), '..', 'templates', 'config.ru.erb'), File.join(Dir.pwd, 'config.ru.erb') + end + desc "Sets up apache vhost" task :vhost do logger.info 'compiling vhost template' @@ -21,13 +27,20 @@ Capistrano::Configuration.instance(:must_exist).load do desc "Adds config.ru file" task :config do - logger.info 'compiling config.ru template' template = File.read(File.join(File.dirname(__FILE__), '..', 'templates', 'config.ru.erb')) + if File.exist?(File.join(Dir.pwd, 'config.ru.erb')) + template = File.join(Dir.pwd, 'config.ru.erb') + logger.info 'using custom Rack configuration template' + else + logger.info 'using supplied Rack configuration template' + end + + logger.info 'compiling config.ru template' + put ERB.new(template).result(binding), "config.ru" logger.info 'uploading config.ru file' - put ERB.new(template).result(binding), "config.ru" - logger.info 'moving vhost file to ' + apache_vhost_dir + logger.info 'moving config.ru file to ' + release_path sudo "mv config.ru #{release_path}" end end lib/capinatra.rb @@ -1,20 +1,21 @@ require 'rubygems' -<% if app_class # modern way of declaring Sinatra apps %> +<%- if defined?(app_class) && app_class # modern way of declaring Sinatra apps -%> require 'sinatra/base' -<% else # old way of declaring Sinatra apps %> +<%- else # old way of declaring Sinatra apps -%> require 'sinatra' root = File.dirname(__FILE__) -Sinatra::Application.default_options.merge! \ - :run => false, - :root => root, - :app_file => File.join(root, '<%= app_file %>'), - :views => File.join(root, 'views') -<% end %> +Sinatra::Application.set :run => false +Sinatra::Application.set :root => root +Sinatra::Application.set :app_file => File.join(root, '<%= app_file %>') +Sinatra::Application.set :views => File.join(root, 'views') +<%- end -%> load File.join(File.dirname(__FILE__), '<%= app_file %>') -<% if app_class %> +<%- if defined?(app_class) && app_class -%> run <%= app_class %> -<% end %> \ No newline at end of file +<%- else -%> +run Sinatra::Application +<%- end -%> \ No newline at end of file templates/config.ru.erb cbad611c53a9cace4c34b2f0a283df7d7252eb28 Jason Rogers jacaetevha@gmail.com http://github.com/nakajima/capinatra/commit/8a0e599e34d267282fdf017a1527d43af2f633c1 8a0e599e34d267282fdf017a1527d43af2f633c1 2009-02-26T19:02:18-08:00 2009-02-26T19:02:18-08:00 config.ru changes added new task to copy the config.ru.erb template to user's directory and updated README accordingly cleaned up the config.ru.erb so that it doesn't output so much whitespace fixed error in config.ru.erb when Sinatra::Base is not in use (check whether or not app_class is defined first) fixed logger messages in the config task 2ef5f8315795f7875ddd9b78b7eed0f1f929ad4f Jason Rogers jacaetevha@gmail.com