doozer 0.2.6 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.3.0

data/doozer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{doozer}
-  s.version = "0.2.6"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["grippy"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2009-10-29}
   s.default_executable = %q{doozer}
   s.description = %q{This GEM provides a small, barebones framework for creating MVC Rack applications.}
   s.email = %q{gmelton@whorde.com}
@@ -57,8 +57,10 @@ Gem::Specification.new do |s|
      "lib/doozer/scripts/cluster.rb",
      "lib/doozer/scripts/console.rb",
      "lib/doozer/scripts/migrate.rb",
+     "lib/doozer/scripts/plugin.rb",
      "lib/doozer/scripts/task.rb",
      "lib/doozer/scripts/test.rb",
+     "lib/doozer/task.rb",
      "lib/doozer/version.rb",
      "lib/doozer/view_helpers.rb",
      "lib/doozer/watcher.rb",
@@ -77,9 +79,11 @@ Gem::Specification.new do |s|
      "templates/skeleton/config/environment.rb",
      "templates/skeleton/config/rack.rb",
      "templates/skeleton/config/routes.rb",
+     "templates/skeleton/gems/plugins/init.rb",
      "templates/skeleton/script/cluster",
      "templates/skeleton/script/console",
      "templates/skeleton/script/migrate",
+     "templates/skeleton/script/plugin",
      "templates/skeleton/script/task",
      "templates/skeleton/script/test",
      "templates/skeleton/static/404.html",

data/lib/doozer.rb

@@ -27,6 +27,7 @@ module Doozer
     autoload :Route,        "doozer/exceptions"
   end
   
+  autoload :Task,           "doozer/task"
   autoload :ViewHelpers,    "doozer/view_helpers"
   autoload :Version,        "doozer/version"
   

data/lib/doozer/app.rb

@@ -15,7 +15,7 @@ module Doozer
       # attach the file watcher for the mvc/lib/etc in development mode
       load_watcher if Doozer::Configs.rack_env != :deployment
       
-      printf "Doozer racked up...\n"
+      puts "=> Doozer racked up"
     end
     
     # This method is called along the rackup chain and maps the request path to the route, controller, and view for the format type.
@@ -121,7 +121,7 @@ module Doozer
     def load_files
       # load models
       load_models
-      printf "Caching files...\n"
+      puts "=> Caching files"
       @@controllers = {}
       @@layouts={}
       @@views={}
@@ -223,7 +223,7 @@ module Doozer
     
     # Load all application models in app/models
     def load_models
-      printf "Loading models...\n"
+      puts "=> Loading models"
       Dir.glob(File.join(app_path,'app/models/*.rb')).each { | model | 
         require model 
       }
@@ -235,7 +235,7 @@ module Doozer
     def load_watcher
       require 'doozer/watcher'
       
-      printf "All along the watchtower...\n"
+      puts "=> Watching files for changes"
       watcher = FileSystemWatcher.new()
       
       # watcher.addDirectory(File.join(File.dirname(__FILE__),'../doozer/'), "*.rb")

data/lib/doozer/configs.rb

@@ -15,8 +15,8 @@ module Doozer
    
    # Load all the config files for the application. Also instantiates a default application Logger.
    def self.load(rack_env)
-      printf "Application path: #{app_path}\n" 
-      printf "Loading configs for #{rack_env}\n"
+      puts "=> App path #{app_path}" 
+      puts "=> Loading configs for #{rack_env}"
       
       @@config = Config::CONFIG
       rack_env = (rack_env.kind_of? String) ? rack_env.to_sym : rack_env
@@ -37,18 +37,16 @@ module Doozer
       end
 
       @@config[:rack_env] = rack_env
-      # p ":rack_env set to #{@@config[:rack_env]}"
-
       begin
        @@config[:database] = Configs.symbolize_keys( YAML.load(File.read(File.join(app_path,'config/database.yml'))) )
       rescue
-       printf "--Failed to load config/database.yml \n"
+       puts "ERROR => Failed to load config/database.yml"
       end
 
       begin
        @@config[:app] = Configs.symbolize_keys( YAML.load(File.read(File.join(app_path,'config/app.yml'))) )
       rescue
-       printf "--Failed to load config/app.yml\n"
+       puts "ERROR => Failed to load config/app.yml"
       end
 
    end
@@ -133,8 +131,8 @@ module Doozer
    def self.app_name
      self.app["name"] || ""
    end
-      
-   # Return the app name
+   
+   # Return the static root
    def self.static_root
      self.app["static_root"] || ""
    end

data/lib/doozer/initializer.rb

@@ -5,10 +5,12 @@ module Doozer
   # Calling boot initializes Doozer in the following order:
   # 1. Doozer::Configs
   # 2. require ORM
-  # 3. require root/config/environment.rb
-  # 4. call after_orm_init
-  # 5. require Doozer::App
-  # 6. call before_rackup_init
+  # 3. require app_path/config/environment.rb
+  # 4. call Doozer::Initializer.after_orm_init
+  # 5. call Doozer.init_after_orm_gems - initialized in app_path/gems/plugins/init.rb
+  # 6. call Doozer.init_after_orm_plugins - initialized in app_path/gems/plugins/init.rb
+  # 7. require Doozer::App
+  # 8. call Doozer::Initializer.before_rackup_init
   class Initializer
     @@after_orm = []
     @@before_rackup = []
@@ -30,6 +32,12 @@ module Doozer
       #--call the after_orm_init features
       Doozer::Initializer.after_orm_init
 
