whatismyip 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/whatismyip.rb

@@ -3,34 +3,47 @@ require 'nokogiri'
 
 class Whatismyip
   
+  attr_reader :public_ip
+  
   def self.check
     %{
     Public IP:
     ==========
-    #{check_public}
+    #{public_ip}
     
     Local IP's:
     ===========
-    #{check_local}
+    #{display_locals}
     }.map {|l| (l.strip.empty?) ? l : l.lstrip }
   end
   
-  def self.check_public
-    doc = Nokogiri::HTML(open('http://whatismyip.com/automation/n09230945.asp', 'User-Agent' => "Ruby/#{RUBY_VERSION}"))
-    doc.css('p').inner_html
+  def self.public_ip
+    return @public_ip unless @public_ip.nil?
+    
+    begin
+      doc = Nokogiri::HTML(open('http://whatismyip.com/automation/n09230945.asp', 'User-Agent' => "Ruby/#{RUBY_VERSION}"))
+      @public_ip = doc.css('p').inner_html
+    rescue SocketError => e
+      puts "Unable to connect to remote server. Are you sure you're connected to the internet? If not, connect and try again."
+      nil
+    end
   end
   
-  def self.check_local
+  def self.local_ips
     result = `ifconfig`
     
     sections = result.split(/^(?=[^\t])/)
     sections_with_relevant_ip = sections.select{ |i| i =~ /inet/ }
     
-    sections_with_relevant_ip.map { |section|
+    Hash[sections_with_relevant_ip.collect { |section|
       device = section[/[^:]+/]
       ip = section[/inet ([^ ]+)/, 1]
-      "#{device}: #{ip}\n"
-    }.compact
+      [device.to_sym, ip]
+    }]
+  end
+  
+  def self.display_locals
+    local_ips.map { |device, ip| "#{device}: #{ip}\n" }
   end
   
 end

data/whatismyip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whatismyip}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jimmy Baker"]
-  s.date = %q{2010-01-11}
+  s.date = %q{2010-01-15}
   s.default_executable = %q{whatismyip}
   s.description = %q{Lets you check your public and local ip addresses by simply typing 'whatismyip' on the command-line}
   s.email = %q{jimmybaker@me.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: whatismyip
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jimmy Baker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -06:00
+date: 2010-01-15 00:00:00 -06:00
 default_executable: whatismyip
 dependencies: 
 - !ruby/object:Gem::Dependency