public_ip 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c6014ac220e8ffedcb14958f6a2d32463d756a42
-  data.tar.gz: 1e0ddf384845fc0e4993986e015413ad4e2a644c
+SHA256:
+  metadata.gz: 39935714ca59a830458e02a82ebbee41923c6467d2c0de7de85b0919a0ba14d2
+  data.tar.gz: 2401864e2aed2471eeb0f84fd0dedd8de4512235f0afdda9bdd78051c649f6bb
 SHA512:
-  metadata.gz: 494aacfe714bdbe90586a2d995c387748d1bb949df19009d9f3ed8b2c13ad215aa26caf5e0d9eae21beac1e1840fbcc76bc4b33433657dded8ba69071cac121c
-  data.tar.gz: 6e827fcee2fe45fe5e808815bc59ba8bf1e124ec883c7a9de8a49ebd74e3581a41643d5b75c1a0a03b403c3c4d6beba04d0452f0c63710793ea91507ee3ad21c
+  metadata.gz: ecdc0f1f5846704361c49ba8a48d55d37fe06bb4a92d4b5a725f30b54915af914f50fd77798b9a017b4c7fb7078495de212a4ce78b6b7f5293c33293ce582f8c
+  data.tar.gz: 8a4b325cb53a39513c3c3d1e50657e9d7da8ac5fc44c422e15b55d0480fde9529f43631f4f2ec1f2df9618132e8a04f6cf992c174bc6b92f42e95eae0f4fbb84

data/.rubocop.yml

@@ -10,5 +10,9 @@ LineLength:
 MethodLength:
   Max: 15
 
-SpaceAfterControlKeyword:
+SpaceAroundKeyword:
   Enabled: true
+
+AllCops:
+  DisplayCopNames: true
+  TargetRubyVersion: 2.1

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.5.0

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.3
-  - rbx-2
+  - 2.5.0
   - ruby-head
 before_install:
   - gem update --system

data/Rakefile

@@ -5,11 +5,11 @@ require 'cucumber/rake/task'
 require 'rubocop/rake_task'
 
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = 'features --format pretty'
+  t.cucumber_opts = 'features --format pretty --retry 5'
 end
 
 RuboCop::RakeTask.new(:rubocop)
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:spec, :features, :rubocop]
+task default: %i[spec features rubocop]

data/bin/public_ip

@@ -31,7 +31,6 @@ class App
 
   description 'Find out what is your public internet IP address'
 
-  on('-l', '--list-services', 'List available services')
   on('-l', '--list-services', 'List available services')
 
   arg :service, :optional

data/lib/public_ip/service/curl_my_ip.rb

@@ -0,0 +1,9 @@
+module PublicIp
+  module Service
+    class CurlMyIp < Plain
+      def self.uri
+        URI('http://curlmyip.net/')
+      end
+    end
+  end
+end

data/lib/public_ip/service/ifconfig_me.rb

@@ -4,6 +4,10 @@ module PublicIp
       def self.uri
         URI('http://ifconfig.me/ip')
       end
+
+      def self.headers
+        { 'User-Agent' => 'curl/7.9.8 (i686-pc-linux-gnu) libcurl 7.9.8 (OpenSSL 0.9.6b) (ipv6 enabled)' }
+      end
     end
   end
 end

data/lib/public_ip/service/ip_echo.rb

@@ -4,6 +4,10 @@ module PublicIp
       def self.uri
         URI('http://ipecho.net/plain')
       end
+
+      def self.headers
+        { 'User-Agent' => 'curl/7.9.8 (i686-pc-linux-gnu) libcurl 7.9.8 (OpenSSL 0.9.6b) (ipv6 enabled)' }
+      end
     end
   end
 end

data/lib/public_ip/service/json_type.rb

@@ -6,12 +6,10 @@ module PublicIp
       extend PublicIp::Service::Registrable
 
       def self.parse_json(_json_data)
-        fail 'Not implemented'
+        raise 'Not implemented'
       end
 
-      def self.ip
-        response = perform_request
-
+      def self.extract_ip(response)
         parse_json(JSON.parse(response.body.strip))
       end
     end

data/lib/public_ip/service/matched_expression.rb

