mack 0.4.2.1 → 0.4.5

data/CHANGELOG

@@ -1,3 +1,22 @@
+===0.4.5
+* Removed boot.rb file. It was unnecessary.
+* When a new Mack application is generated the Rakefile that gets generated is stamped with the Mack gem version used to create it. This ties the project to that gem. This can, of course, be upgraded as new Mack gems come out, but it's a good way of tying your app to a specific revision of Mack.
+* Added support for migrations for both ActiveRecord and DataMapper. DataMapper migration support requires DataMapper 0.3.0 gem. Please keep in mind, though, that DataMapper 0.3.0 has a serious bug in it, which may prevent you from using it. Please see http://www.mackframework.com/2008/04/09/horrible-bug-in-datamapper-030/ for more information.
+* Rewrote distributed routing support to use Rinda inside of plain old DRb. This makes for an almost zero configuration usage.
+* Added: mack_ring_server binary to start a Rinda ring server for use with distributed routing.
+* Sqlite3 is now the default database for Mack applications configured with ORM support.
+* Added a test helper method, rake_task, to aid in the testing of Rake tasks.
+* Added: rake db:migrate
+* Added: rake db:abort_if_pending_migrations
+* Added: rake db:rollback
+* Added: rake db:version
+* Added: rake mack:ring_server:start
+* Added: rake mack:ring_server:stop
+* Added: rake mack:ring_server:restart
+* Added: rake mack:ring_server:services:list
+* gem: application_configuration 1.2.2
+* gem: daemons 1.0.10
+
 ===0.4.2.1
 * Fixed bug with gems:list rake task that was looking in the wrong path for the gems.rb file.
 
@@ -7,7 +26,7 @@
 * Added gems:list and gems:install rake tasks. The gems:list task will list any gems being required for the application. The gems:install task will install all the gems being required for the application.
 * Filters in controllers can now be inherited from parent controller classes.
 * gem: mack_ruby_core_extensions 0.1.5
-* gem: thing 0.7.1
+* gem: thin 0.7.1
 
 ===0.4.1
 * Improved testing support.

data/README

