fix-db-schema-conflicts 3.0.3 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d333bf66122bebe3e479e9799bbefe7731181244f3877b29c15efa70dfdab5dd
-  data.tar.gz: f94f107c5bac325dd24b50bcd78496bac9c4bfb0fb697e16a5fe945af36e25ac
+  metadata.gz: 33306ece42a5e78ae3f2fb97a437e41e940cdc7ebfc92936925f31e858d76b44
+  data.tar.gz: 897316e1cd4a0cd468cd81d9f517ad4ed24fcda62056bc977feb966e9a35e923
 SHA512:
-  metadata.gz: d3dbbc8e064c1db6a7c14846b813ce2b60b4955c35f62af6ca9b4b67d0d28536bd93d8f5e97d2a1ec405697f874d4bdccd0757bdf7b5b280e06efb8661eb5100
-  data.tar.gz: 0330e6fd3a1dac530b2eaab637b2a6bd5affc952711c43813e5266520aca72f693e8d0da41103d4354ad083b82286c45c5d1f314cebe36f0c24f6447e92eb78b
+  metadata.gz: c9a767548f197e89836187becd8211aff34a78312a81e8cf98fd0d60c43e8505474eb1e116f62682eae0cc520c189e1c549cb85534934c15d11f527915c8ced9
+  data.tar.gz: 7d8668f28334b218aefc3cd1e3ccff42e82687cbe6ccc88a0dd470d60ec597ad632673f85512eebb71606b23ed2095125b39947b607947d9cf0e70976aff616a

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.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/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,7 +35,7 @@ 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 
+db:migrate` or `rake db:schema:dump` as you would before and
 `fix-db-schema-conflicts` will do the rest.
 
 ## Installation
@@ -54,7 +52,7 @@ And then execute:
 
 ## Older versions of Rubocop:
 
-If you wish to use a version of Rubocop `< 0.36.0` or below, use 
+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:
@@ -82,8 +80,16 @@ old Ruby.
  - [@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)
+ - [@sg650](https://github.com/sg650)
 
 ## Releases
+- 3.1.1
+  - Use modern autocorrect flag for rubocop >= 1.30 (sg650)
+- 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
@@ -98,7 +104,7 @@ old Ruby.
 - 2.0.0
   - Allow usage of Rubocop >= 0.38.0
   - Remove Rails 5 deprecation warnings for using alias_method_chain
-   - This upgrade breaks compatibility with Ruby 1.9x since 1.9x lacks #prepend
+  - This upgrade breaks compatibility with Ruby 1.9x since 1.9x lacks #prepend
 - 1.2.2
   - Remove dependency on sed
 - 1.2.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.2.0'
+  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

@@ -9,8 +9,10 @@ module FixDBSchemaConflicts
         '.rubocop_schema.yml'
       elsif less_than_rubocop?(53)
         '.rubocop_schema.49.yml'
-      else
+      elsif less_than_rubocop?(77)
         '.rubocop_schema.53.yml'
+      else
+        '.rubocop_schema.77.yml'
       end
     end
 

data/lib/fix_db_schema_conflicts/tasks/db.rake

@@ -13,7 +13,13 @@ namespace :db do
       end
       autocorrect_config = FixDBSchemaConflicts::AutocorrectConfiguration.load
       rubocop_yml = File.expand_path("../../../../#{autocorrect_config}", __FILE__)
-      `bundle exec rubocop --auto-correct --config #{rubocop_yml} #{filename.shellescape}`
+      auto_correct_arg = if Gem.loaded_specs['rubocop'].version >= Gem::Version.new('1.30')
+        'autocorrect'
+      else
+        'auto-correct'
+      end
+
+      `bundle exec rubocop --#{auto_correct_arg} --config #{rubocop_yml} #{filename.shellescape}`
     end
   end
 end

data/lib/fix_db_schema_conflicts/version.rb

@@ -1,3 +1,3 @@
 module FixDBSchemaConflicts
-  VERSION='3.0.3'
+  VERSION='3.1.1'
 end

data/spec/unit/autocorrect_configuration_spec.rb

@@ -22,6 +22,12 @@ RSpec.describe FixDBSchemaConflicts::AutocorrectConfiguration do
     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))

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fix-db-schema-conflicts
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.1
 platform: ruby
 authors:
 - Jake Moffatt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2023-06-16 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.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 11.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -102,12 +102,13 @@ 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
@@ -126,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
@@ -192,24 +194,26 @@ 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.7.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Helps prevent unneeded db/schema.rb conflicts
 test_files:
@@ -220,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

data/.travis.yml

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