kelredd-sinatra-helpers 0.1.10 → 0.2.0

data/lib/sinatra_helpers/generator/app.rb

@@ -1,4 +1,4 @@
-require 'ftools'
+require 'fileutils'
 require 'erb'
 require 'useful/ruby_extensions/string'
 
@@ -17,7 +17,7 @@ module SinatraHelpers::Generator
     end
     
     def name=(name)
-      @name = name.gsub(/([A-Z])([a-z])/, '-\1\2').sub(/^-/, '').downcase
+      @name = name.gsub(/([A-Z])([a-z])/, '-\1\2').sub(/^-/, '').gsub(/\.\w*/, '').downcase
     end
     
     def generate

data/lib/sinatra_helpers/generator/file_templates/Rakefile.erb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'gemsconfig/tasks/rake'
 require 'rake/testtask'
 
 namespace :test do

data/lib/sinatra_helpers/generator/file_templates/app.rb.erb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'sinatra'
-require 'config/boot'
+require 'app/base'
 
 # define routes here or load in route definitions
 

data/lib/sinatra_helpers/generator/file_templates/{boot.rb.erb → base.rb.erb}

@@ -20,8 +20,3 @@ def load_app(files_dir)
 end
 
 require 'config/env'
-begin
-  require "config/envs/#{RACK_ENV.downcase}"
-rescue LoadError => err
-  puts "no environment config set up for '#{RACK_ENV.downcase}', ignoring..."
-end

data/lib/sinatra_helpers/generator/file_templates/config.ru.erb

@@ -0,0 +1,11 @@
+RACK_ENV = ENV["RACK_ENV"] ||= "development" unless defined? RACK_ENV
+require 'app'
+set :app_file, File.join(root_path, 'app.rb')
+disable :run
+
+FileUtils.mkdir_p 'log' unless File.exists?('log')
+log = File.new("log/#{RACK_ENV.downcase}.log", "a+")
+$stdout.reopen(log)
+$stderr.reopen(log)
+
+run Sinatra::Application

data/lib/sinatra_helpers/generator/file_templates/console.erb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+RACK_ENV = ENV['RACK_ENV'] ||= ARGV.first || 'development'
 platform_irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 
 require 'rubygems'

data/lib/sinatra_helpers/generator/file_templates/deploy.rb.erb

@@ -2,3 +2,20 @@ require 'capistrano/ext/multistage'
 require 'useful/cap_tasks'
 
 set :stages, %w(live staging)
+
+require 'useful/cap_tasks/git_query_revision_remote'
+require 'useful/cap_tasks/passenger_deploy'
+require 'useful/cap_tasks/disable_with_down_html'
+require 'useful/cap_tasks/rack_cache'
+
+namespace :deploy do
+  
+  after 'deploy:update_code', 'deploy:setup_stage_environment'
+
+  desc "_: (#{application}) Setup production environment (files, symlinks, etc...)."
+  task :setup_stage_environment, :roles => :app, :except => { :no_release => true } do
+    config = "#{release_path}/admin/#{rack_env}.ru"
+    run "cp #{config} #{release_path}/config.ru"
+  end
+  
+end

data/lib/sinatra_helpers/generator/file_templates/deploy_production.rb.erb

@@ -0,0 +1,2 @@
+set :stage_branch, :production
+set :rack_env, 'production'

data/lib/sinatra_helpers/generator/file_templates/deploy_staging.rb.erb

@@ -0,0 +1,2 @@
+set :stage_branch, :current_git_branch
+set :rack_env, 'staging'

data/lib/sinatra_helpers/generator/file_templates/env.rb.erb

@@ -1,3 +1,6 @@
+require 'logger'
+LOGGER = Logger.new(root_path('log', "#{RACK_ENV}.log"))
+ 
 require 'config/gems'
 Gemsconfig::load if defined?(Gemsconfig)
 
@@ -7,10 +10,23 @@ set :views, root_path("app", "views")
 set :images_path, public_path("images")
 set :environment, RACK_ENV.to_sym if defined?(RACK_ENV)
 
+# Load environment
+begin
+  require "config/envs/#{RACK_ENV.downcase}"
+rescue LoadError => err
+  puts "no environment config set up for '#{RACK_ENV.downcase}', ignoring..."
+end
+
+# Load initializers
+Dir[root_path('config', 'initializers', '*.rb')].each do |file|
+  require file
+end
+
 # load app files
 load_app 'helpers'
 load_app 'models'
 
+# load middlewares
 # TODO: set your session cookie name here
 use Rack::Session::Cookie, :key => '_sess'
 use Rack::Flash
