capinatra 0.0.1 → 0.1.0

data/templates/Capfile

@@ -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}"

data/templates/config.ru.erb

@@ -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
+<% if app_class %>
+run <%= app_class %>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capinatra
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: []