html-proofer 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af929be3f389ca9ac9d1fc449552207eaf5d983a
-  data.tar.gz: 4197105516d8e7e6cf4768ca57d5e45996aef9ee
+  metadata.gz: 216684fe16feed0b7dedc9facd8a4a878a8879bc
+  data.tar.gz: af2b3852d0ae1fec97402b28c93b996304317faa
 SHA512:
-  metadata.gz: 82d3cffe4c8295939d0140a5e0ad297fed56dfbf0031700eb28eeb2bebb9e187f5cfc7587042a23b9534276f7530f63aeddfb7635993426bbbc1476a3ab4c06f
-  data.tar.gz: d8a50d7cb65def4b4f7ca9be03d0ae1ceac83b495cb34f9d7501650a8cac2a1c072a2a25a8b186f1b5459a52559fb39afe8581f16ff388e4cbce4c21e8a91e06
+  metadata.gz: 0a5dc4f9572d363911a456b89ee85b5a08b1cba942b7ae2de53c19c0a514e2a9d3b10a1f6f8fe57988cd31b7ec9fd21b0cb9bbe6d073bb2ce0ebcebff3a6c70f
+  data.tar.gz: eeb376dbe6e5332583440905e630c5ebcc4c15962bef056d235a8ce9fecfa269e2d50bb54386e8606f32c0f1c9eca51f8d7e107b105f8ecaf79b71c97a4b187d

data/html-proofer.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = "html-proofer"
-  gem.version       = "1.1.6"
+  gem.version       = "1.2.0"
   gem.authors       = ["Garen Torikian"]
   gem.email         = ["gjtorikian@gmail.com"]
   gem.description   = %q{Test your rendered HTML files to make sure they're accurate.}

data/lib/html/proofer.rb

@@ -38,14 +38,14 @@ module HTML
         total_files = 0
         external_urls = {}
 
-        logger.info "Running #{get_checks} checks on #{@src} on *#{@options[:ext]}... \n\n".white
+        logger.info colorize :white, "Running #{get_checks} checks on #{@src} on *#{@options[:ext]}... \n\n"
 
         files.each do |path|
           total_files += 1
           html = HTML::Proofer.create_nokogiri(path)
 
           get_checks.each do |klass|
-            logger.debug "Checking #{klass.to_s.downcase} on #{path} ...".blue
+            logger.debug colorize :blue, "Checking #{klass.to_s.downcase} on #{path} ..."
             check =  Object.const_get(klass).new(@src, path, html, @options)
             check.run
             external_urls.merge!(check.external_urls)
@@ -55,20 +55,20 @@ module HTML
 
         external_link_checker(external_urls) unless @options[:disable_external]
 
-        logger.info "Ran on #{total_files} files!\n\n".green
+        logger.info colorize :green, "Ran on #{total_files} files!\n\n"
       else
         external_urls = Hash[*@src.map{ |s| [s, nil] }.flatten]
         external_link_checker(external_urls) unless @options[:disable_external]
       end
 
       if @failed_tests.empty?
-        logger.info "HTML-Proofer finished successfully.".green
+        logger.info colorize :green, "HTML-Proofer finished successfully."
       else
         @failed_tests.sort.each do |issue|
           logger.error issue.to_s.red
         end
 
-        raise "HTML-Proofer found #{@failed_tests.length} failures!".red
+        raise colorize :red, "HTML-Proofer found #{@failed_tests.length} failures!"
       end
     end
 
@@ -80,7 +80,7 @@ module HTML
     def external_link_checker(external_urls)
       external_urls = Hash[external_urls.sort]
 
-      logger.info "Checking #{external_urls.length} external links...".yellow
+      logger.info colorize :yellow, "Checking #{external_urls.length} external links..."
 
       # Typhoeus won't let you pass any non-Typhoeus option
       @proofer_opts.each_key do |opt|
@@ -90,14 +90,18 @@ module HTML
       Ethon.logger = logger # log from Typhoeus/Ethon
 
       external_urls.each_pair do |href, filenames|
-        request = Typhoeus::Request.new(href, @options.merge({:method => :head}))
-        request.on_complete { |response| response_handler(response, filenames) }
-        hydra.queue request
+        queue_request(:head, href, filenames)
       end
-      logger.debug "Running requests for all #{hydra.queued_requests.size} external URLs...".yellow
+      logger.debug colorize :yellow, "Running requests for all #{hydra.queued_requests.size} external URLs..."
       hydra.run
     end
 
+    def queue_request(method, href, filenames)
+      request = Typhoeus::Request.new(href, @options.merge({:method => method}))
+      request.on_complete { |response| response_handler(response, filenames) }
+      hydra.queue request
+    end
+
     def response_handler(response, filenames)
       href = response.options[:effective_url]
       method = response.request.options[:method]
@@ -116,13 +120,11 @@ module HTML
       elsif (response_code == 405 || response_code == 420 || response_code == 503) && method == :head
         # 420s usually come from rate limiting; let's ignore the query and try just the path with a GET
         uri = URI(href)
-        next_response = Typhoeus.get(uri.scheme + "://" + uri.host + uri.path, @options)
-        response_handler(next_response, filenames)
+        queue_request(:get, uri.scheme + "://" + uri.host + uri.path, filenames)
       # just be lazy; perform an explicit get request. some servers are apparently not configured to
       # intercept HTTP HEAD
       elsif method == :head
-        next_response = Typhoeus.get(href, @options)
-        response_handler(next_response, filenames)
+        queue_request(:get, href, filenames)
       else
         # Received a non-successful http response.
         failed_test_msg = "External link #{href} failed: #{response_code} #{response.return_message}"
@@ -158,5 +160,13 @@ module HTML
     def log_level
       @options[:verbose] ? :debug : :info
     end
+
+    def colorize(color, string)
+      if $stdout.isatty && $stderr.isatty
+        Colored.colorize(string, :foreground => color)
+      else
+        string
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-proofer
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Garen Torikian