@@ -20,12 +36,10 @@ Rack::Less.configure do |config|
   config.combinations = {
     'web' => ['reset', 'app']
   }
-  config.compress = config.cache = production? 
+  config.cache = production? 
 end
 
 use Rack::Sprockets
 Rack::Sprockets.configure do |config|
-  if config.cache = production? 
-    config.compress = :whitespace
-  end
+  config.cache = production? 
 end

data/lib/sinatra_helpers/generator/file_templates/env_production.rb.erb

@@ -1,10 +0,0 @@
-require 'rack/cache'
-use Rack::Cache,
-  :verbose     => true,
-  :metastore   => "file:#{root_path('cache-rack', 'meta')}",
-  :entitystore => "file:#{root_path('cache-rack', 'body')}"
-
-FileUtils.mkdir_p 'log' unless File.exists?('log')
-log = File.new("log/#{RACK_ENV.downcase}.log", "a+")
-$stdout.reopen(log)
-$stderr.reopen(log)

data/lib/sinatra_helpers/generator/file_templates/gems.rb.erb

@@ -7,7 +7,7 @@ end
 Gemsconfig::init do |config|
   
   config.gem 'rack-flash', :lib => 'rack-flash'
-  config.gem 'rack-cache', :lib => false
+  config.gem 'rack-cache', :lib => 'rack/cache'
   config.gem 'rack-less', :lib => 'rack/less'
   config.gem 'rack-sprockets', :lib => 'rack/sprockets'
     

data/lib/sinatra_helpers/generator/file_templates/layout

@@ -11,7 +11,7 @@
     <meta name="robots" content="noindex,nofollow" />
   <% end %>
   <link rel="icon" type="image/png" href="/favicon.png"></link>
-  <%= spreadsheet_link_tag Rack::Less.combinations('web'), :media => "all" %>
+  <%= stylesheet_link_tag Rack::Less.combinations('web'), :media => "all" %>
 	<% unless @noscript %>
 	  <%= javascript_include_tag 'app.js' %>
   <% end %>

data/lib/sinatra_helpers/generator/file_templates/production.ru.erb

@@ -3,4 +3,14 @@ require 'app'
 set :app_file, File.join(root_path, 'app.rb')
 disable :run
 
-run Sinatra::Application
+FileUtils.mkdir_p 'log' unless File.exists?('log')
+log = File.new("log/#{RACK_ENV.downcase}.log", "a+")
+$stdout.reopen(log)
+$stderr.reopen(log)
+
+use Rack::Cache,
+  :verbose     => true,
+  :metastore   => "file:#{root_path('cache-rack', 'meta')}",
+  :entitystore => "file:#{root_path('cache-rack', 'body')}"
+
+run Sinatra::Application

data/lib/sinatra_helpers/generator/file_templates/staging.ru.erb

@@ -0,0 +1,11 @@
+RACK_ENV = ENV["RACK_ENV"] ||= "staging" unless defined? RACK_ENV
+require 'app'
+set :app_file, File.join(root_path, 'app.rb')
+disable :run
+
+FileUtils.mkdir_p 'log' unless File.exists?('log')
+log = File.new("log/#{RACK_ENV.downcase}.log", "a+")
+$stdout.reopen(log)
+$stderr.reopen(log)
+
+run Sinatra::Application

data/lib/sinatra_helpers/generator/file_templates/test_helper.rb.erb

@@ -5,11 +5,13 @@ require 'useful/shoulda_macros/test_unit'
 require 'rack/test'
 require 'webrat'
 
+ROOT_DIR = File.expand_path("#{File.dirname(__FILE__)}/..")
+$LOAD_PATH.unshift(ROOT_DIR)
+$LOAD_PATH.unshift(File.join(ROOT_DIR, 'test'))
+
 RACK_ENV = "test"
 require 'app'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
 class Test::Unit::TestCase
   include Rack::Test::Methods
   include Webrat::Methods
@@ -18,5 +20,5 @@ class Test::Unit::TestCase
   Webrat.configure do |config|
     config.mode = :rack
   end
- 
+  
 end

data/lib/sinatra_helpers/generator/template.rb

