fix-db-schema-conflicts 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39192bd1c0fb0868396a4760665ce60c2f9e634c
-  data.tar.gz: bbde2547471a0b37a730f5d9518c3b5b0f190905
+  metadata.gz: b31f634488c200cf35a222e6d9757df89f01c7be
+  data.tar.gz: cd3109362b2eb0be6f147c0bd9d0489756da20b4
 SHA512:
-  metadata.gz: c5f2a60f67b80eb1c864b0fa56c4bd47c443894f0ae6fd5d3256cc3849532bd1a908dd83177b695ee91360b88342ccfb05dbc328db97d99cff50be053cec93ea
-  data.tar.gz: b4e987375106468b7377f6ab11ccebc1d4592ec06d48e704b7dddab9b998dac88593cf6ea4bfa048d7dac60706e634769c1ed4f64764992c457adb5a9b828cc6
+  metadata.gz: 0ab89a8b80be45878ca5c3d4463ef74d1402f9c23a41be6a45149452e0f8c3487d9ae63546a2a5e38c86a06d72d530b40044f162a0c044c26d325ab32389059d
+  data.tar.gz: e715a73705e63559e15c2c0cc2682a94bf8470e160e3a4973b6b4e9310a5054c4e71f8f82a8a7749188ddea2aafec7535b80fc584dda245e236366f3f5c870a6

data/.rubocop_schema.yml

@@ -2,7 +2,7 @@ Style/NumericLiterals:
   Exclude:
     - 'db/schema.rb'
 
-Style/SingleSpaceBeforeFirstArg:
+Style/SpaceBeforeFirstArg:
   Enabled: true
 
 Metrics/BlockNesting:

data/README.md

@@ -52,3 +52,9 @@ If you wish to use a version of Rubocop `< 0.36.0` or below, use `gem 'fix-db-sc
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+## Contributors
+
+ - @TCampaigne
+ - @Lordnibbler
+ - @jakeonrails

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.36.0"
+  spec.add_dependency "rubocop", ">= 0.36.0"
 end

data/lib/fix_db_schema_conflicts/tasks/db.rake

@@ -8,7 +8,7 @@ namespace :db do
         "#{Rails.root}/db/schema.rb"
       end
       rubocop_yml = File.expand_path('../../../../.rubocop_schema.yml', __FILE__)
-      `rubocop --auto-correct --config #{rubocop_yml} #{filename}`
+      `bundle exec rubocop --auto-correct --config #{rubocop_yml} #{filename}`
       `sed -E -e 's/, +/, /g' #{filename} > db/schema.fixed.rb`
       `mv db/schema.fixed.rb #{filename}`
     end

data/lib/fix_db_schema_conflicts/version.rb

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

metadata

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