fix-db-schema-conflicts 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b06ada16be4152262a4cc15084fec8396f63e57e
-  data.tar.gz: 8c89d14a21ffffe10c15ce859f5a2f90676ac228
+  metadata.gz: 39192bd1c0fb0868396a4760665ce60c2f9e634c
+  data.tar.gz: bbde2547471a0b37a730f5d9518c3b5b0f190905
 SHA512:
-  metadata.gz: d4595ed68ea9f6ab555388b62ffafb16030d67b182508a62a199643a313c5939f3241ce8d36263324335c61d7093264c75cf51493bfb5a9800aadb21188fd45e
-  data.tar.gz: e2c890104fc73354828d6fead06931739caa82282121693d2893042d012b56fa96c3ca6aff2db340b7ea53e20aa09c90450d895ccb3a71a6c57849a828d23494
+  metadata.gz: c5f2a60f67b80eb1c864b0fa56c4bd47c443894f0ae6fd5d3256cc3849532bd1a908dd83177b695ee91360b88342ccfb05dbc328db97d99cff50be053cec93ea
+  data.tar.gz: b4e987375106468b7377f6ab11ccebc1d4592ec06d48e704b7dddab9b998dac88593cf6ea4bfa048d7dac60706e634769c1ed4f64764992c457adb5a9b828cc6

data/.rubocop_schema.yml

@@ -15,7 +15,10 @@ Style/AlignHash:
 Style/WordArray:
   MinSize: 3
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: 'comma'
 
 Style/HashSyntax:

data/README.md

@@ -2,6 +2,33 @@
 
 It prevents db/schema.rb conflicts in your Rails projects when working with multiple team members.
 
+Specifically the situation that goes like this:
+
+John is working on a feature, and adds a migration to create an `updated_at` timestamp to `Task`.
+Sara is working on a different feature, and adds a migration to create a `name` column to `Task`.
+They both run their migrations locally, and then get a new copy of master with the other's feature and migration.
+Then when they run migrations again, John's `tasks` table looks like this:
+
+    t.timestamp :updated_at
+    t.string :name
+
+And Sara's looks like this:
+
+    t.string :name
+    t.timestamp :updated_at
+
+And every time they run migrations before committing new code, their `db/schema.rb` file will be showing a change, because they are flipping the order of the columns.
+
+By using the fix-db-schema-conflicts gem, this problem goes away.
+
+## How it works
+
+This gem sorts the table, index, and foreign key names before outputting them to the schema.rb file. Additionally it runs Rubocop with the auto-correct flag to ensure a consistent output format. Then it runs `sed` to cleanup additional horizontal whitespace inserted by Rails.
+
+## 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.
+
 ## Installation
 
 Add this line to your application's Gemfile in your development group:
@@ -14,13 +41,9 @@ And then execute:
 
     $ bundle
 
-## 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.
+## Older versions of Rubocop:
 
-## How it works
-
-This gem sorts the table, index, and foreign key names before outputting them to the schema.rb file. Additionally it runs Rubocop with the auto-correct flag to ensure a consistent output format. Then it runs `sed` to cleanup additional horizontal whitespace inserted by Rails.
+If you wish to use a version of Rubocop `< 0.36.0` or below, use `gem 'fix-db-schema-conflicts', '~> 1.0.2'`
 
 ## Contributing
 

data/fix-db-schema-conflicts.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency "rubocop", "~> 0"
+  spec.add_dependency "rubocop", "~> 0.36.0"
 end

data/lib/fix_db_schema_conflicts/version.rb

@@ -1,3 +1,3 @@
 module FixDBSchemaConflicts
-  VERSION='1.0.2'
+  VERSION='1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fix-db-schema-conflicts
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Jake Moffatt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.36.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.36.0
 description: Ensures consistent output of db/schema.rb despite local differences in
   the database
 email: