github-pages-health-check 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fde439a25a45843f6b1f6d72ce6087ab8a73635
-  data.tar.gz: 3611082fcdf54f63836d4ea4cb1a03ef55318d08
+  metadata.gz: c8f1167cce6a19b07422bbb5375ff71b4fa78e01
+  data.tar.gz: 35a439eed34572584c770fc396082e1e82f8f0c4
 SHA512:
-  metadata.gz: 9fe3eb7d8a550346f116a7fc1080f6f17b6ac874ad2d377fe60693a0133511bcf25fc45b06460d5292772ff13cf58582124196d75e2c0795355817b951bf84ec
-  data.tar.gz: 297061e83479dec893c059d9fd866623b26092e637ba575fe1ee157dda8cc5f055504b38c97c42bd24fc99f75ad1493f3778b777aac1d6e1471297519a11c5e3
+  metadata.gz: 58afef1dd71269fc7190cbd8cadbff2e68f24ba23a49b10743151fd010d5fffef2c75b0f92f3c75d42ba8456d9257ced78b9462260bd489fb3a5e069d9bebb24
+  data.tar.gz: 0db8e4e38545e1a825d310c7994a66fa4bbd6c88f9d8e55fd5676c46763791b49b1ed9aa26580047660361b3601a4f1bfa729a869bfd15dd379dd8c977f17173

data/lib/github-pages-health-check.rb

@@ -1,16 +1,16 @@
-require 'net/dns'
-require 'net/dns/resolver'
-require 'ipaddr'
-require 'public_suffix'
-require 'singleton'
-require 'net/http'
-require_relative 'github-pages-health-check/version'
-require_relative 'github-pages-health-check/cloudflare'
-require_relative 'github-pages-health-check/error'
-require_relative 'github-pages-health-check/errors/deprecated_ip'
-require_relative 'github-pages-health-check/errors/invalid_a_record'
-require_relative 'github-pages-health-check/errors/invalid_cname'
-require_relative 'github-pages-health-check/errors/not_served_by_pages'
+require "net/dns"
+require "net/dns/resolver"
+require "ipaddr"
+require "public_suffix"
+require "singleton"
+require "net/http"
+require_relative "github-pages-health-check/version"
+require_relative "github-pages-health-check/cloudflare"
+require_relative "github-pages-health-check/error"
+require_relative "github-pages-health-check/errors/deprecated_ip"
+require_relative "github-pages-health-check/errors/invalid_a_record"
+require_relative "github-pages-health-check/errors/invalid_cname"
+require_relative "github-pages-health-check/errors/not_served_by_pages"
 
 class GitHubPages
   class HealthCheck
@@ -23,6 +23,11 @@ class GitHubPages
       199.27.73.133
     ]
 
+    CURRENT_IP_ADDRESSES = %w[
+      192.30.252.153
+      192.30.252.154
+    ]
+
     def initialize(domain)
       @domain = domain
     end
@@ -33,7 +38,7 @@ class GitHubPages
 
     # Returns an array of DNS answers
     def dns
-      @dns ||= without_warnings { Net::DNS::Resolver.start(domain).answer } if domain
+      @dns ||= without_warnings { Net::DNS::Resolver.start(absolute_domain).answer  } if domain
     rescue Exception
       false
     end
@@ -76,6 +81,11 @@ class GitHubPages
       dns.first.class == Net::DNS::RR::CNAME && pages_domain?(dns.first.cname.to_s)
     end
 
+    # Is the domain's first response an A record to a valid GitHub Pages IP?
+    def pointed_to_github_pages_ip?
+      dns.first.class == Net::DNS::RR::A && CURRENT_IP_ADDRESSES.include?(dns.first.value)
+    end
+
     # Is the given cname a pages domain?
     #
     # domain - the domain to check, generaly the target of a cname
@@ -98,6 +108,7 @@ class GitHubPages
         :apex_domain?                   => apex_domain?,
         :should_be_a_record?            => should_be_a_record?,
         :pointed_to_github_user_domain? => pointed_to_github_user_domain?,
+        :pointed_to_github_pages_ip?    => pointed_to_github_pages_ip?,
         :pages_domain?                  => pages_domain?,
         :served_by_pages?               => served_by_pages?,
         :valid?                         => valid?,
@@ -109,6 +120,12 @@ class GitHubPages
       scheme = github_domain? ? "https" : "http"
       uri = URI("#{scheme}://#{domain}")
       response = Net::HTTP.get_response(uri)
+      if response.is_a? Net::HTTPRedirection
+        for t in 1..3
+          response = Net::HTTP.get_response(uri)
+          break if response.is_a? Net::HTTPSuccess
+        end
+      end
       response.to_hash["server"] == ["GitHub.com"]
     rescue
       false
@@ -165,5 +182,13 @@ class GitHubPages
       $VERBOSE = warn_level
       result
     end
+
+    # Adjust `domain` so that it won't be searched for with /etc/resolv.conf's search rules.
+    #
+    #     GitHubPages::HealthCheck.new("anything.io").absolute_domain
+    #     => "anything.io."
+    def absolute_domain
+      domain.end_with?(".") ? domain : "#{domain}."
+    end
   end
 end

data/lib/github-pages-health-check/version.rb

@@ -1,5 +1,5 @@
 class GitHubPages
   class HealthCheck
-    VERSION = '0.2.2'
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pages-health-check
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-dns