apartment 0.5.0 → 0.5.1

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 0.5.1
+  * June 21, 2011
+  
+  - Fixed db migrate up/down/rollback
+  - added db:redo
+
 # 0.5.0
   * June 20, 2011
   

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/tasks/apartment.rake

@@ -1,4 +1,4 @@
-namespace :apartment do
+apartment_namespace = namespace :apartment do
   
 	desc "Migrate all multi-tenant databases"
 	task :migrate => :environment do
@@ -10,6 +10,8 @@ namespace :apartment do
 	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 }
   end
 	
@@ -20,6 +22,7 @@ namespace :apartment 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 }
     end
 	  
@@ -28,9 +31,21 @@ namespace :apartment 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 }
     end
     
+    desc  'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'
+    task :redo => :environment do
+      if ENV['VERSION']
+        apartment_namespace['migrate:down'].invoke
+        apartment_namespace['migrate:up'].invoke
+      else
+        apartment_namespace['rollback'].invoke
+        apartment_namespace['migrate'].invoke
+      end
+    end
+    
   end
   
 end

data/spec/tasks/apartment_rake_spec.rb

@@ -30,7 +30,8 @@ describe "apartment rake tasks" do
         ActiveRecord::Migrator.stub(:migrate)   # don't care about this
       end
       
-      it "should migrate all multi-tenant dbs" do
+      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
@@ -57,6 +58,7 @@ 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
@@ -84,6 +86,7 @@ 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
@@ -95,6 +98,7 @@ 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

metadata

@@ -2,7 +2,7 @@
 name: apartment
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Ryan Brunner
@@ -16,7 +16,6 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -24,10 +23,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.0.8
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,10 +34,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,10 +45,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.6.0
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,10 +56,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.6.1
   type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: capybara
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -68,10 +67,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: pg
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,10 +78,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.11.0
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: silent-postgres
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -90,6 +89,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.8
   type: :development
+  prerelease: false
   version_requirements: *id007
 description: Apartment allows Rails applications to deal with database multitenancy
 email: 
@@ -185,12 +185,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2503870912539283995
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2503870912539283995
+      segments: 
+      - 0
       version: "0"
 requirements: []