jackdempsey-beet 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/beet.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
-  s.date = %q{2009-05-20}
+  s.date = %q{2009-05-21}
   s.default_executable = %q{beet}
   s.email = %q{jack.dempsey@gmail.com}
   s.executables = ["beet"]
@@ -28,13 +28,14 @@ Gem::Specification.new do |s|
      "lib/beet/executor.rb",
      "lib/beet/file_system.rb",
      "lib/beet/interaction.rb",
-     "lib/beet/logging.rb",
+     "lib/beet/logger.rb",
      "lib/beet/rails.rb",
      "lib/beet/scm.rb",
      "lib/beet/scm/git.rb",
      "lib/beet/scm/svn.rb",
      "lib/beet/templates/rails/authlogic.rb",
      "lib/beet/templates/rails/clean_files.rb",
+     "lib/beet/templates/rails/db/mysql.rb",
      "lib/beet/templates/rails/git.rb",
      "lib/beet/templates/rails/jquery.rb",
      "spec/beet_spec.rb",

data/lib/beet/executor.rb

@@ -1,22 +1,23 @@
 require 'open-uri'
+require 'beet/logger'
 module Beet
   class Executor
     include Beet::Execution
     include Beet::FileSystem
     include Beet::Interaction
-    include Beet::Logging
 
     # TODO create a better way to mixin things from rails/whatever as needed
     include Beet::Rails
     include Beet::Capistrano
     include Beet::SCM
 
-    attr_reader :root
-    attr_writer :logger
-    attr_accessor :templates, :app_name
+    attr_reader :root, :logger
+    attr_accessor :templates, :project_name
 
-    def initialize(templates, app_name) # :nodoc:
-      @root = File.expand_path(File.join(Dir.pwd, app_name))
+    def initialize(templates, project_name) # :nodoc:
+      @root = File.expand_path(File.join(Dir.pwd, project_name))
+      @project_name = project_name
+      @logger = Beet::Logger.new
       @templates = []
       templates.split(/[\s,]+/).each do |template|
         if file = template_location(template)
@@ -36,13 +37,17 @@ module Beet
       end
     end
 
+    def log(*args)
+      logger.log(*args)
+    end
+
     private
 
     def template_location(template)
       return template if File.exists?(template) or template.include?('http://')
       locations = []
-      locations << File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       locations << File.expand_path(ENV['BEET_TEMPLATES_DIR']) if ENV['BEET_TEMPLATES_DIR']
+      locations << File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       locations.each do |location|
         filename = File.join(location, "#{template}.rb")
         return filename if File.exists?(filename)

data/lib/beet/logger.rb

@@ -0,0 +1,44 @@
+module Beet
+  class Logger # :nodoc:
+    attr_reader :out
+    attr_accessor :quiet
+
+    def initialize(out = $stdout)
+      @out = out
+      @quiet = false
+      @level = 0
+    end
+
+    def log(status, message, &block)
+      @out.print("%12s  %s%s\n" % [status, '  ' * @level, message]) unless quiet
+      indent(&block) if block_given?
+    end
+
+    def indent(&block)
+      @level += 1
+      if block_given?
+        begin
+          block.call
+        ensure
+          outdent
+        end
+      end
+    end
+
+    def outdent
+      @level -= 1
+      if block_given?
+        begin
+          block.call
+        ensure
+          indent
+        end
+      end
+    end
+
+    private
+      def method_missing(method, *args, &block)
+        log(method.to_s, args.first, &block)
+      end
+  end
+end

data/lib/beet/templates/rails/authlogic.rb

@@ -1,8 +1,289 @@
-# app/models/user_session.rb
 file "app/models/user_session.rb" do 