+      #--load the after orm gems
+      Doozer.init_after_orm_gems
+      
+      #--load the after orm plugins
+      Doozer.init_after_orm_plugins
+
       #--load app
       require 'doozer/app'
 
@@ -53,7 +61,7 @@ module Doozer
 
     # Requires the root/config/environment.rb hooks. 
     #
-    # This is where you can place your code to initialize additional plugins for models, extend ruby, or whatever else yor app requires.
+    # This is where you can place your code to initialize additional plugins for models, extend ruby, or whatever else your app requires.
     # 
     #=== Example environment.rb
     # Time::DATE_FORMATS[:month_and_year] = "%B %Y"
@@ -88,7 +96,7 @@ module Doozer
     
     # Primary hook for adding/overriding Doozer::ViewHelpers methods. Code block is pushed onto an array which allows for multiple hooks throughtout different files.
     #
-    # &block - code to execute after prior to Doozer.App.new being intialized. 
+    # &block - code to execute prior to Doozer.App.new being intialized. 
     def self.before_rackup(&block)
       @@before_rackup.push(block) if block_given?
     end

data/lib/doozer/lib.rb

@@ -12,8 +12,9 @@ module Doozer
         }
         klass = parts.join('')
       else
-        klass.capitalize!
+        klass = klass.capitalize
       end
+      return klass
     end
     
     #Returns a one-level deep folder/file structure and preservers underscores for filename. 

data/lib/doozer/orm/active_record.rb

@@ -15,8 +15,7 @@ module Doozer
       config[:reconnect] = db_config["reconnect"] if db_config["reconnect"]
       
       ActiveRecord::Base.establish_connection(config)
-      printf "ORM: #{Doozer::Configs.orm()} initialized...\n"
-      # printf "ORM: logging initialized"
+      puts "=> #{Doozer::Configs.orm()} initialized"
       ActiveRecord::Base.logger = Doozer::Configs.logger
     end
     

data/lib/doozer/orm/data_mapper.rb

@@ -12,7 +12,7 @@ module Doozer
         :password => db_config["password"],
         :host     => db_config["host"]
       })
-      printf "ORM: #{Doozer::Configs.orm()} initialized...\n"
+      puts "=> #{Doozer::Configs.orm()} initialized"
       DataMapper::Logger.new(STDOUT, :debug)
     end
     

data/lib/doozer/orm/sequel.rb

@@ -12,7 +12,7 @@ module Doozer
         :password => db_config["password"],
         :host     => db_config["host"]
       }) 
-      printf "ORM: #{Doozer::Configs.orm} initialized...\n"
+      puts "=> #{Doozer::Configs.orm()} initialized"
     end
     
     def self.after_request; end

data/lib/doozer/partial.rb

@@ -56,7 +56,7 @@ module Doozer
           partial = Doozer::Partial.new(erb, locals, route)
           partial.bind()
       else
-        printf "--no partial exists for #{file}\n"
+        puts "ERROR => no partial exists for #{file}\n"
       end
     end
     
@@ -81,7 +81,7 @@ module Doozer
         # TODO: throw error if doesn't exist
         @@partials[name] = ERB.new(results.join(""))
       rescue
-        printf "sorry couldn't load partial #{name} (#{file}) \n"
+        puts "ERROR => sorry couldn't load partial #{name} (#{file})"
       end
     end    
     

data/lib/doozer/route.rb

@@ -25,7 +25,7 @@ module Doozer
         # sort routes here
         @@parts.sort! do |a, b| a[1].length <=> b[1].length end
         @@parts.reverse!
-        printf "Routes drawn and sorted...\n"
+        puts "=> Routes drawn and sorted"
         # @@parts.each { | i | p i[1] }
       end
       

data/lib/doozer/scripts/cluster.rb

@@ -7,6 +7,7 @@
 # -C command (start || stop || restart || test)
 # -E environment (default: development || deployment)
 # -D (daemonize) - This is automatically initialized in deployment mode. There should be no need to pass this unless you want to test it out in development mode.
+# -c config file - This is used to pass a config file for starting up unicorn
 # -h Hellllpppp!!!
 require 'optparse'
 
@@ -32,7 +33,7 @@ end
 # Automatically starts a test instance of your appserver on http://localhost:5000. (No -E flag is required for this command).
 def test
   cmd = "rackup #{@test_config}" 
-  printf "Command: #{cmd} -p 5000 -E test -o 127.0.0.1\n"
+  puts "=> #{cmd} -p 5000 -E test -o 127.0.0.1"
   system(cmd)
 end
 
@@ -40,23 +41,23 @@ end
 #
 # <b>deployment</b>: Automatically starts a new instance of your appserver for each defined cluster address:port
 def start
-  printf "Starting clusters...\n"
+  puts "Starting clusters..."
   for app in @apps
     if @env == :deployment
       #need to check if application has a pid file so we don't start
       pid_file = "#{APP_PATH}/log/doozer.#{app[:port]}.pid"
       raise "pid file already exists for #{pid_file}" if File.exist?(pid_file)
       cmd = "rackup #{@config} -p #{app[:port]} -E #{@env.to_s} -s #{@server} -o #{app[:ip]} #{@daemonize} -P #{pid_file}" 
-      printf "Command: #{cmd}\n"
+      puts "=> #{cmd}"
       system(cmd)
     else
       cmd = "rackup #{@config} -p #{app[:port]} -E #{@env.to_s} -s #{@server} -o #{app[:ip]}" 
-      printf "Command: #{cmd}\n"
+      puts "=> #{cmd}"
       system(cmd)
       break
     end
   end
