penthouse 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 793411262ca8ce30ae1f03de55a78f76d4f4d9a2
-  data.tar.gz: 28306b0b4536d295809080968dfd0a2fd7621318
+  metadata.gz: 0632eea067e1cf85d45c912212bfa613d7c34566
+  data.tar.gz: 60a49d25ab6339cb567a4815b53df28fc6b30127
 SHA512:
-  metadata.gz: 16ce8d5d39cdc76572d89a91ea895986fbd90d9fb59021f6f5a9fd65a7dc76f49121752c69a49d63fceaa48f0da2132547573c8b3df0f472668adc7e0b7140ee
-  data.tar.gz: 5948007a8f5c28089a94e3f48d60f55110b5f67c4b2cc9bf2fb7b7372f5047930253610d0b1d3ec66e5594a2470ebaea70b3df375a273257a0237e27d6832513
+  metadata.gz: 6e60e2fe6d903e61317ed5e4930d793dded2bbdb93c7762516a477ec18a9de783dfb1690cf22952ffab141acae16b54357a616a51754e79d117b36d75a268c80
+  data.tar.gz: 7d53645c0a228a3cd62c6854e7ede31d3a56b40e5d12f04d18758358c9e38fcec3a7716a2e6637f9ba6908c8f93220e02f4a2077a6f030e901d2ca98bec7abde

data/lib/penthouse/migrator.rb

@@ -1,5 +1,7 @@
 # shamelessly copied & adjusted from Apartment
-# @see https://github.com/influitive/apartment/blob/development/lib/apartment/migrator.rb
+# @see https://github.com/influitive/apartment/blob/master/lib/apartment/migrator.rb
+# overrides Octopus's auto-switching to shards
+# @see https://github.com/thiagopradi/octopus/blob/master/lib/octopus/migration.rb
 
 module Penthouse
   module Migrator
@@ -9,12 +11,12 @@ module Penthouse
     # Migrate to latest version
     # @param tenant_identifier [String, Symbol] the identifier for the tenant to switch to
     # @return [void]
-    def migrate(tenant_identifier)
+    def migrate(tenant_identifier, version)
       Penthouse.switch(tenant_identifier) do
-        version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-
-        ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, version) do |migration|
-          ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
+        if migrator.respond_to?(:migrate_without_octopus)
+          migrator.migrate_without_octopus(migrator.migrations_paths, version)
+        else
+          migrator.migrate(migrator.migrations_paths, version)
         end
       end
     end
@@ -25,7 +27,11 @@ module Penthouse
     # @return [void]
     def run(direction, tenant_identifier, version)
       Penthouse.switch(tenant_identifier) do
-        ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_paths, version)
+        if migrator.respond_to?(:run_without_octopus)
+          migrator.run_without_octopus(direction, migrator.migrations_paths, version)
+        else
+          migrator.run(direction, migrator.migrations_paths, version)
+        end
       end
     end
 
@@ -35,8 +41,16 @@ module Penthouse
     # @return [void]
     def rollback(tenant_identifier, step = 1)
       Penthouse.switch(tenant_identifier) do
-        ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
+        if migrator.respond_to?(:rollback_without_octopus)
+          migrator.rollback_without_octopus(migrator.migrations_paths, step)
+        else
+          migrator.rollback(migrator.migrations_paths, step)
+        end
       end
     end
+
+    def migrator
+      ActiveRecord::Migrator
+    end
   end
 end

data/lib/penthouse/version.rb

@@ -1,3 +1,3 @@
 module Penthouse
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/tasks/penthouse.rake

@@ -6,10 +6,12 @@ penthouse_namespace = namespace :penthouse do
   task :migrate do
     warn_if_tenants_empty
 
+    version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
+
     tenant_identifiers.each do |tenant_identifier|
       begin
         puts("Migrating #{tenant_identifier || '***global***'} tenant")
-        Penthouse::Migrator.migrate(tenant_identifier)
+        Penthouse::Migrator.migrate(tenant_identifier, version)
       rescue Penthouse::TenantNotFound => e
         puts e.message
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penthouse
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryan Townsend