standalone_migrations 7.1.2 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5764e519800ba6fc51161d55f3d8e12634737d88f9de3e2620a2b0fc265edf9
-  data.tar.gz: 00575db5b1e043e6442b8ad01333eebe4b2c4f35ae7e76be3b30ba45e5ae62dd
+  metadata.gz: aa4253d853dda697a79a89168930f03f2cd24faf8735b3c74160052ed4af42cd
+  data.tar.gz: 9134409f5c61cb61aa8eea4c0f8de328e46f5bf6ac8b91001252c224da72b859
 SHA512:
-  metadata.gz: f2f9fd28fb80d93c9d217b66d655ea76dba963da11e2546fea7a41e84cd1d9bde1305d4c9c19836662ea50625182dcbb8156b925d1c8987c260fbfb9660d2250
-  data.tar.gz: 0dd36ec1ecf386948fb89ee65a781748c405d11f66d741b30028e922ac9444585e6180a1c441b147bd0eaed54080881baa3bf251e79e9e315156b50a25ca7e5c
+  metadata.gz: e3f45a0a083c645cefb4adf7518fcdef10304f5a742e6ed167da2e5353b687b9bf957d9880ff216c17f13197c21afa55f2a9cd5c63f80ae3e288c434450a76ce
+  data.tar.gz: '05090f7bfbbefaf86ca4026b2b000e3efb7460e03aa7ea66554cf6444462ec04c518788fe9ed7ae545c914d062580144b1430eca7876d221446be5a0a7c79c21'

data/.github/workflows/CI.yml

@@ -13,22 +13,14 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.6'
           - '2.7'
           - '3.0'
           - '3.1'
         activerecord:
-          - '5.2'
           - '6.0'
           - '6.1'
           - '7.0'
-        exclude:
-          - activerecord: '5.2'
-            ruby: '3.1'
-          - activerecord: '5.2'
-            ruby: '3.0'
-          - activerecord: '7.0'
-            ruby: '2.6'
+          - '7.1'
     name: Ruby ${{ matrix.ruby }} / ActiveRecord ${{ matrix.activerecord }}
     env:
        AR: ~> ${{ matrix.activerecord }}

data/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
 gem 'rake', '>= 10.0'
-gem 'activerecord', ENV['AR'] ? ENV['AR'].split(",") : [">= 6.0.0", "< 7.1.0"]
-gem 'railties', ENV['AR'] ? ENV['AR'].split(",") : [">= 6.0.0", "< 7.1.0"]
+gem 'activerecord', ENV['AR'] ? ENV['AR'].split(",") : [">= 6.0.0", "< 7.2"]
+gem 'railties', ENV['AR'] ? ENV['AR'].split(",") : [">= 6.0.0", "< 7.2"]
 gem 'nokogiri', "~> 1.14"
 
 group :dev do

data/README.markdown

@@ -1,9 +1,11 @@
 Rails migrations in non-Rails (and non Ruby) projects.
 