-  printf "Did they start?\n"
+  puts "Did they start?"
   system("ps -aux | grep rackup")
 end
 
@@ -72,12 +73,12 @@ end
 #
 # See this page for details => http://unicorn.bogomips.org/SIGNALS.html
 def start_unicorn
-  printf "Starting unicorn... \n"
+  puts "Starting unicorn..."
   for app in @apps
     # unicorn
     @config_file = "-c #{@config_file}" if @config_file != ''
     cmd = "unicorn  -p #{app[:port]} -E #{@env.to_s} -o #{app[:ip]} #{@daemonize} #{@config_file} #{@config}"
-    printf "Command: #{cmd}\n"
+    puts "=> #{cmd}"
     system(cmd)
     break
   end
@@ -94,21 +95,21 @@ end
 # <b>deployment</b>: Automatically stops all instances of your appserver for each defined cluster address:port
 def stop
   system("ps -aux | grep rackup")
-  printf "Stoping clusters...\n"
+  puts "Stoping clusters..."
   for app in @apps
     if @env == :deployment
       pid_file = "#{APP_PATH}/log/doozer.#{app[:port]}.pid"
-      printf "Reading pid from #{pid_file}\n" 
+      puts "=> Reading pid from #{pid_file}" 
       if File.exist?(pid_file)
         File.open(pid_file, 'r'){ | f | 
           pid = f.gets.to_i
-          printf "Shutting down process #{pid}\n"
+          puts "=> Shutting down process #{pid}"
           system("kill -9 #{pid}")
 
         }
         File.delete(pid_file) 
       else
-        printf "pid file doesn't exist\n"
+        puts "ERROR => pid file doesn't exist"
       end
     end
   end

data/lib/doozer/scripts/migrate.rb

@@ -86,19 +86,18 @@ Doozer::Initializer.boot(@env)
 # need to grab all the current migrations. assumes there isn't a migration with 000_*_.rb
 migrations = [nil].concat( Dir.glob(File.join(APP_PATH,'db/*_*.rb')) )
 
-printf "Loading migration files\n"
-printf "Version: #{@version}\n"
-printf "Direction: #{@direction}\n"
+puts "Loading migration files..."
+puts "=> Version: #{@version}"
+puts "=> Direction: #{@direction}"
 
 if @version > 0
   file = migrations[@version]
   raise "Can't find file for this migration" if file.nil?
   require file
-  p "Migrating #{file}"
+  puts "=> Migrating #{file}"
   klass = file.split("/").last.gsub(/\.rb/,"").split('_')
   klass = Doozer::Lib.classify(klass.slice(1, klass.length).join('_'))
   obj = Object.const_get(klass)
-  
   case @direction
   when :up
     obj.up

data/lib/doozer/scripts/plugin.rb

@@ -0,0 +1,115 @@
+#= Plugin
+
+require 'optparse'
+@freeze = nil
+@path = nil
+@version = nil
+@force = false
+
+
+opts = OptionParser.new("", 24, ' ') { |opts|
+  opts.banner = "Usage:\n script/plugin -F gem -V version -f\n script/plugin -P path -V version -f"
+  opts.separator ""
+  opts.separator "Command options:"
+  
+  opts.on("-P", "--path PATH", "Turn the path into a plugin.\n\n Possible options:\n 1. git repos\n2. Local path") { | p |
+    @path = p
+  }
+
+  opts.on("-F", "--freeze gem", "Freeze gem to gems/doozer or gems/plugin directory if match is found. Use -V or --version to locate exact version") { | name |
+    @freeze = name
+  }
+
+  opts.on("-V", "--version VERSION", "version of the gem/path to freeze") { | v |
+    @version = v
+  }
+
+  opts.on("-f", "--force", "Remove current plugin before installing") {
+    @force = true
+  }
+
+  opts.on("-h", "--help", "Show help") do
+    puts opts
+    exit
+  end
+
+  opts.parse! ARGV
+}
+
+def git(path, version, force)
+  puts "Checking out remote git repo..."  
+  name = path.split('/').last.gsub(/\.git/,'')
+  name  += "-#{version}" if version
+  plugin_dir = "#{APP_PATH}/gems/plugins"
+  plugin = "#{plugin_dir}/#{name}"
+  puts "=> #{path} to #{plugin}"
+  system("rm -rf #{plugin}") if force
+  system("git clone #{path} #{plugin}")
+  if version
+    system("cd #{plugin}; git checkout #{version}")
+  end
+end
+
+def freeze(gem_name, version, force)
+  # locate the gem to freeze
+  puts "Freezing gem..."
+  path = `gem which #{gem_name} -a`
+  source = gem_name
+  if path.downcase.index('can\'t find')
+    puts path
+    exit
+  end
+  path.gsub!(/\n/, '')
+  gem_path = nil
+  if version
+    name = "#{gem_name}-#{version}"
+    # check if the return from the which statement is actually the correct gem
+    if path.index(name)
+      gem_path=path.split(name)[0]
+    else
+      # attempt to locate the gem+version specified
+      gem_path = path.split(gem_name)[0]
+      if not File.directory?("#{gem_path}#{name}")
+        puts "=> Can't find #{gem_path}#{name}"
+        system("gem list #{gem_name}")
+        exit
+      end
+    end
+    gem_name = name
+  end
+  if gem_path.nil?
+    parts = path.split(gem_name)
+    gem_path = parts[0]
+    gem_name += parts[1].split('/')[0]    
+  end
+  gem_path += gem_name
+  copy(gem_path, force)
+end
+
+def copy(path, force)
+  if File.directory?("#{path}")
+    cp_to_path = "#{APP_PATH}/gems/"
+    if path.index('doozer')
+      cp_to_path += 'doozer'
+    else
+      cp_to_path += 'plugins'
+    end
+    puts "=> Copying: #{path}..."
+    puts "=>  To: #{cp_to_path}"
+    system("cp -R #{'-f' if force} #{path} #{cp_to_path}")
+    puts "=> Completed!"
+    puts "=> Don't forget to initialize your plugin in gems/plugins/init.rb"
+  else
+    puts "ERROR => #{path} doesn't appear to be a valid path"
+  end
+end
+
+if @freeze
+  freeze(@freeze, @version, @force)
+elsif @path
+  if @path.index('.git')
+    git(@path, @version, @force)
+  else
+    copy(@path, @force)
+  end
+end

