fix-db-schema-conflicts 3.1.0 → 3.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b478d22000068319b1a6168be5d1a3293538c3e9d6c30cba29ef8fe54341d2e3
4
- data.tar.gz: 631289c91436eadb879c88201636646abb70fd232bae5b2d08af5cecb28475dd
3
+ metadata.gz: 33306ece42a5e78ae3f2fb97a437e41e940cdc7ebfc92936925f31e858d76b44
4
+ data.tar.gz: 897316e1cd4a0cd468cd81d9f517ad4ed24fcda62056bc977feb966e9a35e923
5
5
  SHA512:
6
- metadata.gz: bf4dcbfe59f4b1ed4e205a83fc4fe83ef6df634397a0ffb7ef2da4bf835c790ef9f99b4df23a7b8688f34af81fa2320d90f1f66152190f994df80b8e5f9584e7
7
- data.tar.gz: 73b62a679824f8ab4fd8809514e1c542f165d024a431a0254ccd6951d6cead1a299a32a63f670cd058598a916ac21d2b38b12a18abfbb23edee8449ec1092220
6
+ metadata.gz: c9a767548f197e89836187becd8211aff34a78312a81e8cf98fd0d60c43e8505474eb1e116f62682eae0cc520c189e1c549cb85534934c15d11f527915c8ced9
7
+ data.tar.gz: 7d8668f28334b218aefc3cd1e3ccff42e82687cbe6ccc88a0dd470d60ec597ad632673f85512eebb71606b23ed2095125b39947b607947d9cf0e70976aff616a
data/README.md CHANGED
@@ -35,7 +35,7 @@ auto-correct flag to ensure a consistent output format.
35
35
  ## Usage
36
36
 
37
37
  You don't have to do anything different. It should just work. Simply run `rake
38
- db:migrate` or `rake db:schema:dump` as you would before and
38
+ db:migrate` or `rake db:schema:dump` as you would before and
39
39
  `fix-db-schema-conflicts` will do the rest.
40
40
 
41
41
  ## Installation
@@ -52,7 +52,7 @@ And then execute:
52
52
 
53
53
  ## Older versions of Rubocop:
54
54
 
55
- If you wish to use a version of Rubocop `< 0.36.0` or below, use
55
+ If you wish to use a version of Rubocop `< 0.36.0` or below, use
56
56
  `gem 'fix-db-schema-conflicts', '~> 1.0.2'`
57
57
 
58
58
  ## Older versions of Ruby:
@@ -82,8 +82,11 @@ old Ruby.
82
82
  - [@rosscooperman](https://github.com/rosscooperman)
83
83
  - [@cabello](https://github.com/cabello)
84
84
  - [@justisb](https://github.com/justisb)
85
+ - [@sg650](https://github.com/sg650)
85
86
 
86
87
  ## Releases
88
+ - 3.1.1
89
+ - Use modern autocorrect flag for rubocop >= 1.30 (sg650)
87
90
  - 3.1.0
88
91
  - Added support for ruby 3 (cabello)
89
92
  - Added support for new Rubocop 0.77+ schema (justisb)
@@ -101,7 +104,7 @@ old Ruby.
101
104
  - 2.0.0
102
105
  - Allow usage of Rubocop >= 0.38.0
103
106
  - Remove Rails 5 deprecation warnings for using alias_method_chain
104
- - This upgrade breaks compatibility with Ruby 1.9x since 1.9x lacks #prepend
107
+ - This upgrade breaks compatibility with Ruby 1.9x since 1.9x lacks #prepend
105
108
  - 1.2.2
106
109
  - Remove dependency on sed
107
110
  - 1.2.1
@@ -13,7 +13,13 @@ namespace :db do
13
13
  end
14
14
  autocorrect_config = FixDBSchemaConflicts::AutocorrectConfiguration.load
15
15
  rubocop_yml = File.expand_path("../../../../#{autocorrect_config}", __FILE__)
16
- `bundle exec rubocop --auto-correct --config #{rubocop_yml} #{filename.shellescape}`
16
+ auto_correct_arg = if Gem.loaded_specs['rubocop'].version >= Gem::Version.new('1.30')
17
+ 'autocorrect'
18
+ else
19
+ 'auto-correct'
20
+ end
21
+
22
+ `bundle exec rubocop --#{auto_correct_arg} --config #{rubocop_yml} #{filename.shellescape}`
17
23
  end
18
24
  end
19
25
  end
@@ -1,3 +1,3 @@
1
1
  module FixDBSchemaConflicts
2
- VERSION='3.1.0'
2
+ VERSION='3.1.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fix-db-schema-conflicts
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0
4
+ version: 3.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jake Moffatt
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-11-17 00:00:00.000000000 Z
11
+ date: 2023-06-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler