outrigger 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 855ecd62fb346fb6e0ee6dcebc3fa2812132a6a71473544835453c6eb9851d6f
-  data.tar.gz: 40c0f0f3ce60783d2fcc8612090f369a8ca66e0174cc38d4c83a299eaaee57af
+  metadata.gz: 470f381099cffd17d79737efc2f7501ab70a3de44df06c92e0a14b579314bd76
+  data.tar.gz: 5fe33a5c351cb9a0511a62c0480d15a23e0cb4fe67bfd32f67aec9eeaefd9b5e
 SHA512:
-  metadata.gz: b9dd84dc5f5eda731e476375b772a8250ec7fdf27319a73ffc6538c8a57de78d2b842a545bffde5135d2369c17aa33ee764602dc8f4d3785e1764ca791734e29
-  data.tar.gz: 239d9517aefd40f773a71887ba83885ac82ad1f62d5e9ec7c693d48fcce107ba41fddb6a3d0a7e7904b3a36b7b4bcec24f5945d686a1781609c80fdb55c60777
+  metadata.gz: 53692e56afb3a76874bb7000811daed3cfac224e7dc344e946bf78cb97b2b44fdabc28529e36f12fb901d8d92f15d86183c9b42cfdd03cd90dbd566e9be68b2c
+  data.tar.gz: fd62d320a416ecbdeb31ef47efd5102097e55407f3213217c9f22b340287429d46bf636e4a4a91197082432e4c50fb4d048e919dcd80563e5cdffabcadfe470c

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 
 begin
@@ -6,14 +8,6 @@ begin
   RSpec::Core::RakeTask.new(:spec)
 
   task(default: :spec)
-rescue LoadError # rubocop:disable Lint/HandleExceptions
-  # no rspec available
-end
-
-task :console do
-  require 'irb'
-  require 'irb/completion'
-  require 'outrigger'
-  ARGV.clear
-  IRB.start
+rescue LoadError
+  nil
 end

data/lib/outrigger/cops/migration/tagged.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RuboCop
   module Cop
     module Migration
@@ -5,6 +7,7 @@ module RuboCop
         def on_class(node)
           _name, _superclass, body = *node
           return unless body && migration_class?(node)
+
           check(node, body)
         end
 
@@ -33,6 +36,7 @@ module RuboCop
                         message: 'No allowed tags have been defined in the RuboCop configuration.'
           elsif tag
             return if allowed_tags.include? tag.children.last.to_a.last
+
             add_offense tag,
                         location: :expression,
                         message: "Tags may only be one of #{allowed_tags}."

data/lib/outrigger/migrator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Outrigger
+  module Migrator
+    def runnable
+      result = super
+      return result unless Outrigger.ordered
+
+      # re-order according to configuration
+      result.sort_by! { |m| [Outrigger.ordered[m.tags.first] || 0, m.version] }
+      result.reverse! if down?
+      result
+    end
+  end
+end

data/lib/outrigger/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Outrigger
   class Railtie < Rails::Railtie
     railtie_name :taggable_migrations
@@ -8,8 +10,9 @@ module Outrigger
 
     initializer 'extend_migrations' do
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Migration.send :include, Outrigger::Taggable
-        ActiveRecord::MigrationProxy.send :include, Outrigger::TaggableProxy
+        ActiveRecord::Migration.include(Outrigger::Taggable)
+        ActiveRecord::MigrationProxy.include(Outrigger::TaggableProxy)
+        ActiveRecord::Migrator.prepend(Outrigger::Migrator)
       end
     end
   end

data/lib/outrigger/taggable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Outrigger
   module Taggable
     def self.included(base)

data/lib/outrigger/taggable_proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Outrigger
   module TaggableProxy
     def self.included(_body)

data/lib/outrigger/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Outrigger
-  VERSION = '2.1.1'.freeze
+  VERSION = '3.0.0'
 end

data/lib/outrigger.rb

@@ -1,13 +1,20 @@
+# frozen_string_literal: true
+
 require 'active_record' unless defined? ActiveRecord
 
+require 'outrigger/migrator'
 require 'outrigger/taggable'
 require 'outrigger/taggable_proxy'
 
 require 'outrigger/railtie' if defined? Rails::Railtie
 
 module Outrigger
-  def self.filter(*tags)
-    tags = tags.flatten.map(&:to_sym)
-    proc { |migration| (tags - migration.tags).empty? }
+  class << self
+    attr_accessor :ordered
+
+    def filter(*tags)
+      tags = tags.flatten.map(&:to_sym)
+      proc { |migration| (tags - migration.tags).empty? }
+    end
   end
 end

data/lib/tasks/outrigger.rake

