fix-db-schema-conflicts 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af0a08da758571d3b22b68a576bd04d9d5ecd724
-  data.tar.gz: a2306d7076190046db6904be9f32c720a0578ec0
+  metadata.gz: 571ecba577de388058f819df72f0f3459b6afcf8
+  data.tar.gz: f0caf6caa58304c3f5fee58b8e988d53e12a9b1b
 SHA512:
-  metadata.gz: 1c5104f294abf63bb42bd455c94c0c5736702275494f3627d2f7eed651fe8e26fe50bb2930d5e5b7c58183066b0a13f36378db0ec699872fbb1b811b25b135dc
-  data.tar.gz: 673dca7a9c198d17b3fde99b3f3b601054e38c432d4a1d7f1985374459ec6d4477c05a1fc1121af4d923681c29a259fabf0200ff369c37e0ae3814b1fb46e6c7
+  metadata.gz: 5f7b58604af4db20cf2560d694af80ddf0d993bb69cbe16e5c5c712cee3d912e755dbf1ff8f47ac775896a8f923e51106232b32660c0d65b709a8e556e5babc7
+  data.tar.gz: 9ee59fa778504bf24e60998605344e7a9deab34ee6b7ac722745a162e6661a37d75188582e72fe4240198ee242b879595360111e9524aed14c69b54d0f7fc5ab

data/README.md

@@ -2,42 +2,47 @@
 
 # fix-db-schema-conflicts
 
-It prevents db/schema.rb conflicts in your Rails projects when working with multiple team members.
+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:
+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
+    t.timestamp :updated_at t.string :name
 
 And Sara's looks like this:
 
-    t.string :name
-    t.timestamp :updated_at
+    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.
+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.
+This gem sorts the table, index, extension, 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.
 
 ## 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.
+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:
 
-```ruby
-gem 'fix-db-schema-conflicts'
-```
+```ruby gem 'fix-db-schema-conflicts' ```
 
 And then execute:
 
@@ -45,11 +50,17 @@ 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:
+
+This gem only works with Ruby >= 2.0. Use versions 1.2.2 or below if you have an
+old Ruby.
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/fix-db-schema-conflicts/fork )
+1. Fork it (https://github.com/[my-github-username]/fix-db-schema-conflicts/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
@@ -61,8 +72,14 @@ If you wish to use a version of Rubocop `< 0.36.0` or below, use `gem 'fix-db-sc
  - @TCampaigne
  - @Lordnibbler
  - @timdiggins
+ - @zoras
+ - @jensljungblad
 
 ## Releases
+ - 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
  - 1.2.2
   - Remove dependency on sed
  - 1.2.1

data/fix-db-schema-conflicts.gemspec

@@ -24,5 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rails', '~> 4.2.0'
   spec.add_development_dependency 'sqlite3', '~> 1.3.0'
 
-  spec.add_dependency 'rubocop', '~> 0.38.0'
+  spec.add_dependency 'rubocop', '>= 0.38.0'
+
+  spec.required_ruby_version = '~> 2.0'
 end

data/lib/fix_db_schema_conflicts/schema_dumper.rb

@@ -1,13 +1,7 @@
 require 'delegate'
 
-module ActiveRecord
-  # = Active Record Schema Dumper
-  #
-  # This class is used to dump the database schema for some connection to some
-  # output format (i.e., ActiveRecord::Schema).
-  class SchemaDumper
-
-    private
+module FixDBSchemaConflicts
+  module SchemaDumper
     class ConnectionWithSorting < SimpleDelegator
       def extensions
         __getobj__.extensions.sort
@@ -26,21 +20,19 @@ module ActiveRecord
       end
     end
 
-    def extensions_with_sorting(*args)
+    def extensions(*args)
       with_sorting do
-        extensions_without_sorting(*args)
+        super(*args)
       end
     end
-    alias_method_chain :extensions, :sorting
 
-    def table_with_sorting(*args)
+    def table(*args)
       with_sorting do
-        table_without_sorting(*args)
+        super(*args)
       end
     end
-    alias_method_chain :table, :sorting
 
-    def with_sorting(&block)
+    def with_sorting
       old, @connection = @connection, ConnectionWithSorting.new(@connection)
       result = yield
       @connection = old
@@ -48,3 +40,5 @@ module ActiveRecord
     end
   end
 end
+
+ActiveRecord::SchemaDumper.send(:prepend, FixDBSchemaConflicts::SchemaDumper)

data/lib/fix_db_schema_conflicts/version.rb

@@ -1,3 +1,3 @@
 module FixDBSchemaConflicts
-  VERSION='1.2.2'
+  VERSION='2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fix-db-schema-conflicts
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jake Moffatt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,14 +84,14 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.38.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.38.0
 description: Ensures consistent output of db/schema.rb despite local differences in
@@ -194,9 +194,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="