From 8572cacddae0520a47def01a9fc74818630eb85c Mon Sep 17 00:00:00 2001 From: Rufus Post Date: Mon, 11 Jan 2016 14:18:40 +1100 Subject: [PATCH] fix space after comma --- .rubocop_todo.yml | 13 ------------- lib/net/ber/core_ext/integer.rb | 2 +- lib/net/ber/core_ext/string.rb | 2 +- lib/net/ldap/dataset.rb | 2 +- lib/net/ldap/entry.rb | 2 +- lib/net/snmp.rb | 12 ++++++------ test/ber/core_ext/test_array.rb | 2 +- test/ber/test_ber.rb | 2 +- test/test_dn.rb | 6 +++--- 9 files changed, 15 insertions(+), 28 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 4c6c68d2..747cb8ca 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -529,19 +529,6 @@ Style/SingleSpaceBeforeFirstArg: - 'lib/net/ldap/dataset.rb' - 'lib/net/ldap/instrumentation.rb' -# Offense count: 24 -# Cop supports --auto-correct. -Style/SpaceAfterComma: - Exclude: - - 'lib/net/ber/core_ext/integer.rb' - - 'lib/net/ber/core_ext/string.rb' - - 'lib/net/ldap/dataset.rb' - - 'lib/net/ldap/entry.rb' - - 'lib/net/snmp.rb' - - 'test/ber/core_ext/test_array.rb' - - 'test/ber/test_ber.rb' - - 'test/test_dn.rb' - # Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. diff --git a/lib/net/ber/core_ext/integer.rb b/lib/net/ber/core_ext/integer.rb index b2149f9b..78313045 100644 --- a/lib/net/ber/core_ext/integer.rb +++ b/lib/net/ber/core_ext/integer.rb @@ -20,7 +20,7 @@ def to_ber_length_encoding if self <= 127 [self].pack('C') else - i = [self].pack('N').sub(/^[\0]+/,"") + i = [self].pack('N').sub(/^[\0]+/, "") [0x80 + i.length].pack('C') + i end end diff --git a/lib/net/ber/core_ext/string.rb b/lib/net/ber/core_ext/string.rb index e8a43e2c..995d26d4 100644 --- a/lib/net/ber/core_ext/string.rb +++ b/lib/net/ber/core_ext/string.rb @@ -75,6 +75,6 @@ def read_ber!(syntax = nil) end def reject_empty_ber_arrays - self.gsub(/0\000/n,'') + self.gsub(/0\000/n, '') end end diff --git a/lib/net/ldap/dataset.rb b/lib/net/ldap/dataset.rb index 54fc1a07..47810ce7 100644 --- a/lib/net/ldap/dataset.rb +++ b/lib/net/ldap/dataset.rb @@ -141,7 +141,7 @@ def read_ldif(io) # $' is the dn-value # Avoid the Base64 class because not all Ruby versions have it. dn = ($1 == ":") ? $'.unpack('m').shift : $' - ds[dn] = Hash.new { |k,v| k[v] = [] } + ds[dn] = Hash.new { |k, v| k[v] = [] } yield :dn, dn if block_given? elsif line.empty? dn = nil diff --git a/lib/net/ldap/entry.rb b/lib/net/ldap/entry.rb index f46912ba..d5068dde 100644 --- a/lib/net/ldap/entry.rb +++ b/lib/net/ldap/entry.rb @@ -142,7 +142,7 @@ def attribute_names def each # :yields: attribute-name, data-values-array if block_given? attribute_names.each do|a| - attr_name,values = a,self[a] + attr_name, values = a, self[a] yield attr_name, values end end diff --git a/lib/net/snmp.rb b/lib/net/snmp.rb index fe7a2899..2ff49aac 100644 --- a/lib/net/snmp.rb +++ b/lib/net/snmp.rb @@ -148,7 +148,7 @@ def parse_get_request data # data[2] is error_index, always zero. send :error_status=, 0 send :error_index=, 0 - data[3].each do |n,v| + data[3].each do |n, v| # A variable-binding, of which there may be several, # consists of an OID and a BER null. # We're ignoring the null, we might want to verify it instead. @@ -166,7 +166,7 @@ def parse_get_response data send :request_id=, data[0].to_i send :error_status=, data[1].to_i send :error_index=, data[2].to_i - data[3].each do |n,v| + data[3].each do |n, v| # A variable-binding, of which there may be several, # consists of an OID and a BER null. # We're ignoring the null, we might want to verify it instead. @@ -177,7 +177,7 @@ def parse_get_response data def version= ver - unless [0,2].include?(ver) + unless [0, 2].include?(ver) raise Error.new("unknown snmp-version: #{ver}") end @version = ver @@ -227,7 +227,7 @@ def pdu_to_ber_string error_status.to_ber, error_index.to_ber, [ - @variables.map do|n,v| + @variables.map do|n, v| [n.to_ber_oid, Net::BER::BerIdentifiedNull.new.to_ber].to_ber_sequence end ].to_ber_sequence @@ -238,7 +238,7 @@ def pdu_to_ber_string error_status.to_ber, error_index.to_ber, [ - @variables.map do|n,v| + @variables.map do|n, v| [n.to_ber_oid, Net::BER::BerIdentifiedNull.new.to_ber].to_ber_sequence end ].to_ber_sequence @@ -249,7 +249,7 @@ def pdu_to_ber_string error_status.to_ber, error_index.to_ber, [ - @variables.map do|n,v| + @variables.map do|n, v| [n.to_ber_oid, v.to_ber].to_ber_sequence end ].to_ber_sequence diff --git a/test/ber/core_ext/test_array.rb b/test/ber/core_ext/test_array.rb index 308fffc5..2d1e957a 100644 --- a/test/ber/core_ext/test_array.rb +++ b/test/ber/core_ext/test_array.rb @@ -6,7 +6,7 @@ def test_control_code_array control_codes << ['1.2.3'.to_ber, true.to_ber].to_ber_sequence control_codes << ['1.7.9'.to_ber, false.to_ber].to_ber_sequence control_codes = control_codes.to_ber_sequence - res = [['1.2.3', true],['1.7.9',false]].to_ber_control + res = [['1.2.3', true], ['1.7.9', false]].to_ber_control assert_equal control_codes, res end diff --git a/test/ber/test_ber.rb b/test/ber/test_ber.rb index 95cfe1ae..c2f5a568 100644 --- a/test/ber/test_ber.rb +++ b/test/ber/test_ber.rb @@ -6,7 +6,7 @@ def test_empty_array end def test_array - ary = [1,2,3] + ary = [1, 2, 3] encoded_ary = ary.map { |el| el.to_ber }.to_ber assert_equal ary, encoded_ary.read_ber diff --git a/test/test_dn.rb b/test/test_dn.rb index 0cb2ec5a..5fff6ae8 100644 --- a/test/test_dn.rb +++ b/test/test_dn.rb @@ -13,17 +13,17 @@ def test_escape_on_initialize def test_to_a dn = Net::LDAP::DN.new('cn=James, ou=Company\\,\\20LLC') - assert_equal ['cn','James','ou','Company, LLC'], dn.to_a + assert_equal ['cn', 'James', 'ou', 'Company, LLC'], dn.to_a end def test_to_a_parenthesis dn = Net::LDAP::DN.new('cn = \ James , ou = "Comp\28ny" ') - assert_equal ['cn',' James','ou','Comp(ny'], dn.to_a + assert_equal ['cn', ' James', 'ou', 'Comp(ny'], dn.to_a end def test_to_a_hash_symbol dn = Net::LDAP::DN.new('1.23.4= #A3B4D5 ,ou=Company') - assert_equal ['1.23.4','#A3B4D5','ou','Company'], dn.to_a + assert_equal ['1.23.4', '#A3B4D5', 'ou', 'Company'], dn.to_a end # TODO: raise a more specific exception than RuntimeError