multi_ar 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95080fdac04820a409aebfeb8329e821145af91e
-  data.tar.gz: 43d5aba9253ef4070601961a66be5ffe57947674
+  metadata.gz: 34e048d2d4906e2af853ade40a158107495f140e
+  data.tar.gz: 44a38ed6cd16746d8e70565d61e22524fe2fcc9c
 SHA512:
-  metadata.gz: 35fcb2b246d26cf9b1586f7975e9dd61cb99ee7f6c531170002d9cef8c68ff114d440b74d28dd2dae7e50af46f65a674a525f340d5efacc34a392e025dd5a8dd
-  data.tar.gz: 417f30d8920899e164f32727a8b04c54e868f708577577a44fd4be384a502589b41076763675993f884548c45853efe1b65116c18be193c47311416144311fba
+  metadata.gz: b8c98f946f3546b27e0eed21f396760df13e90f53a74fd8ac66e222a245b4762240c58126049a947e23febe7d1e650ea5fa9f97ee7dcc8687eaff62486c297ce
+  data.tar.gz: b4e6afd293a028585492fefa6637b8771042533e22c8d8f232637edc86934b1b3e532fd5d3594ebe50a591955a71019c2a0db12bed9428cce1016e6f5d2cbfe4

data/lib/multi_ar/rake/migration_generator.rb

@@ -10,7 +10,7 @@ module ActiveRecordMigrations
       source_root ::ActiveRecord::Generators::MigrationGenerator.source_root
 
       def db_migrate_path
-        dir = ::ActiveRecord::Tasks::DatabaseTasks.migration_dir
+        dir = ::ActiveRecord::Tasks::DatabaseTasks.migrations_paths.first
         db_dir = ::ActiveRecord::Tasks::DatabaseTasks.sub_db_dir
         "#{dir}/#{db_dir}"
       end

data/lib/multi_ar/rake/tasks.rb

@@ -5,11 +5,18 @@ require "active_record/tasks/database_tasks"
 # In case there is no Rails available, let’s do simple class
 begin
   require "rails"
+  require "rails/application"
+
+  Class.new(Rails::Application) unless Rails.application
 rescue LoadError
   class Rails
     def self.root
       nil # TODO, we want MultiAR::root like thing somewhere
     end
+
+    #def self.paths
+    #  { "db/migrate" => "/dev/null" }
+    #end
   end
 end
 
@@ -93,11 +100,14 @@ module Rake
       multiple_databases_task "migrate", "db" do |database_name|
         establish_connection database_name
 
-        MultiAR::MultiAR.migration_dirs.each do |dir|
-          path = "#{dir}/#{database_name}/"
-          # The database should be present only on one migration dir, so this will fail if there is more than one migration dir
-          ActiveRecord::Migrator.migrate path if Dir.exist? path
-        end
+        context = ActiveRecord::MigrationContext.new MultiAR::MultiAR.migration_dirs
+        context.migrate
+
+        #MultiAR::MultiAR.migration_dirs.each do |dir|
+        #  path = "#{dir}/#{database_name}/"
+        #  # The database should be present only on one migration dir, so this will fail if there is more than one migration dir
+        #  ActiveRecord::Migrator.migrate path if Dir.exist? path
+        #end
       end
 
       multiple_databases_task "create", "db" do |database_name|

data/lib/multi_ar/version.rb

@@ -1,4 +1,4 @@
 
 module MultiAR
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end

data/lib/multi_ar.rb

@@ -1,5 +1,4 @@
 
-
 require_relative "multi_ar/rake/ext"
 require_relative "multi_ar/rake/tasks"
 
@@ -19,7 +18,7 @@ module MultiAR
 
     # @api private
     # This will always be overridden, when MultiAR is initialized. Don’t try to do any funny logic with this.
-    @@migration_dirs = []
+    #@@migration_dirs = []
 
     class << self
       # Instance of MultiAR::MultiAR, automatically assigned by MultiAR::MultiAR#new.
@@ -48,13 +47,13 @@ module MultiAR
       @databases = databases
       @db_config = db_config
       @environment = environment
-      @@migration_dirs = migration_dirs unless migration_dirs.empty? # This takes care of that it will only be overridden if there is any given values, making default configs work
+      #@@migration_dirs = migration_dirs unless migration_dirs.empty? # This takes care of that it will only be overridden if there is any given values, making default configs work
+      ActiveRecord::Tasks::DatabaseTasks.migrations_paths = migration_dirs
 
       Database.initialize db_config: db_config
 