data/lib/doozer/scripts/task.rb

@@ -1,19 +1,26 @@
 #= Tasks
 # This file is required in script/task.
 # Add files to /tasks where the specified task_name contains a class with TaskName and a 'run' class method.
-# Running a task automatically loads Doozer::Config and the specified ORM. You must require all other files your tasks require beyond these.
+# Running a task automatically loads Doozer::Config and the specified ORM. 
 # Navigate to your app root and run it with the following commands.
 #
 # script/clusters 
 # -T task_name
 # -E environment (default: development || deployment)
+# -A args
 # -h Hellllpppp!!!
 #
 #== Example
 # Suppose you have this file tasks/who_rocks.rb
 #
 # class WhoRocks
-#   def self.run
+#   def description
+#   """ description """
+#   end
+#   def help
+#   """ help me! """
+#   end
+#   def run
 #    p "You Do!"
 #   end
 # end
@@ -22,6 +29,8 @@
 require 'optparse'
 @env = :development
 @task = nil
+@args = nil
+@help = false
 
 opts = OptionParser.new("", 24, ' ') { |opts|
   opts.banner = "Usage: script/task -T task_name -E (default: development || deployment || test)"
@@ -36,25 +45,45 @@ opts = OptionParser.new("", 24, ' ') { |opts|
     @task = t
   }
 
-  opts.on_tail("-h", "--help", "Show this message") do
-    puts opts
-    exit
+  opts.on("-A", "--args ARGS", "args") { |a|
+    @args = eval(a) if a and a.length
+  }
+
+  opts.on("-h", "--help", "Show this message") do
+    @help = true
   end
 
   opts.parse! ARGV
 }
 
-raise "Missing task_name" if @task.nil?
-
-#--boot it up
-Doozer::Initializer.boot(@env)
+def file_to_task(f, args=nil)
+  require f
+  file_name = f.split("/").last.gsub(/\.rb/,"")
+  klass = Doozer::Lib.classify(file_name)
+  return Object.const_get(klass).new(args), file_name
+end
 
 if @task
   file = File.join(APP_PATH, "tasks/#{@task}.rb")
   raise "Can't find this task file #{@task}" if file.nil?
-  p "Running #{@task}"
-  klass = file.split("/").last
-  require file
-  klass = Doozer::Lib.classify(klass.gsub(/\.rb/,""))
-  Object.const_get(klass).run
+  task, file_name = file_to_task(file, @args)
+  if not @help
+    puts "Running #{@task}.."
+    Doozer::Initializer.boot(@env)
+    task.run
+  else
+    puts ""
+    puts "Task\n  #{@task}\n"
+    puts "Description\n #{task.description}\n"
+    puts "Help\n  #{task.help}\n"
+  end
+elsif @help
+  puts opts;
+  puts "Loading all tasks.."
+  puts "Task | Description"
+  tasks = Dir.glob(File.join(APP_PATH,'tasks/*.rb'))
+  tasks.each { | f |
+    task, file_name = file_to_task(f, nil)
+    puts "=> #{file_name}: #{task.description}"
+  }
 end

data/lib/doozer/task.rb

@@ -0,0 +1,11 @@
+
+module Doozer
+  class Task
+    def initialize(args=nil)
+      @args = args
+    end
+    def name; return self.class.to_s end
+    def help; end
+    def run; end
+  end
+end

data/lib/doozer/version.rb

@@ -1,8 +1,8 @@
 module Doozer
   module Version
     MAJOR=0
-    MINOR=2
-    PATCH=6
+    MINOR=3
+    PATCH=0
     STRING=[MAJOR, MINOR, PATCH].join('.')
   end
 end

data/lib/doozer/view_helpers.rb

@@ -126,6 +126,13 @@ module Doozer
       Doozer::Configs.static_url(path)
     end
 
+    # Render the page title
+    #
+    # retuns page title if it was set in a controller
+    def title
+      return @view[:title] ? @view[:title] : ""
+    end
+
     # Creates metatags
     #
     # retuns a differnt metatag for each key/value added to @view[:meta] hash. See Doozer::Controller#meta for adding examples.

data/lib/generator/generator.rb

@@ -68,7 +68,7 @@ module Doozer
             help_all
           end
         elsif ['-v', '--version'].include?(action)
-          p "Doozer #{Doozer::Version::STRING}"
+          puts "Doozer #{Doozer::Version::STRING}"
         else
           help_all
         end
@@ -76,8 +76,8 @@ module Doozer
     end
     
     def self.help_all
-      printf "Doozer Version: #{Doozer::Version::STRING}\n"
-      printf "Doozer commands:\n"
+      puts "Doozer Version: #{Doozer::Version::STRING}"
+      puts "Commands"
       help(:project)
       help(:model)
       help(:view)