@@ -5,9 +5,7 @@ module PublicIp
 
       attr_reader :match_regex
 
-      def self.ip
-        response = perform_request
-
+      def self.extract_ip(response)
         response.body.match(match_regex)[1].strip
       end
     end

data/lib/public_ip/service/mx_toolbox.rb

@@ -2,13 +2,9 @@ require 'nokogiri'
 
 module PublicIp
   module Service
-    class MxToolbox < ParsedHTML
+    class MxToolbox < Plain
       def self.uri
-        URI('http://mxtoolbox.com/WhatIsMyIP/')
-      end
-
-      def self.parse_ip_address(response_body)
-        Nokogiri::HTML(response_body).css('#ctl00_ContentPlaceHolder1_hlIP').text
+        URI('https://api.mxtoolbox.com/api/v1/utils/whatsmyip')
       end
     end
   end

data/lib/public_ip/service/parsed_html.rb

@@ -3,9 +3,11 @@ module PublicIp
     class ParsedHTML < Simple
       extend PublicIp::Service::Registrable
 
-      def self.ip
-        response = perform_request
+      def self.parse_ip_address(_html)
+        raise 'Not implemented'
+      end
 
+      def self.extract_ip(response)
         parse_ip_address(response.body)
       end
     end

data/lib/public_ip/service/plain.rb

@@ -3,10 +3,8 @@ module PublicIp
     class Plain < Simple
       extend PublicIp::Service::Registrable
 
-      def self.ip
-        response = perform_request
-
-        response.body.strip
+      def self.extract_ip(response)
+        response.body.strip.delete('"')
       end
     end
   end

data/lib/public_ip/service/registry.rb

@@ -8,9 +8,8 @@ module PublicIp
       attr_reader :service_database
 
       def self.register_service(service_class)
-        unless instance.service_database.key?(service_class.symbol)
-          instance.service_database[service_class.symbol] = service_class
-        end
+        return if instance.service_database.key?(service_class.symbol)
+        instance.service_database[service_class.symbol] = service_class
       end
 
       def self.[](service)

data/lib/public_ip/service/simple.rb

@@ -1,14 +1,30 @@
 require 'net/http'
 require 'timeout'
+require 'ipaddress'
 
 module PublicIp
   module Service
+    class InvalidIpAddress < StandardError; end
+    class TimedOut < StandardError; end
+
     class Simple
       attr_reader :uri
       attr_reader :headers
 
+      def self.ip
+        response = perform_request
+
+        ip_address = extract_ip(response)
+
+        unless IPAddress.valid?(ip_address)
+          raise PublicIp::Service::InvalidIpAddress, "#{ip_address} is not a valid ip address"
+        end
+
+        ip_address
+      end
+
       def self.uri
-        fail 'Not implemented'
+        raise 'Not implemented'
       end
 
       def self.headers
@@ -27,7 +43,7 @@ module PublicIp
       end
 
       def self.perform_request
-        Timeout.timeout(PublicIp::TIMEOUT_IN_SECS) do
+        Timeout.timeout(PublicIp::TIMEOUT_IN_SECS, PublicIp::Service::TimedOut) do
           request = Net::HTTP::Get.new(uri, headers)
           http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = (uri.scheme == 'https')

data/lib/public_ip/service/what_is_my_ip.rb

@@ -12,7 +12,9 @@ module PublicIp
       end
 
       def self.parse_ip_address(response_body)
-        Nokogiri::HTML(response_body).css('.ip div').text
+        doc = Nokogiri::HTML(response_body).at('h3:contains("Your Public IPv4 is: ")')
+
+        return doc.text.strip.sub('Your Public IPv4 is: ', '') unless doc.nil?
       end
     end
   end

data/lib/public_ip/version.rb

@@ -1,3 +1,3 @@
 module PublicIp
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'.freeze
 end

data/lib/public_ip.rb

@@ -13,7 +13,6 @@ module PublicIp
   TIMEOUT_IN_SECS = 3
 
   class UnknownService < StandardError; end
-  class TimedOut < StandardError; end
 
   module_function
 
@@ -24,13 +23,11 @@ module PublicIp
     else
       PublicIp::Service::Registry[service].ip
     end
-  rescue Timeout::Error
+  rescue PublicIp::Service::TimedOut, PublicIp::Service::InvalidIpAddress
     tries -= 1
-    if tries > 0 && service == :random
-      retry
-    else
-      raise PublicIp::TimedOut, 'Took too long to get your public ip address, try with another service'
-    end
+    retry if tries.positive? && service == :random
+
+    raise
   end
 
   def list_services

data/public_ip.gemspec

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/BlockLength
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'public_ip/version'
@@ -10,10 +12,10 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Get your public internet IP the easy way.'
   spec.description   = <<-DESCRIPTION
-Ever questioned what is your public internet IP and you've forgotten how to do it.
-Instead of remembering every service that you can query to get your public internet IP you can use PublicIP.
-You can use it directly in your code or in your CLI.
-DESCRIPTION
+  Ever questioned what is your public internet IP and you've forgotten how to do it.
+  Instead of remembering every service that you can query to get your public internet IP you can use PublicIP.
+  You can use it directly in your code or in your CLI.
+  DESCRIPTION
 
   spec.homepage      = 'https://github.com/pedrocarrico/public_ip'
   spec.license       = 'MIT'
@@ -23,14 +25,18 @@ DESCRIPTION
   spec.executables   = ['public_ip']
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.1'
+
+  spec.add_dependency 'ipaddress', '~> 0.8.3'
   spec.add_dependency 'methadone', '~> 1.9.2'
-  spec.add_dependency 'nokogiri', '~> 1.6.7'
+  spec.add_dependency 'nokogiri', '~> 1.8.1'
 
+  spec.add_development_dependency 'aruba', '~> 0.14.3'
   spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'pry', '~> 0.10.3'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4'
-  spec.add_development_dependency 'rubocop', '~> 0.35.1'
-  spec.add_development_dependency 'pry', '~> 0.10.3'
+  spec.add_development_dependency 'rubocop', '~> 0.52.1'
   spec.add_development_dependency 'webmock', '~> 1.22.3'
-  spec.add_development_dependency 'aruba', '~> 0.11.2'
 end
+# rubocop:enable Metrics/BlockLength

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: public_ip
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Pedro Carriço
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ipaddress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
@@ -30,116 +44,116 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 0.14.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 0.14.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 0.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.3
+        version: 0.52.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.3
+        version: 0.52.1
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 1.22.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
-description: |
-  Ever questioned what is your public internet IP and you've forgotten how to do it.
-  Instead of remembering every service that you can query to get your public internet IP you can use PublicIP.
-  You can use it directly in your code or in your CLI.
+        version: 1.22.3
+description: |2
+    Ever questioned what is your public internet IP and you've forgotten how to do it.
+    Instead of remembering every service that you can query to get your public internet IP you can use PublicIP.
+    You can use it directly in your code or in your CLI.
 email:
 - pedro.carrico@gmail.com
 executables:
@@ -164,6 +178,7 @@ files:
 - lib/public_ip.rb
 - lib/public_ip/service/akamai.rb
 - lib/public_ip/service/amazon_aws.rb
+- lib/public_ip/service/curl_my_ip.rb
 - lib/public_ip/service/dyndns.rb
 - lib/public_ip/service/i_can_haz_ip.rb
 - lib/public_ip/service/ident_me.rb
@@ -172,7 +187,6 @@ files:
 - lib/public_ip/service/ip_chicken.rb
 - lib/public_ip/service/ip_echo.rb
 - lib/public_ip/service/ip_info.rb
-- lib/public_ip/service/ip_ogre.rb
 - lib/public_ip/service/ipify.rb
 - lib/public_ip/service/json_type.rb
 - lib/public_ip/service/matched_expression.rb
@@ -201,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -209,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Get your public internet IP the easy way.

data/lib/public_ip/service/ip_ogre.rb

@@ -1,13 +0,0 @@
-module PublicIp
-  module Service
-    class IpOgre < Plain
-      def self.uri
-        URI('http://ipogre.com')
-      end
-
-      def self.headers
-        { 'User-Agent' => 'curl/7.9.8 (i686-pc-linux-gnu) libcurl 7.9.8 (OpenSSL 0.9.6b) (ipv6 enabled)' }
-      end
-    end
-  end
-end