finstyle 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2516678794acc73b1d672039738734f59e277da8
-  data.tar.gz: ad965baa09e63ea6fed1d3d8a59331fbb988de84
+  metadata.gz: f26c307c9547fce50ff28e05b8d1c71c3cb24720
+  data.tar.gz: 434ca3d637bbfab4e6a64065af0e5eba2f14db09
 SHA512:
-  metadata.gz: 490b0375853980a72bdc86fb2ea8a8fc719dddc2f387de649332983639f582060b468ce269e0e758a4ef782880442a0a95a11a127359ae450fd47bce30591971
-  data.tar.gz: 48bcc83bf599e376a4cca64f34bc01ab07a1d0ad8fe5d2164b94e4bfefd15bad10d1de68b6a4a65ff721cf5a29dfe949a3fb80fff3712b21798d096f86c13a35
+  metadata.gz: a03ec604d53ce49184384dfc52973809349bb12f5278babfebe4da005376f5ff1f67ed3247f61d390898cc2a059fc50ec2e567076f205ea8142bbd1490409875
+  data.tar.gz: 86b2ca4f84365c3503a4b8c336c292a5c0f8120aeebc86c4decf189bd59f76304556fbbb4aa0f4585aa3a395c1993ff4c6d4b8781970dbf21e896ea00bb392b9

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
   - 2.1
   - 2.0.0
   - 1.9.3
-  - 1.9.2
   - ruby-head
   - jruby-19mode
 

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.2.0 / 2014-08-30
+
+### Breaking changes
+
+* Upgrade to RuboCop 0.25.0 support. ([@fnichol][])
+* Drop support for Ruby 1.9.2 as upstream (RuboCop) decided to drop support between 0.24.1 and 0.25.0. ([@fnichol][])
+
+### Improvements
+
+* Pull request [#1][]: Readme typo fix. ([@cwjohnston][])
+
+
 ## 1.1.0 / 2014-07-22
 
 ### New features
@@ -25,4 +37,6 @@
 The initial release.
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
-[@fnichol]: https://github.com/fnichol
+[#1]: https://github.com/fnichol/finstyle/issues/1
+[@cwjohnston]: https://github.com/cwjohnston
+[@fnichol]: https://github.com/fnichol

data/Gemfile

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 source "https://rubygems.org"
 
 gemspec

data/Guardfile

@@ -1,4 +1,6 @@
-guard :rubocop, keep_failed: true, cli: "-r finstyle" do
+# -*- encoding: utf-8 -*-
+
+guard :rubocop, :keep_failed => true, :cli => "-r finstyle" do
   watch(%r{.+\.rb$})
   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end

data/README.md

@@ -88,7 +88,7 @@ guard :rubocop, cli: "--config #{Finstyle.config}" do
 end
 ```
 
-### .rubycop.yml
+### .rubocop.yml
 
 As with vanilla RuboCop, any custom settings can still be placed in a `.rubocop.yml` file in the root of your project.
 

data/config/enabled.yml

@@ -54,12 +54,16 @@ Style/BeginBlock:
   Description: 'Avoid the use of BEGIN blocks.'
   Enabled: true
 
+Style/BarePercentLiterals:
+  Description: 'Checks if usage of %() or %Q() matches configuration.'
+  Enabled: true
+
 Style/BlockComments:
   Description: 'Do not use block comments.'
   Enabled: true
 
-Style/BlockNesting:
-  Description: 'Avoid excessive block nesting'
+Style/BlockEndNewline:
+  Description: 'Put end statement of multiline block on its own line.'
   Enabled: true
 
 Style/Blocks:
@@ -97,10 +101,6 @@ Style/ClassCheck:
   Description: 'Enforces consistent use of `Object#is_a?` or `Object#kind_of?`.'
   Enabled: true
 
-Style/ClassLength:
-  Description: 'Avoid classes longer than 100 lines of code.'
-  Enabled: true
-
 Style/ClassMethods:
   Description: 'Use self when defining module/class methods.'
   Enabled: true
@@ -131,10 +131,6 @@ Style/ConstantName:
   Description: 'Constants should use SCREAMING_SNAKE_CASE.'
   Enabled: true
 
-Style/CyclomaticComplexity:
-  Description: 'Avoid complex methods.'
-  Enabled: true
-
 Style/DefWithParentheses:
   Description: 'Use def with parentheses when there are arguments.'
   Enabled: true
@@ -271,10 +267,6 @@ Style/LineEndConcatenation:
                  line end.
   Enabled: true
 
-Style/LineLength:
-  Description: 'Limit lines to 80 characters.'
-  Enabled: true
-
 Style/MethodCallParentheses:
   Description: 'Do not use parentheses for method calls with no arguments.'
   Enabled: true
@@ -285,10 +277,6 @@ Style/MethodDefParentheses:
                  parentheses.
   Enabled: true
 
-Style/MethodLength:
-  Description: 'Avoid methods longer than 10 lines of code.'
-  Enabled: true
-
 Style/MethodName:
   Description: 'Use the configured style when naming methods.'
   Enabled: true
@@ -301,6 +289,10 @@ Style/MultilineBlockChain:
   Description: 'Avoid multi-line chains of blocks.'
   Enabled: true
 
+Style/MultilineBlockLayout:
+  Description: 'Ensures newlines after multiline block do statements.'
+  Enabled: true
+
 Style/MultilineIfThen:
   Description: 'Never use then for multi-line if/unless.'
   Enabled: true
@@ -357,10 +349,6 @@ Style/OpMethod:
   Description: 'When defining binary operators, name the argument other.'
   Enabled: true
 
-Style/ParameterLists:
-  Description: 'Avoid parameter lists longer than three or four parameters.'
-  Enabled: true
-
 Style/ParenthesesAroundCondition:
   Description: >-
                  Don't use parentheses around the condition of an
@@ -371,6 +359,10 @@ Style/PercentLiteralDelimiters:
   Description: 'Use `%`-literal delimiters consistently'
   Enabled: true
 
+Style/PercentQLiterals:
+  Description: 'Checks if uses of %Q/%q match the configured preference.'
+  Enabled: true
+
 Style/PerlBackrefs:
   Description: 'Avoid Perl-style regex back references.'
   Enabled: true
@@ -416,7 +408,9 @@ Style/RescueModifier:
   Enabled: true
 
 Style/SelfAssignment:
-  Description: 'Checks for places where self-assignment shorthand should have been used.'
+  Description: >-
+                 Checks for places where self-assignment shorthand should have
+                 been used.
   Enabled: true
 
 Style/Semicolon:
@@ -595,6 +589,40 @@ Style/WordArray:
   Description: 'Use %w or %W for arrays of words.'
   Enabled: true
 
+#################### Metrics ################################
+
+Metrics/BlockNesting:
+  Description: 'Avoid excessive block nesting'
+  Enabled: true
+
+Metrics/ClassLength:
+  Description: 'Avoid classes longer than 100 lines of code.'
+  Enabled: true
+
+Metrics/CyclomaticComplexity:
+  Description: >-
+                 A complexity metric that is strongy correlated to the number
+                 of test cases needed to validate a method.
+  Enabled: true
+
+Metrics/LineLength:
+  Description: 'Limit lines to 80 characters.'
+  Enabled: true
+
+Metrics/MethodLength:
+  Description: 'Avoid methods longer than 10 lines of code.'
+  Enabled: true
+
+Metrics/ParameterLists:
+  Description: 'Avoid parameter lists longer than three or four parameters.'
+  Enabled: true
+
+Metrics/PerceivedComplexity:
+  Description: >-
+                 A complexity metric geared towards measuring complexity for a
+                 human reader.
+  Enabled: true
+
 #################### Lint ################################
 ### Warnings
 
@@ -619,7 +647,9 @@ Lint/BlockAlignment:
   Enabled: true
 
 Lint/ConditionPosition:
-  Description: 'Checks for condition placed in a confusing position relative to the keyword.'
+  Description: >-
+                 Checks for condition placed in a confusing position relative to
+                 the keyword.
   Enabled: true
 
 Lint/Debugger:
@@ -781,7 +811,9 @@ Rails/Output:
   Enabled: true
 
 Rails/ReadWriteAttribute:
-  Description: 'Checks for read_attribute(:attr) and write_attribute(:attr, val).'
+  Description: >-
+                 Checks for read_attribute(:attr) and
+                 write_attribute(:attr, val).
   Enabled: true
 
 Rails/ScopeArgs:

data/config/finstyle.yml

@@ -14,6 +14,21 @@ Lint/AssignmentInCondition:
 Lint/EndAlignment:
   AlignWith: variable
 
+#
+### Metrics Cops
+#
+
+# ABC complexity is a far better code smell signal than raw class length.
+Metrics/ClassLength:
+  Max: 300
+
+Metrics/LineLength:
+  Max: 100
+
+# ABC complexity is a far better code smell signal than raw method length.
+Metrics/MethodLength:
+  Max: 20
+
 #
 ### Style Cops
 #
@@ -29,10 +44,6 @@ Style/AlignParameters:
 Style/Blocks:
   Enabled: false
 
-# ABC complexity is a far better code smell signal than raw class length.
-Style/ClassLength:
-  Max: 300
-
 # Words help us convey meaning and Ruby aliased methods help with this.
 Style/CollectionMethods:
   PreferredMethods:
@@ -71,13 +82,6 @@ Style/GuardClause:
 Style/IfUnlessModifier:
   Enabled: false
 
-Style/LineLength:
-  Max: 100
-
-# ABC complexity is a far better code smell signal than raw method length.
-Style/MethodLength:
-  Max: 20
-
 # True functional-style chaining is fine by me
 Style/MultilineBlockChain:
   Enabled: false

data/config/upstream.yml

@@ -10,7 +10,16 @@ AllCops:
   # Include gemspec and Rakefile
   Include:
     - '**/*.gemspec'
+    - '**/*.podspec'
+    - '**/*.jbuilder'
+    - '**/*.rake'
+    - '**/Gemfile'
     - '**/Rakefile'
+    - '**/Capfile'
+    - '**/Guardfile'
+    - '**/Podfile'
+    - '**/Thorfile'
+    - '**/Vagrantfile'
   Exclude:
     - 'vendor/**/*'
   # By default, the rails cops are not run. Override in project or home
@@ -107,8 +116,21 @@ Style/AlignParameters:
     - with_first_parameter
     - with_fixed_indentation
 
-Style/BlockNesting:
-  Max: 3
+Style/AndOr:
+  # Whether `and` and `or` are banned only in conditionals (conditionals)
+  # or completely (always).
+  EnforcedStyle: always
+  SupportedStyles:
+    - always
+    - conditionals
+
+
+# Checks if usage of %() or %Q() matches configuration.
+Style/BarePercentLiterals:
+  EnforcedStyle: bare_percent
+  SupportedStyles:
+    - percent_q
+    - bare_percent
 
 Style/BracesAroundHashParameters:
   EnforcedStyle: no_braces
@@ -150,10 +172,6 @@ Style/ClassCheck:
   SupportedStyles:
     - is_a?
     - kind_of?
-    
-Style/ClassLength:
-  CountComments: false  # count full line comments?
-  Max: 100
 
 # Align with the style guide.
 Style/CollectionMethods:
@@ -179,10 +197,6 @@ Style/CommentAnnotation:
     - HACK
     - REVIEW
 
-# Avoid complex methods.
-Style/CyclomaticComplexity:
-  Max: 6
-
 # Multi-line method chaining should be done with leading dots.
 Style/DotPosition:
   EnforcedStyle: leading
@@ -208,6 +222,9 @@ Style/FileName:
     - '**/Rakefile'
     - '**/Gemfile'
     - '**/Capfile'
+    - '**/Vagrantfile'
+    - '**/Podfile'
+    - '**/Thorfile'
 
 # Checks use of for or each in multiline loops.
 Style/For:
@@ -262,15 +279,14 @@ Style/LambdaCall:
     - call
     - braces
 
-Style/LineLength:
-  Max: 80
-  AllowURI: true
-
 Style/Next:
   # With `always` all conditions at the end of an iteration needs to be
-  # replace by next - with `skip_modifier_ifs` the modifier if like this one
+  # replaced by next - with `skip_modifier_ifs` the modifier if like this one
   # are ignored: [1, 2].each { |a| return 'yes' if a == 1 }
   EnforcedStyle: skip_modifier_ifs
+  # `MinBodyLength` defines the number of lines of the a body of an if / unless
+  # needs to have to trigger this cop
+  MinBodyLength: 3
   SupportedStyles:
     - skip_modifier_ifs
     - always
@@ -290,10 +306,6 @@ Style/MethodDefParentheses:
     - require_parentheses
     - require_no_parentheses
 
-Style/MethodLength:
-  CountComments: false  # count full line comments?
-  Max: 10
-
 Style/MethodName:
   EnforcedStyle: snake_case
   SupportedStyles:
@@ -303,10 +315,6 @@ Style/MethodName:
 Style/NumericLiterals:
   MinDigits: 5
 
-Style/ParameterLists:
-  Max: 5
-  CountKeywordArgs: true
-
 # Allow safe assignment in conditions.
 Style/ParenthesesAroundCondition:
   AllowSafeAssignment: true
@@ -323,6 +331,12 @@ Style/PercentLiteralDelimiters:
     '%W': ()
     '%x': ()
 
+Style/PercentQLiterals:
+  EnforcedStyle: lower_case_q
+  SupportedStyles:
+    - lower_case_q # Use %q when possible, %Q when necessary
+    - upper_case_q # Always use %Q
+
 Style/PredicateName:
   NamePrefixBlacklist:
     - is_
@@ -335,7 +349,6 @@ Style/RaiseArgs:
     - compact # raise Exception.new(msg)
     - exploded # raise Exception, msg
 
-
 Style/RedundantReturn:
   # When true allows code like `return x, y`.
   AllowMultipleReturnValues: false
@@ -356,7 +369,6 @@ Style/SignalException:
     - only_fail
     - semantic
 
-
 Style/SingleLineBlockParams:
   Methods:
     - reduce:
@@ -463,6 +475,34 @@ Style/WhileUntilModifier:
 Style/WordArray:
   MinSize: 0
 
+##################### Metrics ##################################
+
+Metrics/BlockNesting:
+  Max: 3
+
+Metrics/ClassLength:
+  CountComments: false  # count full line comments?
+  Max: 100
+
+# Avoid complex methods.
+Metrics/CyclomaticComplexity:
+  Max: 6
+
+Metrics/LineLength:
+  Max: 80
+  AllowURI: true
+
+Metrics/MethodLength:
+  CountComments: false  # count full line comments?
+  Max: 10
+
+Metrics/ParameterLists:
+  Max: 5
+  CountKeywordArgs: true
+
+Metrics/PerceivedComplexity:
+  Max: 7
+
 ##################### Lint ##################################
 
 # Allow safe assignment in conditions.
@@ -509,6 +549,13 @@ Rails/HasAndBelongsToMany:
   Include:
     - app/models/**/*.rb
 
+Rails/Output:
+  Include:
+    - app/**/*.rb
+    - config/**/*.rb
+    - db/**/*.rb
+    - lib/**/*.rb
+    
 Rails/ReadWriteAttribute:
   Include:
     - app/models/**/*.rb

data/finstyle.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |spec|
   spec.test_files     = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths  = ["lib"]
 
-  spec.add_dependency("rubocop", "0.24.1")
+  spec.required_ruby_version = ">= 1.9.3"
+
+  spec.add_dependency("rubocop", "0.25.0")
 
   spec.add_development_dependency("bundler", "~> 1.6")
   spec.add_development_dependency("rake", "~> 10.0")

data/lib/finstyle/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module Finstyle
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finstyle
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="