From 331f212d890bc9963d4f3e39c840857067cb49ab Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Tue, 10 May 2022 14:51:28 -0500 Subject: [PATCH] Get rubocop running again Not clean yet, but at least it runs --- .rubocop.yml | 11 ++++++++--- Gemfile | 2 ++ r2s-bwmsgsv2.rb | 3 ++- sgx-bwmsgsv2.rb | 8 +++++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index cfe00961795787e4bc609049b176d247a054efb7..b48200bf9d7fdd4daeb813166ccf21eae5d2ced0 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,8 +1,10 @@ Metrics/LineLength: Max: 80 -Layout/Tab: +Layout/IndentationStyle: Enabled: false + EnforcedStyle: tabs + IndentationWidth: 2 Layout/IndentationWidth: Width: 1 # one tab @@ -40,10 +42,13 @@ Metrics/ParameterLists: Metrics/PerceivedComplexity: Max: 30 +Naming/MethodParameterName: + Enabled: false + Style/AndOr: Enabled: false -Layout/AlignParameters: +Layout/ParameterAlignment: Enabled: false Style/BlockDelimiters: @@ -110,7 +115,7 @@ Style/MultilineBlockChain: Layout/SpaceAroundEqualsInParameterDefault: EnforcedStyle: no_space -Layout/IndentArray: +Layout/FirstArrayElementIndentation: EnforcedStyle: consistent Style/SymbolArray: diff --git a/Gemfile b/Gemfile index d6426a4e9c83a5a02df4541ad4533b61fd41631f..c0f8074ff1199a4d1a80da806c47ce99ca1c3ecc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + source 'https://rubygems.org' gem 'activesupport', '<5.0.0' diff --git a/r2s-bwmsgsv2.rb b/r2s-bwmsgsv2.rb index ddce5783a578bdf61c116aaf2b7835d17c92c270..50f39d2ff4138be4ab63795746d561849851b798 100755 --- a/r2s-bwmsgsv2.rb +++ b/r2s-bwmsgsv2.rb @@ -1,5 +1,6 @@ #!/usr/bin/env ruby -# +# frozen_string_literal: true + # Copyright (C) 2020 Denver Gingerich # # This file is part of sgx-bwmsgsv2. diff --git a/sgx-bwmsgsv2.rb b/sgx-bwmsgsv2.rb index d0e02fb3de43ee9307c5877d4aee00a618fd430b..b600afb12d20fa64186e1943d36b4cf6a90ea8a1 100755 --- a/sgx-bwmsgsv2.rb +++ b/sgx-bwmsgsv2.rb @@ -1,5 +1,6 @@ #!/usr/bin/env ruby -# +# frozen_string_literal: true + # Copyright (C) 2017-2020 Denver Gingerich # Copyright (C) 2017 Stephen Paul Weber # @@ -369,6 +370,7 @@ module SGXbwmsgsv2 EMPromise.resolve(m.to.node.to_s).then { |num_dest| if num_dest =~ /\A\+?[0-9]+(?:;.*)?\Z/ next num_dest if num_dest[0] == '+' + shortcode = extract_shortcode(num_dest) next shortcode if shortcode end @@ -586,6 +588,7 @@ module SGXbwmsgsv2 if xn xn.children.each_with_object({}) do |field, h| next if field.element_name != "field" + val = field.children.find { |v| v.element_name == "value" } @@ -968,8 +971,7 @@ class WebhookHandler < Goliath::API end if not msg - msg = Blather::Stanza::Message.new(bare_jid, - text) + msg = Blather::Stanza::Message.new(bare_jid, text) end else # per prior switch, this is: jparams['direction'] == 'out' tag_parts = jparams['tag'].split(/ /, 2)