fix-db-schema-conflicts 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2e315e5775c46ac6fa1f379e072246214f4a405a
-  data.tar.gz: 595fe95951f639b7b4019d637101d869e3023eb6
+SHA256:
+  metadata.gz: b478d22000068319b1a6168be5d1a3293538c3e9d6c30cba29ef8fe54341d2e3
+  data.tar.gz: 631289c91436eadb879c88201636646abb70fd232bae5b2d08af5cecb28475dd
 SHA512:
-  metadata.gz: d3e058a81af618b6aad52b69cb7cd0e7f23b63a20a995e8319314b50ec2e49d541b10e89da3907ec6a9139f9a486ece8f64f8690085783284e33b154240dbdcc
-  data.tar.gz: 55e00726a4912d6599f5bb75fd8bc07ec971a103cc5b95bf5395dbca1b7783a9763406da97f60ab3139b7a7f1094bce072c38278d5f25f837b5ff65d6198da3e
+  metadata.gz: bf4dcbfe59f4b1ed4e205a83fc4fe83ef6df634397a0ffb7ef2da4bf835c790ef9f99b4df23a7b8688f34af81fa2320d90f1f66152190f994df80b8e5f9584e7
+  data.tar.gz: 73b62a679824f8ab4fd8809514e1c542f165d024a431a0254ccd6951d6cead1a299a32a63f670cd058598a916ac21d2b38b12a18abfbb23edee8449ec1092220

data/.github/workflows/rspec.yml

@@ -0,0 +1,22 @@
+name: Run rspec
+on:
+  push:
+  pull_request:
+    branches: [ master ]
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ 2.4, 2.5, 2.6 ]
+    name: rspec with ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          bundler: 1
+
+      - run: bundle exec rspec

data/.rubocop_schema.49.yml

@@ -0,0 +1,35 @@
+# Configuration for Rubocop >= 0.49.0
+
+Layout/AlignHash:
+  EnforcedColonStyle: 'key'
+  EnforcedHashRocketStyle: 'key'
+
+Layout/ExtraSpacing:
+  # When true, allows most uses of extra spacing if the intent is to align
+  # things with the previous or next line, not counting empty lines or comment
+  # lines.
+  AllowForAlignment: false
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: true
+
+Style/NumericLiterals:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Max: 2
+
+Style/WordArray:
+  Enabled: false
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/HashSyntax:
+  EnforcedStyle: 'ruby19'
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/.rubocop_schema.53.yml

@@ -0,0 +1,38 @@
+# Configuration for Rubocop >= 0.53.0
+
+Layout/AlignHash:
+  EnforcedColonStyle: 'key'
+  EnforcedHashRocketStyle: 'key'
+
+Layout/ExtraSpacing:
+  # When true, allows most uses of extra spacing if the intent is to align
+  # things with the previous or next line, not counting empty lines or comment
+  # lines.
+  AllowForAlignment: false
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: true
+
+Style/NumericLiterals:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Max: 2
+
+Style/WordArray:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/HashSyntax:
+  EnforcedStyle: 'ruby19'
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/.rubocop_schema.77.yml

@@ -0,0 +1,41 @@
+# Configuration for Rubocop >= 0.77.0
+
+Layout/ExtraSpacing:
+  # When true, allows most uses of extra spacing if the intent is to align
+  # things with the previous or next line, not counting empty lines or comment
+  # lines.
+  AllowForAlignment: false
+
+Layout/HashAlignment:
+  EnforcedColonStyle: 'key'
+  EnforcedHashRocketStyle: 'key'
+
+Layout/LineLength:
+  Enabled: false
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: true
+
+Style/NumericLiterals:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Max: 2
+
+Style/WordArray:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/HashSyntax:
+  EnforcedStyle: 'ruby19'
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/.rubocop_schema.yml

@@ -1,3 +1,5 @@
+# Configuration for Rubocop >= 0.38.0, < 0.49.0
+
 Style/ExtraSpacing:
   # When true, allows most uses of extra spacing if the intent is to align
   # things with the previous or next line, not counting empty lines or comment
@@ -18,7 +20,7 @@ Style/AlignHash:
   EnforcedHashRocketStyle: 'key'
 
 Style/WordArray:
-  MinSize: 3
+  Enabled: false
 
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: 'comma'

data/README.md

