.gitignore Rakefile authlogic/spec/views/home/index.html.haml_spec.rb common/app/controllers/application_controller.rb common/app/views/layouts/application.html.haml @@ -6,6 +6,7 @@ class ApplicationController < ActionController::Base helper_method :current_user_session, :current_user filter_parameter_logging :password, :password_confirmation before_filter :blackbird_override + before_filter :activate_authlogic protect_from_forgery # See ActionController::RequestForgeryProtection for details authlogic/app/controllers/application_controller.rb @@ -81,6 +81,7 @@ run 'mkdir -p spec/fixtures' controllers/password_reset_controller_spec.rb controllers/user_sessions_controller_spec.rb controllers/users_controller_spec.rb + views/home/index.html.haml_spec.rb ).each do |name| file "spec/#{name}", open("#{SOURCE}/authlogic/spec/#{name}").read end authlogic/base.rb @@ -25,15 +25,17 @@ git :add => "." git :commit => "-a -m 'Initial commit'" # Haml, doing this before gemtools install since we are using 2.1 -unless File.exist?('tmp/haml') - inside('tmp') do - run 'rm -rf ./haml' if File.exist?('haml') - run 'git clone git://github.com/nex3/haml.git' +if `gem list haml | grep 2.1.0`.chomp == '' + unless File.exist?('tmp/haml') + inside('tmp') do + run 'rm -rf ./haml' if File.exist?('haml') + run 'git clone git://github.com/nex3/haml.git' + end end -end -inside('tmp/haml') do - run 'rake install' + inside('tmp/haml') do + run 'rake install' + end end run 'echo N\n | haml --rails .' @@ -156,12 +158,24 @@ file 'public/blackbird/blackbird.png', git :add => "." git :commit => "-a -m 'Added Blackbird'" +# Add ApplicationController +file 'app/controllers/application_controller.rb', + open("#{SOURCE}/common/app/controllers/application_controller.rb").read +git :add => "." +git :commit => "-a -m 'Added ApplicationController'" + # Add ApplicationHelper file 'app/helpers/application_helper.rb', open("#{SOURCE}/common/app/helpers/application_helper.rb").read git :add => "." git :commit => "-a -m 'Added ApplicationHelper'" +# Add Layout +file 'app/views/layouts/application.html.haml', + open("#{SOURCE}/common/app/views/layouts/application.html.haml").read +git :add => "." +git :commit => "-a -m 'Added Layout'" + # Remove index.html and add HomeController git :rm => 'public/index.html' generate :rspec_controller, 'home' @@ -195,7 +209,11 @@ EOQ nil end -load_template(templ) unless templ.nil? +if templ.nil? + +else + load_template(templ) +end puts "\n#{'*' * 80}\n\n" unless @auth_message.nil? base.rb bc149ea9c8af6a349faee3c4950ac35ac496b6c2 Michael Moen michael@underpantsgnome.com http://github.com/pixels-and-bits/strappy/commit/b66d0fb511a07b7d86c4f30332aa74af981fab87 b66d0fb511a07b7d86c4f30332aa74af981fab87 2009-02-20T14:21:29-08:00 2009-02-20T14:21:29-08:00 setup tests for the generated apps 3d27af465dce505d478b0701cbb15236be617738 Michael Moen michael@underpantsgnome.com