findmyips 1.0.5 → 1.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzIxZjA4ZmY3OTkzOTQ3ZDJhMWM1NGE0NGYzNjRlMTA5ZGNlOWU1NQ==
-  data.tar.gz: !binary |-
-    ZjZhZTQ5MjY1MjM4ZjU5ZTJhZDdjOTA2NjEyNzA5YzgwNDFlZDc2Mg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MTVjZWI4Yzg1ZDBiNzcxMGNhY2I3M2IwMjg5NTA0YTJkYjM1YjhkMDBiODg3
-    ZWJmMGIxNzk2MmUwNWQ1ZDczNjhkNzI5NzU3ZDUwZDljZTgwNTZhMTUyNjBm
-    OWQyMGVmYjAwYmYzZjk1ZDRhOTQ5Mzc0Yzg2YjUwZDI5MWIyNzY=
-  data.tar.gz: !binary |-
-    MWY2NzM5MDIzYTJhMDc1MDQ1MmFhMDQ2OWFhMzYzMjc2Mjg5MjIyZDI3MDIy
-    OTQ2ZGMxNTk0MDQyMDcyOGUyZjM4NGJiYjU2ZjZkNTJmYTZhMGVhNWVmZThk
-    OGNmZmE0YjlkZDZkNmU3Mjk2NWJiYzdmYjc1YzM2ZDQ0NDkzNzI=
+SHA1:
+  metadata.gz: 43a65ad8ceb6db691ee3be51f5bf1f6865e51cec
+  data.tar.gz: c2a4738de55c8182feadd308a2c5e52be477e38c
+SHA512:
+  metadata.gz: 215b6b6c552ee8335422591b249635239bd5d2c37c0cd907fc26f6fdf62438d060bed646aa9c61f847c24e0f8cc6fcd12abe6a36dd4da285bc3c2940b31c876f
+  data.tar.gz: 7b63716dbd6566a379a8282c8e1101341658c01887e2afe10a32b37be95272d05e37ef8ed1d82ef37d3a541d8dda6c5fff38a267789ec00b95070be0d273bfc6

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p448
+ruby-2.3.1

data/Gemfile.lock

@@ -1,75 +1,91 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
-    builder (3.2.2)
-    colorize (0.6.0)
-    cucumber (1.3.9)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    builder (3.2.3)
+    colorize (0.8.1)
+    cucumber (2.4.0)
       builder (>= 2.1.2)
+      cucumber-core (~> 1.5.0)
+      cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      gherkin (~> 4.0)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
-    diff-lcs (1.2.5)
-    docile (1.1.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
+    cucumber-wire (0.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    gherkin (4.0.0)
+    git (1.3.0)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
       hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpauth (0.2.0)
-    jeweler (1.8.8)
+    hashie (3.5.5)
+    highline (1.7.8)
+    jeweler (2.3.3)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-    json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    lockfile (2.1.0)
-    multi_json (1.8.2)
-    multi_test (0.0.2)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+      semver2
+    json (1.8.6)
+    jwt (1.5.6)
+    mini_portile2 (2.1.0)
+    multi_json (1.12.1)
+    multi_test (0.1.2)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.3.0)
+      faraday (>= 0.8, < 0.11)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.1.0)
+      rack (>= 1.2, < 3)
+    psych (2.2.4)
+    public_suffix (2.0.5)
+    rack (2.0.1)
+    rake (12.0.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    simplecov (0.8.1)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    semver2 (3.4.2)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
-      lockfile (>= 2.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    thread_safe (0.3.6)
 
 PLATFORMS
   ruby
@@ -82,3 +98,6 @@ DEPENDENCIES
   rdoc (~> 3.12)
   rspec (>= 2.8.0)
   simplecov
+
+BUNDLED WITH
+   1.14.4

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.1.2

data/bin/findmyips

@@ -7,7 +7,7 @@ $:.unshift(_lib) unless $:.include?(_lib)
 require "dldinternet/net/findmyips.rb"
 include DLDInternet::Net::FindMyIPs
 
-external = IPAddr.new(getExternal, Socket::AF_INET)
+external = IPAddr.new(getExternal('ipinfo.io/ip'), Socket::AF_INET)
 puts
 puts "External IP: ".white + "#{external}".green
 puts "Internal IP: ".white + "#{getLocal}".green

data/findmyips.gemspec

@@ -2,18 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: findmyips 1.0.2 ruby lib
+# stub: findmyips 1.1.2 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "findmyips"
-  s.version = "1.0.2"
+  s.name = "findmyips".freeze
+  s.version = "1.1.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Christo De Lange"]
-  s.date = "2013-10-07"
-  s.description = "Look up my IP address"
-  s.email = "github@dldinternet.com"
-  s.executables = ["findmyips", "findmyips.sh"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Christo De Lange".freeze]
+  s.date = "2017-03-02"
+  s.description = "Look up my IP address".freeze
+  s.email = "github@dldinternet.com".freeze
+  s.executables = ["findmyips".freeze, "findmyips.sh".freeze]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -39,40 +40,39 @@ Gem::Specification.new do |s|
     "spec/findmyips_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/dldinternet/findmyips"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.5"
-  s.summary = "Obtain my public and internal IP addresses"
+  s.homepage = "http://github.com/dldinternet/findmyips".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.10".freeze
+  s.summary = "Obtain my public and internal IP addresses".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<colorize>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_runtime_dependency(%q<colorize>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 2.8.0"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_development_dependency(%q<cucumber>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bundler>.freeze, ["> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 1.8.4"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<colorize>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.8.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["> 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.8.4"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<colorize>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 2.8.0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<cucumber>.freeze, [">= 0"])
+      s.add_dependency(%q<bundler>.freeze, ["> 1.0.0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 1.8.4"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<colorize>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.8.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["> 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.8.4"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<colorize>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 2.8.0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<cucumber>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, ["> 1.0.0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 1.8.4"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 end
 

data/lib/dldinternet/net/findmyips.rb

@@ -29,15 +29,17 @@ module DLDInternet
       alias :getInternal getLocal
 
       #Simply fetch the external from dyndns, not so much magic :p
-      def getPublic(host = 'checkip.dyndns.org', port = 80, timeout = 5, maxtries = 10, report_progress = true)
+      def getPublic(url = 'checkip.dyndns.org', timeout = 5, maxtries = 10, report_progress = true)
         tries= 0
+        uri = URI.parse(url)
+        uri = URI.parse("http://#{url}") unless uri and uri.scheme
         while true
           begin
-            dyn = ::Net::HTTP.new(host, port)
+            dyn = ::Net::HTTP.new(uri.host, uri.port)
             dyn.open_timeout = timeout
             dyn.read_timeout = timeout
             unless dyn.nil?
-              resp = dyn.get("/")
+              resp = dyn.get(uri.path)
               unless resp.nil?
                 ip = resp.read_body.match(/\d+\.\d+\.\d+\.\d+/)
                 return ip[0]
@@ -45,7 +47,7 @@ module DLDInternet
             end
           rescue Timeout::Error => e
             #puts e.class.to_s+" "+e.message
-            puts "No response from #{host}:#{port} within #{timeout} seconds".light_red if report_progress
+            puts "No response from #{uri.host}:#{uri.port} within #{timeout} seconds".light_red if report_progress
             tries += 1
             raise StandardError.new("Max retries exceeded") if tries >= maxtries
           end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: findmyips
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.2
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Look up my IP address
@@ -118,10 +118,10 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .rspec
-- .ruby-gemset
-- .ruby-version
+- ".document"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -147,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Obtain my public and internal IP addresses