awesome_bot 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19d8dfe764c84b4cf654c29ba4d6bd9e953a1b9c
-  data.tar.gz: 2811c9cdbae2178e934979da5f2885ffd5ba6968
+  metadata.gz: 86f47522c8abd6392f288ac1b07c0ad82304a593
+  data.tar.gz: 91e754b597dbf52696bf580c482097a01d59b9bf
 SHA512:
-  metadata.gz: c566f671dae5922252856621d86052914e8c9f154c0ac31b30e70df1455ad9d0475ca1210ea84f9983e2edcf00b9dc9ef66448bdcdcdf9bd45c23afaee53f50f
-  data.tar.gz: 3bcd9be66cf3a23fc0373f61fbe8ee7cde059bd0e5261df82fdb5b86ac5b571a6da5cd019010a9b240116ab066f957b2f055a22c8d960ed8a75372a9f667141a
+  metadata.gz: 43b2abdd184fce42b28121d65171720deafd55db92d4b6c75093acb0a526ca83309af7564da7efa26d06a656b2501ab579f56d169f049ede2843c3cc87ea1255
+  data.tar.gz: 987906144e1c1534d905433bc0ee44a616358197b4a589aabbaf2f3bf0b73e276fa802f4d03e0a9ab90ece70b19585bf6cb586db71384973125c77bd5d22437e

data/.travis.yml

@@ -7,7 +7,7 @@ script:
   - awesome_bot
   - awesome_bot bin/assets/test-no-issues
   - awesome_bot bin/assets/test-no-links
-  - awesome_bot bin/assets/test-parse
+  - awesome_bot bin/assets/test-parse --white-list coveralls,travis-ci
   - awesome_bot bin/assets/test-dupe --allow-dupe
   - awesome_bot bin/assets/test-timeout --allow-timeout --set-timeout 1
   - awesome_bot bin/assets/test-timeout-and-redirect --allow-timeout --set-timeout 1 --allow-redirect

data/CHANGELOG.md

@@ -56,14 +56,20 @@
 
 # 1.5.0
 
