@@ -2,13 +2,19 @@ Gem::Specification.new do |s| s.name = %q{capinatra} - s.version = "0.0.1" + s.version = "0.1.0" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.date = %q{2008-12-21} s.default_executable = %q{capinatra} s.executables = ["capinatra"] - s.files = ["bin/capinatra", "lib/capinatra.rb", "templates/Capfile", "templates/config.ru.erb", "templates/vhost.conf.erb"] + s.files = [ + "bin/capinatra", + "lib/capinatra.rb", + "templates/Capfile", + "templates/config.ru.erb", + "templates/vhost.conf.erb" + ] s.require_paths = ["lib"] s.rubygems_version = %q{1.3.1} s.summary = %q{Quickly deploy Sinatra apps on Passenger} capinatra.gemspec @@ -3,7 +3,13 @@ require 'rubygems' require 'capinatra' load 'deploy' if respond_to?(:namespace) # cap2 differentiator -# app settings +# set an app_class if you're using the more recent style of creating +# Sinatra apps, where app_class would be the name of your subclass +# of Sinatra::Base. if you're just requiring 'sinatra' and using the +# more traditional DSL style of Sinatra, then comment this line out. +set :app_class, 'YourApp' + +# standard settings set :app_file, "app.rb" set :application, "your-app-name" set :domain, "your-app-domain.com" @@ -11,7 +17,7 @@ role :app, domain role :web, domain role :db, domain, :primary => true -# general settings +# environment settings set :user, "deploy" set :group, "deploy" set :deploy_to, "/home/deploy/apps/#{application}" templates/Capfile @@ -1,4 +1,7 @@ require 'rubygems' +<% if app_class # modern way of declaring Sinatra apps %> +require 'sinatra/base' +<% else # old way of declaring Sinatra apps %> require 'sinatra' root = File.dirname(__FILE__) @@ -8,7 +11,10 @@ Sinatra::Application.default_options.merge! \ :root => root, :app_file => File.join(root, '<%= app_file %>'), :views => File.join(root, 'views') +<% end %> load File.join(File.dirname(__FILE__), '<%= app_file %>') -run Sinatra.application \ No newline at end of file +<% if app_class %> +run <%= app_class %> +<% end %> \ No newline at end of file templates/config.ru.erb 63188c22ed84ae26ab9409928d718c93c84e6635 Pat Nakajima patnakajima@gmail.com http://github.com/nakajima/capinatra/commit/cbad611c53a9cace4c34b2f0a283df7d7252eb28 cbad611c53a9cace4c34b2f0a283df7d7252eb28 2009-02-01T15:22:29-08:00 2009-02-01T15:22:29-08:00 Update for compatibility with most recent version of Sinatra. Legacy support is still in there, though I haven't tested it, so be careful. Also note that if you're subclassing Sinatra::Base, you need to specify the name of your subclass in your Capfile as :app_class. This will then be used at the bottom of the generated rackup file where we call `run` and pass your subclass. ac2bdc3e692f588c3902f2e2c155e337ee99cfc7 Pat Nakajima patnakajima@gmail.com