fix-db-schema-conflicts 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ecdcc56d2a2876277bf55418402686c906e329b8
-  data.tar.gz: 5f23bb38ec5e70d7e0f76bbe287785a7ffc85b33
+SHA256:
+  metadata.gz: d333bf66122bebe3e479e9799bbefe7731181244f3877b29c15efa70dfdab5dd
+  data.tar.gz: f94f107c5bac325dd24b50bcd78496bac9c4bfb0fb697e16a5fe945af36e25ac
 SHA512:
-  metadata.gz: 2473ee6a7474dd182784d6d2f20f7cece39ecc1467c346ac53d1f002d99920520c3ff6871b8e54aa9ba62b80560fe144d4083c945901191390bd568985979efb
-  data.tar.gz: 9cdb6b11e152112577faa8ba66eb21a76c20f19119211893975ee00a0da054c0c217f7a9ce62c0b87ddae6490e08cb9dee67f18babd9b44b56ddeba50fd6b2f2
+  metadata.gz: d3dbbc8e064c1db6a7c14846b813ce2b60b4955c35f62af6ca9b4b67d0d28536bd93d8f5e97d2a1ec405697f874d4bdccd0757bdf7b5b280e06efb8661eb5100
+  data.tar.gz: 0330e6fd3a1dac530b2eaab637b2a6bd5affc952711c43813e5266520aca72f693e8d0da41103d4354ad083b82286c45c5d1f314cebe36f0c24f6447e92eb78b

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/README.md

@@ -37,8 +37,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 +54,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:
 
@@ -81,8 +81,11 @@ old Ruby.
  - [@vsubramanian](https://github.com/vsubramanian)
  - [@claytron](https://github.com/claytron)
  - [@amckinnell](https://github.com/amckinnell)
+ - [@rosscooperman](https://github.com/rosscooperman)
 
 ## Releases
+- 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

data/lib/fix_db_schema_conflicts/autocorrect_configuration.rb

@@ -5,13 +5,19 @@ module FixDBSchemaConflicts
     end
 
     def load
-      at_least_rubocop_49? ? '.rubocop_schema.49.yml' : '.rubocop_schema.yml'
+      if less_than_rubocop?(49)
+        '.rubocop_schema.yml'
+      elsif less_than_rubocop?(53)
+        '.rubocop_schema.49.yml'
+      else
+        '.rubocop_schema.53.yml'
+      end
     end
 
     private
 
-    def at_least_rubocop_49?
-      Gem::Version.new('0.49.0') <= Gem.loaded_specs['rubocop'].version
+    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/version.rb

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

data/spec/integration/integration_spec.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/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

@@ -16,6 +16,12 @@ RSpec.describe FixDBSchemaConflicts::AutocorrectConfiguration do
     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
+
   def installed_rubocop(version:)
     allow(Gem).to receive_message_chain(:loaded_specs, :[], :version)
       .and_return(Gem::Version.new(version))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fix-db-schema-conflicts
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Jake Moffatt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop_schema.49.yml"
+- ".rubocop_schema.53.yml"
 - ".rubocop_schema.yml"
 - ".travis.yml"
 - Gemfile
@@ -207,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Helps prevent unneeded db/schema.rb conflicts