-  %q{
-    class UserSession < Authlogic::Session::Base
-      # configuration here, see documentation for sub modules of Authlogic::Session
+  %{
+class UserSession < Authlogic::Session::Base
+  logout_on_timeout true # default is false
+end
+}
+end
+
+file "app/models/user.rb" do
+  %{
+class User < ActiveRecord::Base
+  acts_as_authentic do |c|
+    c.logged_in_timeout = 10.minutes # default is 10.minutes
+  end
+end
+}
+end
+
+file "app/controllers/user_sessions_controller.rb" do
+  %{
+class UserSessionsController < ApplicationController
+  before_filter :require_no_user, :only => [:new, :create]
+  before_filter :require_user, :only => :destroy
+
+  def new
+    @user_session = UserSession.new
+  end
+
+  def create
+    @user_session = UserSession.new(params[:user_session])
+    if @user_session.save
+      flash[:notice] = "Login successful!"
+      redirect_back_or_default account_url
+    else
+      render :action => :new
+    end
+  end
+
+  def destroy
+    current_user_session.destroy
+    flash[:notice] = "Logout successful!"
+    redirect_back_or_default new_user_session_url
+  end
+end
+}
+end
+
+
+file "app/views/user_sessions/new.html.erb" do
+    %{
+<h1>Login</h1>
+
+<% form_for @user_session, :url => user_session_path do |f| %>
+  <%= f.error_messages %>
+  <%= f.label :email %><br />
+  <%= f.text_field :email %><br />
+  <br />
+  <%= f.label :password %><br />
+  <%= f.password_field :password %><br />
+  <br />
+  <%= f.check_box :remember_me %><%= f.label :remember_me %><br />
+  <br />
+  <%= f.submit "Login" %>
+<% end %>
+}
+end
+
+# Setup some routes
+route 'map.resource :user_session'
+route 'map.resource :account, :controller => "users"'
+route 'map.resources :users'
+route 'map.register "/register", :controller => "users", :action => "new"'
+route 'map.login "/login", :controller => "user_sessions", :action => "new"'
+route 'map.logout "/logout", :controller => "user_sessions", :action => "destroy"'
+
+file "app/controllers/application_controller.rb" do
+  %{
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  helper :all
+  helper_method :current_user_session, :current_user
+  filter_parameter_logging :password, :password_confirmation
+
+  private
+    def current_user_session
+      return @current_user_session if defined?(@current_user_session)
+      @current_user_session = UserSession.find
+    end
+
+    def current_user
+      return @current_user if defined?(@current_user)
+      @current_user = current_user_session && current_user_session.record
+    end
+
+    def require_user
+      unless current_user
+        store_location
+        flash[:notice] = "You must be logged in to access this page"
+        redirect_to new_user_session_url
+        return false
+      end
+    end
+
+    def require_no_user
+      if current_user
+        store_location
+        flash[:notice] = "You must be logged out to access this page"
+        redirect_to account_url
+        return false
+      end
+    end
+
+    def store_location
+      session[:return_to] = request.request_uri
+    end
+
+    def redirect_back_or_default(default)
+      redirect_to(session[:return_to] || default)
+      session[:return_to] = nil
     end
-  }
 end
+}
+end
+
+file "app/controllers/users_controller.rb" do
+  %{
+class UsersController < ApplicationController
+  before_filter :require_no_user, :only => [:new, :create]
+  before_filter :require_user, :only => [:show, :edit, :update]
+  
+  def new
+    @user = User.new
+  end
+  
+  def create
+    @user = User.new(params[:user])
+    if @user.save
+      flash[:notice] = "Account registered!"
+      redirect_back_or_default account_url
+    else
+      render :action => :new
+    end
+  end
+  
+  def show
+    @user = @current_user
+  end
+ 
+  def edit
+    @user = @current_user
+  end
+  
+  def update
+    @user = @current_user # makes our views "cleaner" and more consistent
+    if @user.update_attributes(params[:user])
+      flash[:notice] = "Account updated!"
+      redirect_to account_url
+    else
+      render :action => :edit
+    end
+  end
+end
+}
+end
+
+file "app/views/users/_form.html.erb" do
+    %{
+<%= form.label :email %><br />
+<%= form.text_field :email %><br />
+<br />
+<%= form.label :password, form.object.new_record? ? nil : "Change password" %><br />
+<%= form.password_field :password %><br />
+<br />
+<%= form.label :password_confirmation %><br />
+<%= form.password_field :password_confirmation %><br />
+}
+end
+
+file "app/views/users/edit.html.erb" do
+    %{
+<h1>Edit My Account</h1>
+ 
+<% form_for @user, :url => account_path do |f| %>
+  <%= f.error_messages %>
+  <%= render :partial => "form", :object => f %>
+  <%= f.submit "Update" %>
+<% end %>
+ 
+<br /><%= link_to "My Profile", account_path %>
+}
+end
+
+file "app/views/users/new.html.erb" do
+    %{
+<h1>Register</h1>
+ 
+<% form_for @user, :url => account_path do |f| %>
+  <%= f.error_messages %>
+  <%= render :partial => "form", :object => f %>
+  <%= f.submit "Register" %>
+<% end %>
+}
+end
+
+file "app/views/users/show.html.erb" do
+    %{
+<p>
+  <b>Email:</b>
+  <%=h @user.email %>
+</p>
+ 
+<p>
+  <b>Login count:</b>
+  <%=h @user.login_count %>
+</p>
+ 
+<p>
+  <b>Last request at:</b>
+  <%=h @user.last_request_at %>
+</p>
+ 
+<p>
+  <b>Last login at:</b>
+  <%=h @user.last_login_at %>
+</p>
+ 
+<p>
+  <b>Current login at:</b>
+  <%=h @user.current_login_at %>
+</p>
+ 
+<p>
+  <b>Last login ip:</b>
+  <%=h @user.last_login_ip %>
+</p>
+ 
+<p>
+  <b>Current login ip:</b>
+  <%=h @user.current_login_ip %>
+</p>
+ 
+ 
+<%= link_to 'Edit', edit_account_path %>
+}
+end
+
+# can't rely on internal rails migration generation, so we do it this way
+run "script/generate migration beet_authlogic_create_user"
+
+#now open it
+file(Dir.glob('db/migrate/*beet_authlogic_create_user*').first) do
+  %{
+class BeetAuthlogicCreateUser < ActiveRecord::Migration
+  def self.up
+    unless table_exists?(:users)
+      create_table :users do |t|
+        t.string    :email,               :null => false                # optional, you can use login instead, or both
+        t.string    :crypted_password,    :null => false                # optional, see below
+        t.string    :password_salt,       :null => false                # optional, but highly recommended
+        t.string    :persistence_token,   :null => false                # required
+        t.string    :single_access_token, :null => false                # optional, see Authlogic::Session::Params
+        t.string    :perishable_token,    :null => false                # optional, see Authlogic::Session::Perishability
+
+        # Magic columns, just like ActiveRecord's created_at and updated_at. These are automatically maintained by Authlogic if they are present.
+        t.integer   :login_count,         :null => false, :default => 0 # optional, see Authlogic::Session::MagicColumns
+        t.integer   :failed_login_count,  :null => false, :default => 0 # optional, see Authlogic::Session::MagicColumns
+        t.datetime  :last_request_at                                    # optional, see Authlogic::Session::MagicColumns
+        t.datetime  :current_login_at                                   # optional, see Authlogic::Session::MagicColumns
+        t.datetime  :last_login_at                                      # optional, see Authlogic::Session::MagicColumns
+        t.string    :current_login_ip                                   # optional, see Authlogic::Session::MagicColumns
+        t.string    :last_login_ip                                      # optional, see Authlogic::Session::MagicColumns
+      end
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+end
+}
+end
+
+gem 'authlogic'
+
+rake "gems:install", :sudo => true
+rake "db:create:all" 
+rake "db:migrate"

