apartment 0.9.1 → 0.9.2

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 0.9.2
+  * July 4, 2011
+  
+  - Migrations now run associated rails migration fully, fixes schema.rb not being reloaded after migrations
+
 # 0.9.1
   * June 24, 2011
   

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/tasks/apartment.rake

@@ -1,20 +1,17 @@
 apartment_namespace = namespace :apartment do
-  
-	desc "Migrate all multi-tenant databases"
-	task :migrate => :environment do
-		ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_path)
 
+	desc "Migrate all multi-tenant databases"
+	task :migrate => 'db:migrate' do
+	  
 		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
-	  
+	task :seed => 'db:seed' do
+
 	  Apartment.database_names.each do |db| 
       puts("Seeding #{db} database")
       Apartment::Database.process(db) do
@@ -24,10 +21,9 @@ apartment_namespace = namespace :apartment do
   end
 	
 	desc "Rolls the schema back to the previous version (specify steps w/ STEP=n) across all multi-tenant dbs."
-  task :rollback => :environment do
+  task :rollback => 'db:rollback' do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_path, step)
-    
+
     Apartment.database_names.each do |db| 
       puts("Rolling back #{db} database")
       Apartment::Migrator.rollback db, step
@@ -37,10 +33,9 @@ apartment_namespace = namespace :apartment do
 	namespace :migrate do
 	  
 	  desc 'Runs the "up" for a given migration VERSION across all multi-tenant dbs.'
-	  task :up => :environment do
+	  task :up => 'db:migrate:up' 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 do |db| 
         puts("Migrating #{db} database up")
@@ -49,10 +44,9 @@ apartment_namespace = namespace :apartment do
     end
 	  
 	  desc 'Runs the "down" for a given migration VERSION across all multi-tenant dbs.'
-	  task :down => :environment do
+	  task :down => 'db:migrate:down' 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 do |db| 
         puts("Migrating #{db} database down")
@@ -61,7 +55,7 @@ apartment_namespace = namespace :apartment do
     end
     
     desc  'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'
-    task :redo => :environment do
+    task :redo => 'db:migrate:redo' do
       if ENV['VERSION']
         apartment_namespace['migrate:down'].invoke
         apartment_namespace['migrate:up'].invoke

data/spec/integration/apartment_rake_integration_spec.rb

@@ -59,7 +59,7 @@ describe "apartment rake tasks" do
     
     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
+        Apartment::Database.should_receive(:seed).exactly(@db_names.length).times
         
         @rake['apartment:seed'].invoke
       end

data/spec/tasks/apartment_rake_spec.rb

@@ -7,7 +7,13 @@ describe "apartment rake tasks" do
     @rake = Rake::Application.new
     Rake.application = @rake
     load 'tasks/apartment.rake'
-    Rake::Task.define_task(:environment)    # stub out loading rails environment
+    # stub out rails tasks
+    Rake::Task.define_task('db:migrate')
+    Rake::Task.define_task('db:seed')
+    Rake::Task.define_task('db:rollback')
+    Rake::Task.define_task('db:migrate:up')
+    Rake::Task.define_task('db:migrate:down')
+    Rake::Task.define_task('db:migrate:redo')
   end
   
   after do
@@ -31,7 +37,6 @@ describe "apartment rake tasks" do
       end
       
       it "should migrate public and all multi-tenant dbs" do
-        ActiveRecord::Migrator.should_receive(:migrate).once
         Apartment::Migrator.should_receive(:migrate).exactly(db_count).times
         @rake['apartment:migrate'].invoke
       end
@@ -58,7 +63,6 @@ describe "apartment rake tasks" do
         end
         
         it "migrates up to a specific version" do
-          ActiveRecord::Migrator.should_receive(:run).with(:up, anything, version.to_i).once
           Apartment::Migrator.should_receive(:run).with(:up, anything, version.to_i).exactly(db_count).times
           @rake['apartment:migrate:up'].invoke
         end
@@ -86,7 +90,6 @@ describe "apartment rake tasks" do
         end
         
         it "migrates up to a specific version" do
-          ActiveRecord::Migrator.should_receive(:run).with(:down, anything, version.to_i).once
           Apartment::Migrator.should_receive(:run).with(:down, anything, version.to_i).exactly(db_count).times
           @rake['apartment:migrate:down'].invoke
         end
@@ -98,13 +101,11 @@ describe "apartment rake tasks" do
       let(:step){ '3' }
       
       it "should rollback dbs" do
-        ActiveRecord::Migrator.should_receive(:rollback).once
         Apartment::Migrator.should_receive(:rollback).exactly(db_count).times
         @rake['apartment:rollback'].invoke
       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

metadata

@@ -2,7 +2,7 @@
 name: apartment
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Ryan Brunner
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 749751042564884907
+      hash: 1126220868121977386
       segments: 
       - 0
       version: "0"
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 749751042564884907
+      hash: 1126220868121977386
       segments: 
       - 0
       version: "0"