@@ -1,13 +1,11 @@
+# frozen_string_literal: true
+
 namespace :db do
   namespace :migrate do
     desc 'Run migrations for a Tag'
     task tagged: %i[environment load_config] do |_t, args|
       puts("Migrating Tags: #{args.extras}")
-      if ActiveRecord.gem_version >= Gem::Version.new('5.2.0')
-        ActiveRecord::Base.connection.migration_context.migrate(nil, &Outrigger.filter(args.extras))
-      else
-        ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, &Outrigger.filter(args.extras))
-      end
+      ActiveRecord::Base.connection.migration_context.migrate(nil, &Outrigger.filter(args.extras))
     end
   end
 end

data/spec/gemfiles/{rails-6.0.gemfile → rails_6.0.gemfile}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec path: '../../'

data/spec/gemfiles/{rails-6.1.gemfile → rails_6.1.gemfile}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec path: '../../'

data/spec/outrigger/cops/migration/tagged_spec.rb

@@ -1,7 +1,8 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
 require 'outrigger/cops/migration/tagged'
 
-RSpec.describe RuboCop::Cop::Migration::Tagged do # rubocop:disable Metrics/BlockLength
+RSpec.describe RuboCop::Cop::Migration::Tagged do # rubocop:disable RSpec/FilePath
   let(:config_hash) do
     {
       'Migration/Tagged' => {
@@ -23,7 +24,7 @@ RSpec.describe RuboCop::Cop::Migration::Tagged do # rubocop:disable Metrics/Bloc
     RUBY
   end
 
-  subject(:cop) { described_class.new(config) }
+  subject(:cop) { described_class.new(config) } # rubocop:disable RSpec/LeadingSubject
 
   shared_examples_for 'valid migrations' do
     it 'passes valid versioned migration' do
@@ -32,10 +33,10 @@ RSpec.describe RuboCop::Cop::Migration::Tagged do # rubocop:disable Metrics/Bloc
     end
   end
 
-  context 'valid config' do # rubocop:disable Metrics/BlockLength
+  context 'with valid config' do
     include_examples 'valid migrations'
 
-    context 'missing tags' do
+    context 'with missing tags' do
       let(:migration_class) do
         <<~RUBY
           class Test < ActiveRecord::Migration[4.2]
@@ -52,7 +53,7 @@ RSpec.describe RuboCop::Cop::Migration::Tagged do # rubocop:disable Metrics/Bloc
       end
     end
 
-    context 'invalid tag' do
+    context 'with invalid tag' do
       let(:migration_class) do
         <<~RUBY
           class Test < ActiveRecord::Migration[4.2]
@@ -71,7 +72,7 @@ RSpec.describe RuboCop::Cop::Migration::Tagged do # rubocop:disable Metrics/Bloc
     end
   end
 
-  context 'invalid config' do
+  context 'with invalid config' do
     let(:config_hash) do
       {
         'Migration/Tagged' => {

data/spec/outrigger/migrator_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Outrigger
+  describe Migrator do
+    around do |example|
+      Outrigger.ordered = { predeploy: -1, postdeploy: 1 }
+      example.call
+    ensure
+      Outrigger.ordered = nil
+    end
+
+    let(:migrations) do
+      [PostDeployMigration.new(nil, 1), UntaggedMigration.new(nil, 2), PreDeployMigration.new(nil, 3),
+       MultiMigration.new(nil, 4)]
+    end
+
+    before do
+      allow(ActiveRecord::InternalMetadata).to receive(:create_table)
+    end
+
+    it 'sorts' do
+      schema_migration = object_double(ActiveRecord::SchemaMigration, create_table: nil, all_versions: [])
+      expect(ActiveRecord::Migrator.new(:up, migrations, schema_migration).runnable.map(&:class)).to eq(
+        [
+          PreDeployMigration, MultiMigration, UntaggedMigration, PostDeployMigration
+        ]
+      )
+    end
+
+    it 'reverse sorts when going down' do
+      schema_migration = object_double(ActiveRecord::SchemaMigration, create_table: nil, all_versions: [1, 2, 3, 4])
+      expect(ActiveRecord::Migrator.new(:down, migrations, schema_migration).runnable.map(&:class)).to eq(
+        [
+          PostDeployMigration, UntaggedMigration, MultiMigration, PreDeployMigration
+        ]
+      )
+    end
+  end
+end

data/spec/outrigger/outrigger_spec.rb

@@ -1,15 +1,15 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe Outrigger do
   describe 'filter' do
-    it 'should return a proc that tests migrations' do
-      filter = Outrigger.filter(:predeploy)
+    it 'returns a proc that tests migrations' do
+      filter = described_class.filter(:predeploy)
 
       expect(filter.call(PreDeployMigration)).to eq(true)
     end
 
-    it 'should accept multiple tags' do
-      filter = Outrigger.filter(:predeploy, :postdeploy)
+    it 'accepts multiple tags' do
+      filter = described_class.filter(:predeploy, :postdeploy)
 
       expect(filter.call(MultiMigration)).to eq(true)
       expect(filter.call(PreDeployMigration)).to eq(false)

data/spec/outrigger/railtie_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe Outrigger::Railtie do
-  let(:subject) { Outrigger::Railtie }
-
   it 'provides a railtie_name' do
-    expect(subject.railtie_name).to eq 'taggable_migrations'
+    expect(described_class.railtie_name).to eq 'taggable_migrations'
   end
 end

data/spec/outrigger/taggable_proxy_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 class TestProxy
   include Outrigger::TaggableProxy
@@ -6,7 +6,7 @@ class TestProxy
 end
 
 describe Outrigger::TaggableProxy do
-  it 'it should delegate tags to the migration' do
+  it 'delegates tags to the migration' do
     proxy = TestProxy.new
     proxy.migration = PreDeployMigration.new
 

data/spec/outrigger/taggable_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe Outrigger::Taggable do
   it 'PreDeployMigration should be predeploy' do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 SimpleCov.start do
   add_filter 'lib/outrigger/version.rb'
@@ -7,14 +9,16 @@ end
 SimpleCov.minimum_coverage(85)
 
 require 'bundler/setup'
+require 'byebug'
 require 'rails/railtie'
 require 'rubocop'
 require 'rubocop/rspec/support'
 
 require 'outrigger'
 
-ActiveRecord::Migration.send :include, Outrigger::Taggable
-ActiveRecord::MigrationProxy.send :include, Outrigger::TaggableProxy
+ActiveRecord::Migration.include(Outrigger::Taggable)
+ActiveRecord::MigrationProxy.include(Outrigger::TaggableProxy)
+ActiveRecord::Migrator.prepend(Outrigger::Migrator)
 
 class PreDeployMigration < ActiveRecord::Migration[5.0]
   tag :predeploy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: outrigger
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Drew Bowman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
@@ -34,23 +34,37 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
@@ -60,7 +74,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
@@ -98,42 +112,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: '1.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.20'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 description: Migrations
 email:
 executables: []
@@ -143,17 +185,16 @@ files:
 - Rakefile
 - lib/outrigger.rb
 - lib/outrigger/cops/migration/tagged.rb
+- lib/outrigger/migrator.rb
 - lib/outrigger/railtie.rb
 - lib/outrigger/taggable.rb
 - lib/outrigger/taggable_proxy.rb
 - lib/outrigger/version.rb
 - lib/tasks/outrigger.rake
-- spec/gemfiles/rails-5.0.gemfile
-- spec/gemfiles/rails-5.1.gemfile
-- spec/gemfiles/rails-5.2.gemfile
-- spec/gemfiles/rails-6.0.gemfile
-- spec/gemfiles/rails-6.1.gemfile
+- spec/gemfiles/rails_6.0.gemfile
+- spec/gemfiles/rails_6.1.gemfile
 - spec/outrigger/cops/migration/tagged_spec.rb
+- spec/outrigger/migrator_spec.rb
 - spec/outrigger/outrigger_spec.rb
 - spec/outrigger/railtie_spec.rb
 - spec/outrigger/taggable_proxy_spec.rb
@@ -171,24 +212,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.24
 signing_key:
 specification_version: 4
 summary: Tag migrations and run them separately
 test_files:
-- spec/gemfiles/rails-5.0.gemfile
-- spec/gemfiles/rails-5.1.gemfile
-- spec/gemfiles/rails-5.2.gemfile
-- spec/gemfiles/rails-6.0.gemfile
-- spec/gemfiles/rails-6.1.gemfile
+- spec/gemfiles/rails_6.0.gemfile
+- spec/gemfiles/rails_6.1.gemfile
 - spec/outrigger/cops/migration/tagged_spec.rb
+- spec/outrigger/migrator_spec.rb
 - spec/outrigger/outrigger_spec.rb
 - spec/outrigger/railtie_spec.rb
 - spec/outrigger/taggable_proxy_spec.rb

data/spec/gemfiles/rails-5.0.gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '../../'
-
-gem 'activerecord', '~> 5.0.7'

data/spec/gemfiles/rails-5.1.gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '../../'
-
-gem 'activerecord', '~> 5.1.6'

data/spec/gemfiles/rails-5.2.gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '../../'
-
-gem 'activerecord', '~> 5.2.0'