data/lib/beet/templates/rails/db/mysql.rb

@@ -0,0 +1,43 @@
+file 'config/database.yml' do
+  %{  
+# MySQL.  Versions 4.1 and 5.0 are recommended.
+#
+# Install the MySQL driver:
+#   gem install mysql
+# On Mac OS X:
+#   sudo gem install mysql -- --with-mysql-dir=/usr/local/mysql
+# On Mac OS X Leopard:
+#   sudo env ARCHFLAGS="-arch i386" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
+#       This sets the ARCHFLAGS environment variable to your native architecture
+# On Windows:
+#   gem install mysql
+#       Choose the win32 build.
+#       Install MySQL and put its /bin directory on your path.
+#
+# And be sure to use new-style password hashing:
+#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
+---
+development: &defaults
+  adapter: mysql
+  encoding: utf8
+  reconnect: false
+  database: #{project_name}_development
+  pool: 5
+  username: root
+  password:
+  socket: /tmp/mysql.sock
+ 
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<:       *defaults
+  database: #{project_name}_test
+ 
+production:
+  <<:       *defaults
+  database: #{project_name}_production
+}
+end
+
+FileUtils.copy "config/database.yml", "config/database.yml.example"

data/lib/beet.rb

@@ -2,7 +2,6 @@
 require 'beet/execution'
 require 'beet/file_system'
 require 'beet/interaction'
-require 'beet/logging'
 require 'beet/capistrano'
 require 'beet/rails'
 require 'beet/scm'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jackdempsey-beet
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 00:00:00 -07:00
+date: 2009-05-21 00:00:00 -07:00
 default_executable: beet
 dependencies: []
 
@@ -36,13 +36,14 @@ files:
 - lib/beet/executor.rb
 - lib/beet/file_system.rb
 - lib/beet/interaction.rb
-- lib/beet/logging.rb
+- lib/beet/logger.rb
 - lib/beet/rails.rb
 - lib/beet/scm.rb
 - lib/beet/scm/git.rb
 - lib/beet/scm/svn.rb
 - lib/beet/templates/rails/authlogic.rb
 - lib/beet/templates/rails/clean_files.rb
+- lib/beet/templates/rails/db/mysql.rb
 - lib/beet/templates/rails/git.rb
 - lib/beet/templates/rails/jquery.rb
 - spec/beet_spec.rb

data/lib/beet/logging.rb

@@ -1,14 +0,0 @@
-require 'logger'
-module Beet
-  module Logging
-
-    def log(action, message = '')
-      logger.debug("#{action}: #{message}")
-    end
-
-    def logger
-      @logger ||= Logger.new(STDOUT)
-    end
-
-  end
-end