diff options
| -rw-r--r-- | lib/custodian/parser.rb | 10 | ||||
| -rw-r--r-- | lib/custodian/protocoltest/dns.rb | 2 | ||||
| -rw-r--r-- | lib/custodian/protocoltest/ldap.rb | 2 | ||||
| -rw-r--r-- | lib/custodian/protocoltest/mx.rb | 2 | ||||
| -rw-r--r-- | lib/custodian/protocoltest/ping.rb | 2 | ||||
| -rw-r--r-- | lib/custodian/protocoltest/tcp.rb | 2 | ||||
| -rw-r--r-- | lib/custodian/settings.rb | 2 | ||||
| -rw-r--r-- | lib/custodian/testfactory.rb | 4 | ||||
| -rwxr-xr-x | t/test-custodian-alertfactory.rb | 4 | ||||
| -rwxr-xr-x | t/test-custodian-parser.rb | 8 | ||||
| -rwxr-xr-x | t/test-custodian-testfactory.rb | 4 | ||||
| -rwxr-xr-x | t/test-custodian-util-ping.rb | 4 |
12 files changed, 23 insertions, 23 deletions
diff --git a/lib/custodian/parser.rb b/lib/custodian/parser.rb index e73001f..0bafd47 100644 --- a/lib/custodian/parser.rb +++ b/lib/custodian/parser.rb @@ -53,8 +53,8 @@ module Custodian # Constructor # def initialize - @MACROS = Hash.new() - @jobs = Array.new() + @MACROS = {} + @jobs = [] end @@ -119,7 +119,7 @@ module Custodian # def define_macro( line ) name = nil - val = Array.new + val = [] # # Get the name of the macro. @@ -212,7 +212,7 @@ module Custodian # def expand_macro( input ) - r = Array.new() + r = [] if ( input =~ /^(\S+)\s+(.*)$/ ) macro=$1.dup @@ -320,7 +320,7 @@ module Custodian # # The array of objects we will return to the caller. # - ret = Array.new() + ret = [] # # For each host in our possibly-macro-expanded list: diff --git a/lib/custodian/protocoltest/dns.rb b/lib/custodian/protocoltest/dns.rb index 7187a75..05c8534 100644 --- a/lib/custodian/protocoltest/dns.rb +++ b/lib/custodian/protocoltest/dns.rb @@ -128,7 +128,7 @@ module Custodian # def resolve_via( server, ltype, name, period ) - results = Array.new() + results = [] begin timeout( period ) do diff --git a/lib/custodian/protocoltest/ldap.rb b/lib/custodian/protocoltest/ldap.rb index fd02623..56203b2 100644 --- a/lib/custodian/protocoltest/ldap.rb +++ b/lib/custodian/protocoltest/ldap.rb @@ -125,7 +125,7 @@ module Custodian else @error = "failed to bind to LDAP server '#{@host}' with username '#{@ldap_user}' and password '#{@ldap_pass}'" return false - end + .end end rescue LDAP::ResultError => ex @error = "LDAP exception: #{ex} when talking to LDAP server '#{@host}' with username '#{@ldap_user}' and password '#{@ldap_pass}'" diff --git a/lib/custodian/protocoltest/mx.rb b/lib/custodian/protocoltest/mx.rb index c05283d..29a9183 100644 --- a/lib/custodian/protocoltest/mx.rb +++ b/lib/custodian/protocoltest/mx.rb @@ -63,7 +63,7 @@ module Custodian # # The MX-hosts # - mx = Array.new() + mx = [] # # Lookup the MX record diff --git a/lib/custodian/protocoltest/ping.rb b/lib/custodian/protocoltest/ping.rb index 937a5db..ff406d5 100644 --- a/lib/custodian/protocoltest/ping.rb +++ b/lib/custodian/protocoltest/ping.rb @@ -102,7 +102,7 @@ module Custodian # # Perform the DNS lookups of the specified name. # - ips = Array.new() + ips = [] # # Does the name look like an IP? diff --git a/lib/custodian/protocoltest/tcp.rb b/lib/custodian/protocoltest/tcp.rb index dd2e52b..9ca2180 100644 --- a/lib/custodian/protocoltest/tcp.rb +++ b/lib/custodian/protocoltest/tcp.rb @@ -159,7 +159,7 @@ module Custodian # # Perform the DNS lookups of the specified name. # - ips = Array.new() + ips = [] # # Does the name look like an IP? diff --git a/lib/custodian/settings.rb b/lib/custodian/settings.rb index 206e6a9..8bcf71c 100644 --- a/lib/custodian/settings.rb +++ b/lib/custodian/settings.rb @@ -38,7 +38,7 @@ module Custodian def _load( file = "/etc/custodian/custodian.cfg" ) @parsed = true - @settings = Hash.new() + @settings = {} # # The global configuration file. diff --git a/lib/custodian/testfactory.rb b/lib/custodian/testfactory.rb index fc007e9..03222a2 100644 --- a/lib/custodian/testfactory.rb +++ b/lib/custodian/testfactory.rb @@ -37,7 +37,7 @@ module Custodian # # The array we return. # - result = Array.new() + result = [] # @@ -89,7 +89,7 @@ module Custodian # Register a new test type - this must be called by our derived classes # def self.register_test_type name - @@subclasses[name] ||= Array.new() + @@subclasses[name] ||= [] @@subclasses[name].push(self) end diff --git a/t/test-custodian-alertfactory.rb b/t/test-custodian-alertfactory.rb index f81a763..e12dbdd 100755 --- a/t/test-custodian-alertfactory.rb +++ b/t/test-custodian-alertfactory.rb @@ -30,7 +30,7 @@ class TestAlertFactory < Test::Unit::TestCase # # Ensure we can create each of the two alert types we care about # - methods = Array.new() + methods = [] methods.push( "file" ) methods.push( "smtp" ) @@ -94,7 +94,7 @@ class TestAlertFactory < Test::Unit::TestCase obj = Custodian::AlertFactory.create( nil, nil ) end assert_raise ArgumentError do - obj = Custodian::AlertFactory.create( Array.new, nil ) + obj = Custodian::AlertFactory.create( [], nil ) end end diff --git a/t/test-custodian-parser.rb b/t/test-custodian-parser.rb index bd6a933..5822ecd 100755 --- a/t/test-custodian-parser.rb +++ b/t/test-custodian-parser.rb @@ -93,12 +93,12 @@ class TestCustodianParser < Test::Unit::TestCase # parser = Custodian::Parser.new() # 2.a. Comment lines return nil. - tmp = Array.new() + tmp = [] tmp.push( "# This is a comment.." ) assert( parser.parse_lines( tmp ).nil? ) # 2.b. Adding a test will return an array of test-objects. - tmp = Array.new() + tmp = [] tmp.push( "smtp.bytemark.co.uk must run ssh on 22 otherwise 'oops'." ); ret = parser.parse_lines( tmp ) assert( ret.kind_of? Array ); @@ -171,7 +171,7 @@ EOF # # Input text # - text = Array.new() + text = [] text.push( "FOO is kvm1.vm.bytemark.co.uk." ); text.push( "FOO2 is kvm2.vm.bytemark.co.uk." ); @@ -202,7 +202,7 @@ EOF # # Input text to parse. # - text = Array.new() + text = [] text.push( "FOO is kvm1.vm.bytemark.co.uk." ); text.push( "FOO is kvm2.vm.bytemark.co.uk." ); diff --git a/t/test-custodian-testfactory.rb b/t/test-custodian-testfactory.rb index aef71c6..6a115ce 100755 --- a/t/test-custodian-testfactory.rb +++ b/t/test-custodian-testfactory.rb @@ -32,7 +32,7 @@ class TestTestFactory < Test::Unit::TestCase end assert_raise ArgumentError do - obj = Custodian::TestFactory.create( Array.new, nil ) + obj = Custodian::TestFactory.create( [], nil ) end @@ -290,7 +290,7 @@ class TestTestFactory < Test::Unit::TestCase def test_target_detection - a = Array.new() + a = [] a.push( "test.host.example.com must run ftp.") a.push( "ftp://test.host.example.com/ must run ftp.") diff --git a/t/test-custodian-util-ping.rb b/t/test-custodian-util-ping.rb index efeef64..3dd363a 100755 --- a/t/test-custodian-util-ping.rb +++ b/t/test-custodian-util-ping.rb @@ -49,10 +49,10 @@ class TestPingUtil < Test::Unit::TestCase # A hostname is a string, not an array, hash, or similar. # assert_raise ArgumentError do - Custodian::Util::Ping.new( Hash.new) + Custodian::Util::Ping.new( {}) end assert_raise ArgumentError do - Custodian::Util::Ping.new( Array.new) + Custodian::Util::Ping.new( []) end |