Fix most of the rubocop errors

This commit is contained in:
Martin Lensment 2014-11-11 17:02:20 +02:00
parent 34410a8ed5
commit 2a2acf92d5

View file

@ -1,7 +1,6 @@
class Zonefile class Zonefile
RECORDS = [:mx, :a, :a4, :ns, :cname, :txt, :ptr, :srv, :soa, :ds, RECORDS = [:mx, :a, :a4, :ns, :cname, :txt, :ptr, :srv, :soa, :ds,
:dnskey, :rrsig, :nsec,:nsec3, :nsec3param, :tlsa, :naptr] :dnskey, :rrsig, :nsec, :nsec3, :nsec3param, :tlsa, :naptr]
attr_accessor(*RECORDS, :ttl, :origin) attr_accessor(*RECORDS, :ttl, :origin)
@ -20,7 +19,7 @@ class Zonefile
end end
def new_serial def new_serial
base = "%04d%02d%02d" % [Time.now.year, Time.now.month, Time.now.day] base = '%04d%02d%02d' % [Time.now.year, Time.now.month, Time.now.day]
if (@soa[:serial].to_i / 100) > base.to_i if (@soa[:serial].to_i / 100) > base.to_i
ns = @soa[:serial].to_i + 1 ns = @soa[:serial].to_i + 1
@ -29,7 +28,7 @@ class Zonefile
end end
ii = 0 ii = 0
while (("#{base}%02d" % ii).to_i <= @soa[:serial].to_i) do while (("#{base}%02d" % ii).to_i <= @soa[:serial].to_i)
ii += 1 ii += 1
end end
@soa[:serial] = "#{base}%02d" % ii @soa[:serial] = "#{base}%02d" % ii
@ -40,7 +39,7 @@ class Zonefile
$ORIGIN #{origin} ; designates the start of this zone file in the namespace $ORIGIN #{origin} ; designates the start of this zone file in the namespace
$TTL #{ttl} ; default expiration time of all resource records without their own TTL value $TTL #{ttl} ; default expiration time of all resource records without their own TTL value
#{self.soa[:origin]} #{self.soa[:ttl]} IN SOA #{self.soa[:primary_ns]} #{self.soa[:email]} ( #{soa[:origin]} #{soa[:ttl]} IN SOA #{soa[:primary_ns]} #{soa[:email]} (
#{sprintf('%-13s', soa[:serial])}; serial number #{sprintf('%-13s', soa[:serial])}; serial number
#{sprintf('%-13s', soa[:refresh])}; refresh, seconds #{sprintf('%-13s', soa[:refresh])}; refresh, seconds
#{sprintf('%-13s', soa[:retry])}; retry, seconds #{sprintf('%-13s', soa[:retry])}; retry, seconds
@ -49,97 +48,97 @@ $TTL #{ttl} ; default expiration time of all resource records witho
) )
eos eos
self.ns.each do |ns| ns.each do |ns|
out << "#{ns[:name]} #{ns[:ttl]} #{ns[:class]} NS #{ns[:host]}\n" out << "#{ns[:name]} #{ns[:ttl]} #{ns[:class]} NS #{ns[:host]}\n"
end end
out << "\n; Zone MX Records\n" unless self.mx.empty? out << "\n; Zone MX Records\n" unless mx.empty?
self.mx.each do |mx| mx.each do |mx|
out << "#{mx[:name]} #{mx[:ttl]} #{mx[:class]} MX #{mx[:pri]} #{mx[:host]}\n" out << "#{mx[:name]} #{mx[:ttl]} #{mx[:class]} MX #{mx[:pri]} #{mx[:host]}\n"
end end
out << "\n; Zone A Records\n" unless self.a.empty? out << "\n; Zone A Records\n" unless a.empty?
self.a.each do |a| a.each do |a|
out << "#{a[:name]} #{a[:ttl]} #{a[:class]} A #{a[:host]}\n" out << "#{a[:name]} #{a[:ttl]} #{a[:class]} A #{a[:host]}\n"
end end
out << "\n; Zone CNAME Records\n" unless self.cname.empty? out << "\n; Zone CNAME Records\n" unless cname.empty?
self.cname.each do |cn| cname.each do |cn|
out << "#{cn[:name]} #{cn[:ttl]} #{cn[:class]} CNAME #{cn[:host]}\n" out << "#{cn[:name]} #{cn[:ttl]} #{cn[:class]} CNAME #{cn[:host]}\n"
end end
out << "\n; Zone AAAA Records\n" unless self.a4.empty? out << "\n; Zone AAAA Records\n" unless a4.empty?
self.a4.each do |a4| a4.each do |a4|
out << "#{a4[:name]} #{a4[:ttl]} #{a4[:class]} AAAA #{a4[:host]}\n" out << "#{a4[:name]} #{a4[:ttl]} #{a4[:class]} AAAA #{a4[:host]}\n"
end end
out << "\n; Zone TXT Records\n" unless self.txt.empty? out << "\n; Zone TXT Records\n" unless txt.empty?
self.txt.each do |tx| txt.each do |tx|
out << "#{tx[:name]} #{tx[:ttl]} #{tx[:class]} TXT #{tx[:text]}\n" out << "#{tx[:name]} #{tx[:ttl]} #{tx[:class]} TXT #{tx[:text]}\n"
end end
out << "\n; Zone SRV Records\n" unless self.srv.empty? out << "\n; Zone SRV Records\n" unless srv.empty?
self.srv.each do |srv| srv.each do |srv|
out << "#{srv[:name]} #{srv[:ttl]} #{srv[:class]} SRV #{srv[:pri]} #{srv[:weight]} #{srv[:port]} #{srv[:host]}\n" out << "#{srv[:name]} #{srv[:ttl]} #{srv[:class]} SRV #{srv[:pri]} #{srv[:weight]} #{srv[:port]} #{srv[:host]}\n"
end end
out << "\n; Zone PTR Records\n" unless self.ptr.empty? out << "\n; Zone PTR Records\n" unless ptr.empty?
self.ptr.each do |ptr| ptr.each do |ptr|
out << "#{ptr[:name]} #{ptr[:ttl]} #{ptr[:class]} PTR #{ptr[:host]}\n" out << "#{ptr[:name]} #{ptr[:ttl]} #{ptr[:class]} PTR #{ptr[:host]}\n"
end end
out << "\n; Zone DS Records\n" unless self.ds.empty? out << "\n; Zone DS Records\n" unless ds.empty?
self.ds.each do |ds| ds.each do |ds|
out << "#{ds[:name]} #{ds[:ttl]} #{ds[:class]} DS #{ds[:key_tag]} #{ds[:algorithm]} #{ds[:digest_type]} #{ds[:digest]}\n" out << "#{ds[:name]} #{ds[:ttl]} #{ds[:class]} DS #{ds[:key_tag]} #{ds[:algorithm]} #{ds[:digest_type]} #{ds[:digest]}\n"
end end
out << "\n; Zone NSEC Records\n" unless self.ds.empty? out << "\n; Zone NSEC Records\n" unless self.ds.empty?
self.nsec.each do |nsec| nsec.each do |nsec|
out << "#{nsec[:name]} #{nsec[:ttl]} #{nsec[:class]} NSEC #{nsec[:next]} #{nsec[:types]}\n" out << "#{nsec[:name]} #{nsec[:ttl]} #{nsec[:class]} NSEC #{nsec[:next]} #{nsec[:types]}\n"
end end
out << "\n; Zone NSEC3 Records\n" unless self.ds.empty? out << "\n; Zone NSEC3 Records\n" unless self.ds.empty?
self.nsec3.each do |nsec3| nsec3.each do |nsec3|
out << "#{nsec3[:name]} #{nsec3[:ttl]} #{nsec3[:class]} NSEC3 #{nsec3[:algorithm]} #{nsec3[:flags]} #{nsec3[:iterations]} #{nsec3[:salt]} #{nsec3[:next]} #{nsec3[:types]}\n" out << "#{nsec3[:name]} #{nsec3[:ttl]} #{nsec3[:class]} NSEC3 #{nsec3[:algorithm]} #{nsec3[:flags]} #{nsec3[:iterations]} #{nsec3[:salt]} #{nsec3[:next]} #{nsec3[:types]}\n"
end end
out << "\n; Zone NSEC3PARAM Records\n" unless self.ds.empty? out << "\n; Zone NSEC3PARAM Records\n" unless self.ds.empty?
self.nsec3param.each do |nsec3param| nsec3param.each do |nsec3param|
out << "#{nsec3param[:name]} #{nsec3param[:ttl]} #{nsec3param[:class]} NSEC3PARAM #{nsec3param[:algorithm]} #{nsec3param[:flags]} #{nsec3param[:iterations]} #{nsec3param[:salt]}\n" out << "#{nsec3param[:name]} #{nsec3param[:ttl]} #{nsec3param[:class]} NSEC3PARAM #{nsec3param[:algorithm]} #{nsec3param[:flags]} #{nsec3param[:iterations]} #{nsec3param[:salt]}\n"
end end
out << "\n; Zone DNSKEY Records\n" unless self.ds.empty? out << "\n; Zone DNSKEY Records\n" unless self.ds.empty?
self.dnskey.each do |dnskey| dnskey.each do |dnskey|
out << "#{dnskey[:name]} #{dnskey[:ttl]} #{dnskey[:class]} DNSKEY #{dnskey[:flag]} #{dnskey[:protocol]} #{dnskey[:algorithm]} #{dnskey[:public_key]}\n" out << "#{dnskey[:name]} #{dnskey[:ttl]} #{dnskey[:class]} DNSKEY #{dnskey[:flag]} #{dnskey[:protocol]} #{dnskey[:algorithm]} #{dnskey[:public_key]}\n"
end end
out << "\n; Zone RRSIG Records\n" unless self.ds.empty? out << "\n; Zone RRSIG Records\n" unless self.ds.empty?
self.rrsig.each do |rrsig| rrsig.each do |rrsig|
out << "#{rrsig[:name]} #{rrsig[:ttl]} #{rrsig[:class]} RRSIG #{rrsig[:type_covered]} #{rrsig[:algorithm]} #{rrsig[:labels]} #{rrsig[:original_ttl]} #{rrsig[:expiration]} #{rrsig[:inception]} #{rrsig[:key_tag]} #{rrsig[:signer]} #{rrsig[:signature]}\n" out << "#{rrsig[:name]} #{rrsig[:ttl]} #{rrsig[:class]} RRSIG #{rrsig[:type_covered]} #{rrsig[:algorithm]} #{rrsig[:labels]} #{rrsig[:original_ttl]} #{rrsig[:expiration]} #{rrsig[:inception]} #{rrsig[:key_tag]} #{rrsig[:signer]} #{rrsig[:signature]}\n"
end end
out << "\n; Zone TLSA Records\n" unless self.tlsa.empty? out << "\n; Zone TLSA Records\n" unless tlsa.empty?
self.tlsa.each do |tlsa| tlsa.each do |tlsa|
out << "#{tlsa[:name]} #{tlsa[:ttl]} #{tlsa[:class]} TLSA #{tlsa[:certificate_usage]} #{tlsa[:selector]} #{tlsa[:matching_type]} #{tlsa[:data]}\n" out << "#{tlsa[:name]} #{tlsa[:ttl]} #{tlsa[:class]} TLSA #{tlsa[:certificate_usage]} #{tlsa[:selector]} #{tlsa[:matching_type]} #{tlsa[:data]}\n"
end end
out << "\n; Zone NAPTR Records\n" unless self.ds.empty? out << "\n; Zone NAPTR Records\n" unless self.ds.empty?
self.naptr.each do |naptr| naptr.each do |naptr|
out << "#{naptr[:name]} #{naptr[:ttl]} #{naptr[:class]} NAPTR #{naptr[:order]} #{naptr[:preference]} #{naptr[:flags]} #{naptr[:service]} #{naptr[:regexp]} #{naptr[:replacement]}\n" out << "#{naptr[:name]} #{naptr[:ttl]} #{naptr[:class]} NAPTR #{naptr[:order]} #{naptr[:preference]} #{naptr[:flags]} #{naptr[:service]} #{naptr[:regexp]} #{naptr[:replacement]}\n"
end end