-[![Build Status](https://travis-ci.org/thuss/standalone-migrations.svg?branch=master)](https://travis-ci.org/thuss/standalone-migrations)
+[![Build Status](https://github.com/thuss/standalone-migrations/actions/workflows/CI.yml/badge.svg)](https://github.com/thuss/standalone-migrations/actions)
 
 WHAT'S NEW
 ==========
+In the 7.x release we've added support for Rails 7 migrations thanks to multiple community submitted PR's!
+
 In the 6.x release we've added support for Rails 6 migrations thanks to [Marco Adkins](https://github.com/marcoadkins).
 
 In the 5.x release we have moved to using Rails 5 migrations instead of maintaining our own migration related code. Just about anything you can do with Rails 5 migrations you can now do with [Standalone Migrations](https://github.com/thuss/standalone-migrations) too!
@@ -18,6 +20,15 @@ Install Ruby, RubyGems and a ruby-database driver (e.g. `gem install mysql` or `
 
     $ gem install standalone_migrations
 
+or use a Gemfile (and then `bundle install`):
+
+```
+source 'https://rubygems.org'
+
+gem 'standalone_migrations'
+gem 'pg' # or mysql2
+```
+
 Add to `Rakefile` in your projects base directory:
 
 ```ruby
@@ -272,3 +283,4 @@ Contributors
  - [Mithun James](https://github.com/drtechie)
  - [Sarah Ridge](https://github.com/smridge)
  - [John Bachir](https://jjb.cc)
+ - [Pysis](https://github.com/Pysis868)

data/VERSION

@@ -1 +1 @@
-7.1.2
+7.1.3

data/lib/standalone_migrations/configurator.rb

@@ -2,7 +2,6 @@ require 'active_support/all'
 require 'yaml'
 
 module StandaloneMigrations
-
   class InternalConfigurationsProxy
 
     attr_reader :configurations
@@ -32,70 +31,100 @@ module StandaloneMigrations
     end
 
     def initialize(options = {})
-      defaults = {
-        :config       => "db/config.yml",
-        :migrate_dir  => "db/migrate",
-        :root         => Pathname.pwd,
-        :seeds        => "db/seeds.rb",
-      }
-      @options = load_from_file(defaults.dup) || defaults.merge(options)
+      options = options.dup
+      @schema = options.delete('schema')
+      @config_overrides = defaults
+      c_os['paths'].merge!(options.delete('paths') || {})
+      c_os.merge!(options)
 
-      ENV['SCHEMA'] ||= schema if schema
-      Rails.application.config.root = root
-      Rails.application.config.paths["config/database"] = config
-      Rails.application.config.paths["db/migrate"] = migrate_dir
-      Rails.application.config.paths["db/seeds.rb"] = seeds
-    end
+      load_from_file
+
+      ENV['SCHEMA'] ||= @schema if @schema
+      rac = Rails.application.config
 
-    def config
-      @options[:config]
+      rac.root = c_os['root']
+      c_os['paths'].each do |path, value|
+        rac.paths[path] = value
+      end
     end
 
-    def migrate_dir
-      @options[:migrate_dir]
+    def config_for_all
+      Configurator.load_configurations.dup
     end
 
-    def root
-      @options[:root]
+    def config_for(environment)
+      config_for_all[environment.to_s]
     end
 
-    def seeds
-      @options[:seeds]
+    def c_os
+      config_overrides
+    end
+    def config_overrides
+      @config_overrides
     end
 
-    def schema
-      @options[:schema]
+    def c_o_p_m
+      config_override_path_mappings
+    end
+    def config_override_path_mappings
+      {
+        'config/database' => {
+          'config_key_path' => ['config', 'database'],
+                  'default' => 'db/config.yml'
+        },
+                     'db' => {
+          'config_key_path' => ['db'    , 'dir'     ],
+                  'default' => 'db'
+        },
+             'db/migrate' => {
+          'config_key_path' => ['db'    , 'migrate' ],
+                  'default' => 'db/migrate'
+        },
+            'db/seeds.rb' => {
+          'config_key_path' => ['db'    , 'seeds'   ],
+                  'default' => 'db/seeds.rb'
+        },
+      }
     end
 
-    def config_for_all
-      Configurator.load_configurations.dup
+    def defaults
+      {
+        'paths' => c_o_p_m.map do |path, value|
+          [ path, value['default'] ]
+        end.to_h,
+        'root' => Pathname.pwd,
+      }
     end
 
-    def config_for(environment)
-      config_for_all[environment.to_s]
+    def schema
+      @schema
     end
 
     private
 
     def configuration_file
-      if !ENV['DATABASE']
-        ".standalone_migrations"
-      else
-        ".#{ENV['DATABASE']}.standalone_migrations"
-      end
+      ".#{ENV['DATABASE']}.standalone_migrations".sub(/^\.\./, '.')
     end
 
-    def load_from_file(defaults)
+    def load_from_file
       return nil unless File.exist? configuration_file
-      config = YAML.load( ERB.new(IO.read(configuration_file)).result )
-      {
-        :config       => config["config"] ? config["config"]["database"] : defaults[:config],
-        :migrate_dir  => (config["db"] || {})["migrate"] || defaults[:migrate_dir],
-        :root         => config["root"] || defaults[:root],
-        :seeds        => (config["db"] || {})["seeds"] || defaults[:seeds],
-        :schema       => (config["db"] || {})["schema"]
-      }
-    end
+      data = YAML.load( ERB.new(IO.read(configuration_file)).result )
+
+      @schema = data.dig('db', 'schema')
 
+      c_o_paths = c_o_p_m.map do |path, value|
+        [
+          path,
+          data.dig(*value['config_key_path'])
+        ]
+      end.to_h.select { |key, value| value.present? }
+
+      c_o_paths = defaults['paths'].merge(c_o_paths)
+
+      @config_overrides = defaults.merge({
+        'paths' => c_o_paths,
+        'root'  => data.dig('root'),
+      }.select { |key, value| value.present? })
+    end
   end
 end

data/spec/standalone_migrations/configurator_spec.rb

@@ -12,21 +12,47 @@ module StandaloneMigrations
       end
     end
 
+    it "does not break / emit an error" do
+      expect { Configurator.new }.not_to raise_error
+    end
+
+    context "default values when .standalone_configurations is missing" do
+      let(:configurator) do
+        Configurator.new
+      end
+
+      it "use config/database.yml" do
+        expect(configurator.c_os['paths']['config/database']).to eq('db/config.yml')
+      end
+
+      it "use db dir" do
+        expect(configurator.c_os['paths']['db']).to eq('db')
+      end
+
+      it "use db/migrate dir" do
+        expect(configurator.c_os['paths']['db/migrate']).to eq('db/migrate')
+      end
+
+      it "use db/seeds.rb" do
+        expect(configurator.c_os['paths']['db/seeds.rb']).to eq("db/seeds.rb")
+      end
+    end
+
     describe "environment yaml configuration loading" do
 
       let(:env_hash_other_db) do
         {
           "development" => {"adapter" => "mysql2", "database" => "database_name"},
-          "test" => {"adapter" => "mysql2", "database" => "database_name"},
-          "production" => {"adapter" => "mysql2", "database" => "database_name"}
+          "test"        => {"adapter" => "mysql2", "database" => "database_name"},
+          "production"  => {"adapter" => "mysql2", "database" => "database_name"}
         }
       end
 
       around(:each) do |example|
         @env_hash = {
           "development" => {"adapter" => "sqlite3", "database" => "db/development.sql"},
-          "test" => {"adapter" => "sqlite3", "database" => "db/test.sql"},
-          "production" => {"adapter" => "sqlite3", "database" => ":memory:"}
+          "test"        => {"adapter" => "sqlite3", "database" => "db/test.sql"       },
+          "production"  => {"adapter" => "sqlite3", "database" => ":memory:"          }
         }
         FileUtils.mkdir_p "db"
         File.open("db/config.yml", "w") do |f|
@@ -88,31 +114,16 @@ module StandaloneMigrations
 
     end
 
-    context "default values when .standalone_configurations is missing" do
-      let(:configurator) do
-        Configurator.new
-      end
-
-      it "use config/database.yml" do
-        expect(configurator.config).to eq('db/config.yml')
-      end
-
-      it "use db/migrate dir" do
-        expect(configurator.migrate_dir).to eq('db/migrate')
-      end
-
-      it "use db/seeds.rb" do
-        expect(configurator.seeds).to eq("db/seeds.rb")
-      end
-    end
-
     context "passing configurations as a parameter" do
       let(:args) do
         {
-          :config => "custom/config/database.yml",
-          :migrate_dir => "custom/db/migrate",
-          :seeds => "custom/db/seeds.rb",
-          :schema => "custom/db/schema.rb"
+          'paths' => {
+            'config/database' => "custom/config/database.yml" ,
+                         'db' => "db"                         ,
+                 'db/migrate' => "custom/db/migrate"          ,
+                'db/seeds.rb' => "custom/db/seeds.rb"         ,
+          },
+                     'schema' => "custom/db/schema.rb"
         }
       end
 
@@ -121,19 +132,31 @@ module StandaloneMigrations
       end
 
       it "use custom config" do
-        expect(configurator.config).to eq(args[:config])
+        expect(configurator.c_os['paths']['config/database']).to(
+          eq(args['paths']['config/database'])
+        )
+      end
+
+      it "use custom db dir" do
+        expect(configurator.c_os['paths']['db']).to(
+          eq(args['paths']['db'])
+        )
       end
 
       it "use custom migrate dir" do
-        expect(configurator.migrate_dir).to eq(args[:migrate_dir])
+        expect(configurator.c_os['paths']['db/migrate']).to(
+          eq(args['paths']['db/migrate'])
+        )
       end
 
       it "use custom seeds" do
-        expect(configurator.seeds).to eq(args[:seeds])
+        expect(configurator.c_os['paths']['db/seeds.rb']).to(
+          eq(args['paths']['db/seeds.rb'])
+        )
       end
 
       it "use custom schema" do
-        expect(configurator.schema).to eq(args[:schema])
+        expect(configurator.schema).to eq(args['schema'])
       end
 
     end
@@ -148,9 +171,10 @@ module StandaloneMigrations
       let(:yaml_hash) do
         {
           "db" => {
-            "seeds" => "file/db/seeds.rb",
-            "migrate" => "file/db/migrate",
-            "schema" => "file/db/schema.rb"
+            "dir"     => "file/db"          ,
+            "migrate" => "file/db/migrate"  ,
+              "seeds" => "file/db/seeds.rb" ,
+             "schema" => "file/db/schema.rb"
           },
           "config" => {
             "database" => "file/config/database.yml"
@@ -161,9 +185,10 @@ module StandaloneMigrations
       let(:yaml_hash_other_db) do
         {
           "db" => {
-            "seeds" => "db2/seeds.rb",
-            "migrate" => "db2/migrate",
-            "schema" => "db2/schema.rb"
+                "dir" => "db2"          ,
+            "migrate" => "db2/migrate"  ,
+              "seeds" => "db2/seeds.rb" ,
+             "schema" => "db2/schema.rb"
           },
           "config" => {
             "database" => "config/config_other.yml"
@@ -180,7 +205,9 @@ module StandaloneMigrations
         before(:each) do
           ENV['DATABASE'] = "other_db"
           file_other_db = ".other_db.standalone_migrations"
-          File.open(file_other_db, "w") { |file| file.write(yaml_hash_other_db.to_yaml) }
+          File.open(file_other_db, "w") do |file|
+            file.write(yaml_hash_other_db.to_yaml)
+          end
         end
 
         let(:other_configurator) do
@@ -188,11 +215,15 @@ module StandaloneMigrations
         end
 
         it "look up named dot file" do
-          expect(other_configurator.config).to eq(yaml_hash_other_db['config']['database'])
+          expect(other_configurator.c_os['paths']['config/database']).to(
+            eq(yaml_hash_other_db['config']['database'])
+          )
         end
 
         it "load config from named dot file" do
-          expect(other_configurator.migrate_dir).to eq('db2/migrate')
+          expect(other_configurator.c_os['paths']['db/migrate']).to(
+            eq('db2/migrate')
+          )
         end
 
         after(:all) do
@@ -215,33 +246,46 @@ module StandaloneMigrations
         end
 
         it "use default values for the missing configurations" do
-          expect(configurator.migrate_dir).to eq('db/migrate')
+          expect(configurator.c_os['paths']['db']).to(
+            eq('db'         )
+          )
+          expect(configurator.c_os['paths']['db/migrate']).to(
+            eq('db/migrate' )
+          )
         end
 
         it "use custom config from file" do
-          expect(configurator.config).to eq(yaml_hash["config"]["database"])
+          expect(configurator.c_os['paths']['config/database']).to(
+            eq(yaml_hash["config"]["database"])
+          )
         end
 
         it "use custom config value from partial configuration" do
-          expect(configurator.seeds).to eq(yaml_hash["db"]["seeds"])
+          expect(configurator.c_os['paths']['db/seeds.rb']).to(
+            eq(yaml_hash["db"]["seeds"])
+          )
         end
 
       end
 
       it "use custom config from file" do
-        expect(configurator.config).to eq(yaml_hash["config"]["database"])
+        expect(configurator.c_os['paths']['config/database']).to(
+          eq(yaml_hash["config"]["database"])
+        )
       end
 
       it "use custom migrate dir from file" do
-        expect(configurator.migrate_dir).to eq(yaml_hash["db"]["migrate"])
+        expect(configurator.c_os['paths']['db/migrate']).to eq(yaml_hash["db"]["migrate"])
       end
 
       it "use custom seeds from file" do
-        expect(configurator.seeds).to eq(yaml_hash["db"]["seeds"])
+        expect(configurator.c_os['paths']['db/seeds.rb']).to eq(yaml_hash["db"]["seeds"])
       end
 
       it "use custom schema from file" do
-        expect(configurator.schema).to eq(yaml_hash["db"]["schema"])
+        expect(configurator.schema).to(
+          eq(yaml_hash["db"]["schema"])
+        )
       end
 
     end

data/spec/standalone_migrations_spec.rb

@@ -18,7 +18,7 @@ describe 'Standalone migrations' do
   end
 
   def schema
-    ENV['SCHEMA'] || ActiveRecord::Tasks::DatabaseTasks.schema_file(ActiveRecord::Base.schema_format)
+    ENV['SCHEMA'] || 'db/schema.rb'
   end
 
   def run(cmd)
@@ -296,13 +296,13 @@ production:
   describe 'db:test:load' do
     it 'loads' do
       write(schema, "puts 'LOADEDDD'")
-      expect(run("rake db:test:load")).to match(/LOADEDDD/)
+      expect(run("rake db:test:load_schema")).to match(/LOADEDDD/)
     end
 
     it "fails without schema" do
       schema_path = schema
       `rm -rf #{schema_path}` if File.exist?(schema_path)
-      expect { run("rake db:test:load") }.to raise_error(/try again/)
+      expect { run("rake db:test:load_schema") }.to raise_error(/try again/)
     end
   end
 

data/standalone_migrations.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: standalone_migrations 7.1.2 ruby lib
+# stub: standalone_migrations 7.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "standalone_migrations".freeze
-  s.version = "7.1.2"
+  s.version = "7.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Todd Huss".freeze, "Michael Grosser".freeze]
-  s.date = "2023-11-02"
+  s.date = "2023-11-17"
   s.email = "thuss@gabrito.com".freeze
   s.extra_rdoc_files = [
     "LICENSE",
@@ -66,13 +66,13 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :add_runtime_dependency then
     s.add_runtime_dependency(%q<rake>.freeze, [">= 10.0"])
-    s.add_runtime_dependency(%q<activerecord>.freeze, [">= 6.0.0", "< 7.1.0"])
-    s.add_runtime_dependency(%q<railties>.freeze, [">= 6.0.0", "< 7.1.0"])
+    s.add_runtime_dependency(%q<activerecord>.freeze, [">= 6.0.0", "< 7.2"])
+    s.add_runtime_dependency(%q<railties>.freeze, [">= 6.0.0", "< 7.2"])
     s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.14"])
   else
     s.add_dependency(%q<rake>.freeze, [">= 10.0"])
-    s.add_dependency(%q<activerecord>.freeze, [">= 6.0.0", "< 7.1.0"])
-    s.add_dependency(%q<railties>.freeze, [">= 6.0.0", "< 7.1.0"])
+    s.add_dependency(%q<activerecord>.freeze, [">= 6.0.0", "< 7.2"])
+    s.add_dependency(%q<railties>.freeze, [">= 6.0.0", "< 7.2"])
     s.add_dependency(%q<nokogiri>.freeze, ["~> 1.14"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standalone_migrations
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.1.3
 platform: ruby
 authors:
 - Todd Huss
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -34,7 +34,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,7 +64,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement