fix-db-schema-conflicts 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a22f4fef26050e4e70f51478ba4514f7966814ef
-  data.tar.gz: de684bf1d48ce3057065863af4aaba2ddd6473b0
+  metadata.gz: ecdcc56d2a2876277bf55418402686c906e329b8
+  data.tar.gz: 5f23bb38ec5e70d7e0f76bbe287785a7ffc85b33
 SHA512:
-  metadata.gz: 8cc025eecba85b55061e46ba58eb643fa8c1af686a8603011a121905553ca9fcc2e89019ed5f07f31b8893ca2ce28e12be3daf6261712fd0c279210f4df3720d
-  data.tar.gz: dde9a90e6b9c7d75612c70168599c2dcec5f78823b86bc7719cc9572956b3f348d08c34953bb0099b5aa92d3f343998e536f2b4890331f893072851a1dbc919b
+  metadata.gz: 2473ee6a7474dd182784d6d2f20f7cece39ecc1467c346ac53d1f002d99920520c3ff6871b8e54aa9ba62b80560fe144d4083c945901191390bd568985979efb
+  data.tar.gz: 9cdb6b11e152112577faa8ba66eb21a76c20f19119211893975ee00a0da054c0c217f7a9ce62c0b87ddae6490e08cb9dee67f18babd9b44b56ddeba50fd6b2f2

data/.rubocop_schema.49.yml

@@ -0,0 +1,35 @@
+# Configuration for Rubocop >= 0.49.0
+
+Layout/AlignHash:
+  EnforcedColonStyle: 'key'
+  EnforcedHashRocketStyle: 'key'
+
+Layout/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
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: true
+
+Style/NumericLiterals:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Max: 2
+
+Style/WordArray:
+  Enabled: false
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/HashSyntax:
+  EnforcedStyle: 'ruby19'
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/.rubocop_schema.yml

@@ -1,3 +1,5 @@
+# Configuration for Rubocop >= 0.38.0, < 0.49.0
+
 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

data/README.md

@@ -83,6 +83,8 @@ old Ruby.
  - [@amckinnell](https://github.com/amckinnell)
 
 ## Releases
+- 3.0.2
+  - Added support for new Rubocop 0.49+ schema (amckinnell)
 - 3.0.1
   - Improve formatting to be more consistent (amckinnell)
   - Bump rake dependency to bypass a rake bug in older version (amckinnell)

data/lib/fix_db_schema_conflicts/autocorrect_configuration.rb

@@ -0,0 +1,17 @@
+module FixDBSchemaConflicts
+  class AutocorrectConfiguration
+    def self.load
+      new.load
+    end
+
+    def load
+      at_least_rubocop_49? ? '.rubocop_schema.49.yml' : '.rubocop_schema.yml'
+    end
+
+    private
+
+    def at_least_rubocop_49?
+      Gem::Version.new('0.49.0') <= Gem.loaded_specs['rubocop'].version
+    end
+  end
+end

data/lib/fix_db_schema_conflicts/tasks/db.rake

@@ -1,15 +1,18 @@
 require 'shellwords'
+require_relative '../autocorrect_configuration'
 
 namespace :db do
   namespace :schema do
     task :dump do
       puts "Dumping database schema with fix-db-schema-conflicts gem"
+
       filename = ENV['SCHEMA'] || if defined? ActiveRecord::Tasks::DatabaseTasks
         File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, 'schema.rb')
       else
         "#{Rails.root}/db/schema.rb"
       end
-      rubocop_yml = File.expand_path('../../../../.rubocop_schema.yml', __FILE__)
+      autocorrect_config = FixDBSchemaConflicts::AutocorrectConfiguration.load
+      rubocop_yml = File.expand_path("../../../../#{autocorrect_config}", __FILE__)
       `bundle exec rubocop --auto-correct --config #{rubocop_yml} #{filename.shellescape}`
     end
   end

data/lib/fix_db_schema_conflicts/version.rb

@@ -1,3 +1,3 @@
 module FixDBSchemaConflicts
-  VERSION='3.0.1'
+  VERSION='3.0.2'
 end

data/spec/integration/integration_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe 'Fix DB Schema Conflicts' do
+RSpec.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`
+    `cd spec/test-app && rm -f db/schema.rb && rake db:migrate`
 
     generated_lines = File.readlines('spec/test-app/db/schema.rb')
 

data/spec/spec_helper.rb

@@ -40,9 +40,9 @@ RSpec.configure do |config|
     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
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+
   # 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
@@ -53,7 +53,7 @@ RSpec.configure do |config|
   # 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"
+  # 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:
@@ -79,7 +79,7 @@ RSpec.configure do |config|
   # 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
+  # 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
@@ -92,5 +92,4 @@ RSpec.configure do |config|
   # 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/unit/autocorrect_configuration_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'fix_db_schema_conflicts/autocorrect_configuration'
+
+RSpec.describe FixDBSchemaConflicts::AutocorrectConfiguration do
+  subject(:autocorrect_config) { described_class }
+
+  it 'for versions up to 0.49.0' do
+    installed_rubocop(version: '0.39.0')
+
+    expect(autocorrect_config.load).to eq('.rubocop_schema.yml')
+  end
+
+  it 'for versions 0.49.0 and above' do
+    installed_rubocop(version: '0.49.0')
+
+    expect(autocorrect_config.load).to eq('.rubocop_schema.49.yml')
+  end
+
+  def installed_rubocop(version:)
+    allow(Gem).to receive_message_chain(:loaded_specs, :[], :version)
+      .and_return(Gem::Version.new(version))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fix-db-schema-conflicts
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Jake Moffatt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop_schema.49.yml"
 - ".rubocop_schema.yml"
 - ".travis.yml"
 - Gemfile
@@ -112,6 +113,7 @@ files:
 - Rakefile
 - fix-db-schema-conflicts.gemspec
 - lib/fix-db-schema-conflicts.rb
+- lib/fix_db_schema_conflicts/autocorrect_configuration.rb
 - lib/fix_db_schema_conflicts/railtie.rb
 - lib/fix_db_schema_conflicts/schema_dumper.rb
 - lib/fix_db_schema_conflicts/tasks/db.rake
@@ -184,6 +186,7 @@ files:
 - spec/test-app/test/test_helper.rb
 - spec/test-app/vendor/assets/javascripts/.keep
 - spec/test-app/vendor/assets/stylesheets/.keep
+- spec/unit/autocorrect_configuration_spec.rb
 homepage: https://github.com/jakeonrails/fix-db-schema-conflicts
 licenses:
 - MIT
@@ -277,3 +280,4 @@ test_files:
 - spec/test-app/test/test_helper.rb
 - spec/test-app/vendor/assets/javascripts/.keep
 - spec/test-app/vendor/assets/stylesheets/.keep
+- spec/unit/autocorrect_configuration_spec.rb