standalone_migrations 7.1.1 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66f87cd3256a662758f0fd259e5f70041cb7d66bd9c291bf40ba6b48786fa437
-  data.tar.gz: 54ffbe0be9e3122eaa6ba568448ce62f80bff8f0005308417b47e67e45aa3d71
+  metadata.gz: aa4253d853dda697a79a89168930f03f2cd24faf8735b3c74160052ed4af42cd
+  data.tar.gz: 9134409f5c61cb61aa8eea4c0f8de328e46f5bf6ac8b91001252c224da72b859
 SHA512:
-  metadata.gz: cdfe6fcfdd99b9586126daa36c9772479f7872bab6755cf6daeeef0aa8cd3695154a37e9bd9d15ee49ed18317d7f02d7010206afe55e2cd88309d39ba2164f92
-  data.tar.gz: 87c736c8d019bb2b9d36b628f220902e4f77e20ef7cf866ae6bc6ba00e4453dcf09a5f4d520598e222266bda03d09845fdfeadf3db6fbf87d0a74b6bde960a13
+  metadata.gz: e3f45a0a083c645cefb4adf7518fcdef10304f5a742e6ed167da2e5353b687b9bf957d9880ff216c17f13197c21afa55f2a9cd5c63f80ae3e288c434450a76ce
+  data.tar.gz: '05090f7bfbbefaf86ca4026b2b000e3efb7460e03aa7ea66554cf6444462ec04c518788fe9ed7ae545c914d062580144b1430eca7876d221446be5a0a7c79c21'

data/.github/workflows/CI.yml

