diff options
Diffstat (limited to 'lib/custodian/util')
| -rw-r--r-- | lib/custodian/util/bytemark.rb | 2 | ||||
| -rw-r--r-- | lib/custodian/util/dns.rb | 2 | ||||
| -rw-r--r-- | lib/custodian/util/ping.rb | 8 | ||||
| -rw-r--r-- | lib/custodian/util/timespan.rb | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/lib/custodian/util/bytemark.rb b/lib/custodian/util/bytemark.rb index c821b18..07e5684 100644 --- a/lib/custodian/util/bytemark.rb +++ b/lib/custodian/util/bytemark.rb @@ -29,7 +29,7 @@ module Custodian def self.inside?( target ) inside = false - if ( BYTEMARK_RANGES.any?{|range| range.include?(IPAddr.new(target))} ) + if BYTEMARK_RANGES.any?{|range| range.include?(IPAddr.new(target))} inside = true end diff --git a/lib/custodian/util/dns.rb b/lib/custodian/util/dns.rb index 9cbbf59..2a0c705 100644 --- a/lib/custodian/util/dns.rb +++ b/lib/custodian/util/dns.rb @@ -61,7 +61,7 @@ module Custodian timeout( period ) do begin Socket.getaddrinfo(hostname, 'echo').each do |a| - resolved = a[3] if ( a ) + resolved = a[3] if a end rescue SocketError resolved = nil diff --git a/lib/custodian/util/ping.rb b/lib/custodian/util/ping.rb index 9abc746..4056803 100644 --- a/lib/custodian/util/ping.rb +++ b/lib/custodian/util/ping.rb @@ -26,7 +26,7 @@ module Custodian # def initialize( hostname ) - raise ArgumentError, "Hostname must not be nil" if ( hostname.nil? ) + raise ArgumentError, "Hostname must not be nil" if hostname.nil? raise ArgumentError, "Hostname must be a String" unless hostname.kind_of?( String ) @hostname = hostname @@ -47,7 +47,7 @@ module Custodian # Does the hostname resolve to an IPv4 address? # def is_ipv4? - if ( ( ! @resolved.nil? ) && ( @resolved =~ /^([0-9]+).([0-9]+).([0-9]+).([0-9]+)$/ ) ) + if ( ! @resolved.nil? ) && ( @resolved =~ /^([0-9]+).([0-9]+).([0-9]+).([0-9]+)$/ ) true else false @@ -59,7 +59,7 @@ module Custodian # Does the hostname resolve to an IPv6 address? # def is_ipv6? - if ( ( ! @resolved.nil? ) && ( @resolved =~ /^([a-f0-9:]+)$/i ) ) + if ( ! @resolved.nil? ) && ( @resolved =~ /^([a-f0-9:]+)$/i ) true else false @@ -74,7 +74,7 @@ module Custodian # Return false on error. # def run_ping - if ( is_ipv6? ) + if is_ipv6? if ( system( "ping6 -c 1 #{@resolved} 2>/dev/null >/dev/null" ) == true ) return true end diff --git a/lib/custodian/util/timespan.rb b/lib/custodian/util/timespan.rb index 5340c65..b3cb647 100644 --- a/lib/custodian/util/timespan.rb +++ b/lib/custodian/util/timespan.rb @@ -17,15 +17,15 @@ module Custodian # # Handle PM times. # - if ( ( desc.kind_of? String ) && - ( desc =~ /([0-9]+)pm$/i ) ) + if ( desc.kind_of? String ) && + ( desc =~ /([0-9]+)pm$/i ) desc = $1.dup.to_i + 12; end # # Handle AM times. # - if ( desc.kind_of? String ) + if desc.kind_of? String desc = desc.sub( /am$/, '' ) desc = desc.to_i end @@ -70,7 +70,7 @@ module Custodian while( hour != p_end ) valid[hour] = 1 hour += 1 - hour = 0 if ( hour > 23 ) + hour = 0 if hour > 23 end valid[p_end]=1 @@ -92,7 +92,7 @@ module Custodian # # Default to the current hour, if not specified. # - if ( cur_hour.nil? ) + if cur_hour.nil? cur_hour = Time.now.hour end |