multi_ar 5.1.3 → 6.0.0.pre.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a84a45efae46d76b878918d4b5a05251c9a69b744c9441a1d1a723e86f5341
-  data.tar.gz: 864a297a5c7615a566a03681ce323bb88cfced098c4c3c293823d72f16088577
+  metadata.gz: 4be873bd564b04b81d3a4245160c98007dec42edb692cabf64ce1a4ae3e2b5ef
+  data.tar.gz: c33cbbed7eea9697166655ba9952e3155048c156975c82a20413bd99bb86b366
 SHA512:
-  metadata.gz: 045fc555b3557a4dc55ac02629d46be893696066551a89da2e197953c0620b4de77a20bfd6264c2ea134f2bba002b84d0358d215c265d66243b2ea55305fc442
-  data.tar.gz: aaf8c5830298cf650d0a957678692d466e627b2861d0d089ba40684112d658a3bbebbed46d69b5bb6642109c8e9b5e322220a1170f1cd610a92987031436e7c3
+  metadata.gz: e6a1152839e3967942d039eac8f6bc91a9ac572fe804f9d0cf1bbbc9aa040428d858350c5ed49d2dbcc3c2e0876bbc7a2801f606fb15876d2332e380d728af6f
+  data.tar.gz: 9ece6a831414d6bfbbdaf168db31e219ef3f161b31ad36e046da51f2244e2c06269da387217cd4250d7b96c81fa79cb665150afeb95a5d70a3db43623d9bb607

data/lib/multi_ar/interface.rb

@@ -65,6 +65,7 @@ module MultiAR
       p.banner @description if @description
       p.opt "init",         "Create stub environment with configuration and database.yaml. " +
                             "For current dir, use “.”.",                                              type: :string
+      p.opt "gem",          "Run migrations from an installed gem",                                   type: :string
       p.opt "databases",    "List of databases to perform operations",                                type: :strings if(@options["databases"] != false && !@options["databases"].respond_to?(:each))
       p.opt "db_config",    "Path to database config file",                                           type: :string, default: DEFAULT_DB_CONFIG if @options["db_config"] == true
       p.opt "config",       "Path to MultiAR framework config file",                                  type: :string, default: "config/settings.yaml" if @options["config"] == true
@@ -137,6 +138,7 @@ module MultiAR
       opts[:db_config] = @opts["db_config"] unless @opts["db_config"].nil?
       #opts[:migration_dirs] = [ @opts["migration_dir"] ]
       opts[:config] = @opts["config"] unless @opts["config"].nil?
+      opts[:migrations_from_gem] = @opts["gem"] unless @opts["gem"].nil?
       opts[:databases] = parse_databases_input(@opts["databases"])
       opts[:environment] = @opts["environment"]
       opts[:verbose] = @opts["verbose"]
@@ -155,7 +157,7 @@ module MultiAR
         elsif !@options["migration_dir"].nil?
           out[database] = "#{@options["migration_dir"]}/#{database}"
         else
-          out[database] = "db/migrate/#{database}"
+          out[database] = nil
         end
       end
 
@@ -180,6 +182,8 @@ module MultiAR
           File.write database_config, bootstrap_db_config(opts) unless File.exist?(database_config)
         end
 
+        bootstrap_db_dir opts
+
         bootstrap_config opts
       end
 
@@ -191,9 +195,6 @@ module MultiAR
       str = ""
       databases = parse_databases_input(opts["databases"])
       databases.each do |db, migration_path|
-        # This is a bit misleading place to create the migration dir, but it needs to be done somewhere.
-        FileUtils.mkdir_p(migration_path)
-
         # Create the config file
         [ "development", "production", "test"].each do |env|
           full_name = "#{db}_#{env}"
@@ -211,6 +212,14 @@ module MultiAR
       str
     end
 
+    def bootstrap_db_dir opts
+      databases = parse_databases_input(opts["databases"])
+      databases.each do |db, migration_path|
+        migration_path = "db/migrate/#{db}" if migration_path.nil?
+        FileUtils.mkdir_p(migration_path)
+      end
+    end
+
     def bootstrap_gemfile
 
       str = <<-EOS.gsub(/^ {6}/, "")

data/lib/multi_ar/rake/migration_generator.rb

@@ -10,7 +10,8 @@ module ActiveRecordMigrations
       source_root ::ActiveRecord::Generators::MigrationGenerator.source_root
 
       def db_migrate_path
-        databases = MultiAR::MultiAR::databases.first[1]
+        database_name = MultiAR::MultiAR::databases.first[0]
+        MultiAR::MultiAR::solve_migration_path database_name
       end
     end
   end

data/lib/multi_ar/rake/tasks.rb

@@ -102,7 +102,8 @@ module Rake
       multiple_databases_task "migrate", "db" do |database_name|
         establish_connection database_name
 
-        context = ActiveRecord::MigrationContext.new(MultiAR::MultiAR.databases[database_name])
+        migration_path = MultiAR::MultiAR::solve_migration_path database_name
+        context = ActiveRecord::MigrationContext.new(migration_path, ::ActiveRecord::Base.connection.schema_migration)
         context.migrate
 
         #MultiAR::MultiAR.migration_dirs.each do |dir|

data/lib/multi_ar/version.rb

@@ -1,4 +1,4 @@
 
 module MultiAR
