apartment 0.6.0 → 0.7.0

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 0.7.0
+  * June 22, 2011
+  
+  - Added apartment:seed rake task for seeding all dbs
+
 # 0.6.0
   * June 21, 2011
   

data/lib/apartment/adapters/abstract_adapter.rb

@@ -55,6 +55,11 @@ module Apartment
 
         connect_to_new(database)
   		end
+  		
+  		def seed_data
+	      load_or_abort("#{Rails.root}/db/seeds.rb")
+      end
+	    alias_method :seed, :seed_data
       
       protected
       
@@ -70,10 +75,6 @@ module Apartment
   	      load_or_abort("#{Rails.root}/db/schema.rb")
   	    end
   	    
-  	    def seed_data
-  	      load_or_abort("#{Rails.root}/db/seeds.rb")
-	      end
-  	    
   	    # Return a new config that is multi-tenanted
         def multi_tenantify(database)
     			@config.clone.tap do |config|

data/lib/apartment/database.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/string/inflections'    # for `constantize`
 module Apartment
 	module Database
 	  
-	  MULTI_TENANT_METHODS = [:create, :switch, :reset, :connect_and_reset, :process]
+	  MULTI_TENANT_METHODS = [:create, :switch, :reset, :connect_and_reset, :process, :seed]
 	  
 	  class << self
 

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/tasks/apartment.rake

@@ -4,15 +4,34 @@ apartment_namespace = namespace :apartment do
 	task :migrate => :environment do
 		ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_path)
 
-		Apartment.database_names.each{ |db| Apartment::Migrator.migrate db }
+		Apartment.database_names.each do |db| 
+      # Note sure I should use puts here, but Rails.logger doesn't work,  how do I log in migrations?
+		  puts("Migrating #{db} database")
+		  Apartment::Migrator.migrate db
+	  end
 	end
 	
+	desc "Seed all multi-tenant databases"
+	task :seed => :environment do
+	  Apartment::Database.seed
+	  
+	  Apartment.database_names.each do |db| 
+      puts("Seeding #{db} database")
+      Apartment::Database.process(db) do
+        Apartment::Database.seed
+      end
+    end
+  end
+	
 	desc "Rolls the schema back to the previous version (specify steps w/ STEP=n) across all multi-tenant dbs."
   task :rollback => :environment do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_path, step)
     
-    Apartment.database_names.each{ |db| Apartment::Migrator.rollback db, step }
+    Apartment.database_names.each do |db| 
+      puts("Rolling back #{db} database")
+      Apartment::Migrator.rollback db, step
+    end
   end
 	
 	namespace :migrate do
@@ -21,18 +40,24 @@ apartment_namespace = namespace :apartment do
 	  task :up => :environment do
 	    version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
-      
       ActiveRecord::Migrator.run(:up, ActiveRecord::Migrator.migrations_path, version)
-      Apartment.database_names.each{ |db| Apartment::Migrator.run :up, db, version }
+      
+      Apartment.database_names.each do |db| 
+        puts("Migrating #{db} database up")
+        Apartment::Migrator.run :up, db, version
+      end
     end
 	  
 	  desc 'Runs the "down" for a given migration VERSION across all multi-tenant dbs.'
 	  task :down => :environment do
 	    version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
-      
       ActiveRecord::Migrator.run(:down, ActiveRecord::Migrator.migrations_path, version)
-      Apartment.database_names.each{ |db| Apartment::Migrator.run :down, db, version }
+      
+      Apartment.database_names.each do |db| 
+        puts("Migrating #{db} database down")
+        Apartment::Migrator.run :down, db, version
+      end
     end
     
     desc  'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'

data/spec/integration/apartment_rake_integration_spec.rb

@@ -40,7 +40,6 @@ describe "apartment rake tasks" do
     end
     
     describe "#migrate" do
-      
       it "should migrate all databases" do
         Apartment::Migrator.should_receive(:migrate).exactly(@db_names.length).times
         
@@ -58,5 +57,13 @@ describe "apartment rake tasks" do
       end
     end
     
+    describe "apartment:seed" do
+      it "should seed all databases" do
+        Apartment::Database.should_receive(:seed).exactly(@db_names.length + 1).times    # +1 for the public db
+        
+        @rake['apartment:seed'].invoke
+      end
+    end
+    
   end
 end

data/spec/tasks/apartment_rake_spec.rb

@@ -104,11 +104,13 @@ describe "apartment rake tasks" do
       end
       
       it "should rollback dbs STEP amt" do
+        ActiveRecord::Migrator.should_receive(:rollback).once
         Apartment::Migrator.should_receive(:rollback).with(anything, step.to_i).exactly(db_count).times
         ENV['STEP'] = step
         @rake['apartment:rollback'].invoke
       end
     end
+    
   end
   
 end

metadata

@@ -2,7 +2,7 @@
 name: apartment
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ryan Brunner
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4521352595890258295
+      hash: 1175145384606930711
       segments: 
       - 0
       version: "0"
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4521352595890258295
+      hash: 1175145384606930711
       segments: 
       - 0
       version: "0"