@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+        activerecord:
+          - '6.0'
+          - '6.1'
+          - '7.0'
+          - '7.1'
+    name: Ruby ${{ matrix.ruby }} / ActiveRecord ${{ matrix.activerecord }}
+    env:
+       AR: ~> ${{ matrix.activerecord }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: |
+          bundle exec rake

data/.rspec

@@ -1,2 +1,2 @@
---color
+--force-color
 --profile

data/Gemfile

@@ -1,11 +1,12 @@
 source 'https://rubygems.org'
 
 gem 'rake', '>= 10.0'
-gem 'activerecord', ENV['AR'] ? ENV['AR'].split(",") : [">= 4.2.7", "< 7.1.0", "!= 5.2.3", "!=5.2.3.rc1"]
-gem 'railties', ENV['AR'] ? ENV['AR'].split(",") : [">= 4.2.7", "< 7.1.0", "!= 5.2.3", "!=5.2.3.rc1"]
+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
-  gem 'sqlite3', ENV['SQL'] ? ENV['SQL'].split(",") : ['~> 1.4']
+  gem 'sqlite3', '~> 1.5'
   gem 'rspec', '>= 2.99.0'
   gem 'jeweler'
 end

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
@@ -271,3 +282,5 @@ Contributors
  - [Marco Adkins](https://github.com/marcoadkins)
  - [Mithun James](https://github.com/drtechie)
  - [Sarah Ridge](https://github.com/smridge)
+ - [John Bachir](https://jjb.cc)
+ - [Pysis](https://github.com/Pysis868)

data/Rakefile

@@ -1,32 +1,16 @@
 require 'rubygems'
 require 'bundler/setup'
 
-task :default do
-  sh "rspec spec"
-end
-
 task :all do
   sh "AR='~>3.0.0' bundle update activerecord && bundle exec rake"
   sh "AR='~>3.1.0.rc4' bundle update activerecord && bundle exec rake"
 end
 
-task :specs => ["specs:nodb"]
-namespace :specs do
+begin
   require 'rspec/core/rake_task'
-
-  desc "only specs that don't use database connection"
-  RSpec::Core::RakeTask.new "nodb" do |t|
-    t.pattern = "spec/standalone_migrations/**/*_spec.rb"
-  end
-
-  desc "run all specs for travis"
-  RSpec::Core::RakeTask.new "travis" do |t|
-    t.pattern = "spec/**/*_spec.rb"
-    t.rspec_opts = "--tag ~@travis_error"
-  end
-
-  desc "run all specs including those which uses database"
-  task :all => [:default, :nodb]
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+  # no rspec available
 end
 
 # rake install -> install gem locally (for tests)
@@ -50,3 +34,5 @@ else
 
   Jeweler::GemcutterTasks.new
 end
+
+task default: "spec"

data/VERSION

@@ -1 +1 @@
-7.1.1
+7.1.3

data/example/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+ruby '~> 3.0'
+
+gem 'standalone_migrations'
+gem 'sqlite3'

data/example/README.markdown

@@ -0,0 +1,23 @@
+This is an example minimal app based off of
+[this blog post](https://www.techcareerbooster.com/blog/use-activerecord-in-your-ruby-project),
+archived [here](article.pdf) with permission of the author.
+
+It demonstrates:
+
+* database configuration
+* a migration
+* a model
+* loading all relevant code into a runtime and using it
+
+
+```
+bundle
+bundle exec rake db:create
+bundle exec rake db:migrate
+bundle exec irb -r ./boot.rb
+```
+
+```ruby
+Movie.create! title: "Attack of the Cats", director: "Furball McCat"
+Movie.count
+```

data/example/Rakefile

@@ -1,9 +1,2 @@
-# $LOAD_PATH handling not need if the standalone_migrations
-# gem is installed
-lib = File.expand_path("../../lib", __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
-require "standalone_migrations"
+require 'standalone_migrations'
 StandaloneMigrations::Tasks.load_tasks
-
-# and that's it!

data/example/app/models/movie.rb

@@ -0,0 +1,4 @@
+class Movie < ActiveRecord::Base
+  validates :title, presence: true, uniqueness: {case_insensitive: true}
+  validates :director, presence: true
+end

data/example/boot.rb

@@ -0,0 +1,9 @@
+require 'active_record'
+require_relative './app/models/movie'
+
+def db_configuration
+  db_configuration_file = File.join(File.expand_path('..', __FILE__), '.', 'db', 'config.yml')
+  YAML.load(File.read(db_configuration_file))
+end
+
+ActiveRecord::Base.establish_connection(db_configuration["development"])

data/example/db/.gitignore

@@ -0,0 +1 @@
+*.sqlite3

data/example/db/migrate/20210202023614_create_movies.rb

@@ -0,0 +1,11 @@
+class CreateMovies < ActiveRecord::Migration[6.0]
+  def change
+    create_table :movies do |t|
+      t.string :title, null: false
+      t.string :director, null: false
+
+      t.timestamps
+    end
+
+  end
+end

data/example/db/schema.rb

@@ -0,0 +1,22 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 2021_02_02_023614) do
+
+  create_table "movies", force: :cascade do |t|
+    t.string "title", null: false
+    t.string "director", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
+end

data/lib/standalone_migrations/configurator.rb

@@ -2,7 +2,6 @@ require 'active_support/all'
 require 'yaml'
 
 module StandaloneMigrations
-
   class InternalConfigurationsProxy
 
     attr_reader :configurations
@@ -32,72 +31,100 @@ module StandaloneMigrations
     end
 
     def initialize(options = {})
-      default_schema = ENV['SCHEMA'] || ActiveRecord::Tasks::DatabaseTasks.schema_file(ActiveRecord::Base.schema_format)
-      defaults = {
-        :config       => "db/config.yml",
-        :migrate_dir  => "db/migrate",
-        :root         => Pathname.pwd,
-        :seeds        => "db/seeds.rb",
-        :schema       => default_schema
-      }
-      @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
-      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"] || defaults[: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

@@ -4,30 +4,62 @@ require 'yaml'
 module StandaloneMigrations
   describe Configurator, "which allows define custom dirs and files to work with your migrations" do
 
-    describe "environment yaml configuration loading" do
+    around(:each) do |example|
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          example.run
+        end
+      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" }
+          "development" => {"adapter" => "mysql2", "database" => "database_name"},
+          "test"        => {"adapter" => "mysql2", "database" => "database_name"},
+          "production"  => {"adapter" => "mysql2", "database" => "database_name"}
         }
       end
 
-      before(:all) do
+      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:" }
+          "development" => {"adapter" => "sqlite3", "database" => "db/development.sql"},
+          "test"        => {"adapter" => "sqlite3", "database" => "db/test.sql"       },
+          "production"  => {"adapter" => "sqlite3", "database" => ":memory:"          }
         }
-        @original_dir = Dir.pwd
-        Dir.chdir( File.expand_path("../../", __FILE__) )
-        FileUtils.mkdir_p "tmp/db"
-        Dir.chdir "tmp"
+        FileUtils.mkdir_p "db"
         File.open("db/config.yml", "w") do |f|
           f.write @env_hash.to_yaml
         end
+
+        example.run
       end
 
       it "load the specific environment config" do
@@ -49,7 +81,7 @@ module StandaloneMigrations
         let(:configurator) { Configurator.new }
 
         before(:all) do
-          @new_config = { 'sbrobous' => 'test' }
+          @new_config = {'sbrobous' => 'test'}
           Configurator.environments_config do |env|
             env.on "production" do
               @new_config
@@ -80,43 +112,18 @@ module StandaloneMigrations
 
       end
 
-      after(:all) do
-        Dir.chdir @original_dir
-      end
-
-    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
-
-      it "use db/schema.rb" do
-        expect(configurator.schema).to end_with("/db/schema.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
 
@@ -125,36 +132,49 @@ 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
 
     context "using a .standalone_migrations file with configurations" do
 
-      before(:all) do
-        @original_dir = Dir.pwd
-        Dir.chdir File.expand_path("../", __FILE__)
+      before(:each) do
+        file = ".standalone_migrations"
+        File.open(file, "w") { |file| file.write(yaml_hash.to_yaml) }
       end
 
       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"
@@ -165,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"
@@ -176,33 +197,36 @@ module StandaloneMigrations
       end
 
       let(:configurator) do
-        file = ".standalone_migrations"
-        File.open(file, "w") { |file| file.write(yaml_hash.to_yaml) }
         Configurator.new
       end
 
       context "with database environment variable passed" do
 
-        before(:all) do
+        before(:each) do
           ENV['DATABASE'] = "other_db"
+          file_other_db = ".other_db.standalone_migrations"
+          File.open(file_other_db, "w") do |file|
+            file.write(yaml_hash_other_db.to_yaml)
+          end
         end
 
         let(:other_configurator) do
-          file_other_db = ".other_db.standalone_migrations"
-          File.open(file_other_db, "w") { |file| file.write(yaml_hash_other_db.to_yaml) }
           Configurator.new
         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
-          File.delete ".other_db.standalone_migrations"
           ENV['DATABASE'] = nil
         end
 
@@ -222,38 +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"])
-      end
-
-      after(:all) do
-        File.delete ".standalone_migrations"
-        Dir.chdir @original_dir
+        expect(configurator.schema).to(
+          eq(yaml_hash["db"]["schema"])
+        )
       end
 
     end

data/spec/standalone_migrations_spec.rb

@@ -3,36 +3,31 @@ describe 'Standalone migrations' do
 
   def write(file, content)
     raise "cannot write nil" unless file
-    file = tmp_file(file)
     folder = File.dirname(file)
-    `mkdir -p #{folder}` unless File.exist?(folder)
+    FileUtils.mkdir_p(folder) if folder != ''
     File.open(file, 'w') { |f| f.write content }
   end
 
   def read(file)
-    File.read(tmp_file(file))
+    File.read(file)
   end
 
   def migration(name)
-    m = `cd spec/tmp/db/migrate && ls`.split("\n").detect { |m| m =~ /#{name}/ }
+    m = `cd db/migrate && ls`.split("\n").detect { |m| m =~ /#{name}/ }
     m ? "db/migrate/#{m}" : m
   end
 
-  def tmp_file(file)
-    "spec/tmp/#{file}"
-  end
-
   def schema
-    ENV['SCHEMA']
+    ENV['SCHEMA'] || 'db/schema.rb'
   end
 
   def run(cmd)
-    result = `cd spec/tmp && #{cmd} 2>&1`
+    result = `#{cmd} 2>&1`
     raise result unless $?.success?
     result
   end
 
-  def make_migration(name, options={})
+  def make_migration(name, options = {})
     task_name = options[:task_name] || 'db:new_migration'
     migration = run("rake #{task_name} name=#{name}").match(%r{db/migrate/\d+.*.rb})[0]
     content = read(migration)
@@ -42,9 +37,9 @@ describe 'Standalone migrations' do
     migration.match(/\d{14}/)[0]
   end
 
-  def write_rakefile(config=nil)
+  def write_rakefile(config = nil)
     write 'Rakefile', <<-TXT
-$LOAD_PATH.unshift '#{File.expand_path('lib')}'
+$LOAD_PATH.unshift '#{File.expand_path('../../lib')}'
 begin
   require "standalone_migrations"
   StandaloneMigrations::Tasks.load_tasks
@@ -56,10 +51,10 @@ end
 
   def write_multiple_migrations
     migration_superclass = if Rails::VERSION::MAJOR >= 5
-      "ActiveRecord::Migration[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-    else
-      "ActiveRecord::Migration"
-    end
+                             "ActiveRecord::Migration[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+                           else
+                             "ActiveRecord::Migration"
+                           end
 
     write_rakefile %{t.migrations = "db/migrations", "db/migrations2"}
     write "db/migrate/20100509095815_create_tests.rb", <<-TXT
@@ -86,10 +81,17 @@ end
     TXT
   end
 
+  around(:each) do |example|
+    FileUtils.mkdir_p('tmp')
+    Dir.mktmpdir("spec-", "tmp") do |dir|
+      Dir.chdir(dir) do
+        example.run
+      end
+    end
+  end
+
   before do
     StandaloneMigrations::Configurator.instance_variable_set(:@env_config, nil)
-    `rm -rf spec/tmp` if File.exist?('spec/tmp')
-    `mkdir spec/tmp`
     write_rakefile
     write(schema, '')
     write 'db/config.yml', <<-TXT
@@ -105,10 +107,6 @@ production:
     TXT
   end
 
-  after(:all) do
-    `rm -rf spec/tmp` if File.exist?('spec/tmp')
-  end
-
   it "warns of deprecated folder structure" do
     warning = /DEPRECATED.* db\/migrate/
     expect(run("rake db:create")).not_to match(warning)
@@ -135,16 +133,14 @@ production:
         expect(connection_established).to be true
       end
 
-      Dir.chdir(File.join(File.dirname(__FILE__), "tmp")) do
-        load "Rakefile"
-        Rake::Task['standalone:connection'].invoke
-      end
+      load "Rakefile"
+      Rake::Task['standalone:connection'].invoke
     end
   end
 
   describe 'db:new_migration' do
     it "fails if i do not add a name" do
-      expect(lambda{ run("rake db:new_migration") }).to raise_error(/name=/)
+      expect { run("rake db:new_migration") }.to raise_error(/name=/)
     end
 
     it "generates a new migration with this name from ENV and timestamp" do
@@ -213,7 +209,7 @@ production:
       make_migration('yyy')
       # Rails has a bug where it's sending a bad failure exception
       # https://github.com/rails/rails/issues/28905
-      expect(lambda{ run("rake db:migrate:down") }).to raise_error(/VERSION|version/)
+      expect { run("rake db:migrate:down") }.to raise_error(/VERSION|version/)
     end
   end
 
@@ -232,7 +228,7 @@ production:
       make_migration('yyy')
       # Rails has a bug where it's sending a bad failure exception
       # https://github.com/rails/rails/issues/28905
-      expect(lambda{ run("rake db:migrate:up") }).to raise_error(/VERSION|version/)
+      expect { run("rake db:migrate:up") }.to raise_error(/VERSION|version/)
     end
   end
 
@@ -271,7 +267,7 @@ production:
   describe 'db:schema:load' do
     it "loads the schema" do
       run('rake db:schema:dump')
-      write(schema, read(schema)+"\nputs 'LOADEDDD'")
+      write(schema, read(schema) + "\nputs 'LOADEDDD'")
       result = run('rake db:schema:load')
       expect(result).to match(/LOADEDDD/)
     end
@@ -282,7 +278,7 @@ production:
       run "rake db:drop"
       run "rake db:create"
       run "rake db:schema:load"
-      expect(run( "rake db:migrate").strip).to eq('')
+      expect(run("rake db:migrate").strip).to eq('')
     end
   end
 
@@ -293,20 +289,20 @@ production:
 
     it "fails when migrations are pending" do
       make_migration('yyy')
-      expect(lambda{ run("rake db:abort_if_pending_migrations") }).to raise_error(/1 pending migration/)
+      expect { run("rake db:abort_if_pending_migrations") }.to raise_error(/1 pending migration/)
     end
   end
 
   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 = "spec/tmp/#{schema}"
+      schema_path = schema
       `rm -rf #{schema_path}` if File.exist?(schema_path)
-      expect(lambda{ run("rake db:test:load") }).to raise_error(/try again/)
+      expect { run("rake db:test:load_schema") }.to raise_error(/try again/)
     end
   end
 
@@ -335,14 +331,12 @@ production:
         write(".standalone_migrations", yaml_hash.to_yaml)
       end
 
-
       it "loads" do
         write("db/seeds2.rb", "puts 'LOADEDDD'")
         expect(run("rake db:seed")).to match(/LOADEDDD/)
       end
     end
 
-
     it "does nothing without seeds" do
       expect(run("rake db:seed").length).to eq(0)
     end
@@ -352,7 +346,7 @@ production:
     it "should not error when a seeds file does not exist" do
       make_migration('yyy')
       run('rake db:migrate DB=test')
-      expect(lambda{ run("rake db:reset") }).not_to raise_error
+      expect { run("rake db:reset") }.not_to raise_error
     end
   end
 
@@ -365,7 +359,7 @@ production:
     end
 
     it "should error on an invalid database", :travis_error => true do
-      expect(lambda{ run("rake db:create RAILS_ENV=nonexistent")}).to raise_error(/rake aborted/)
+      expect { run("rake db:create RAILS_ENV=nonexistent") }.to raise_error(/rake aborted/)
     end
   end
 end

data/standalone_migrations.gemspec

@@ -2,33 +2,39 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: standalone_migrations 7.1.1 ruby lib
+# stub: standalone_migrations 7.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "standalone_migrations".freeze
-  s.version = "7.1.1"
+  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-04-06"
+  s.date = "2023-11-17"
   s.email = "thuss@gabrito.com".freeze
   s.extra_rdoc_files = [
     "LICENSE",
     "README.markdown"
   ]
   s.files = [
+    ".github/workflows/CI.yml",
     ".rspec",
-    ".travis.yml",
     "Gemfile",
     "LICENSE",
     "README.markdown",
     "Rakefile",
     "VERSION",
-    "example/.gitignore",
+    "example/Gemfile",
+    "example/README.markdown",
     "example/Rakefile",
+    "example/app/models/movie.rb",
+    "example/article.pdf",
+    "example/boot.rb",
+    "example/db/.gitignore",
     "example/db/config.yml",
-    "example/db/migrate/20120930053225_create_table_awesome_migration.rb",
+    "example/db/migrate/20210202023614_create_movies.rb",
+    "example/db/schema.rb",
     "lib/standalone_migrations.rb",
     "lib/standalone_migrations/callbacks.rb",
     "lib/standalone_migrations/configurator.rb",
@@ -60,12 +66,14 @@ 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, [">= 4.2.7", "< 7.1.0", "!= 5.2.3", "!= 5.2.3.rc1"])
-    s.add_runtime_dependency(%q<railties>.freeze, [">= 4.2.7", "< 7.1.0", "!= 5.2.3", "!= 5.2.3.rc1"])
+    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, [">= 4.2.7", "< 7.1.0", "!= 5.2.3", "!= 5.2.3.rc1"])
-    s.add_dependency(%q<railties>.freeze, [">= 4.2.7", "< 7.1.0", "!= 5.2.3", "!= 5.2.3.rc1"])
+    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.1
+  version: 7.1.3
 platform: ruby
 authors:
 - Todd Huss
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -31,64 +31,54 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 5.2.3
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 5.2.3.rc1
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 5.2.3
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 5.2.3.rc1
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 5.2.3
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 5.2.3.rc1
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        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
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
-    - - "!="
+        version: '1.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3.rc1
+        version: '1.14'
 description:
 email: thuss@gabrito.com
 executables: []
@@ -97,17 +87,23 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files:
+- ".github/workflows/CI.yml"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - VERSION
-- example/.gitignore
+- example/Gemfile
+- example/README.markdown
 - example/Rakefile
+- example/app/models/movie.rb
+- example/article.pdf
+- example/boot.rb
+- example/db/.gitignore
 - example/db/config.yml
-- example/db/migrate/20120930053225_create_table_awesome_migration.rb
+- example/db/migrate/20210202023614_create_movies.rb
+- example/db/schema.rb
 - lib/standalone_migrations.rb
 - lib/standalone_migrations/callbacks.rb
 - lib/standalone_migrations/configurator.rb

data/.travis.yml

@@ -1,29 +0,0 @@
-language: ruby
-rvm:
-  - 2.5.9
-  - 2.6.9
-  - 2.7.5
-  - 3.0.3
-env:
-  - AR="~> 4.2.0" SQL="~>1.3.6" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-  - AR="~> 5.0.0" SQL="~>1.3.6" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-  - AR=">= 5.1.0.rc2,< 5.2" SQL="~>1.3.6" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-  - AR=">= 5.2.0.rc2,< 5.3,!= 5.2.3,!=5.2.3.rc1" SQL="~>1.3.6" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-  - AR="~> 6.0.0" SQL="~>1.4" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-  - AR="~> 6.1.0" SQL="~>1.4" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-  - AR="~> 7.0.0" SQL="~>1.4" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-jobs:
-  exclude:
-    - rvm: 2.6.9
-      env: AR="~> 4.2.0" SQL="~>1.3.6" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-    - rvm: 2.7.5
-      env: AR="~> 4.2.0" SQL="~>1.3.6" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-    - rvm: 3.0.3
-      env: AR="~> 4.2.0" SQL="~>1.3.6" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-    - rvm: 2.7.5
-      env: AR="~> 5.0.0" SQL="~>1.3.6" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-    - rvm: 2.7.5
-      env: AR=">= 5.1.0.rc2,< 5.2" SQL="~>1.3.6" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-    - rvm: 2.7.5
-      env: AR=">= 5.2.0.rc2,< 5.3,!= 5.2.3,!=5.2.3.rc1" SQL="~>1.3.6" NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-script: bundle exec rake specs:travis

data/example/.gitignore

@@ -1,5 +0,0 @@
-*.sqlite3
-Gemfile
-.bundle/
-bin/
-Gemfile.lock

data/example/db/migrate/20120930053225_create_table_awesome_migration.rb

@@ -1,7 +0,0 @@
-class CreateTableAwesomeMigration < ActiveRecord::Migration[5.0]
-  def up
-  end
-
-  def down
-  end
-end