golia 1.2 → 1.2.1

data/golia.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.description = "Golia is an website performance analyzer. Check speed and dead links."
   s.default_executable = "golia"
   s.executables = ["golia"]
-  s.version = "1.2"
+  s.version = "1.2.1"
   s.date = Time.now.strftime("%Y-%m-%d")
   s.extra_rdoc_files = Dir["*.rdoc"]
   s.files = %w(README.rdoc Rakefile golia.gemspec) + Dir["lib/**/*"]

data/lib/golia.rb

@@ -7,12 +7,11 @@ require 'tmpdir'
 class Golia
   def initialize(link)
     @host = begin
-      link = "http://#{link}" unless link =~ /^http/
-      "http://" + URI.parse(link).host
-    rescue
-      puts "<= Invalid url #{link}"
+      link = "http://#{link}" unless link =~ /^http(s?)/
+      "http#{$1}://" + URI.parse(link).host
     end
-    @pid  = "#{Dir.tmpdir}/golia-#{@host.gsub(/^http:\/\//, '')}"
+
+    @pid  = "#{Dir.tmpdir}/golia-#{@host.gsub(/^https?:\/\//, '')}"
     @checked, @links, @invalid, @valid, @long, @ms = [], [], [], [], [], []
 
     if File.exist?(@pid)
@@ -20,9 +19,14 @@ class Golia
       Process.kill(9, File.read(@pid).to_i) rescue nil
     end
 
-    trap("INT") { puts "<= Golia has ended his set (crowd applauds)"; kill; Process.kill(9, Process.pid) }
+    trap("INT") { puts "<= Golia has ended his set (crowd applauds)"; kill }
 
-    parse!(link)
+    begin
+      parse!(link)
+    rescue
+      puts "<= Invalid url #{link}"
+      kill
+    end
   end
 
   def parse!(url)
@@ -31,12 +35,13 @@ class Golia
     @ms << Time.now-begun_at
     body  = response.read
     links = body.scan(/<a.+?href=["'](.+?)["']/m).flatten
-    links.reject! { |link| link =~ /^\/$|^http|^mailto|^javascript|#/ || File.extname(link) != "" }
+    links.reject! { |link| link =~ /^\/$|^https?|^mailto|^javascript|#/ || File.extname(link) != "" }
     links.map! { |link| link = "/"+link if link !~ /^\//; @host+link }
     @links.concat(links-@checked)
   end
 
   def kill
+    Process.kill(9, Process.pid)
     FileUtils.rm_rf(@pid)
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: golia
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  version: "1.2"
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - DAddYE