@@ -10,6 +10,9 @@ Mack is also about performance. Because Mack uses technologies like Thin[http://
 ==Getting Started
 First things first, let's generate your application:
   $ mack <app_name>
+  
+If you'd like to configure your application to use an ORM, then when you generate it, use the following command:
+  $ mack <app_name> -o <data_mapper|active_record>
 
 To run a Mack application:
   $ rake script:server

data/bin/mack

@@ -24,6 +24,10 @@ opts.parse!(ARGV)
 
 include FileUtils
 
+def mack_version
+  "0.4.5"
+end
+
 def create_dir(dir)
   mkdir_p(dir)
   puts "Created: #{dir}"
@@ -59,4 +63,4 @@ erb_files.each do |fl|
   end
 end
 
-cp(File.join(File.dirname(__FILE__), "templates", "public", "favicon.ico"), File.join(app, "public", "favicon.ico"))
+cp(File.join(File.dirname(__FILE__), "templates", "public", "favicon.ico"), File.join(app, "public", "favicon.ico"))

data/bin/mack_ring_server

@@ -0,0 +1,15 @@
+#!/usr/local/bin/ruby
+require 'rubygems'
+require 'daemons'
+require 'rinda/ring'
+require 'rinda/tuplespace'
+require 'fileutils'
+
+FileUtils.mkdir_p(File.join("tmp", "pids"))
+
+Daemons.run_proc('mack_ring_server', {:dir_mode => :normal, :dir => File.join("tmp", "pids"), :monitor => true, :multiple => false}) do
+  puts 'Starting mack_ring_server...'
+  DRb.start_service
+  Rinda::RingServer.new(Rinda::TupleSpace.new)
+  DRb.thread.join
+end                                                                                                                                                          

data/bin/templates/Rakefile.template

@@ -2,5 +2,5 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-gem 'mack'
+gem 'mack', '<%= mack_version %>'
 require 'mack_tasks'

data/bin/templates/config/database.yml.template

@@ -1,20 +1,32 @@
+# development:
+#   adapter: mysql
+#   database: <%= app.downcase %>_development
+#   host: localhost
+#   username: root
+#   password: 
+#     
+# test:
+#   adapter: mysql
+#   database: <%= app.downcase %>_test
+#   host: localhost
+#   username: root
+#   password:
+# 
+# production:
+#   adapter: mysql
+#   database: <%= app.downcase %>_production
+#   host: localhost
+#   username: root
+#   password:
+
 development:
-  adapter: mysql
-  database: <%= app.downcase %>_development
-  host: localhost
-  username: root
-  password: 
-    
+  adapter: sqlite3
+  database: db/<%= app.downcase %>_development.db 
+
 test:
-  adapter: mysql
-  database: <%= app.downcase %>_test
-  host: localhost
-  username: root
-  password:
+  adapter: sqlite3
+  database: db/<%= app.downcase %>_test.db 
 
 production:
-  adapter: mysql
-  database: <%= app.downcase %>_production
-  host: localhost
-  username: root
-  password:
+  adapter: sqlite3
+  database: db/<%= app.downcase %>_production.db 

data/lib/distributed/routing/urls.rb

@@ -4,45 +4,32 @@ module Mack
       # A class used to house the Mack::Routes::Url module for distributed applications.
       # Functionally this class does nothing, but since you can't cache a module, a class is needed.
       class Urls
+        include DRbUndumped
         
         def initialize(dsd) # :nodoc:
           @dsd = dsd
-          @url_method_list = {}
         end
         
-        # def add_url_method(key, meth)
-        #   @url_method_list[key.to_sym] = meth
-        # end
+        def put
+          Mack::Distributed::Utils::Rinda.register_or_renew(:space => app_config.mack.distributed_app_name.to_sym, 
+                                                            :klass_def => :distributed_routes, 
+                                                            :object => self)
+        end
         
-        def []=(key, method)
-          @url_method_list[key.to_sym] = method
-          @runner = nil
+        def run(meth, options)
+          self.send(meth, options)
         end
         
-        def run
-          if @runner.nil?
-            klass_name = String.randomize(40).downcase.camelcase
-            meths = ""
-            @url_method_list.each_pair {|k,v| meths += v + "\n\n"}
-            eval %{
-              class Mack::Distributed::Routes::Temp::M#{klass_name}
-                include Mack::Routes::Urls
-                def initialize(dsd)
-                  @dsd = dsd
-                end
-                #{meths}
-              end
-            }
-            @runner = "Mack::Distributed::Routes::Temp::M#{klass_name}".constantize.new(@dsd)
+        class << self
+          
+          def get(app_name)
+            Mack::Distributed::Utils::Rinda.read(:space => app_name.to_sym, :klass_def => :distributed_routes)
           end
-          @runner
+          
         end
         
       end # Urls
       
-      module Temp # :nodoc:
-      end # Temp
-      
     end # Routes
   end # Distributed
 end # Mack

data/lib/distributed/utils/rinda.rb

@@ -0,0 +1,45 @@
+module Mack
+  module Distributed
+    module Utils
+      module Rinda
+        
+        def self.register_or_renew(options = {})
+          options = handle_options(options)
+          ::DRb.start_service
+          begin
+            ring_server.take([options[:space], options[:klass_def], nil, nil], options[:timeout])
+          rescue Exception => e
+            puts e.message
+          end
+          register(options)
+        end
+        
+        def self.register(options = {})
+          options = handle_options(options)
+          ::DRb.start_service
+          ring_server.write([options[:space], 
+                             options[:klass_def], 
+                             options[:object], 
+                             options[:description]], 
+                            ::Rinda::SimpleRenewer.new)
+        end
+        
+        def self.ring_server
+          rs = ::Rinda::RingFinger.primary
+          rs
+        end
+        
+        def self.read(options = {})
+          options = handle_options(options)
+          ring_server.read([options[:space], options[:klass_def], nil, options[:description]], options[:timeout])[2]
+        end
+        
+        private
+        def self.handle_options(options = {})
+          {:space => :name, :klass_def => nil, :object => nil, :description => nil, :timeout => app_config.mack.drb_timeout}.merge(options)
+        end
+        
+      end
+    end
+  end
+end

data/lib/errors/errors.rb

@@ -100,5 +100,14 @@ module Mack
       end
     end
     
+    # Raised if there are migrations that need to be run before a task is performed.
+    class UnrunMigrations < StandardError
+      # Taks the number of migrations that need to be run.
+      def initialize(number)
+        super("You currently have #{number} #{number == 1 ? "migration" : "migrations"} that #{number == 1 ? "needs" : "need"} to be run.")
+      end
+      
+    end
+    
   end # Errors
 end # Mack

data/lib/generators/migration/base.rb

@@ -0,0 +1,26 @@
+module Mack
+  module Generator
+    module Migration # :nodoc:
+      class Base < Mack::Generator::Base
+        
+        attr_reader :db_directory
+        attr_reader :migrations_directory
+        
+        def initialize(env = {})
+          super(env)
+          @db_directory = File.join(MACK_ROOT, "db")
+          @migrations_directory = File.join(@db_directory, "migrations")
+        end
+        
+        def next_migration_number
+          last = Dir.glob(File.join(@migrations_directory, "*.rb")).last
+          if last
+            return File.basename(last).match(/^\d+/).to_s.succ
+          end
+          return "001"
+        end
+        
+      end # Base
+    end # Migration
+  end # Generator
+end # Mack

data/lib/generators/migration_generator/migration_generator.rb

@@ -0,0 +1,14 @@
+class MigrationGenerator < Mack::Generator::Migration::Base
+
+  require_param :name
+  
+  def generate # :nodoc:
+    directory(migrations_directory)
+    
+    template_dir = File.join(File.dirname(__FILE__), "templates")
+    
+    template(File.join(template_dir, "migration.rb.template"), File.join(migrations_directory, "#{next_migration_number}_#{param(:name)}.rb"))
+    
+  end
+  
+end

data/lib/generators/migration_generator/templates/migration.rb.template

@@ -0,0 +1,9 @@
+class <%= param(:name).camelcase %> < <%= app_config.orm.camelcase %>::Migration
+
+  def self.up
+  end
+
+  def self.down
+  end
+
+end

data/lib/generators/plugin_generator/plugin_generator.rb

@@ -19,6 +19,8 @@ class PluginGenerator < Mack::Generator::Base
     directory(plugin_dir)
     # create vendor/plugins/<name>/lib
     directory(File.join(plugin_dir, "lib"))
+    # create vendor/plugins/<name>/lib/tasks
+    directory(File.join(plugin_dir, "lib", "tasks"))
     
     # create vendor/plugins/<name>/init.rb
     template(File.join(template_dir, "init.rb.template"), File.join(plugin_dir, "init.rb"))

data/lib/generators/scaffold_generator/scaffold_generator.rb

@@ -33,31 +33,22 @@ class ScaffoldGenerator < Mack::Generator::Base
     app_cont_dir = File.join(MACK_APP, "controllers")
     directory(app_cont_dir)
     
-    app_model_dir = File.join(MACK_APP, "models")
-    directory(app_model_dir)
-    
-    app_views_dir = File.join(MACK_APP, "views", @name_plural)
-    directory(app_views_dir)
-    
     temp_dir = File.join(File.dirname(__FILE__), "templates")
 
-    case app_config.orm
-    when "activerecord"
-      template(File.join(temp_dir, "generic", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
-      template(File.join(temp_dir, "activerecord", "app", "models", "model.rb.template"), File.join(app_model_dir, "#{@name_singular}.rb"), :force => param(:force))
-      
-      template(File.join(temp_dir, "generic", "app", "views", "index.html.erb.template"), File.join(app_views_dir, "index.html.erb"), :force => param(:force))
-      template(File.join(temp_dir, "generic", "app", "views", "edit.html.erb.template"), File.join(app_views_dir, "edit.html.erb"), :force => param(:force))
-      template(File.join(temp_dir, "generic", "app", "views", "new.html.erb.template"), File.join(app_views_dir, "new.html.erb"), :force => param(:force))
-      template(File.join(temp_dir, "generic", "app", "views", "show.html.erb.template"), File.join(app_views_dir, "show.html.erb"), :force => param(:force))
-    when "data_mapper"
-      template(File.join(temp_dir, "data_mapper", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
-      template(File.join(temp_dir, "data_mapper", "app", "models", "model.rb.template"), File.join(app_model_dir, "#{@name_singular}.rb"), :force => param(:force))
+    if app_config.orm
+      app_model_dir = File.join(MACK_APP, "models")
+      directory(app_model_dir)
+
+      app_views_dir = File.join(MACK_APP, "views", @name_plural)
+      directory(app_views_dir)
       
+      template(File.join(temp_dir, "generic", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
+      template(File.join(temp_dir, "generic", "app", "models", "model.rb.template"), File.join(app_model_dir, "#{@name_singular}.rb"), :force => param(:force))
       template(File.join(temp_dir, "generic", "app", "views", "index.html.erb.template"), File.join(app_views_dir, "index.html.erb"), :force => param(:force))
       template(File.join(temp_dir, "generic", "app", "views", "edit.html.erb.template"), File.join(app_views_dir, "edit.html.erb"), :force => param(:force))
       template(File.join(temp_dir, "generic", "app", "views", "new.html.erb.template"), File.join(app_views_dir, "new.html.erb"), :force => param(:force))
       template(File.join(temp_dir, "generic", "app", "views", "show.html.erb.template"), File.join(app_views_dir, "show.html.erb"), :force => param(:force))
+      MigrationGenerator.new("NAME" => "create_#{@name_plural}").run
     else
       template(File.join(temp_dir, "no_orm", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
     end

data/lib/generators/scaffold_generator/templates/generic/app/controllers/controller.rb.template

@@ -1,40 +1,40 @@
 class <%= @name_plural_camel %>Controller < Mack::Controller::Base
-  
+
   # GET /<%= @name_plural %>
   def index
     @<%= @name_plural %> = <%= @name_singular_camel %>.find(:all)
   end
-  
+
   # GET /<%= @name_plural %>/1
   def show
     @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
   end
-  
+
   # GET /<%= @name_plural %>/new
   def new
     @<%= @name_singular %> = <%= @name_singular_camel %>.new
   end
-  
+
   # GET /<%= @name_plural %>/1/edit
   def edit
     @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
   end
-  
+
   # POST /<%= @name_plural %>
   def create
     @<%= @name_singular %> = <%= @name_singular_camel %>.new(params(:<%= @name_singular %>))
     if @<%= @name_singular %>.save
-      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>))
+      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
     else
       render(:action => "new")
     end
   end
-  
+
   # PUT /<%= @name_plural %>/1
   def update
     @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
     if @<%= @name_singular %>.update_attributes(params(:<%= @name_singular %>))
-      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>))
+      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
     else
       render(:action => "edit")
     end
@@ -43,8 +43,8 @@ class <%= @name_plural_camel %>Controller < Mack::Controller::Base
   # DELETE /<%= @name_plural %>/1
   def delete
     @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
-    @<%= @name_singular %>.destroy
+    @<%= @name_singular %>.destroy<%= app_config.orm == "data_mapper" ? "!" : "" %>
     redirect_to(<%= @name_plural %>_index_url)
   end
-  
+
 end

data/lib/generators/scaffold_generator/templates/generic/app/models/model.rb.template

@@ -0,0 +1,2 @@
+class <%= @name_singular_camel %> < <%= app_config.orm.camelcase %>::Base
+end

data/lib/generators/scaffold_generator/templates/no_orm/app/controllers/controller.rb.template

@@ -1,38 +1,38 @@
 class <%= @name_plural_camel %>Controller < Mack::Controller::Base
-  
+
   # GET /<%= @name_plural %>
   def index
     "<%= @name_plural_camel %>#index"
   end
-  
+
   # POST /<%= @name_plural %>
   def create
     "<%= @name_plural_camel %>#create"
   end
-  
+
   # GET /<%= @name_plural %>/new
   def new
     "<%= @name_plural_camel %>#new"
   end
-  
+
   # GET /<%= @name_plural %>/1
   def show
     "<%= @name_plural_camel %>#show id: #{params(:id)}"
   end
-  
+
   # GET /<%= @name_plural %>/1/edit
   def edit
     "<%= @name_plural_camel %>#edit id: #{params(:id)}"
   end
-  
+
   # PUT /<%= @name_plural %>/1
   def update
     "<%= @name_plural_camel %>#update id: #{params(:id)}"
   end
-  
+
   # DELETE /<%= @name_plural %>/1
   def delete
     "<%= @name_plural_camel %>#delete"
   end
-  
+
 end

data/lib/initialization/configuration.rb

@@ -61,23 +61,11 @@ module Mack
             }
           }
         },
-        "mack_distributed_routes_url_cache_options" => {
-          "debug" => false,
-          "adapter" => "drb",
-          "store_options" => {
-            "host" => "druby://127.0.0.1:61676"
-          },
-          "logging" => {
-            "logger_1" => {
-              "type" => "file",
-              "file" => File.join(MACK_ROOT, "log", "mack_distributed_routes_url_cache.log")
-            }
-          }
-        },
         "mack::site_domain" => "http://localhost:3000",
         "mack::use_distributed_routes" => false,
         "mack::distributed_app_name" => nil,
         "mack::distributed_site_domain" => "http://localhost:3000",
+        "mack::drb_timeout" => 1,
         "log::detailed_requests" => true,
         "log::level" => "info",
         "log::console" => false,

data/lib/initialization/initializer.rb

@@ -9,6 +9,9 @@ require 'log4r'
 require 'crypt/rijndael'
 require 'singleton'
 require 'uri'
+require 'drb'
+require 'rinda/ring'
+require 'rinda/tuplespace'
 
 # Set up Mack constants, if they haven't already been set up.
 unless Object.const_defined?("MACK_ENV")

data/lib/initialization/initializers/orm_support.rb

@@ -1,20 +1,45 @@
+#--
 # setup ORM:
+#++
 
-[:activerecord, :data_mapper].each do |orm|
-  eval("def using_#{orm}?; false; end")
+$using_active_record = false
+$using_data_mapper = false
+
+# Returns true if the system is setup to use ActiveRecord
+def using_active_record?
+  $using_active_record
+end
+
+# Returns true if the system is setup to use DataMapper
+def using_data_mapper?
+  $using_data_mapper
+end
+
+module ActiveRecord # :nodoc:
+end
+module DataMapper # :nodoc:
 end
 
 unless app_config.orm.nil?
   dbs = YAML::load(ERB.new(IO.read(File.join(MACK_CONFIG, "database.yml"))).result)
   case app_config.orm
-  when 'activerecord'
+  when 'active_record'
     require 'activerecord'
     ActiveRecord::Base.establish_connection(dbs[MACK_ENV])
-    eval("def using_activerecord?; true; end")
+    class ArSchemaInfo < ActiveRecord::Base # :nodoc:
+      set_table_name :schema_info
+    end
+    $using_active_record = true
+    $using_data_mapper = false # set to false, in case we're flipping back and forth
   when 'data_mapper'
     require 'data_mapper'
     DataMapper::Database.setup(dbs[MACK_ENV])
-    eval("def using_data_mapper?; true; end")
+    class DmSchemaInfo < DataMapper::Base # :nodoc:
+      set_table_name "schema_info"
+      property :version, :integer, :default => 0
+    end
+    $using_data_mapper = true
+    $using_active_record = false # set to false, in case we're flipping back and forth
   else
     MACK_DEFAULT_LOGGER.warn("Attempted to configure an unknown ORM: #{app_config.orm}")
   end

data/lib/routing/route_map.rb

@@ -7,12 +7,16 @@ module Mack
     # 
     # See Mack::Routes::RouteMap for more information.
     def self.build
-      $distributed_urls = Mack::Distributed::Routes::Urls.new(app_config.mack.distributed_site_domain) if $distributed_urls.nil?
       yield Mack::Routes::RouteMap.instance
-      Mack::Routes::Urls.include_safely_into(Mack::Controller::Base, Mack::ViewBinder, Test::Unit::TestCase)
+      Mack::Routes::Urls.include_safely_into(Mack::Controller::Base, 
+                                             Mack::ViewBinder, 
+                                             Test::Unit::TestCase, 
+                                             Mack::Distributed::Routes::Urls)
       if app_config.mack.use_distributed_routes
         raise Mack::Distributed::Errors::ApplicationNameUndefined.new if app_config.mack.distributed_app_name.nil?
-        Mack::Distributed::Routes::UrlCache.set(app_config.mack.distributed_app_name.to_sym, $distributed_urls)
+        
+        d_urls = Mack::Distributed::Routes::Urls.new(app_config.mack.distributed_site_domain)
+        d_urls.put
       end
       # puts "Finished compiling routes: #{Mack::Routes::RouteMap.instance.routes_list.inspect}"
     end
@@ -218,9 +222,8 @@ module Mack
         Mack::Routes::Urls.class_eval(url)
         
         if app_config.mack.use_distributed_routes
-          $distributed_urls["#{n_route}_url"] = url
           
-          $distributed_urls["#{n_route}_distributed_url"] = %{
+          Mack::Routes::Urls.class_eval %{
             def #{n_route}_distributed_url(options = {})
               (@dsd || app_config.mack.distributed_site_domain) + #{n_route}_url(options)
             end

data/lib/routing/urls.rb

@@ -64,17 +64,19 @@ module Mack
       #   droute_url(:registration_app, :signup_url, {:from => :google})
       def droute_url(app_name, route_name, options = {})
         if app_config.mack.use_distributed_routes
-          ivar_cache("droute_url_hash") do
-            {}
-          end
-          d_urls = @droute_url_hash[app_name.to_sym]
-          if d_urls.nil?
-            d_urls = Mack::Distributed::Routes::UrlCache.get(app_name.to_sym)
-            @droute_url_hash[app_name.to_sym] = d_urls
-            if d_urls.nil?
-              raise Mack::Distributed::Errors::UnknownApplication.new(app_name)
-            end
-          end
+          d_urls = Mack::Distributed::Routes::Urls.get(app_name)
+          # return d_urls.send(route_name, options)
+          # ivar_cache("droute_url_hash") do
+          #   {}
+          # end
+          # d_urls = @droute_url_hash[app_name.to_sym]
+          # if d_urls.nil?
+          #   d_urls = Mack::Distributed::Routes::UrlCache.get(app_name.to_sym)
+          #   @droute_url_hash[app_name.to_sym] = d_urls
+          #   if d_urls.nil?
+          #     raise Mack::Distributed::Errors::UnknownApplication.new(app_name)
+          #   end
+          # end
           route_name = route_name.to_s
           if route_name.match(/_url$/)
             unless route_name.match(/_distributed_url$/)
@@ -83,11 +85,13 @@ module Mack
           else
             route_name << "_distributed_url"
           end
-          if d_urls.run.respond_to?(route_name)
-            return d_urls.run.send(route_name, options)
-          else
-            raise Mack::Distributed::Errors::UnknownRouteName.new(app_name, route_name)
-          end
+          raise Mack::Distributed::Errors::UnknownRouteName.new(app_name, route_name) unless d_urls.respond_to?(route_name)
+          return d_urls.run(route_name, options)
+          # if d_urls.run.respond_to?(route_name)
+          #   return d_urls.run.send(route_name, options)
+          # else
+          #   raise Mack::Distributed::Errors::UnknownRouteName.new(app_name, route_name)
+          # end
         else
           return nil
         end

data/lib/sea_level/helpers/view_helpers/orm_helpers.rb

@@ -1,4 +1,4 @@
-if using_activerecord?
+if using_active_record?
   class ActiveRecord::Base # :nodoc:
     def business_display_name
       self.class.name#.titlecase

data/lib/tasks/db_tasks.rake

@@ -0,0 +1,94 @@
+namespace :db do
+  
+  desc "Migrate the database through scripts in db/migrations"
+  task :migrate => "db:schema:create" do
+    migration_files.each do |migration|
+      require migration
+      migration = File.basename(migration, ".rb")
+      m_number = migration_number(migration)
+      if m_number > @schema_info.version
+        migration_name(migration).camelcase.constantize.up
+        @schema_info.version += 1
+        @schema_info.save
+      end
+    end # each
+  end # migrate
+  
+  desc "Rolls the schema back to the previous version. Specify the number of steps with STEP=n"
+  task :rollback => ["db:schema:create", "db:abort_if_pending_migrations"] do
+    migrations = migration_files.reverse
+    (ENV["STEP"] || 1).to_i.times do |step|
+      migration = migrations[step]
+      require migration
+      migration = File.basename(migration, ".rb")
+      m_number = migration_number(migration)
+      if m_number == @schema_info.version
+        migration_name(migration).camelcase.constantize.down
+        @schema_info.version -= 1
+        @schema_info.save
+      end
+    end
+
+  end # rollback
+  
+  desc "Raises an error if there are pending migrations"
+  task :abort_if_pending_migrations do
+    migrations = migration_files.reverse
+    return if migrations.empty?
+    migration = migrations.first
+    migration = File.basename(migration, ".rb")
+    m_number = migration_number(migration)
+    if m_number > @schema_info.version
+      raise Mack::Errors::UnrunMigrations.new(m_number - @schema_info.version)
+    end
+  end
+  
+  desc "Displays the current schema version of your database"
+  task :version => "db:schema:create" do
+    puts "\nYour database is currently at version: #{@schema_info.version}\n"
+  end
+  
+  private
+  namespace :schema do
+    
+    task :create => "mack:environment" do
+      if using_data_mapper? 
+        require 'data_mapper/migration'
+        unless DmSchemaInfo.table.exists?
+          DmSchemaInfo.table.create!
+          DmSchemaInfo.create(:version => 0)
+        end
+        @schema_info = DmSchemaInfo.first
+      elsif using_active_record?
+        require 'active_record/migration'
+        class CreateArSchemaInfo < ActiveRecord::Migration # :nodoc:
+          def self.up
+            create_table :schema_info do |t|
+              t.column :version, :integer, :default => 0
+            end
+          end # up
+        end # CreateArSchemaInfo
+        unless ArSchemaInfo.table_exists?
+          CreateArSchemaInfo.up
+          ArSchemaInfo.create(:version => 0)
+        end
+        @schema_info = ArSchemaInfo.find(:first)
+      end
+    end # create
+    
+  end # schema
+  
+  
+  def migration_files
+    Dir.glob(File.join(MACK_ROOT, "db", "migrations", "*.rb"))
+  end
+  
+  def migration_number(migration)
+    migration.match(/(^\d+)/).captures.last.to_i
+  end
+  
+  def migration_name(migration)
+    migration.match(/^\d+_(.+)/).captures.last
+  end
+  
+end # db

data/lib/tasks/mack_ring_server_tasks.rake

@@ -0,0 +1,33 @@
+require 'rinda/ring'
+namespace :mack do
+  namespace :ring_server do
+    
+    desc "Start the Rinda ring server"
+    task :start do
+      `mack_ring_server start`
+    end
+    
+    desc "Stop the Rinda ring server"
+    task :stop do
+      `mack_ring_server stop`
+    end
+    
+    namespace :services do
+      
+      desc "Lists all services on the ring server"
+      task :list do
+        DRb.start_service
+        ring_server = Rinda::RingFinger.primary
+        services = ring_server.read_all([nil, nil, nil, nil])
+        puts "Services on #{ring_server.__drburi}"
+        services.each do |service|
+          puts "#{service[0]}: #{service[1]} on #{service[2].__drburi} - #{service[3]}"
+        end
+      end
+      
+    end # services
+    
+  end # ring_server
+end # mack
+
+alias_task "mack:ring_server:restart", "mack:ring_server:stop", "mack:ring_server:start"

data/lib/tasks/mack_server_tasks.rake

@@ -30,7 +30,8 @@ namespace :mack do
       options.handler = (ENV["HANDLER"] ||= d_handler)
 
 
-      require File.join(MACK_ROOT, "config", "boot.rb")
+      # require File.join(MACK_ROOT, "config", "boot.rb")
+      require 'mack'
 
       if options.handler == "thin"
         # thin_opts = ["start", "-r", "config/thin.ru"]

data/lib/tasks/mack_tasks.rake

@@ -4,7 +4,8 @@ namespace :mack do
   task :environment do
     MACK_ENV = ENV["MACK_ENV"] ||= "development" unless Object.const_defined?("MACK_ENV")
     MACK_ROOT = FileUtils.pwd unless Object.const_defined?("MACK_ROOT")
-    require File.join(MACK_ROOT, "config", "boot.rb")
+    require 'mack'
+    # require File.join(MACK_ROOT, "config", "boot.rb")
   end # environment
 
   desc "Loads an irb console allow you full access to the application w/o a browser."

data/lib/tasks/test_tasks.rake

@@ -1,7 +1,22 @@
 desc "Run test code."
 Rake::TestTask.new(:default) do |t|
-  Rake::Task["log:clear"].invoke
+  # Rake::Task["log:clear"].invoke
   t.libs << "test"
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
+
+namespace :test do
+  
+  task :empty do |t|
+    ENV["TEST:EMPTY"] = "true"
+    puts ENV["TEST:EMPTY"]
+  end
+  
+  task :raise_exception do |t|
+    raise "Oh No!"
+  end
+  
+end
+
+alias_task :test, :default

data/lib/test_extensions/test_helpers.rb

@@ -4,13 +4,48 @@ module Mack
   
   module TestHelpers
     
+    # Runs the given rake task. Takes an optional hash that mimics command line parameters.
+    def rake_task(name, env = {}, tasks = File.join(File.dirname(__FILE__), "..", "mack_tasks.rb"))
+      # set up the Rake application
+      rake = Rake::Application.new
+      Rake.application = rake
+      
+      load(tasks)
+      
+      # save the old ENV so we can revert it
+      old_env = ENV.to_hash
+      # add in the new ENV stuff
+      env.each_pair {|k,v| ENV[k.to_s] = v}
+      
+      begin
+        # run the rake task
+        rake[name].invoke
+        
+        # yield for the tests
+        yield if block_given?
+        
+      rescue Exception => e
+        raise e
+      ensure
+        # empty out the ENV
+        ENV.clear
+        # revert to the ENV before the test started
+        old_env.to_hash.each_pair {|k,v| ENV[k] = v}
+
+        # get rid of the Rake application
+        Rake.application = nil
+      end
+    end
+    
+    # Temporarily changes the application configuration. Changes are reverted after
+    # the yield returns.
     def temp_app_config(options = {})
       app_config.load_hash(options, String.randomize)
       yield
       app_config.revert
     end
     
-    def remote_test
+    def remote_test # :nodoc:
       if (app_config.run_remote_tests)
         yield
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.4.2.1
+  version: 0.4.5
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-02 00:00:00 -04:00
+date: 2008-04-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,7 +37,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: cachetastic
@@ -84,10 +84,20 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.4
     version: 
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.10
+    version: 
 description: Mack is a powerful, yet simple, web application framework.  It takes some cues from the likes of Rails and Merb, so it's not entirely unfamiliar. Mack hopes to provide developers a great framework for building, and deploying, portal and distributed applications.
 email: mark@mackframework.com
 executables: 
 - mack
+- mack_ring_server
 extensions: []
 
 extra_rdoc_files: 
@@ -98,18 +108,19 @@ files:
 - lib/core_extensions/kernel.rb
 - lib/core_extensions/string.rb
 - lib/distributed/errors/errors.rb
-- lib/distributed/routing/url_cache.rb
 - lib/distributed/routing/urls.rb
+- lib/distributed/utils/rinda.rb
 - lib/errors/errors.rb
-- lib/generators/generator_base.rb
+- lib/generators/base.rb
+- lib/generators/migration/base.rb
+- lib/generators/migration_generator/migration_generator.rb
+- lib/generators/migration_generator/templates/migration.rb.template
 - lib/generators/plugin_generator/plugin_generator.rb
 - lib/generators/plugin_generator/templates/init.rb.template
 - lib/generators/plugin_generator/templates/lib/plugin.rb.template
 - lib/generators/scaffold_generator/scaffold_generator.rb
-- lib/generators/scaffold_generator/templates/activerecord/app/models/model.rb.template
-- lib/generators/scaffold_generator/templates/data_mapper/app/controllers/controller.rb.template
-- lib/generators/scaffold_generator/templates/data_mapper/app/models/model.rb.template
 - lib/generators/scaffold_generator/templates/generic/app/controllers/controller.rb.template
+- lib/generators/scaffold_generator/templates/generic/app/models/model.rb.template
 - lib/generators/scaffold_generator/templates/generic/app/views/edit.html.erb.template
 - lib/generators/scaffold_generator/templates/generic/app/views/index.html.erb.template
 - lib/generators/scaffold_generator/templates/generic/app/views/new.html.erb.template
@@ -143,9 +154,11 @@ files:
 - lib/sea_level/session.rb
 - lib/sea_level/view_binder.rb
 - lib/tasks/cachetastic_tasks.rake
+- lib/tasks/db_tasks.rake
 - lib/tasks/gem_tasks.rake
 - lib/tasks/log_tasks.rake
 - lib/tasks/mack_dump_tasks.rake
+- lib/tasks/mack_ring_server_tasks.rake
 - lib/tasks/mack_server_tasks.rake
 - lib/tasks/mack_tasks.rake
 - lib/tasks/rake_helpers.rb
@@ -166,7 +179,6 @@ files:
 - bin/templates/config/app_config/development.yml.template
 - bin/templates/config/app_config/production.yml.template
 - bin/templates/config/app_config/test.yml.template
-- bin/templates/config/boot.rb.template
 - bin/templates/config/database.yml.template
 - bin/templates/config/initializers/gems.rb.template
 - bin/templates/config/routes.rb.template

data/bin/templates/config/boot.rb.template

@@ -1,6 +0,0 @@
-require 'rubygems'
-require 'rack'
-require 'fileutils'
-
-gem 'mack'
-require 'mack'

data/lib/distributed/routing/url_cache.rb

@@ -1,10 +0,0 @@
-module Mack
-  module Distributed
-    module Routes # :nodoc:
-      # Used to house the Mack::Distributed::Routes::Urls object for each distributed application.
-      class UrlCache < Cachetastic::Caches::Base
-        
-      end # UrlCache
-    end # Routes
-  end # Distributed
-end # Mack

data/lib/generators/scaffold_generator/templates/activerecord/app/models/model.rb.template

@@ -1,2 +0,0 @@
-class <%= @name_singular_camel %> < ActiveRecord::Base
-end

data/lib/generators/scaffold_generator/templates/data_mapper/app/controllers/controller.rb.template

@@ -1,50 +0,0 @@
-class <%= @name_plural_camel %>Controller < Mack::Controller::Base
-  
-  # GET /<%= @name_plural %>
-  def index
-    @<%= @name_plural %> = <%= @name_singular_camel %>.find(:all)
-  end
-  
-  # GET /<%= @name_plural %>/1
-  def show
-    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
-  end
-  
-  # GET /<%= @name_plural %>/new
-  def new
-    @<%= @name_singular %> = <%= @name_singular_camel %>.new
-  end
-  
-  # GET /<%= @name_plural %>/1/edit
-  def edit
-    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
-  end
-  
-  # POST /<%= @name_plural %>
-  def create
-    @<%= @name_singular %> = <%= @name_singular_camel %>.new(params(:<%= @name_singular %>))
-    if @<%= @name_singular %>.save
-      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
-    else
-      render(:action => "new")
-    end
-  end
-  
-  # PUT /<%= @name_plural %>/1
-  def update
-    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
-    if @<%= @name_singular %>.update_attributes(params(:<%= @name_singular %>))
-      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
-    else
-      render(:action => "edit")
-    end
-  end
-
-  # DELETE /<%= @name_plural %>/1
-  def delete
-    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
-    @<%= @name_singular %>.destroy!
-    redirect_to(<%= @name_plural %>_index_url)
-  end
-  
-end

data/lib/generators/scaffold_generator/templates/data_mapper/app/models/model.rb.template

@@ -1,2 +0,0 @@
-class <%= @name_singular_camel %> < DataMapper::Base
-end