-    VERSION = "5.1.3"
+    VERSION = "6.0.0-beta"
 end

data/lib/multi_ar.rb

@@ -19,6 +19,8 @@ module MultiAR
     # This will always be overridden, when MultiAR is initialized. Don’t try to do any funny logic with this.
     @@__databases = {}
 
+    @default_migration_path = "db/migrate"
+
     class << self
       # Instance of MultiAR::MultiAR, automatically assigned by MultiAR::MultiAR#new.
       # Used internally in the gem, to access configuration and other internal parts.
@@ -27,7 +29,7 @@ module MultiAR
 
     # @param databases array of available databases
     # @todo config file is overriding parameters passed here... I think it should be other way around, but need more custom logic for that :/
-    def initialize databases: nil, environment: "development", config: "config/settings.yaml", db_config: "config/database.yaml", verbose: false
+    def initialize databases: nil, environment: "development", config: "config/settings.yaml", db_config: "config/database.yaml", verbose: false, migrations_from_gem: nil
 
       # first load config
       if not config.nil? and File.exist? config
@@ -46,6 +48,9 @@ module MultiAR
       raise "#{db_config} is not valid path to a file. Try specifying --db-config <path> or configuring it in the configuration file." if db_config.nil? or !File.exist?(db_config)
       #raise "databases is not responding to :each. Try passing passing --databases <database> or configuring it in the configuration file." unless databases.respond_to? :each
 
+      # One can run migrations from a gem, instead of current project.
+      load_migration_gem migrations_from_gem, databases if not migrations_from_gem.nil?
+
       parse_databases_input databases unless databases.nil?
 
       #@databases = databases
@@ -115,11 +120,13 @@ module MultiAR
     #
     # @note often you want to add full path to this dir, `__dir__` is useful for this.
     def self.add_database database_name, migration_path
-      raise "Migration dir #{migration_path} does not exist." unless Dir.exist? migration_path
-      begin
-        ActiveRecord::Tasks::DatabaseTasks.migrations_paths << migration_path
-      rescue NameError
-        # multi_ar can be used without migration support, so adding a database to migration paths is only necessary when actually running migrations.
+      unless migration_path.nil?
+        raise "Migration dir #{migration_path} does not exist." unless Dir.exist? migration_path
+        begin
+          ActiveRecord::Tasks::DatabaseTasks.migrations_paths << migration_path
+        rescue NameError
+          # multi_ar can be used without migration support, so adding a database to migration paths is only necessary when actually running migrations.
+        end
       end
       @@__databases[database_name] = migration_path
     end
@@ -141,6 +148,17 @@ module MultiAR
       @@__databases
     end
 
+    # Returns calculated migration path or if path have not been given, fallback to default db/migrate/DB_NAME if it exists.
+    def self.solve_migration_path database_name
+      path = self.databases[database_name]
+      if path.nil?
+        path = "db/migrate/#{database_name}"
+        raise "Trying to use migrations for non-existing database. Please specify database if you have migrations in custom location. Given database: #{database_name}" unless File.exist? path
+      end
+
+      path
+    end
+
     # TODO: remember to remove these if not needed...
     # Helper to resolve a path to database
     #def self.resolve_database_path
@@ -152,6 +170,36 @@ module MultiAR
 
     private
 
+    def load_migration_gem migrations_from_gem, databases
+      # If the gem is not installed, we just want to fail.
+      gem migrations_from_gem
+
+      spec = Gem.loaded_specs[migrations_from_gem]
+      gem_dir = nil
+      if spec.respond_to? :full_gem_path
+        gem_dir = spec.full_gem_path
+      else
+        require_paths = spec["require_paths"]
+        gem_dir = require_paths[0]
+      end
+
+      # This file contains gem specific details which can be used to bootstrap MultiAR.
+      # There could be default values, but for security, as loading arbitrary gems accidentally could cause hard-to-recognize security bugs, since migrations are plain Ruby code.
+      # TODO: document contents of that file somewhere.
+      info_file = "#{gem_dir}/config/multi_ar_gem.yaml"
+
+      raise "File #{info_file} does not exist. Please check that your gem contains config/multi_ar_gem.yaml for automatic operation." unless File.exist? info_file
+      yaml = YAML.load_file info_file
+
+      migration_dir = yaml["migration_dir"]
+
+      # Put in gem’s migration path, so stuff should just magically work
+
+      databases.each do |database, migration_path|
+        databases[database] = "#{gem_dir}/#{migration_dir}"
+      end
+    end
+
     # Supports three different input formats:
     #
     # 1. Array with strings of database names
@@ -163,7 +211,7 @@ module MultiAR
           if database.kind_of? Hash
             ::MultiAR::MultiAR::add_database database["database"], database["migration_path"]
           else
-            ::MultiAR::MultiAR::add_database database, "db/migrate/#{database}"
+            ::MultiAR::MultiAR::add_database database, "#{default_migration_path}/#{database}"
           end
         end
         return

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_ar
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 6.0.0.pre.beta
 platform: ruby
 authors:
 - Samu Voutilainen
@@ -10,26 +10,31 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  37jzNNQuoDPqiNcASg0XaZAxvWI=
   -----END CERTIFICATE-----
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
@@ -51,28 +56,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: safe_attributes
   requirement: !ruby/object:Gem::Requirement
@@ -107,28 +112,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -190,12 +195,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Multi database feature set for ActiveRecord