multi_ar 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e703260ff0896138cefe607320db98e5c020bbe0233117a518e833ae5afb0408
-  data.tar.gz: 2a2d097579ffb99fd8735b4fe5c53aef110d5edabc47761375b0edcbc4f59174
+  metadata.gz: c2d35c65ac586a681d1ae51f3a61a6f98e79f47a467dbdd097d20f427a9b51f8
+  data.tar.gz: a169328e8a669ba95a69fd36fe0fc52c33a5f10f99fdb5186572bc8019fee43f
 SHA512:
-  metadata.gz: 1c8c633fbdc59cd7d7bf4e01429956a602776f26bb726d2b26ef55985786c98e8cebfd960040dd540e5255d4405a227b805a5ed20859c10723d29cbaf81095d0
-  data.tar.gz: 665b59f332f12c9c6ee82629fb07a7e06fb3e56dc3425433c1e6801672ad1db8b178465450c446168a4e6f8ad639f4717ccf620efa2c6a7383f5338c5cc8cd87
+  metadata.gz: 19a8273f4ba5bdb663f8b961eabc38bb19e90d2701b2573348350497c5d10637e58c226654279d8565dd36448ca6d97140b8526ae68e2c0e313cfaef7e3586a2
+  data.tar.gz: 3a93f3563be70937ba18b40056bc89e1969945b87915fcd4bf2dfe5e771dfd280bc99beb1c244271198613682db218cc5b74e893704334347aa06a6c4c695a34

data/lib/multi_ar/interface.rb

@@ -140,11 +140,11 @@ module MultiAR
       opts[:databases] = parse_databases_input(@opts["databases"])
       opts[:environment] = @opts["environment"]
       opts[:verbose] = @opts["verbose"]
-      opts[:migration_framework] = @migration_framework
       @multi_ar = MultiAR.new opts
     end
 
     def parse_databases_input databases
+      return if databases.nil?
       raise "You did not give proper databases. Please see --help for instructions." unless databases.respond_to? :each
 
       out = {}

data/lib/multi_ar/version.rb

@@ -1,4 +1,4 @@
 
 module MultiAR
-    VERSION = "5.0.0"
+    VERSION = "5.1.0"
 end

data/lib/multi_ar.rb

@@ -27,7 +27,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:, environment: "development", config: "config/settings.yaml", db_config: "config/database.yaml", verbose: false, migration_framework: true
+    def initialize databases: nil, environment: "development", config: "config/settings.yaml", db_config: "config/database.yaml", verbose: false
 
       # first load config
       if not config.nil? and File.exist? config
@@ -35,27 +35,22 @@ module MultiAR
         config = Psych.load_file config
         b = binding
         config.each do |key, value|
-          if key == "databases"
-            out = {}
-            value.each do |database|
-              out[database["database"]] = database["migration_path"]
-            end
-            value = out
+          # If databases have been passed, we don’t have much reason to override it from config
+          if key != "databases" || databases.nil?
+            b.local_variable_set key.to_sym, value
           end
-          b.local_variable_set key.to_sym, value
         end
       end
 
       # then check that we have data in format we want it to be
       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
+      #raise "databases is not responding to :each. Try passing passing --databases <database> or configuring it in the configuration file." unless databases.respond_to? :each
 
-      parse_databases_input databases
+      parse_databases_input databases unless databases.nil?
 
       #@databases = databases
       @db_config = db_config
       @environment = environment
-      @migration_framework = migration_framework
       #@@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
 
@@ -120,9 +115,11 @@ 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
-      if @migration_framework
-        raise "Migration dir #{migration_path} does not exist." unless Dir.exist? 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.
       end
       @@__databases[database_name] = migration_path
     end
@@ -144,12 +141,30 @@ module MultiAR
       @@__databases
     end
 
+    # TODO: remember to remove these if not needed...
+    # Helper to resolve a path to database
+    #def self.resolve_database_path
+
+    #end
+
+    #def self.resolve_databases_paths
+    #end
+
     private
 
+    # Supports three different input formats:
+    #
+    # 1. Array with strings of database names
+    # 2. Array with hashes of { "database" => "db_name", "migration_path" => "/path/to/migrations" }
+    # 3. Hash with key as database name and value as migration path
     def parse_databases_input dbs
       if dbs.kind_of? Array
         dbs.each do |database|
-          ::MultiAR::MultiAR::add_database database, "db/migrate/#{database}"
+          if database.kind_of? Hash
+            ::MultiAR::MultiAR::add_database database["database"], database["migration_path"]
+          else
+            ::MultiAR::MultiAR::add_database database, "db/migrate/#{database}"
+          end
         end
         return
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_ar
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Samu Voutilainen
@@ -29,7 +29,7 @@ cert_chain:
   w7Q+3AEK9ifd9ywHO2Ott0JdJEadxhU4N0cI6bQg+uJiSYmdBK0vEJN4lhNg1w37
   C6hgCMQL3/D3kq732F4KGypqykYwx1wRDGHLxDTBHY26sy/TXfHcj4zPuKA=
   -----END CERTIFICATE-----
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -161,12 +161,10 @@ description: |-
   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:
-- multi_ar
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/multi_ar
 - lib/multi_ar.rb
 - lib/multi_ar/database.rb
 - lib/multi_ar/interface.rb

data/bin/multi_ar

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative "../lib/multi_ar/interface"
-
-require_relative "../lib/multi_ar/version"
-
-interface = MultiAR::Interface.new
-interface.version = "multi_ar-#{MultiAR::VERSION}"
-interface.description = "Multi database migration tools utilizing ActiveRecord"
-interface.migration_framework = true
-opts = interface.cli do |parser|
-  # Nya.
-end