penthouse 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92248bef6760f1ed6455c27c851fce79e267b8e7
-  data.tar.gz: cc5a1f2bfdda094227a8449123dd8178a09305a0
+  metadata.gz: ddf585328bcdfaa3c9899c24c391500330ddcc84
+  data.tar.gz: 1b1ab82b1efdb9fd4e9defb3819317d47ae4e4f0
 SHA512:
-  metadata.gz: 41bcde8417c7e7c4ee517682c47230a91dcf72fa918b8834a7ad21032daf3c661ea5c38374c129a9cbdc7b5754faf65eaf85d783f72aceca938996fc20301e85
-  data.tar.gz: 2c1fe638a8a09aabce3a3c80813f4f4f4ed5106b794688f6b083b8c35413dd7e94d1387370feeeb7a2bc26acd777d592991e4804e056278d619cbe784c8d1278
+  metadata.gz: 0c3a1758e69b996836f73cdb094217bec0ae9b8584692e678708579e05ff9589ef8d48abd285fcc8f4c085c0a67f2331992db879b372f54e6531ad6e9ae472fe
+  data.tar.gz: 43f988b517f943dd75d4924dc78016f1ccadd1255e7e4a48e9668738933f7e76a489f8964df2f186689563ad2f747dd4d1e7e85211e9e4aa6a15a3d57dfa2d0c

data/lib/penthouse/migrator.rb

@@ -1,7 +1,5 @@
 require 'active_record'
-require 'set'
 require 'active_support/core_ext/module/aliasing'
-require 'active_support/core_ext/array/wrap'
 
 module Penthouse
   module Migration
@@ -37,16 +35,33 @@ module Penthouse
           alias_method :down_with_octopus,    :down_with_penthouse
           alias_method :run_with_octopus,     :run_with_penthouse
         end
+
+        alias_method_chain :migrate,    :penthouse
+        alias_method_chain :migrations, :penthouse
+
+        # override any new Octopus methods with the new Penthouse ones
+        alias_method :migrate_with_octopus,    :migrate_with_penthouse
+        alias_method :migrations_with_octopus, :migrations_with_penthouse
       end
     end
 
+    # this may seem stupid but it gets around issues with Octopus
+    def migrate_with_penthouse(*args)
+      migrate_without_penthouse(*args)
+    end
+
+    # this may seem stupid but it gets around issues with Octopus
+    def migrations_with_penthouse
+      migrations_without_penthouse
+    end
+
     module ClassMethods
       def migrate_with_penthouse(migrations_paths, target_version = nil, &block)
         unless Penthouse.configuration.migrate_tenants?
           return migrate_without_penthouse(migrations_paths, target_version, &block)
         end
 
-        Penthouse.each_tenant(tenant_identifiers: tenants_to_migrate) do |tenant|
+        wrap_penthouse do
           migrate_without_penthouse(migrations_paths, target_version, &block)
         end
       end
@@ -56,18 +71,18 @@ module Penthouse
           return up_without_penthouse(migrations_paths, target_version, &block)
         end
 
-        Penthouse.each_tenant(tenant_identifiers: tenants_to_migrate) do |tenant|
-          up_without_penthouse(migrations_paths, target_version, &block)
+        wrap_penthouse do
+          up_without_penthouse(migrations_paths, target_version)
         end
       end
 
       def down_with_penthouse(migrations_paths, target_version = nil, &block)
         unless Penthouse.configuration.migrate_tenants?
-          return down_without_penthouse(migrations_paths, target_version, &block)
+          return down_without_penthouse(migrations_paths, target_version)
         end
 
-        Penthouse.each_tenant(tenant_identifiers: tenants_to_migrate) do |tenant|
-          down_without_penthouse(migrations_paths, target_version, &block)
+        wrap_penthouse do
+          down_without_penthouse(migrations_paths, target_version)
         end
       end
 
@@ -76,13 +91,21 @@ module Penthouse
           return run_without_penthouse(direction, migrations_paths, target_version)
         end
 
-        Penthouse.each_tenant(tenant_identifiers: tenants_to_migrate) do |tenant|
+        wrap_penthouse do
           run_without_penthouse(direction, migrations_paths, target_version)
         end
       end
 
       private
 
+      def wrap_penthouse(&block)
+        if Penthouse.tenant
+          block.yield
+        else
+          Penthouse.each_tenant(tenant_identifiers: tenants_to_migrate, &block)
+        end
+      end
+
       def tenants_to_migrate
         return @tenants_to_migrate if defined?(@tenants_to_migrate)
         @tenants_to_migrate = begin

data/lib/penthouse/version.rb

@@ -1,3 +1,3 @@
 module Penthouse
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/penthouse.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rack', '~> 1.6.4'
   # db
   spec.add_development_dependency 'ar-octopus', '~> 0.8.6'
+  spec.add_development_dependency 'activesupport', '~> 4.2.6'
   spec.add_development_dependency 'activerecord', '~> 4.2.6'
   spec.add_development_dependency 'pg'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: penthouse
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Ryan Townsend
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.6
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.6
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +192,6 @@ files:
 - lib/penthouse/sidekiq/middleware/client.rb
 - lib/penthouse/sidekiq/middleware/server.rb
 - lib/penthouse/sidekiq/railtie.rb
-- lib/penthouse/tasks/enhancements.rb
 - lib/penthouse/tenants/base_tenant.rb
 - lib/penthouse/tenants/migratable.rb
 - lib/penthouse/tenants/octopus_schema_tenant.rb

data/lib/penthouse/tasks/enhancements.rb

@@ -1,35 +0,0 @@
-# Require this file to append Penthouse rake tasks to ActiveRecord db rake tasks
-# Enabled by default in the initializer
-
-# shamelessly copied & adjusted from Apartment
-# @see https://github.com/influitive/apartment/blob/development/lib/apartment/tasks/enhancements.rb
-
-module Penthouse
-  class RakeTaskEnhancer
-    TASKS = %w(db:migrate db:rollback db:migrate:up db:migrate:down db:migrate:redo db:seed)
-
-    class << self
-      def enhance!
-        TASKS.each do |name|
-          task = Rake::Task[name]
-          task.enhance do
-            if should_enhance?
-              enhance_task(task)
-            end
-          end
-        end
-      end
-
-      def should_enhance?
-        Penthouse.configuration.migrate_tenants?
-      end
-
-      def enhance_task(task)
-        Rake::Task[task.name.sub(/db:/, 'penthouse:')].invoke
-      end
-    end
-
-  end
-end
-
-Penthouse::RakeTaskEnhancer.enhance!