@@ -1,5 +1,3 @@
-[![Build Status](https://travis-ci.org/jakeonrails/fix-db-schema-conflicts.svg?branch=master)](https://travis-ci.org/jakeonrails/fix-db-schema-conflicts)
-
 # fix-db-schema-conflicts
 
 It prevents db/schema.rb conflicts in your Rails projects when working with
@@ -37,8 +35,8 @@ auto-correct flag to ensure a consistent output format.
 ## Usage
 
 You don't have to do anything different. It should just work. Simply run `rake
-db:migrate` or `rake db:schema:dump` as you would before and `fix-db-schema-
-conflicts` will do the rest.
+db:migrate` or `rake db:schema:dump` as you would before and 
+`fix-db-schema-conflicts` will do the rest.
 
 ## Installation
 
@@ -54,8 +52,8 @@ And then execute:
 
 ## Older versions of Rubocop:
 
-If you wish to use a version of Rubocop `< 0.36.0` or below, use `gem 'fix-db-
-schema-conflicts', '~> 1.0.2'`
+If you wish to use a version of Rubocop `< 0.36.0` or below, use 
+`gem 'fix-db-schema-conflicts', '~> 1.0.2'`
 
 ## Older versions of Ruby:
 
@@ -80,9 +78,22 @@ old Ruby.
  - [@jensljungblad](https://github.com/jensljungblad)
  - [@vsubramanian](https://github.com/vsubramanian)
  - [@claytron](https://github.com/claytron)
+ - [@amckinnell](https://github.com/amckinnell)
+ - [@rosscooperman](https://github.com/rosscooperman)
+ - [@cabello](https://github.com/cabello)
+ - [@justisb](https://github.com/justisb)
 
 ## Releases
-
+- 3.1.0
+  - Added support for ruby 3 (cabello)
+  - Added support for new Rubocop 0.77+ schema (justisb)
+- 3.0.3
+  - Added support for new Rubocop 0.53+ schema (rosscooperman)
+- 3.0.2
+  - Added support for new Rubocop 0.49+ schema (amckinnell)
+- 3.0.1
+  - Improve formatting to be more consistent (amckinnell)
+  - Bump rake dependency to bypass a rake bug in older version (amckinnell)
 - 3.0.0
   - Only support Ruby 2.2+ since lower versions haved reached EOL.
 - 2.0.1

data/fix-db-schema-conflicts.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 11.1.1'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~>3.4.0'
   spec.add_development_dependency 'rails', '~> 4.2.0'
   spec.add_development_dependency 'sqlite3', '~> 1.3.0'
 
   spec.add_dependency 'rubocop', '>= 0.38.0'
 
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '>= 2.0.0', '< 4'
 end

data/lib/fix_db_schema_conflicts/autocorrect_configuration.rb

@@ -0,0 +1,25 @@
+module FixDBSchemaConflicts
+  class AutocorrectConfiguration
+    def self.load
+      new.load
+    end
+
+    def load
+      if less_than_rubocop?(49)
+        '.rubocop_schema.yml'
+      elsif less_than_rubocop?(53)
+        '.rubocop_schema.49.yml'
+      elsif less_than_rubocop?(77)
+        '.rubocop_schema.53.yml'
+      else
+        '.rubocop_schema.77.yml'
+      end
+    end
+
+    private
+
+    def less_than_rubocop?(ver)
+      Gem.loaded_specs['rubocop'].version < Gem::Version.new("0.#{ver}.0")
+    end
+  end
+end

data/lib/fix_db_schema_conflicts/tasks/db.rake

@@ -1,15 +1,18 @@
 require 'shellwords'
+require_relative '../autocorrect_configuration'
 
 namespace :db do
   namespace :schema do
     task :dump do
       puts "Dumping database schema with fix-db-schema-conflicts gem"
+
       filename = ENV['SCHEMA'] || if defined? ActiveRecord::Tasks::DatabaseTasks
         File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, 'schema.rb')
       else
         "#{Rails.root}/db/schema.rb"
       end
-      rubocop_yml = File.expand_path('../../../../.rubocop_schema.yml', __FILE__)
+      autocorrect_config = FixDBSchemaConflicts::AutocorrectConfiguration.load
+      rubocop_yml = File.expand_path("../../../../#{autocorrect_config}", __FILE__)
       `bundle exec rubocop --auto-correct --config #{rubocop_yml} #{filename.shellescape}`
     end
   end

data/lib/fix_db_schema_conflicts/version.rb

@@ -1,3 +1,3 @@
 module FixDBSchemaConflicts
-  VERSION='3.0.0'
+  VERSION='3.1.0'
 end

data/spec/integration/integration_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe 'Fix DB Schema Conflicts' do
+RSpec.describe 'Fix DB Schema Conflicts' do
 
   let(:expected_lines) { reference_db_schema.lines }
 
   it 'generates a sorted schema with no extra spacing' do
 
-    `cd spec/test-app && rm db/schema.rb && rake db:migrate`
+    `cd spec/test-app && rm -f db/schema.rb && rake db:migrate`
 
     generated_lines = File.readlines('spec/test-app/db/schema.rb')
 
@@ -20,8 +20,6 @@ end
 
 def reference_db_schema
   <<-RUBY
-# encoding: UTF-8
-
 # 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.

data/spec/spec_helper.rb

@@ -40,9 +40,9 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+
   # These two settings work together to allow you to limit a spec run
   # to individual examples or groups you care about by tagging them with
   # `:focus` metadata. When nothing is tagged with `:focus`, all examples
@@ -53,7 +53,7 @@ RSpec.configure do |config|
   # Allows RSpec to persist some state between runs in order to support
   # the `--only-failures` and `--next-failure` CLI options. We recommend
   # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
+  # config.example_status_persistence_file_path = "spec/examples.txt"
 
   # Limits the available syntax to the non-monkey patched syntax that is
   # recommended. For more details, see:
@@ -79,7 +79,7 @@ RSpec.configure do |config|
   # Print the 10 slowest examples and example groups at the
   # end of the spec run, to help surface which specs are running
   # particularly slow.
-  config.profile_examples = 10
+  # config.profile_examples = 10
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
@@ -92,5 +92,4 @@ RSpec.configure do |config|
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
-=end
 end

data/spec/test-app/db/schema.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 # 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.

data/spec/unit/autocorrect_configuration_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'fix_db_schema_conflicts/autocorrect_configuration'
+
+RSpec.describe FixDBSchemaConflicts::AutocorrectConfiguration do
+  subject(:autocorrect_config) { described_class }
+
+  it 'for versions up to 0.49.0' do
+    installed_rubocop(version: '0.39.0')
+
+    expect(autocorrect_config.load).to eq('.rubocop_schema.yml')
+  end
+
+  it 'for versions 0.49.0 and above' do
+    installed_rubocop(version: '0.49.0')
+
+    expect(autocorrect_config.load).to eq('.rubocop_schema.49.yml')
+  end
+
+  it 'for versions 0.53.0 and above' do
+    installed_rubocop(version: '0.53.0')
+
+    expect(autocorrect_config.load).to eq('.rubocop_schema.53.yml')
+  end
+
+  it 'for versions 0.77.0 and above' do
+    installed_rubocop(version: '0.77.0')
+
+    expect(autocorrect_config.load).to eq('.rubocop_schema.77.yml')
+  end
+
+  def installed_rubocop(version:)
+    allow(Gem).to receive_message_chain(:loaded_specs, :[], :version)
+      .and_return(Gem::Version.new(version))
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fix-db-schema-conflicts
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Jake Moffatt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 11.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 11.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -102,16 +102,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop_schema.49.yml"
+- ".rubocop_schema.53.yml"
+- ".rubocop_schema.77.yml"
 - ".rubocop_schema.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - fix-db-schema-conflicts.gemspec
 - lib/fix-db-schema-conflicts.rb
+- lib/fix_db_schema_conflicts/autocorrect_configuration.rb
 - lib/fix_db_schema_conflicts/railtie.rb
 - lib/fix_db_schema_conflicts/schema_dumper.rb
 - lib/fix_db_schema_conflicts/tasks/db.rake
@@ -123,6 +127,7 @@ files:
 - spec/test-app/Gemfile.lock
 - spec/test-app/README.rdoc
 - spec/test-app/Rakefile
+- spec/test-app/app/assets/config/manifest.js
 - spec/test-app/app/assets/images/.keep
 - spec/test-app/app/assets/javascripts/application.js
 - spec/test-app/app/assets/stylesheets/application.css
@@ -184,28 +189,31 @@ files:
 - spec/test-app/test/test_helper.rb
 - spec/test-app/vendor/assets/javascripts/.keep
 - spec/test-app/vendor/assets/stylesheets/.keep
+- spec/unit/autocorrect_configuration_spec.rb
 homepage: https://github.com/jakeonrails/fix-db-schema-conflicts
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 2.0.0
+  - - "<"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Helps prevent unneeded db/schema.rb conflicts
 test_files:
@@ -216,6 +224,7 @@ test_files:
 - spec/test-app/Gemfile.lock
 - spec/test-app/README.rdoc
 - spec/test-app/Rakefile
+- spec/test-app/app/assets/config/manifest.js
 - spec/test-app/app/assets/images/.keep
 - spec/test-app/app/assets/javascripts/application.js
 - spec/test-app/app/assets/stylesheets/application.css
@@ -277,3 +286,4 @@ test_files:
 - spec/test-app/test/test_helper.rb
 - spec/test-app/vendor/assets/javascripts/.keep
 - spec/test-app/vendor/assets/stylesheets/.keep
+- spec/unit/autocorrect_configuration_spec.rb

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-rvm:
- - "2.2.0"
- - "2.3.0"
- - "2.4.0"