@@ -89,10 +89,10 @@ module Doozer
     
     def self.controller(name)
       return if help?(name, :controller) 
-      printf "Generating File(s)..."
+      puts "Generating File(s)..."
       path = "#{APP_PATH}/app/controllers/#{name.downcase}_controller.rb"
       if not File.exist?(path)
-        p "-- Generating Controller: #{path}"
+        puts "=> Generating controller: #{path}"
         file = File.new(path, "w+")
         if file
             template = "class #{Doozer::Lib.classify(name)}Controller < ApplicationController\nend"
@@ -100,33 +100,33 @@ module Doozer
             #make the view directory for this controller
             path = "#{APP_PATH}/app/views/#{name.downcase}"
             if not File.exist?(path)
-                p "-- Generating View Folder: #{path}"
+                puts "=> Generating view folder: #{path}"
                 FileUtils.mkdir path
             end
         else
-           p "Unable to open file!"
+           puts "ERROR => Unable to open file!"
         end
       else
-        p "-- Skipping: #{path} (already exists)"
+        puts "Skipping: #{path} (already exists)"
       end      
     end
 
     def self.model(orm, name)
       return if help?(name, :model)       
       raise "No ORM is defined. Please set this in database.yml" if orm.nil?
-      p "Loaded ORM: #{orm}"        
+      puts "=> Loaded ORM: #{orm}"        
       path = "#{APP_PATH}/app/models/#{name}.rb"
       if not File.exist?(path)
-        p "-- Generating Model: #{path}"
+        puts "=> Generating model: #{path}"
         file = File.new(path, "w+")
         if file
            template = eval("model_#{orm}('#{name}')")
            file.syswrite(template)
         else
-           p "Unable to open file!"
+           puts "ERROR => Unable to open file!"
         end
       else
-        p "-- Skipping: #{path} (already exists)"
+        puts "Skipping: #{path} (already exists)"
       end
     end
     def self.model_active_record(name)
@@ -156,15 +156,15 @@ end
 
     def self.view(view, formats)
       return if help?(view, :view) 
-      printf "Generating View File(s)..."
+      puts "Generating View File(s)..."
       raise "Not sure which controller to associate this view with. Needs to be controller_name/action_name. Example: index/login" if not view.index('/')
       formats.each{|f|
         file="#{APP_PATH}/app/views/#{view}.#{f.strip}.erb"
         if not File.exist?(file)
-          p "-- Generating: #{file}"
+          puts "=> Generating view: #{file}"
           FileUtils.touch file
         else
-          p "-- Skipping: #{file} (already exists)"
+          puts "Skipping: #{file} (already exists)"
         end
       }
     end
@@ -174,19 +174,19 @@ end
     
       raise "No ORM is defined. Please set this in database.yml" if orm.nil?      
       version = migrate_next
-      p "Loaded ORM: #{orm}"
+      puts "=> Loaded ORM: #{orm}"
       path = "#{APP_PATH}/db/#{version}_#{name.downcase}.rb"
       if not File.exist?(path)
-        p "-- Generating Migration: #{path}"
+        puts "=> Generating migration: #{path}"
         file = File.new(path, "w+")
         if file
            template = eval("migrate_#{orm}('#{name}')")
            file.syswrite(template)
         else
-           p "Unable to open file!"
+           puts "ERROR => Unable to open file!"
         end
       else
-        p "-- Skipping: #{path} (already exists)"
+        puts "Skipping: #{path} (already exists)"
       end
     end
     def self.migrate_next
@@ -251,36 +251,46 @@ end
     
     def self.task(name)
       return if help?(name, :task)
-      p "Generating file..."        
+      puts "Generating file..."        
       path = "#{APP_PATH}/tasks/#{name}.rb"
       if not File.exist?(path)
-        p "-- Generating Task: #{path}"
+        puts "=> Generating task: #{path}"
         file = File.new(path, "w+")
         if file
            klass = Doozer::Lib.classify(name)
            template = """
 #= Task #{klass}
-class #{klass}
-  def self.run
-      #place your task here
+#
+class #{klass} < Doozer::Task
+  def description
+    \"\"\"Place your task description here\"\"\"
+  end
+
+  def help
+    \"\"\"Place your task help here\"\"\"
+  end
+
+  def run
+    # Place your task here
+    # @args holds evaluated args string
   end
 end
 """
            file.syswrite(template)
         else
-           p "Unable to open file!"
+           puts "ERROR => Unable to open file!"
         end
       else
-        p "-- Skipping: #{path} (already exists)"
+        puts "Skipping: #{path} (already exists)"
       end
     end
 
     def self.helper(name)
       return if help?(name, :helper)
-      p "Generating file..."        
+      puts "Generating file..."
       path = "#{APP_PATH}/app/helpers/#{name}_helper.rb"
       if not File.exist?(path)
-        p "-- Generating Helper: #{path}"
+        puts "=> Generating helper: #{path}"
         file = File.new(path, "w+")
         if file
            klass = Doozer::Lib.classify(name)
@@ -291,16 +301,16 @@ end
 """
            file.syswrite(template)
         else
-           p "Unable to open file!"
+           puts "ERROR => Unable to open file!"
         end
       else
-        p "-- Skipping: #{path} (already exists)"
+        puts "Skipping: #{path} (already exists)"
       end
     end
     
     def self.help?(name, action=nil)
       if name.to_sym == :"-h" or name == :help
-        printf "doozer commands:\n"
+        puts "Commands:"
         help(action)
         return true
       end
@@ -346,7 +356,7 @@ Task - Create a task file in project/tasks with the class name of TaskName.
     Command: doozer generate (task or -T) task_name 
     Example: doozer generate task task_name\n"""
       end
-      printf h
+      puts h
     end
 
     # TODO: Dry this up...
@@ -354,84 +364,84 @@ Task - Create a task file in project/tasks with the class name of TaskName.
     
       # create application skeleton
       if not File.exist?(name)
-        p "Creating #{name}/"
+        puts "Creating #{name}/"
         system("mkdir #{name}")
       else
-        p "Skipping application directory (already exists)"
+        puts "Skipping application directory (already exists)"
       end
 
       #create app folder
       if not File.exist?("#{name}/app")
-        p "Creating app directory"
+        puts "=> Creating app directory"
         system("mkdir #{name}/app")
       else
-        p "Skipping #{name}/app directory (already exists)"
+        puts "Skipping #{name}/app directory (already exists)"
       end
       
       #copy controllers
       if not File.exist?("#{name}/app/controllers")
-        p "Creating #{name}/app/controllers directory and files"
+        puts "=> Creating #{name}/app/controllers directory and files"
         system("mkdir #{name}/app/controllers")
         system("cp #{skeleton_path 'app/controllers/*.rb'} #{name}/app/controllers")
       else
-        p "Skipping #{name}/app/controllers directory (already exists)"
+        puts "Skipping #{name}/app/controllers directory (already exists)"
       end
 
       #copy models
       if not File.exist?("#{name}/app/models")
-        p "Creating #{name}/app/models directory and files"
+        puts "=> Creating #{name}/app/models directory and files"
         system("mkdir #{name}/app/models")
       else
-        p "Skipping #{name}/app/models directory (already exists)"
+        puts "Skipping #{name}/app/models directory (already exists)"
       end
 
       #copy views
       if not File.exist?("#{name}/app/views")
-        p "Creating #{name}/app/views directory and files"
+        puts "=> Creating #{name}/app/views directory and files"
         system("mkdir #{name}/app/views")
       else
-        p "Skipping #{name}/app/views directory (already exists)"
+        puts "Skipping #{name}/app/views directory (already exists)"
       end
 
       #copy views/layouts
       if not File.exist?("#{name}/app/views/layouts")
-        p "Creating #{name}/app/views/layouts directory and files"
+        puts "=> Creating #{name}/app/views/layouts directory and files"
         system("mkdir #{name}/app/views/layouts")
         system("cp #{skeleton_path 'app/views/layouts/*.erb'} #{name}/app/views/layouts")
       else
-        p "Skipping #{name}/app/views/layouts directory (already exists)"
+        puts "Skipping #{name}/app/views/layouts directory (already exists)"
       end
 
       #copy views/index
       if not File.exist?("#{name}/app/views/index")
-        p "Creating #{name}/app/views/index directory and files"
+        puts "=> Creating #{name}/app/views/index directory and files"
         system("mkdir #{name}/app/views/index")
         system("cp #{skeleton_path 'app/views/index/*.erb'} #{name}/app/views/index")
       else
-        p "Skipping #{name}/app/views/index directory (already exists)"
+        puts "Skipping #{name}/app/views/index directory (already exists)"
       end
 
       #copy views/global
       if not File.exist?("#{name}/app/views/global")
-        p "Creating #{name}/app/views/global directory and files"
+        puts "=> Creating #{name}/app/views/global directory and files"
         system("mkdir #{name}/app/views/global")
         system("cp #{skeleton_path 'app/views/global/*.erb'} #{name}/app/views/global")
       else
-        p "Skipping #{name}/app/views/global directory (already exists)"
+        puts "Skipping #{name}/app/views/global directory (already exists)"
       end
 
       #copy helpers
       if not File.exist?("#{name}/app/helpers")
-        p "Creating #{name}/app/helpers directory and files"
+        puts "=> Creating #{name}/app/helpers directory and files"
         system("mkdir #{name}/app/helpers")
         system("cp #{skeleton_path 'app/helpers/*.rb'} #{name}/app/helpers")  
       else
-        p "Skipping #{name}/app/helpers directory (already exists)"
+        puts "Skipping #{name}/app/helpers directory (already exists)"
       end
 
       #copy configs
       if not File.exist?("#{name}/config")
-        p "Creating #{name}/config directory and files"
+        puts "=> Creating #{name}/config directory and files"
         system("mkdir #{name}/config")
         system("cp #{skeleton_path 'config/*.yml'} #{name}/config")
         system("cp #{skeleton_path 'config/*.rb'} #{name}/config")
@@ -444,102 +454,111 @@ Task - Create a task file in project/tasks with the class name of TaskName.
         boot = ERB.new(results.join(""))
         File.open("#{name}/config/boot.rb", 'w') {|f| f.write(boot.result(binding)) }
       else
-        p "Skipping #{name}/config directory (already exists)"
+        puts "Skipping #{name}/config directory (already exists)"
+      end
+
+      # create gems folder
+      if not File.exist?("#{name}/gems")
+        puts "=> Creating #{name}/gems directory"
+        system("cp -R #{skeleton_path 'gems'} #{name}")
+        system("mkdir #{name}/gems/doozer")
+      else
+        puts "Skipping #{name}/gems directory (already exists)"
       end
 
       # create log folder
       if not File.exist?("#{name}/log")
-        p "Creating #{name}/log directory"
+        puts "=> Creating #{name}/log directory"
         system("mkdir #{name}/log")
       else
-        p "Skipping #{name}/log directory (already exists)"
+        puts "Skipping #{name}/log directory (already exists)"
       end
 
       #copy db
       if not File.exist?("#{name}/db")
