rc 0.57.1, fixup, todo + drop rails_best_practices (#1372)

4 files changed, 11 insertions, 16 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 9db8d56..bd589cc 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-06-03 20:42:10 +0200 using RuboCop version 0.56.0.
+# on 2018-06-08 09:41:49 +0200 using RuboCop version 0.57.1.
 # 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
@@ -19,7 +19,7 @@ Lint/AmbiguousBlockAssociation:
     - 'lib/oxidized/model/model.rb'
     - 'lib/oxidized/model/nos.rb'
 
-# Offense count: 683
+# Offense count: 684
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
@@ -68,11 +68,10 @@ Lint/ShadowingOuterLocalVariable:
     - 'lib/oxidized/model/fortios.rb'
     - 'lib/oxidized/model/planet.rb'
 
-# Offense count: 10
+# Offense count: 7
 Lint/UnderscorePrefixedVariableName:
   Exclude:
     - 'lib/oxidized/input/cli.rb'
-    - 'lib/oxidized/manager.rb'
     - 'lib/oxidized/model/model.rb'
     - 'lib/oxidized/nodes.rb'
 
@@ -263,7 +262,7 @@ Style/Alias:
     - 'lib/oxidized/node.rb'
     - 'lib/oxidized/nodes.rb'
 
-# Offense count: 46
+# Offense count: 47
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, conditionals
@@ -418,7 +417,7 @@ Style/LineEndConcatenation:
   Exclude:
     - 'lib/oxidized/hook.rb'
 
-# Offense count: 141
+# Offense count: 142
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
@@ -491,7 +490,7 @@ Style/NumericPredicate:
     - 'lib/oxidized/nodes.rb'
     - 'lib/oxidized/worker.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/OrAssignment:
   Exclude:
@@ -540,12 +539,11 @@ Style/Proc:
   Exclude:
     - 'lib/oxidized/hook/githubrepo.rb'
 
-# Offense count: 10
+# Offense count: 9
 # Cop supports --auto-correct.
 Style/RedundantBegin:
   Exclude:
     - 'lib/oxidized/input/telnet.rb'
-    - 'lib/oxidized/manager.rb'
     - 'lib/oxidized/output/git.rb'
     - 'lib/oxidized/output/gitcrypt.rb'
 
@@ -704,16 +702,15 @@ Style/WordArray:
   EnforcedStyle: percent
   MinSize: 3
 
-# Offense count: 4
+# Offense count: 3
 # Cop supports --auto-correct.
 Style/ZeroLengthPredicate:
   Exclude:
     - 'lib/oxidized/core.rb'
-    - 'lib/oxidized/input/telnet.rb'
     - 'lib/oxidized/model/ciscosmb.rb'
     - 'lib/oxidized/output/git.rb'
 
-# Offense count: 302
+# Offense count: 306
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb
index e077d5d..9701608 100644
--- a/lib/oxidized/hook/githubrepo.rb
+++ b/lib/oxidized/hook/githubrepo.rb
@@ -49,7 +49,7 @@ class GithubRepo < Oxidized::Hook
       if cfg.has_key?('username')
         git_user = cfg.username
       else
-        git_user = username_from_url ? username_from_url : 'git'
+        git_user = username_from_url || 'git'
       end
 
       if cfg.has_key?('password')
diff --git a/lib/oxidized/model/br6910.rb b/lib/oxidized/model/br6910.rb
index 1e79da3..77fa980 100644
--- a/lib/oxidized/model/br6910.rb
+++ b/lib/oxidized/model/br6910.rb
@@ -1,4 +1,3 @@
-
 class BR6910 < Oxidized::Model
   prompt /^([\w.@()-]+[#>]\s?)$/
   comment '! '
diff --git a/oxidized.gemspec b/oxidized.gemspec
index 9202335..afef310 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '~> 5.8'
   s.add_development_dependency 'mocha',    '~> 1.1'
   s.add_development_dependency 'pry',      '~> 0'
-  s.add_development_dependency 'rails_best_practices', '~> 1.19'
   s.add_development_dependency 'rake',     '~> 10.0'
-  s.add_development_dependency 'rubocop',  '~> 0.56.0'
+  s.add_development_dependency 'rubocop',  '~> 0.57.1'
 end