@@ -4,15 +4,18 @@ module SinatraHelpers::Generator
 
   TEMPLATE = {
     'app.rb.erb' => 'app.rb',
+    'config.ru.erb' => 'config.ru',
     'Capfile.erb' => 'Capfile',
     'Rakefile.erb' => 'Rakefile',
     'gitignore.erb' => '.gitignore',
     
     :admin => {
-      'production.ru.erb' => 'production.ru'
+      'production.ru.erb' => 'production.ru',
+      'staging.ru.erb' => 'staging.ru'
     },
     
     :app => {
+      'base.rb.erb' => 'base.rb',
       :helpers => {},
       :models => {},
       :views => {
@@ -29,7 +32,6 @@ module SinatraHelpers::Generator
     },
     
     :config => {
-      'boot.rb.erb' => 'boot.rb',
       'deploy.rb.erb' => 'deploy.rb',
       :deploy => {
         'deploy_production.rb.erb' => 'production.rb',
@@ -38,10 +40,14 @@ module SinatraHelpers::Generator
       'env.rb.erb' => 'env.rb',
       :envs => {
         'env_development.rb.erb' => 'development.rb',
-        'env_test.rb.erb' => 'test.rb',
-        'env_production.rb.erb' => 'production.rb'
+        'env_production.rb.erb' => 'production.rb',
+        'env_staging.rb.erb' => 'staging.rb',
+        'env_test.rb.erb' => 'test.rb'
       },
-      'gems.rb.erb' => 'gems.rb'
+      'gems.rb.erb' => 'gems.rb',
+      :initializers => {
+        'init.rb.erb' => 'init.rb'
+      }
     },
     
     :log => {},
@@ -51,8 +57,7 @@ module SinatraHelpers::Generator
     },
     
     :script => {
-      'console.erb' => 'console',
-      'server.erb' => 'server'
+      'console.erb' => 'console'
     },
     
     :test => {

data/lib/sinatra_helpers/version.rb

@@ -2,8 +2,8 @@ module SinatraHelpers
   module Version
     
     MAJOR = 0
-    MINOR = 1
-    TINY  = 10
+    MINOR = 2
+    TINY  = 0
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 10
-  version: 0.1.10
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -06:00
+date: 2010-03-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,8 +106,9 @@ files:
 - lib/sinatra_helpers/generator/file_templates/app.js.erb
 - lib/sinatra_helpers/generator/file_templates/app.less.erb
 - lib/sinatra_helpers/generator/file_templates/app.rb.erb
-- lib/sinatra_helpers/generator/file_templates/boot.rb.erb
+- lib/sinatra_helpers/generator/file_templates/base.rb.erb
 - lib/sinatra_helpers/generator/file_templates/Capfile.erb
+- lib/sinatra_helpers/generator/file_templates/config.ru.erb
 - lib/sinatra_helpers/generator/file_templates/console.erb
 - lib/sinatra_helpers/generator/file_templates/deploy.rb.erb
 - lib/sinatra_helpers/generator/file_templates/deploy_production.rb.erb
@@ -115,17 +116,19 @@ files:
 - lib/sinatra_helpers/generator/file_templates/env.rb.erb
 - lib/sinatra_helpers/generator/file_templates/env_development.rb.erb
 - lib/sinatra_helpers/generator/file_templates/env_production.rb.erb
+- lib/sinatra_helpers/generator/file_templates/env_staging.rb.erb
 - lib/sinatra_helpers/generator/file_templates/env_test.rb.erb
 - lib/sinatra_helpers/generator/file_templates/gems.rb.erb
 - lib/sinatra_helpers/generator/file_templates/gitignore.erb
 - lib/sinatra_helpers/generator/file_templates/index.html.erb.erb
+- lib/sinatra_helpers/generator/file_templates/init.rb.erb
 - lib/sinatra_helpers/generator/file_templates/layout
 - lib/sinatra_helpers/generator/file_templates/layout_test.rb.erb
 - lib/sinatra_helpers/generator/file_templates/model_test.rb.erb
 - lib/sinatra_helpers/generator/file_templates/production.ru.erb
 - lib/sinatra_helpers/generator/file_templates/Rakefile.erb
 - lib/sinatra_helpers/generator/file_templates/reset.less.erb
-- lib/sinatra_helpers/generator/file_templates/server.erb
+- lib/sinatra_helpers/generator/file_templates/staging.ru.erb
 - lib/sinatra_helpers/generator/file_templates/test_helper.rb.erb
 - lib/sinatra_helpers/generator/template.rb
 - lib/sinatra_helpers/generator.rb

data/lib/sinatra_helpers/generator/file_templates/server.erb

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-platform_ruby = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'ruby.bat' : 'ruby'
-
-require 'rubygems'
-require 'sinatra/base'
-
-puts "Loading default environment (Sinatra #{Sinatra::VERSION})"
-exec "#{platform_ruby} app.rb"