-      ActiveRecord::Tasks::DatabaseTasks.class_eval { attr_accessor :sub_db_dir, :migration_dir }
+      ActiveRecord::Tasks::DatabaseTasks.class_eval { attr_accessor :sub_db_dir }
       ActiveRecord::Tasks::DatabaseTasks.sub_db_dir = databases.first # TODO: I don’t think this is how it should work
-      ActiveRecord::Tasks::DatabaseTasks.migration_dir = migration_dirs.first # TODO: I don’t think this is how it should work
 
       @rake = ::Rake::Application.new
       ::Rake.application = @rake
@@ -73,7 +72,7 @@ module MultiAR
     # Array of paths to directories where migrations resides.
     # @see add_migration_dir
     def self.migration_dirs
-      return @@migration_dirs
+      ActiveRecord::Tasks::DatabaseTasks.migrations_paths
     end
 
     # Outputs contents if verbose flag has been passed.
@@ -93,7 +92,7 @@ module MultiAR
     # @note often you want to add full path to this dir, `__dir__` is useful for this.
     def self.add_migration_dir path
       raise "Migration dir #{path} does not exist." unless Dir.exist? path
-      @@migration_dirs << path
+      ActiveRecord::Tasks::DatabaseTasks.migrations_paths << path
     end
 
     # @todo this shows rake in start of the command, we want to show multi_ar instead.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_ar
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Samu Voutilainen
@@ -11,25 +11,25 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   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
-  MRQwEgYKCZImiZPyLGQBGRYEc21hcjESMBAGCgmSJomT8ixkARkWAmZpMB4XDTE3
-  MDMwODEwNTc0OFoXDTE4MDMwODEwNTc0OFowOTENMAsGA1UEAwwEc21hcjEUMBIG
+  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
-  hvcNAQEBBQADggEPADCCAQoCggEBALvQbvJnLuogtsBEsQVXxBuHJnI6lHR9cqrf
-  l/+Czx3L1mXl0rQBovvcnlXeEnZY3T5DOX47DKkp040XH/E8GNvbQNz8+pUbw9zn
-  hrHpf47QYv54lwi1j+iXseKW3SKcIXX+qBwx0dqyX4uXbqf10Yr7PWT3aUaAg3Ja
-  2c6WWXfmjtxgUG+bUbl0R5wJjfQw9ZyPQXPSGl91MPzaBsuWHzQxDgH2bapti3S7
-  Q7A0dh9aiQIeXKHfhaF1gubXfFtgfvjtfRRC+RtFQ8FUVvEdrH7SGXhsiSMnBmi0
-  5EfpwNQMR9wtgSPFTFKFxPuXYeamWBrHxEFh+EqXcANMT/XGxC0CAwEAAaNrMGkw
-  CQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGvHm+HKyiO9LhSFk+Qr
-  UCShvPsCMBcGA1UdEQQQMA6BDHNtYXJAc21hci5maTAXBgNVHRIEEDAOgQxzbWFy
-  QHNtYXIuZmkwDQYJKoZIhvcNAQEFBQADggEBAF0Q3srp4bIXnpMrHRAo1zr/BQYk
-  IG9fVJukAzF8eA43qzge+gYxAR49viwN4SpJ8smf9HHCJdSf2CP+/A3wEtAiadDd
-  ISyrQmOytq1572gUOMKoa5Ldehv4K8zLXUUKSR5zIcxTM+Ps39wnSZQpwGmsNP1S
-  cFmo15zHVuhxYrrhkUK5mdQpo0BAGwc/mZGeSzbq6+qSKWBEDpCVQWto9i0Xf8vh
-  xhmaYRqn3azWQoht7k9S9EgR6gyzbRZOGWY73QxMvPho+P79etvFY7jq+FyTamSg
-  jRqpb6h1mR1Hf8srR8R/GCDiZdggn0e0wzmHCDQQE4eD0FubzrnjsEeTFXU=
+  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
   -----END CERTIFICATE-----
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -158,7 +158,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.4'
 description: |-
-  Core library for multi database support in any Ruby project for ActiveRecord 4.
+  Core library for multi database support in any Ruby project for ActiveRecord.
     Migrations are supported by optional gem multi_ar_migrations.
 email: smar@smar.fi
 executables:
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Multi database feature set for ActiveRecord