fix-db-schema-conflicts 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b31f634488c200cf35a222e6d9757df89f01c7be
-  data.tar.gz: cd3109362b2eb0be6f147c0bd9d0489756da20b4
+  metadata.gz: 91f9ae814e0c6eb43a7a00649383e87d2d576907
+  data.tar.gz: 79c2473824d3e891a67c857c0d91aaa87177bc6b
 SHA512:
-  metadata.gz: 0ab89a8b80be45878ca5c3d4463ef74d1402f9c23a41be6a45149452e0f8c3487d9ae63546a2a5e38c86a06d72d530b40044f162a0c044c26d325ab32389059d
-  data.tar.gz: e715a73705e63559e15c2c0cc2682a94bf8470e160e3a4973b6b4e9310a5054c4e71f8f82a8a7749188ddea2aafec7535b80fc584dda245e236366f3f5c870a6
+  metadata.gz: 5a6d5a9220171c134f35fd03af0d3f4a4e225ad153c0a88f05171570a26a5f21166890bb0b1d23aeb4f47b1e6791aa0476d2ad70708ac99d0000bffb5ffd13df
+  data.tar.gz: 73c5b1adc970434b882fcff25744e3ca14447889cb7ef5267ff74d41632c5a334333d4a14fb50da93b1c3be0e5de52730224e755f5989424c84c43b4a6bae933

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.rubocop_schema.yml

@@ -1,3 +1,9 @@
+Style/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
+
 Style/NumericLiterals:
   Exclude:
     - 'db/schema.rb'

data/README.md

@@ -58,3 +58,10 @@ If you wish to use a version of Rubocop `< 0.36.0` or below, use `gem 'fix-db-sc
  - @TCampaigne
  - @Lordnibbler
  - @jakeonrails
+
+## Releases
+ - 1.2.1
+  - Upgrade Rubocop to get major performance boost
+  - Add support for sorting of extensions
+  - Fix spacing regression introduced by Rubocop upgrade
+  - Add test suite and an integration test

data/fix-db-schema-conflicts.gemspec

@@ -20,6 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'sqlite3'
 
-  spec.add_dependency "rubocop", ">= 0.36.0"
+  spec.add_dependency "rubocop", ">= 0.38.0"
 end

data/lib/fix_db_schema_conflicts/schema_dumper.rb

@@ -8,7 +8,11 @@ module ActiveRecord
   class SchemaDumper
 
     private
-    class TableSorter < SimpleDelegator
+    class ConnectionWithSorting < SimpleDelegator
+      def extensions
+        __getobj__.extensions.sort
+      end
+
       def columns(table)
         __getobj__.columns(table).sort_by(&:name)
       end
@@ -22,14 +26,25 @@ module ActiveRecord
       end
     end
 
-    def table_with_sorting(table, stream)
-      old_connection = @connection
-      @connection = TableSorter.new(old_connection)
-      result = table_without_sorting(table, stream)
-      @connection = old_connection
-      result
+    def extensions_with_sorting(*args)
+      with_sorting do
+        extensions_without_sorting(*args)
+      end
+    end
+    alias_method_chain :extensions, :sorting
+
+    def table_with_sorting(*args)
+      with_sorting do
+        table_without_sorting(*args)
+      end
     end
     alias_method_chain :table, :sorting
 
+    def with_sorting(&block)
+      old, @connection = @connection, ConnectionWithSorting.new(@connection)
+      result = yield
+      @connection = old
+      result
+    end
   end
 end

data/lib/fix_db_schema_conflicts/version.rb

@@ -1,3 +1,3 @@
 module FixDBSchemaConflicts
-  VERSION='1.2.0'
+  VERSION='1.2.1'
 end

data/spec/integration/integration_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe 'Fix DB Schema Conflicts' do
+
+  let(:expected_lines) { reference_db_schema.lines }
+
+  it 'generates a sorted schema with no extra spacing' do
+
+    `cd spec/test-app && rm db/schema.rb && rake db:migrate`
+
+    generated_lines = File.readlines('spec/test-app/db/schema.rb')
+
+    generated_lines.zip(expected_lines).each do |generated, expected|
+      next if expected.nil?
+      next if expected.start_with?('ActiveRecord::Schema.define')
+      expect(generated).to eq(expected)
+    end
+  end
+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.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20160322223258) do
+  create_table "companies", force: :cascade do |t|
+    t.string "addr1"
+    t.string "addr2"
+    t.string "city"
+    t.datetime "created_at", null: false
+    t.string "name"
+    t.string "phone"
+    t.string "state"
+    t.datetime "updated_at", null: false
+    t.string "zip"
+  end
+
+  add_index "companies", ["city"], name: "index_companies_on_city"
+  add_index "companies", ["name"], name: "index_companies_on_name"
+  add_index "companies", ["state"], name: "index_companies_on_state"
+
+  create_table "people", force: :cascade do |t|
+    t.integer "age"
+    t.date "birthdate"
+    t.datetime "created_at", null: false
+    t.string "first_name"
+    t.string "last_name"
+    t.datetime "updated_at", null: false
+  end
+  RUBY
+end

data/spec/spec_helper.rb

@@ -0,0 +1,96 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

data/spec/test-app/.gitignore

@@ -0,0 +1,17 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*
+!/log/.keep
+/tmp

data/spec/test-app/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.2.5.2'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3'
+
+gem 'fix-db-schema-conflicts', path: '../..'

data/spec/test-app/Gemfile.lock

@@ -0,0 +1,125 @@
+PATH
+  remote: ../..
+  specs:
+    fix-db-schema-conflicts (1.2.0)
+      rubocop (>= 0.36.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.5.2)
+      actionpack (= 4.2.5.2)
+      actionview (= 4.2.5.2)
+      activejob (= 4.2.5.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.5.2)
+      actionview (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5.2)
+      activesupport (= 4.2.5.2)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5.2)
+      activesupport (= 4.2.5.2)
+      globalid (>= 0.3.0)
+    activemodel (4.2.5.2)
+      activesupport (= 4.2.5.2)
+      builder (~> 3.1)
+    activerecord (4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
+      arel (~> 6.0)
+    activesupport (4.2.5.2)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.3)
+    ast (2.2.0)
+    builder (3.2.2)
+    concurrent-ruby (1.0.1)
+    erubis (2.7.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.99.1)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    parser (2.3.0.6)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.5.2)
+      actionmailer (= 4.2.5.2)
+      actionpack (= 4.2.5.2)
+      actionview (= 4.2.5.2)
+      activejob (= 4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activerecord (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.5.2)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.5.2)
+      actionpack (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rainbow (2.1.0)
+    rake (11.1.1)
+    rubocop (0.38.0)
+      parser (>= 2.3.0.6, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.7.5)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fix-db-schema-conflicts!
+  rails (= 4.2.5.2)
+  sqlite3
+
+BUNDLED WITH
+   1.10.6

data/spec/test-app/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/spec/test-app/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks