house_style 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcabc44f82f66793565b2f2b254107fa249cb939
-  data.tar.gz: 50a45ad11f91645d955a69c758c8fe5970bb57d5
+  metadata.gz: 95d2d734013eac78dd85fa204f113c669c57c5ea
+  data.tar.gz: ac316b7c54461412bece3b4b79bce33fcce5bb2f
 SHA512:
-  metadata.gz: f87abc7fc4429838399898ff1c8fab7ab7acd87b724e0dcd3f4f50fdb5781cff39be63c56b6655fffae0f7fd8cf93e3a3befd396a057d41c0c9eef871ace271d
-  data.tar.gz: 187bb131325771a26a916d7ea65c2fce1fecbb79791b708c519f513bb5092117dbccfafd3b9efd47e925fe0b5ffa5d5360af07788c5183744855ba78170f5f36
+  metadata.gz: c56037fa21bffbe8cb809d957b0d0dbfc4911759eb3541f3566ba203b7da68d776b880836653947d918696bda673aabbd99847604add23da10fb5c5c198470d6
+  data.tar.gz: cfbad3cf9fa1595b8f3c19a11cef60cdbcf25b4af7b9ed6916e15fa76c669af0aca0fa60949e2f3c6b29457dad2ee892ab6aa0c612f5b219881c3dc6ef679eb3

data/CHANGELOG.md

@@ -1,8 +1,21 @@
-# 0.2.1
+# CHANGELOG
+
+## 1.0.0
+
+- Increases dependency to Rubocop 0.37.2, which changes how to specify Rails cops and introduces the requirement of a Ruby version in each project's `.rubocop.yml` file. A working value for this value will be inserted when `rails generate house_style:install` is run.
+- Support for turning off cops in the Rails `db/migrate/` folder is improved to a system that should actually work.
+- New cop `Style/FrozenStringLiteralComment` is disabled by default.
+- New cop `Style/SignalException` is supported, using the `semantic` default to best match existing practice.
+
+## 0.2.2
+
+- [FIX] Revert gemspec file selection, as replacement was not correctly including the essential rubocop `.yml` files.
+
+## 0.2.1
 
 - [FIX] Rename generator template files so they are included in gem release.
 
-# 0.2.0
+## 0.2.0
 
 - New defaults for `db/migrate` folders in Rails projects.
 - Rails projects using `house_style` can now use a Rails generator to install the relevant house style configurations:
@@ -10,10 +23,10 @@
     - `{Rails.root}/spec/.rubocop.yml` loads tweaked config for RSpec folders, including use of the `rubocop-rspec` plugin
     - `{Rails.root}/db/migrate/.rubocop.yml` ignores key rules for compatibility with Rails-generated migrations, etc.
 
-# 0.1.1
+## 0.1.1
 
 - New `rspec/rubocop.yml` defaults.
 
-# 0.1.0
+## 0.1.0
 
 - Initial release

data/house_style.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'house_style'
-  spec.version       = '0.2.2'
+  spec.version       = '1.0.0'
   spec.authors       = ['Scott Matthewman']
   spec.email         = ['scott@altmetric.com']
 
@@ -16,8 +16,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rubocop', '~> 0.35.1'
-  spec.add_dependency 'rubocop-rspec', '~> 1.3.1'
+  spec.add_dependency 'rubocop', '~> 0.37.2'
+  spec.add_dependency 'rubocop-rspec', '~> 1.4'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/generators/house_style/install_generator.rb

@@ -8,15 +8,22 @@ module HouseStyle
     end
 
     def create_root_rubocop_yml
-      copy_file 'rubocop.yml', '.rubocop.yml'
+      template 'rubocop.yml', '.rubocop.yml', assigns: { ruby_version: ruby_version }
     end
 
     def create_rspec_rubocop_yml
-      copy_file 'rspec-rubocop.yml', 'spec/.rubocop.yml'
+      template 'rspec-rubocop.yml', 'spec/.rubocop.yml'
     end
 
     def create_db_migrate_rubocop_yml
-      copy_file 'db_migrate_rubocop.yml', 'db/migrate/.rubocop.yml'
+      template 'db_migrate_rubocop.yml', 'db/migrate/.rubocop.yml'
+    end
+
+    private
+
+    def ruby_version
+      major, minor, _ = RUBY_VERSION.split('.')
+      "#{major}.#{minor}"
     end
   end
 end

data/lib/generators/house_style/templates/rubocop.yml

@@ -1,2 +1,5 @@
+AllCops:
+  TargetRubyVersion: <%= ruby_version %>
+
 inherit_gem:
   house_style: rails/rubocop.yml

data/rails/db_migrate.yml

@@ -1,24 +1,16 @@
 Metrics/ClassLength:
-  Exclude:
-    - db/migrate/*.rb
+  Enabled: false
 Metrics/LineLength:
-  Exclude:
-    - db/migrate/*.rb
+  Enabled: false
 Metrics/MethodLength:
-  Exclude:
-    - db/migrate/*.rb
+  Enabled: false
 Style/BlockDelimiters:
-  Exclude:
-    - db/migrate/*.rb
+  Enabled: false
 Style/Documentation:
-  Exclude:
-    - db/migrate/*.rb
+  Enabled: false
 Style/EmptyLineBetweenDefs:
-  Exclude:
-    - db/migrate/*.rb
+  Enabled: false
 Style/StringLiterals:
-  Exclude:
-    - db/migrate/*.rb
+  Enabled: false
 Metrics/AbcSize:
-  Exclude:
-    - db/migrate/*.rb
+  Enabled: false

data/rails/rubocop.yml

@@ -1,4 +1,4 @@
 inherit_from: ../ruby/rubocop.yml
 
-AllCops:
-  RunRailsCops: true
+Rails:
+  Enabled: true

data/rspec/rubocop.yml

@@ -6,6 +6,8 @@ Metrics/LineLength:
   Enabled: false
 Metrics/ModuleLength:
   Enabled: false
+RSpec/NotToNot:
+  AcceptedMethod: to_not
 Style/BlockDelimiters:
   Exclude:
     - spec/factories/**/*.rb

data/ruby/configuration.yml

@@ -2,7 +2,6 @@ AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
   ExtraDetails: true
-  RunRailsCops: false
   UseCache: true
 
   Include:

data/ruby/style.yml

@@ -36,6 +36,8 @@ Style/EmptyLineBetweenDefs:
   AllowAdjacentOneLineDefs: true
 Style/Encoding:
   EnforcedStyle: when_needed
+Style/FrozenStringLiteralComment:
+  Enabled: false
 Style/GuardClause:
   MinBodyLength: 3
 Style/HashSyntax:
@@ -52,6 +54,8 @@ Style/NonNilCheck:
   IncludeSemanticChanges: true
 Style/NumericLiterals:
   MinDigits: 6
+Style/SignalException:
+  EnforcedStyle: semantic
 Style/StringLiterals:
   Enabled: false
 Style/StringMethods:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: house_style
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Scott Matthewman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.37.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.37.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement