fix-db-schema-conflicts 2.0.0 → 2.0.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 +4 -4
- data/README.md +16 -9
- data/lib/fix_db_schema_conflicts/tasks/db.rake +3 -1
- data/lib/fix_db_schema_conflicts/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 68adb310404b799be9a7ce31b3580e3ed4da7339
|
4
|
+
data.tar.gz: 45064f34cd2960f46009fedc8924fb4478ddc0a6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a33b78745c8767457af0a88415b7b2192e4ef596c5af5464cfb6cf735c13971d022e6947c47008389b20fdb1783f68f3f4ab0284a00547bd9810551888173a60
|
7
|
+
data.tar.gz: dc8db5c6da65277c87764cff637ba9e5dc017d51f3069e4c4266bec672f45ec86c06bd4ade9bb87c8c8b0228f1cb16a855cf9307b452ff14ef58f9f825284864
|
data/README.md
CHANGED
@@ -14,11 +14,13 @@ locally, and then get a new copy of master with the other's feature and
|
|
14
14
|
migration. Then when they run migrations again, John's `tasks` table looks like
|
15
15
|
this:
|
16
16
|
|
17
|
-
t.timestamp :updated_at
|
17
|
+
t.timestamp :updated_at
|
18
|
+
t.string :name
|
18
19
|
|
19
20
|
And Sara's looks like this:
|
20
21
|
|
21
|
-
t.string :name
|
22
|
+
t.string :name
|
23
|
+
t.timestamp :updated_at
|
22
24
|
|
23
25
|
And every time they run migrations before committing new code, their
|
24
26
|
`db/schema.rb` file will be showing a change, because they are flipping the
|
@@ -42,7 +44,9 @@ conflicts` will do the rest.
|
|
42
44
|
|
43
45
|
Add this line to your application's Gemfile in your development group:
|
44
46
|
|
45
|
-
```ruby
|
47
|
+
```ruby
|
48
|
+
gem 'fix-db-schema-conflicts'
|
49
|
+
```
|
46
50
|
|
47
51
|
And then execute:
|
48
52
|
|
@@ -68,14 +72,17 @@ old Ruby.
|
|
68
72
|
|
69
73
|
## Contributors
|
70
74
|
|
71
|
-
- @jakeonrails - Creator and maintainer
|
72
|
-
- @TCampaigne
|
73
|
-
- @Lordnibbler
|
74
|
-
- @timdiggins
|
75
|
-
- @zoras
|
76
|
-
- @jensljungblad
|
75
|
+
- [@jakeonrails](https://github.com/jakeonrails) - Creator and maintainer
|
76
|
+
- [@TCampaigne](https://github.com/TCampaigne)
|
77
|
+
- [@Lordnibbler](https://github.com/Lordnibbler)
|
78
|
+
- [@timdiggins](https://github.com/timdiggins)
|
79
|
+
- [@zoras](https://github.com/zoras)
|
80
|
+
- [@jensljungblad](https://github.com/jensljungblad)
|
81
|
+
- [@vsubramanian](https://github.com/vsubramanian)
|
77
82
|
|
78
83
|
## Releases
|
84
|
+
- 2.0.1
|
85
|
+
- Fix bug that caused failure when project directory has a space in it
|
79
86
|
- 2.0.0
|
80
87
|
- Allow usage of Rubocop >= 0.38.0
|
81
88
|
- Remove Rails 5 deprecation warnings for using alias_method_chain
|
@@ -1,3 +1,5 @@
|
|
1
|
+
require 'shellwords'
|
2
|
+
|
1
3
|
namespace :db do
|
2
4
|
namespace :schema do
|
3
5
|
task :dump do
|
@@ -8,7 +10,7 @@ namespace :db do
|
|
8
10
|
"#{Rails.root}/db/schema.rb"
|
9
11
|
end
|
10
12
|
rubocop_yml = File.expand_path('../../../../.rubocop_schema.yml', __FILE__)
|
11
|
-
`bundle exec rubocop --auto-correct --config #{rubocop_yml} #{filename}`
|
13
|
+
`bundle exec rubocop --auto-correct --config #{rubocop_yml} #{filename.shellescape}`
|
12
14
|
end
|
13
15
|
end
|
14
16
|
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: 2.0.
|
4
|
+
version: 2.0.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:
|
11
|
+
date: 2017-03-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|