-- [output] display url redirect location, by [Colby M. White](https://github.com/colbywhite)
+- [output] display url redirect location, by [Colby M. White][]
 - [output] update logic for number of unique links
 - [output] standardize indent
-- rename `Result` `rejected` to `links_white_listed` 
+- rename `Result` `rejected` to `links_white_listed`
+
+# 1.5.1
+
+- [fix] link parsing error with markdown badge
+- improve code, suggested by [Colby M. White][]
 
 ## Contact
 
 - [github.com/dkhamsing](https://github.com/dkhamsing)
 - [twitter.com/dkhamsing](https://twitter.com/dkhamsing)
 
+[Colby M. White]:https://github.com/colbywhite
 [R.I. Pienaar]:https://github.com/ripienaar

data/bin/assets/test-parse

@@ -1,2 +1,4 @@
 [Eddystone](https://en.wikipedia.org/wiki/Eddystone_(Google))
 her [dockerfiles](https://github.com/jfrazelle/dockerfiles))
+
+# ng-flow [![Build Status](https://travis-ci.org/flowjs/ng-flow.svg)](https://travis-ci.org/flowjs/ng-flow) [![Coverage Status](https://coveralls.io/repos/flowjs/ng-flow/badge.svg?branch=master&service=github)](https://coveralls.io/github/flowjs/ng-flow?branch=master)

data/lib/awesome_bot/check.rb

@@ -9,9 +9,17 @@ module AwesomeBot
 
   STATUS_OK = '✓'
   STATUS_OTHER = 'x'
-  STATUS_REDIRECT = '→'  
+  STATUS_REDIRECT = '→'
 
   class << self
+    def log_status(s, log)
+      if status_is_redirected? s
+        log.addp STATUS_REDIRECT
+      else
+        log.addp(s == 200 ? STATUS_OK : STATUS_OTHER)
+      end
+    end
+
     def check(content, white_listed = nil, skip_dupe = false, log = Log.new)
       log.add '> Will allow duplicate links' if skip_dupe
 
@@ -34,11 +42,7 @@ module AwesomeBot
       log.addp 'Checking URLs: ' if r.links.count > 0
       r.status =
         statuses(r.links.uniq, NUMBER_OF_THREADS) do |s|
-          if (s > 299) && (s < 400)
-            log.addp STATUS_REDIRECT
-          else
-            log.addp(s == 200 ? STATUS_OK : STATUS_OTHER)
-          end
+          log_status s, log
         end
       log.add ''
 
@@ -47,11 +51,7 @@ module AwesomeBot
       log.addp 'Checking white listed URLs: '
       r.white_listed =
         statuses(r.links_white_listed.uniq, NUMBER_OF_THREADS, true) do |s|
-          if (s > 299) && (s < 400)
-            log.addp STATUS_REDIRECT
-          else
-            log.addp(s == 200 ? STATUS_OK : STATUS_OTHER)
-          end
+          log_status s, log
         end
       log.add ''
 

data/lib/awesome_bot/cli.rb

@@ -1,6 +1,7 @@
 require 'awesome_bot/check'
 require 'awesome_bot/log'
 require 'awesome_bot/result'
+require 'awesome_bot/statuses'
 require 'awesome_bot/version'
 
 # Command line interface
@@ -24,7 +25,7 @@ module AwesomeBot
       print "#{s} " unless s == STATUS_ERROR
       print "#{x['url']}"
       print " #{x['error']}" if s == STATUS_ERROR
-      print " #{STATUS_REDIRECT} #{x['headers']['location']}" if s > 299 && s <400
+      print " #{STATUS_REDIRECT} #{x['headers']['location']}" if status_is_redirected? s
       puts ''
     end
 

data/lib/awesome_bot/links.rb

@@ -9,7 +9,9 @@ module AwesomeBot
           x.gsub(/'.*/, '').gsub(/,.*/, '').gsub('/:', '/')
         end
         .map do |x|
-          if (x.scan(')').count == 2) && (x.scan('(').count == 1)
+          if x.include? ')]'
+            x.gsub /\)\].*/, ''
+          elsif (x.scan(')').count == 2) && (x.scan('(').count == 1)
             x.gsub(/\)\).*/, ')')
           elsif x.scan(')').count > 0
             x.gsub(/\).*/, '')

data/lib/awesome_bot/result.rb

@@ -1,7 +1,8 @@
-require 'awesome_bot/white_list'
-
 # Result
 module AwesomeBot
+  require 'awesome_bot/statuses'
+  require 'awesome_bot/white_list'
+
   # Result
   class Result
     attr_accessor :dupes
@@ -23,7 +24,7 @@ module AwesomeBot
 
     def statuses_issues(allow_redirects = false, allow_timeouts = false)
       s = status.select { |x| x['status'] != 200 }
-      r = s.reject { |x| (x['status'] > 299) && (x['status'] < 400) }
+      r = s.reject { |x| AwesomeBot.status_is_redirected? x['status'] }
       t = s.reject do |x|
         (x['status'] == -1) && ((x['error'].message == 'Net::ReadTimeout') || (x['error'].message == 'execution expired'))
       end

data/lib/awesome_bot/statuses.rb

@@ -18,6 +18,10 @@ module AwesomeBot
       head ? net_head_status(url) : net_get_status(url)
     end
 
+    def status_is_redirected?(status)
+      (status > 299) && (status < 400)
+    end
+
     def statuses(links, threads, head = false)
       statuses = []
       Parallel.each(links, in_threads: threads) do |u|
@@ -25,6 +29,7 @@ module AwesomeBot
           response = net_status u, head
           status = response.status
           headers = response.headers
+          error = nil # nil (success)
         rescue => e
           status = STATUS_ERROR
           headers = {}

data/lib/awesome_bot/version.rb

@@ -5,5 +5,5 @@ module AwesomeBot
                         'Great for "awesome" projects.'
   PROJECT_URL = 'https://github.com/dkhamsing/awesome_bot'
 
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awesome_bot
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Daniel Khamsing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday