Merge pull request #542 from rpush/ar/prepare_4.2.0

Prepare 4.2.0
rpush · Dec 13, 2019 · 116ea93 · 116ea93
2 parents 9e56e77 + 003b72f
commit 116ea93
Show file tree

Hide file tree

Showing 14 changed files with 113 additions and 113 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -9,22 +9,22 @@ AllCops:
     - vendor/bundle/**/*
   TargetRubyVersion: 2.3
 
-LineLength:
+Metrics/LineLength:
   Enabled: false
 
-StringLiterals:
+Style/StringLiterals:
   Enabled: false
 
-Documentation:
+Style/Documentation:
   Enabled: false
 
-MethodLength:
+Metrics/MethodLength:
   Enabled: false
 
-ClassLength:
+Metrics/ClassLength:
   Enabled: false
 
-CyclomaticComplexity:
+Metrics/CyclomaticComplexity:
   Enabled: false
 
 Style/SignalException:

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-04-30 14:03:41 +0200 using RuboCop version 0.68.0.
+# on 2019-12-13 13:21:51 +0100 using RuboCop version 0.77.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -27,29 +27,11 @@ Gemspec/OrderedDependencies:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/AlignArguments:
+Layout/ArgumentAlignment:
   Exclude:
     - 'lib/rpush/daemon/apns2/delivery.rb'
     - 'lib/rpush/daemon/apnsp8/delivery.rb'
 
-# Offense count: 80
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/AlignHash:
-  Exclude:
-    - 'lib/rpush/client/active_model/pushy/notification.rb'
-    - 'lib/rpush/daemon/apns2/delivery.rb'
-    - 'lib/rpush/daemon/apnsp8/delivery.rb'
-    - 'lib/rpush/daemon/constants.rb'
-    - 'lib/rpush/daemon/gcm/delivery.rb'
-    - 'lib/rpush/daemon/service_config_methods.rb'
-    - 'lib/rpush/daemon/wns/delivery.rb'
-    - 'lib/rpush/daemon/wpns/delivery.rb'
-    - 'spec/functional/apns2_spec.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
@@ -79,19 +61,13 @@ Layout/EmptyLineAfterMagicComment:
 
 # Offense count: 2
 # Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: around, only_before
 Layout/EmptyLinesAroundAccessModifier:
   Exclude:
     - 'lib/rpush/daemon/apns2/delivery.rb'
     - 'lib/rpush/daemon/apnsp8/delivery.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
-Layout/EmptyLinesAroundClassBody:
-  Exclude:
-    - 'lib/rpush/daemon/dispatcher/apns_http2.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
@@ -103,7 +79,7 @@ Layout/ExtraSpacing:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   Exclude:
     - 'lib/rpush/daemon/store/active_record/reconnectable.rb'
     - 'spec/unit/daemon/store/active_record/reconnectable_spec.rb'
@@ -112,23 +88,41 @@ Layout/IndentFirstArrayElement:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Exclude:
     - 'lib/rpush/client/active_model/gcm/notification.rb'
 
+# Offense count: 80
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'lib/rpush/client/active_model/pushy/notification.rb'
+    - 'lib/rpush/daemon/apns2/delivery.rb'
+    - 'lib/rpush/daemon/apnsp8/delivery.rb'
+    - 'lib/rpush/daemon/constants.rb'
+    - 'lib/rpush/daemon/gcm/delivery.rb'
+    - 'lib/rpush/daemon/service_config_methods.rb'
+    - 'lib/rpush/daemon/wns/delivery.rb'
+    - 'lib/rpush/daemon/wpns/delivery.rb'
+    - 'spec/functional/apns2_spec.rb'
+
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
+# SupportedStyles: squiggly, active_support, powerpack, unindent
+Layout/HeredocIndentation:
   Exclude:
     - 'lib/rpush/daemon.rb'
     - 'lib/tasks/test.rake'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: normal, rails
+# SupportedStyles: normal, indented_internal_methods
 Layout/IndentationConsistency:
   Exclude:
     - 'spec/functional/apns2_spec.rb'
@@ -148,7 +142,7 @@ Layout/InitialIndentation:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Layout/LeadingBlankLines:
+Layout/LeadingEmptyLines:
   Exclude:
     - 'lib/rpush/client/redis.rb'
 
@@ -207,12 +201,11 @@ Layout/SpaceInsideHashLiteralBraces:
   Exclude:
     - 'spec/unit/notification_shared.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
-    - 'lib/rpush/client/redis/app.rb'
     - 'lib/rpush/daemon/apnsp8/delivery.rb'
 
 # Offense count: 6
@@ -225,18 +218,29 @@ Lint/NestedMethodDefinition:
   Exclude:
     - 'spec/unit/daemon/apns/feedback_receiver_spec.rb'
 
-# Offense count: 1
+# Offense count: 5
 # Cop supports --auto-correct.
-Lint/UnneededCopDisableDirective:
+Lint/RedundantCopDisableDirective:
   Exclude:
     - 'lib/rpush/daemon/gcm/delivery.rb'
+    - 'lib/rpush/daemon/interruptible_sleep.rb'
+    - 'lib/rpush/daemon/rpc/client.rb'
+    - 'lib/rpush/daemon/tcp_connection.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Lint/UnneededRequireStatement:
+Lint/RedundantRequireStatement:
   Exclude:
     - 'lib/rpush/daemon.rb'
 
+# Offense count: 4
+# Configuration parameters: AllowComments.
+Lint/SuppressedException:
+  Exclude:
+    - 'lib/rpush/daemon/interruptible_sleep.rb'
+    - 'lib/rpush/daemon/rpc/client.rb'
+    - 'lib/rpush/daemon/tcp_connection.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
@@ -265,19 +269,21 @@ Lint/UselessAssignment:
   Exclude:
     - 'spec/functional/apns2_spec.rb'
 
-# Offense count: 1
-Metrics/AbcSize:
-  Max: 31
-
-# Offense count: 67
+# Offense count: 70
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
   Max: 326
 
 # Offense count: 1
-# Configuration parameters: Blacklist.
-# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+Naming/BlockParameterName:
+  Exclude:
+    - 'lib/rpush/daemon/adm/delivery.rb'
+
+# Offense count: 1
+# Configuration parameters: ForbiddenDelimiters.
+# ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'lib/rpush/daemon.rb'
@@ -291,18 +297,12 @@ Naming/MemoizedInstanceVariableName:
 
 # Offense count: 1
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-Naming/UncommunicativeBlockParamName:
-  Exclude:
-    - 'lib/rpush/daemon/adm/delivery.rb'
-
-# Offense count: 1
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
-Naming/UncommunicativeMethodParamName:
+# AllowedNames: io, id, to, by, on, in, at, ip, db, os
+Naming/MethodParameterName:
   Exclude:
     - 'lib/rpush/daemon/loggable.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, camelCase
 Naming/VariableName:
@@ -415,7 +415,7 @@ Style/FormatStringToken:
 # Offense count: 223
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: when_needed, always, never
+# SupportedStyles: always, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
@@ -461,7 +461,7 @@ Style/MultipleComparison:
   Exclude:
     - 'lib/rpush/client/active_model/apns/notification.rb'
 
-# Offense count: 33
+# Offense count: 34
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
@@ -490,12 +490,11 @@ Style/OrAssignment:
     - 'lib/rpush/daemon/wns/delivery.rb'
     - 'lib/rpush/daemon/wpns/delivery.rb'
 
-# Offense count: 21
+# Offense count: 20
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Exclude:
-    - 'lib/rpush/cli.rb'
     - 'lib/rpush/client/active_model/apns/app.rb'
     - 'lib/rpush/client/active_model/apnsp8/app.rb'
     - 'lib/rpush/daemon/gcm/delivery.rb'
@@ -508,8 +507,8 @@ Style/PercentLiteralDelimiters:
 
 # Offense count: 17
 # Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
-# Whitelist: present?, blank?, presence, try, try!
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
   Exclude:
     - 'lib/rpush/client/active_model/apns/notification.rb'
@@ -533,7 +532,7 @@ Style/Semicolon:
   Exclude:
     - 'spec/functional/apns2_spec.rb'
 
-# Offense count: 10
+# Offense count: 11
 # Cop supports --auto-correct.
 # Configuration parameters: MinSize.
 # SupportedStyles: percent, brackets

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,27 @@
 
 ## Unreleased
 
-- Add support for critical APNS alerts [#502](https://github.com/rpush/rpush/pull/502) (by [@servn](https://github.com/servn))
-- Fix disabling APNS feedback for specific Rpush apps [#511](https://github.com/rpush/rpush/pull/511) (by [@kirbydcool](https://github.com/kirbydcool))
+Nothing so far.
+
+## 4.2.0 (2019-12-13)
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v4.1.1...v4.2.0)
+
+**Merged pull requests:**
+
+- Fix Rails 6.1 related deprecation warnings [\#541](https://github.com/rpush/rpush/pull/541) ([dsantosmerino](https://github.com/dsantosmerino))
+- GCM notification incorrectly mixes data into notification hashes [\#535](https://github.com/rpush/rpush/pull/535) ([mkon](https://github.com/mkon))
+- handle priority in WNS [\#533](https://github.com/rpush/rpush/pull/533) ([Fivell](https://github.com/Fivell))
+- Update development apns urls to match documentation [\#524](https://github.com/rpush/rpush/pull/524) ([jhottenstein](https://github.com/jhottenstein))
+- Update README to remove incorrect info [\#523](https://github.com/rpush/rpush/pull/523) ([sharang-d](https://github.com/sharang-d))
+- Fix and improve Travis setup [\#520](https://github.com/rpush/rpush/pull/520) ([aried3r](https://github.com/aried3r))
+- Explicitly use Rails 6.0.0 [\#519](https://github.com/rpush/rpush/pull/519) ([jsantos](https://github.com/jsantos))
+- Stale bot config change [\#515](https://github.com/rpush/rpush/pull/515) ([aried3r](https://github.com/aried3r))
+- Add stale bot configuration. [\#514](https://github.com/rpush/rpush/pull/514) ([drn](https://github.com/drn))
+- Correctly use feedback_enabled. [\#511](https://github.com/rpush/rpush/pull/511) ([kirbycool](https://github.com/kirbycool))
+- Update apns_http2.rb [\#510](https://github.com/rpush/rpush/pull/510) ([mldoscar](https://github.com/mldoscar))
+- Add `mutable_content` support for GCM [\#506](https://github.com/rpush/rpush/pull/506) ([hon3st](https://github.com/hon3st))
+- Add support for critical alerts [\#502](https://github.com/rpush/rpush/pull/502) ([servn](https://github.com/servn))
 
 ## 4.1.1 (2019-05-13)