From 3a96cc957dbd97c6ffeaea42f738e7c35b4acbc7 Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
Date: Mon, 9 Mar 2015 13:08:33 +0000
Subject: Avoid "Array.new" and "Hash.new"

Instead use {} + ().
---
 lib/custodian/parser.rb            | 10 +++++-----
 lib/custodian/protocoltest/dns.rb  |  2 +-
 lib/custodian/protocoltest/ldap.rb |  2 +-
 lib/custodian/protocoltest/mx.rb   |  2 +-
 lib/custodian/protocoltest/ping.rb |  2 +-
 lib/custodian/protocoltest/tcp.rb  |  2 +-
 lib/custodian/settings.rb          |  2 +-
 lib/custodian/testfactory.rb       |  4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'lib/custodian')

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
 
-- 
cgit v1.2.1