-        p "Creating #{name}/db directory and files"
+        puts "=> Creating #{name}/db directory and files"
         system("mkdir #{name}/db")
       else
-        p "Skipping #{name}/db directory (already exists)"
+        puts "Skipping #{name}/db directory (already exists)"
       end
 
       #copy lib
       if not File.exist?("#{name}/lib")
-        p "Creating #{name}/lib directory and files"
+        puts "=> Creating #{name}/lib directory and files"
         system("mkdir #{name}/lib")
       else
-        p "Skipping #{name}/lib directory (already exists)"
+        puts "Skipping #{name}/lib directory (already exists)"
       end
 
       #copy script
       if not File.exist?("#{name}/script")
-        p "Creating #{name}/script directory and files"
+        puts "=> Creating #{name}/script directory and files"
         system("mkdir #{name}/script")
         system("cp #{skeleton_path 'script/*'} #{name}/script")
       else
-        p "Skipping #{name}/script directory (already exists)"
+        puts "Skipping #{name}/script directory (already exists)"
       end
 
       #copy static
       if not File.exist?("#{name}/static")
-        p "Creating #{name}/static directory and files"
+        puts "=> Creating #{name}/static directory and files"
         system("mkdir #{name}/static")
         system("cp #{skeleton_path 'static/*.*'} #{name}/static/")
       else
-        p "Skipping #{name}/static directory (already exists)"
+        puts "Skipping #{name}/static directory (already exists)"
       end
 
       #copy static/images
       if not File.exist?("#{name}/static/images")
-        p "Creating #{name}/script/images directory and files"
+        puts "=> Creating #{name}/script/images directory and files"
         system("mkdir #{name}/static/images")
       else
-        p "Skipping #{name}/static/images directory (already exists)"
+        puts "Skipping #{name}/static/images directory (already exists)"
       end
 
       #copy static/css
       if not File.exist?("#{name}/static/css")
-        p "Creating #{name}/script/css directory and files"
+        puts "=> Creating #{name}/script/css directory and files"
         system("mkdir #{name}/static/css")
         system("cp #{skeleton_path 'static/css/*.css'} #{name}/static/css")
       else
-        p "Skipping #{name}/static/css directory (already exists)"
+        puts "Skipping #{name}/static/css directory (already exists)"
       end
 
       #copy static/images
       if not File.exist?("#{name}/static/html")
-        p "Creating #{name}/script/html directory and files"
+        puts "=> Creating #{name}/script/html directory and files"
         system("mkdir #{name}/static/html")
       else
-        p "Skipping #{name}/static/html directory (already exists)"
+        puts "Skipping #{name}/static/html directory (already exists)"
       end
 
       #copy static/images
       if not File.exist?("#{name}/static/js")
-        p "Creating #{name}/script/js directory and files"
+        puts "=> Creating #{name}/script/js directory and files"
         system("mkdir #{name}/static/js")
         system("cp #{skeleton_path 'static/js/*.js'} #{name}/static/js")
       else
-        p "Skipping #{name}/static/js directory (already exists)"
+        puts "Skipping #{name}/static/js directory (already exists)"
       end
 
       #copy test
       if not File.exist?("#{name}/test")
-        p "Creating #{name}/test directory and files"
+        puts "=> Creating #{name}/test directory and files"
         system("mkdir #{name}/test")
         system("cp #{skeleton_path 'test/*.rb'} #{name}/test")
         system("mkdir #{name}/test/fixtures")
         system("cp #{skeleton_path 'test/fixtures/*.rb'} #{name}/test/fixtures")
       else
-        p "Skipping test directory (already exists)"
+        puts "Skipping test directory (already exists)"
       end
 
       #copy test
       if not File.exist?("#{name}/tasks")
-        p "Creating #{name}/tasks directory and files"
+        puts "=> Creating #{name}/tasks directory and files"
         system("mkdir #{name}/tasks")
       else
-        p "Skipping #{name}/test directory (already exists)"
+        puts "Skipping #{name}/test directory (already exists)"
       end
 
       #copy rakefile

data/templates/skeleton/config/boot.erb

@@ -3,9 +3,58 @@ DOOZER_GEM_VERSION='<%=@version%>'
 require 'date'
 require 'rubygems'
 
-begin
-  gem 'doozer', "= #{DOOZER_GEM_VERSION}"
-  require 'doozer'
-rescue Gem::LoadError
-  raise "doozer-#{DOOZER_GEM_VERSION} gem not installed"
+module Doozer
+  class << self
+    @@after_orm_plugins = []
+    @@after_orm_gems = []
+    def load!
+      init_doozer
+      init_plugins
+    end
+    def init_doozer
+      path = "#{APP_PATH}/gems/doozer/doozer-#{DOOZER_GEM_VERSION}"
+      if File.exist?(path)
+        $:.unshift "#{path}/lib"
+        require "#{path}/lib/doozer"
+      else
+        begin
+          gem 'doozer', "= #{DOOZER_GEM_VERSION}"
+          require 'doozer'
+        rescue Gem::LoadError
+          raise "doozer-#{DOOZER_GEM_VERSION} gem not installed"
+        end
+      end
+    end
+    def init_plugins
+      begin
+        require 'gems/plugins/init'
+      rescue => e
+      end
+    end
+    def init_after_orm_plugins
+      @@after_orm_plugins.each { | p |
+        plugin(p[:folder], p[:init_file])
+      }
+    end
+    def init_after_orm_gems
+      @@after_orm_gems.each { | g |
+        require_gem(g[:name], g[:version])
+      }
+    end
+    def require_gem(name, version=nil)
+        gem name, version if not version.nil? 
+        require name
+    end
+    def require_gem_after_orm(name, version=nil)
+        @@after_orm_gems.push({:name=>name, :version=>version})
+    end
+    def plugin(folder, init_file)
+      $:.unshift "#{APP_PATH}/gems/plugins/#{folder}/lib"
+      require "#{APP_PATH}/gems/plugins/#{folder}/lib/#{init_file}"
+    end
+    def plugin_after_orm(folder, init_file)
+      @@after_orm_plugins.push({:folder=>folder, :init_file=>init_file})
+    end
+  end
 end
