rails-app-installer 0.1.1 → 0.1.2

data/lib/rails-installer/databases.rb

@@ -6,14 +6,17 @@ class RailsInstaller
   # database handler, subclass this class and define a +yml+ class and
   # optionally a +create_database+ method.
   class Database
-    @@db_map = {}
+    @@db_map = Hash.new(self)
 
     # Connect to the database (using the 'database.yml' generated by the +yml+
     # method).  Returns true if the database already exists, and false if the
     # database doesn't exist yet.
     def self.connect(installer)
+      database_yml = File.read File.join(installer.install_directory, 'config', 'database.yml') rescue nil
+      database_yml ||= yml(installer)
+      
       ActiveRecord::Base.establish_connection( 
-        YAML.load(yml(installer))['production'])
+        YAML.load(database_yml)['production'])
       begin
         tables = ActiveRecord::Base.connection.tables
         if tables.size > 0
@@ -127,6 +130,7 @@ class RailsInstaller
       # nothing
     end
 
+    # Inheritence hook
     def self.inherited(sub)
       name = sub.to_s.gsub(/^.*::/,'').gsub(/([A-Z])/) do |match|
         "_#{match.downcase}"
@@ -138,6 +142,21 @@ class RailsInstaller
     def self.dbs
       @@db_map
     end
+    
+    # Database host name
+    def self.db_host(installer)
+      installer.config['db_host'] || 'localhost'
+    end
+    
+    # Database user name
+    def self.db_user(installer)
+      installer.config['db_user'] || ENV['USER'] || installer.app_name 
+    end
+    
+    # Database name
+    def self.db_name(installer)
+      installer.config['db_name'] || installer.app_name
+    end
   
     # The driver for SQLite 3.  This is pretty minimal, as all we need is a
     # +yml+ class to provide a basic 'database.yml'.
@@ -177,18 +196,6 @@ class RailsInstaller
     #
     # It will call +createdb+ to set up the db all on its own.
     class Postgresql < RailsInstaller::Database
-      def self.db_host(installer)
-        installer.config['db_host'] || 'localhost'
-      end
-      
-      def self.db_user(installer)
-        installer.config['db_user'] || ENV['USER'] || installer.app_name 
-      end
-      
-      def self.db_name(installer)
-        installer.config['db_name'] || installer.app_name
-      end
-      
       def self.yml(installer)
         %Q{
         login: &login
@@ -217,5 +224,36 @@ class RailsInstaller
         system("createdb -U #{db_user installer} #{db_name installer}-test")
       end
     end
+    
+    # Mysql DB class, thanks Phillip Toland
+    class Mysql < RailsInstaller::Database
+      def self.yml(installer)
+        %Q{
+        login: &login
+          adapter: mysql
+          host: #{db_host installer}
+          username: #{db_user installer}
+          password: #{installer.config['db_password']}
+          database: #{db_name installer}
+
+        development:
+          <<: *login
+
+        production:
+          <<: *login
+
+        test:
+          database: #{db_name installer}-test
+          <<: *login
+        }
+      end
+
+      # Create a MySQL database.
+      def self.create_database(installer)
+        installer.message "Creating MySQL database"
+        system("mysql -u #{db_user installer} -p#{installer.config['db_password']} -e 'create database #{db_name installer}'")
+        system("mysql -u #{db_user installer} -p#{installer.config['db_password']} -e 'create database #{db_name installer}-test'")
+      end
+    end
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rails-app-installer
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-08-09 00:00:00 -07:00
+  version: 0.1.2
+date: 2006-08-10 00:00:00 -07:00
 summary: An installer for Rails apps
 require_paths: 
 - lib