house_style 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7f3e03115cf21942533eb2b83671c1a6fee4fc32
-  data.tar.gz: 515e38a2d767ec64164fb3f71590be5fecfcd664
+SHA256:
+  metadata.gz: 2b3c9f9f6267d9d7370a38d34f97b6277aa7a843209597965fc7ed71994f18a9
+  data.tar.gz: 2eb0151b69c20a8fc48fe0d1ed53cd46c4706a6a592a6afd98486cf3016fd0ef
 SHA512:
-  metadata.gz: ff7d4e0e7f311682be3469f3f9c49e49eb9442b39037195641a5ef69a6b53b2b4199ca7348b3134caacd1c676c3bba33211c56af02cacb718cfa1a877a6df38d
-  data.tar.gz: eedaf71742b220a3f2b70b7fef336e6a4ed1b10371a2203e728502903044285659fccfd06a6b63f2d71a6ed4b4948161339d94922be83f15733a50775916dae7
+  metadata.gz: 01ac391150f614674bcdf5036efce447e118b14e1845874a1acdd6c7ff3c15b6470078b67b73b8bfa6fd08a86fd3238b1be77d2951e9162284c8dfb03f825952
+  data.tar.gz: 31031e95a31e4d42029194e01265bf10d8ee2673b819cb5319c2323759fdb4bee7a95c8b479a0a5880d6c2bc891c86d541a96396418dd57820d35ad4484e3d69

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 1.6.0
+- [FIX] Require Rubocop higher than 0.49 to fix security issue: https://nvd.nist.gov/vuln/detail/CVE-2017-8418
+- [FIX] Rename `IndentHash` to `IndentFirstHashElement`, and require Rubocop 0.68 or higher because of this change.
+- Rails cops are now split into a different gem `rubocop-rails` that we include by default.
+- Disable new Rails cops InverseOf & HasManyOrHasOneDependent.
+- Exclude spec files for Lint/AmbiguousBlockAssociation as recommended in https://github.com/rubocop-hq/rubocop/issues/4222#issuecomment-290655562
+- Exclude specific rake configuration file for RSpec/ContextWording.
+- Specify `indented` as the default value for `IndentFirstArrayElement`.
+- Enforce `single_quotes` for `StringLiterals` by default.
+
+
 ## 1.5.1
 - [FIX] Remove `Include` values. Since 0.57 `Include` overwrites the hardcoded defaults. All values here are already included in the defaults, so no point in defining them here anymore.
 - [FIX] `SpaceInsideHashLiteralBraces` now belongs to `Layout` instead of `Style`

data/house_style.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'house_style'
-  spec.version       = '1.5.1'
+  spec.version       = '1.6.0'
   spec.authors       = ['Altmetric', 'Scott Matthewman']
   spec.email         = ['engineering@altmetric.com', 'scott.matthewman@gmail.com']
 
@@ -24,7 +24,8 @@ will be taken into account by rubocop also.
   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.63', '< 0.64'
+  spec.add_dependency 'rubocop', '>= 0.68', '< 0.75'
+  spec.add_dependency 'rubocop-rails', '~> 2.3'
   spec.add_dependency 'rubocop-rspec', '~> 1.15'
 
   spec.add_development_dependency 'bundler', '~> 1.10'

data/rails/rubocop.yml

@@ -7,3 +7,9 @@ AllCops:
     - lib/tasks/cucumber.rake
 Rails:
   Enabled: true
+Rails/InverseOf:
+  Enabled: false
+Rails/HasManyOrHasOneDependent:
+  Enabled: false
+
+require: rubocop-rails

data/rspec/rubocop.yml

@@ -24,3 +24,9 @@ Style/SymbolProc:
     - spec/factories/**/*.rb
 Style/WordArray:
   Enabled: false
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - spec/**/*
+RSpec/ContextWording:
+  Exclude:
+    - spec/support/shared_contexts/rake.rb

data/ruby/style.yml

@@ -39,12 +39,16 @@ Style/GuardClause:
   MinBodyLength: 3
 Style/HashSyntax:
   EnforcedStyle: ruby19_no_mixed_keys
-Layout/IndentHash:
+Layout/IndentFirstArrayElement:
+  EnforcedStyle: consistent
+Layout/IndentFirstHashElement:
   EnforcedStyle: consistent
 Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Layout/MultilineOperationIndentation:
   Enabled: false
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
 Style/NonNilCheck:
   IncludeSemanticChanges: true
 Style/NumericLiterals:
@@ -52,7 +56,8 @@ Style/NumericLiterals:
 Style/SignalException:
   EnforcedStyle: semantic
 Style/StringLiterals:
-  Enabled: false
+  EnforcedStyle: 'single_quotes'
+  Enabled: true
 Style/StringMethods:
   Enabled: true
 Style/AccessModifierDeclarations:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: house_style
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Altmetric
@@ -9,28 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.63'
+        version: '0.68'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.75'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.63'
+        version: '0.68'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.75'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -130,8 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A centralised store of house style rules