+Doozer.load!

data/templates/skeleton/config/environment.rb

@@ -1,6 +1,6 @@
 # This file is loaded right after orm is initialized and right before app, controllers and models
 # place code here which is used throughout the application
-printf "Loading Environment... \n"
+puts "=> Loading environment"
 
 Doozer::Initializer.after_orm do | config |
   # require 'doozer/plugins/paginate/init'

data/templates/skeleton/gems/plugins/init.rb

@@ -0,0 +1,26 @@
+"""
+There are a few different methods you can call to load plugins and gems from this file.
+
+1. Doozer.plugin('folder', 'init_file') - Instantly loads the plugin during the boot process.
+2. Doozer.plugin_after_orm('folder', 'init_file') - Delays loading the plugin until after the ORM is initialized.
+3. Doozer.require_gem('gem_name', 'version') - Instantly loads the gem during the boot process.
+4. Doozer.require_gem_after_orm('gem_name', 'version') - Delays loading the gem until after the ORM is initialized.
+
+To queue a plugin or gem to be loaded, follow these examples.
+
+  To load the following plugins:
+    gems/plugins
+                /plugin1
+                        /init.rb
+                /plugin2
+                        /init.rb
+
+    You would place the following method calls in this file:
+      Doozer.plugin('plugin1', 'init')
+      Doozer.plugin_after_orm('plugin2', 'init')
+
+  To load the following gems, follow these examples:
+    Doozer.require_gem('example', '= 0.1.0')
+    Doozer.require_gem_after_orm('example', '>= 0.1.0')
+
+"""

data/templates/skeleton/script/console

@@ -7,7 +7,7 @@ require boot
 @env = (ARGV.length > 0) ? ARGV[0] : 'development'
 ARGV.delete(@env) if ARGV.include?(@env)
 @env = @env.to_sym
-printf "[Doozer #{Doozer::Version::STRING}]\n"
+puts "[Doozer #{Doozer::Version::STRING}]"
 # see http://ruby-doc.org/core/ for more options
 IRB.conf[:LOAD_MODULES] = ["irb/completion", boot, "#{DOOZER_PATH}/doozer/scripts/console"]
 IRB.conf[:USE_READLINE] = true

data/templates/skeleton/script/plugin

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = Dir.pwd
+require File.join(APP_PATH, 'config/boot')
+require File.join(DOOZER_PATH, 'doozer/scripts/plugin')

data/test/project/config/environment.rb

@@ -1,6 +1,6 @@
 # This file is loaded right after orm is initialized and right before app, controllers and models
 # place code here which is used throughout the application
-printf "Loading Environment... \n"
+puts "=> Loading environment"
 
 Doozer::Initializer.after_orm do | config |
   # require 'doozer/plugins/paginate/init'

data/test/project/script/console

@@ -6,7 +6,7 @@ require File.join(APP_PATH, 'config/boot')
 @env = (ARGV.length > 0) ? ARGV[0] : 'development'
 ARGV.delete(@env) if ARGV.include?(@env)
 @env = @env.to_sym
-printf "[Doozer #{Doozer::Version::STRING}]\n"
+puts "[Doozer #{Doozer::Version::STRING}]"
 # see http://ruby-doc.org/core/ for more options
 IRB.conf[:LOAD_MODULES] = ["irb/completion", "#{DOOZER_PATH}/doozer/scripts/console"]
 IRB.conf[:USE_READLINE] = true

data/test/test_helper.rb

@@ -9,7 +9,7 @@ require 'doozer'
 class RoutingHelper < Test::Unit::TestCase
   
   def setup
-    printf "\n Routing Helper setup... \n"
+    puts "=> Routing helper setup"
     @app_path = File.join(File.dirname(__FILE__), 'project')
     
     #--boot

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doozer
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors: 
 - grippy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -07:00
+date: 2009-10-29 00:00:00 -07:00
 default_executable: doozer
 dependencies: []
 
@@ -61,8 +61,10 @@ files:
 - lib/doozer/scripts/cluster.rb
 - lib/doozer/scripts/console.rb
 - lib/doozer/scripts/migrate.rb
+- lib/doozer/scripts/plugin.rb
 - lib/doozer/scripts/task.rb
 - lib/doozer/scripts/test.rb
+- lib/doozer/task.rb
 - lib/doozer/version.rb
 - lib/doozer/view_helpers.rb
 - lib/doozer/watcher.rb
@@ -81,9 +83,11 @@ files:
 - templates/skeleton/config/environment.rb
 - templates/skeleton/config/rack.rb
 - templates/skeleton/config/routes.rb
+- templates/skeleton/gems/plugins/init.rb
 - templates/skeleton/script/cluster
 - templates/skeleton/script/console
 - templates/skeleton/script/migrate
+- templates/skeleton/script/plugin
 - templates/skeleton/script/task
 - templates/skeleton/script/test
 - templates/skeleton/static/404.html