Merge remote-tracking branch 'original/master' into fix-style-violati…

…on-1021-style-string-literals

.rubocop.yml

@@ -1,11 +1 @@
 inherit_from: .rubocop_todo.yml
-
-# FIXME: These style issues are not part of the automatically generated
-# .rubocop_todo.yml config.
-Style/GuardClause:
-  Enabled: false
-
-# FIXME: These style issues are not part of the automatically generated
-# .rubocop_todo.yml config.
-Style/ConditionalAssignment:
-  Enabled: false

.rubocop_todo.yml

@@ -26,21 +26,6 @@ Lint/AssignmentInCondition:
     - 'lib/cucumber/runtime/support_code.rb'
     - 'spec/cucumber/formatter/spec_helper.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AlignWith, SupportedStyles.
-# SupportedStyles: either, start_of_block, start_of_line
-Lint/BlockAlignment:
-  Exclude:
-    - 'lib/cucumber/formatter/html.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
-# SupportedStyles: start_of_line, def
-Lint/DefEndAlignment:
-  Enabled: false
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Lint/DeprecatedClassMethods:
@@ -52,13 +37,6 @@ Lint/DuplicateMethods:
   Exclude:
     - 'lib/cucumber/multiline_argument.rb'
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
-# SupportedStyles: keyword, variable, start_of_line
-Lint/EndAlignment:
-  Enabled: false
-
 # Offense count: 2
 Lint/Eval:
   Exclude:
@@ -87,11 +65,6 @@ Lint/NestedMethodDefinition:
   Exclude:
     - 'lib/cucumber/formatter/ansicolor.rb'
 
-# Offense count: 1
-Lint/NonLocalExitFromIterator:
-  Exclude:
-    - 'lib/autotest/cucumber_mixin.rb'
-
 # Offense count: 7
 Lint/RescueException:
   Exclude:
@@ -133,15 +106,6 @@ Lint/UnusedBlockArgument:
 Lint/UnusedMethodArgument:
   Enabled: false
 
-# Offense count: 1
-Lint/UselessAccessModifier:
-  Exclude:
-    - 'lib/cucumber/multiline_argument/data_table.rb'
-
-# Offense count: 56
-Lint/UselessAssignment:
-  Enabled: false
-
 # Offense count: 60
 Metrics/AbcSize:
   Max: 99

CONTRIBUTING.md

@@ -17,7 +17,7 @@ The rest of this document is a guide for those maintaining Cucumber, and others
 
 ## Talking with other devs
 
-You can chat with the core team on https://gitter.im/cucumber/cucumber. We try to have office hours on Fridays.
+You can chat with the core team on https://gitter.im/cucumber/contributors. We try to have office hours on Fridays.
 
 ## Installing your own gems
 

History.md

@@ -24,6 +24,12 @@
 * Several tests failing with rbenv ([#1017](https://github.com/cucumber/cucumber-ruby/issues/1017) @nodo)
 * Add rubocop to check the style of the codebase ([1014](https://github.com/cucumber/cucumber-ruby/issues/1014) @nodo)
 * Fix the rubocop violation 'Lint/AmbiguousRegexpLiteral' ([1025](https://github.com/cucumber/cucumber-ruby/pull/1025) @pmatsinopoulos)
+* Fix rubocop violations ([#1024](https://github.com/cucumber/cucumber-ruby/pull/1024) @madundead)
+* Fix style violations ([#1023](https://github.com/cucumber/cucumber-ruby/pull/1023) @nodo)
+* fix Lint/UselessAssignment ([1029](https://github.com/cucumber/cucumber-ruby/pull/1029) @hotovson)
+* fix Lint/EndAlignment ([#1032](https://github.com/cucumber/cucumber-ruby/pull/1032) @hotovson)
+* fix Lint/NonLocalExitFromIterator ([#1037](https://github.com/cucumber/cucumber-ruby/pull/1037) @hotovson)
+* fix Lint/UselessAccessModifier ([#1036](https://github.com/cucumber/cucumber-ruby/pull/1036) @hotovson)
 
 ## [v2.4.0](https://github.com/cucumber/cucumber-ruby/compare/v2.3.3...v2.4.0)
 

examples/i18n/ar/lib/calculator.rb

@@ -6,6 +6,6 @@ def push(n)
   end
 
   def جمع
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 end

examples/i18n/ca/lib/calculadora.rb

@@ -6,11 +6,11 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide
     @args[0].to_f / @args[1].to_f
   end
 
-end
+end

examples/i18n/cs/lib/calculator.rb

@@ -3,12 +3,12 @@ def push(n)
     @args ||= []
     @args << n
   end
-  
+
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide
     @args[0].to_f / @args[1].to_f
   end
-end
+end

examples/i18n/da/lib/lommeregner.rb

@@ -6,6 +6,6 @@ def push(n)
 
   def add
     #@args[0] + @args[1]
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 end

examples/i18n/de/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/el/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/en/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/eo/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/es/lib/calculador.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/et/lib/kalkulaator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def liida
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def jaga

examples/i18n/fi/lib/laskin.rb

@@ -5,7 +5,7 @@ def pinoa(n)
   end
 
   def summaa
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def jaa

examples/i18n/fr/lib/calculatrice.rb

@@ -5,6 +5,6 @@ def push(n)
   end
 
   def additionner
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 end

examples/i18n/he/lib/calculator.rb

@@ -6,7 +6,7 @@ def push(n)
   end
 
   def חבר
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def חלק

examples/i18n/hi/lib/calculator.rb

@@ -6,7 +6,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/ht/lib/kalkilatris.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def ajoute
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divize

examples/i18n/hu/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/id/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/it/lib/calcolatrice.rb

@@ -3,9 +3,9 @@ def push(n)
     @args ||= []
     @args << n
   end
-  
+
   def add
     #@args[0] + @args[1]
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
-end
+end

examples/i18n/ja/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/ko/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/lt/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/lv/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/no/lib/kalkulator.rb

@@ -6,6 +6,6 @@ def push(n)
 
   def add
     #@args[0] + @args[1]
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 end

examples/i18n/pl/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def dodaj
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def podziel

examples/i18n/pt/lib/calculadora.rb

@@ -3,7 +3,7 @@ def push(n)
     @args ||= []
     @args << n
   end
-  
+
   def soma
     @args.inject(0) {|n,sum| sum+n}
   end

examples/i18n/ro/lib/calculator.rb

@@ -6,6 +6,6 @@ def push(n)
 
   def add
     #@args[0] + @args[1]
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 end

examples/i18n/sk/lib/calculator.rb

@@ -5,7 +5,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

examples/i18n/sr-Cyrl/lib/calculator.rb

@@ -6,7 +6,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
 end

examples/i18n/sr-Latn/lib/calculator.rb

@@ -6,7 +6,7 @@ def push(n)
   end
 
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
 end

examples/i18n/sv/lib/kalkulator.rb

@@ -6,6 +6,6 @@ def push(n)
 
   def add
     #@args[0] + @args[1]
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 end

examples/i18n/tr/lib/hesap_makinesi.rb

@@ -6,7 +6,7 @@ def push(n)
   end
 
   def topla
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def böl