deadfinder 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8024d88f4693ba6418aab2cca93f3c267fa823f2fa7b47116d39d7d6adb3d40
-  data.tar.gz: 0c494d74bbbb448eb482204b2525478847d13b62e32c4b2cbd97f16315890973
+  metadata.gz: 5a9dba525c92f09cb14019fe890f73dc85eaa975179ac19efca534f0fdc76b14
+  data.tar.gz: fee3168a2912dacd9a2740b1aaf2c495b0b68b48b4d024c208523d8a8a5bb5e1
 SHA512:
-  metadata.gz: b231b730274c98b22672a4169cb943054db76b6ae0fec70f66eee4eb9e314217942b71d0d4da854556d8f7ec81e33d29be8cb9a758ea12ab3d7aec4ce40907b0
-  data.tar.gz: 55ae74b443389b62dbd34150deed7e9de433540ca8e2796ed753d90366849f8690d6025d21cd513154e2379cf31c582817c7dd5119ecf629da42dd1d2571296a
+  metadata.gz: be806719c1ed5ca905885222d485f376c7e1a61dff0388f812e05d52e279e21315af08fdcfb5b66e9773c88be2f1a5c8c434eba62e6340f91db76ea29f4643db
+  data.tar.gz: d966f9237d2a4f62ba98684346b045c49bd14b024723eda22ac5f0c9c2fb0e62fc358d6607d924c0cdd80cd10e8e5f4eb37a13a067188d8394d142fe0476001b

data/lib/deadfinder/logger.rb

@@ -4,44 +4,51 @@ require 'colorize'
 
 class Logger
   @silent = false
+  @mutex = Mutex.new
 
   def self.set_silent
-    @silent = true
+    @mutex.synchronize { @silent = true }
   end
 
   def self.unset_silent
-    @silent = false
+    @mutex.synchronize { @silent = false }
   end
 
   def self.silent?
-    @silent
+    @mutex.synchronize { @silent }
+  end
+
+  def self.log(prefix, text, color)
+    return if silent?
+
+    puts prefix.colorize(color) + text.to_s.colorize(:"light_#{color}")
   end
 
   def self.info(text)
-    puts 'ℹ '.colorize(:blue) + text.to_s.colorize(:light_blue) unless silent?
+    log('ℹ ', text, :blue)
   end
 
   def self.error(text)
-    puts '⚠︎ '.colorize(:red) + text.to_s unless silent?
+    log('⚠︎ ', text, :red)
   end
 
   def self.target(text)
-    puts '► '.colorize(:green) + text.to_s.colorize(:light_green) unless silent?
+    log('► ', text, :green)
   end
 
   def self.sub_info(text)
-    puts '  ● '.colorize(:blue) + text.to_s.colorize(:light_blue) unless silent?
+    log('  ● ', text, :blue)
   end
 
   def self.sub_done(text)
-    puts '  ✓ '.colorize(:blue) + text.to_s.colorize(:light_blue) unless silent?
+    log('  ✓ ', text, :blue)
   end
 
   def self.found(text)
-    puts "  ✘ #{text}".colorize(:red) unless silent?
+    log('  ✘ ', text, :red)
   end
 
   def self.verbose(text)
-    puts '  ➜ '.colorize(:yellow) + text.to_s.colorize(:light_yellow) unless silent?
+    log('  ➜ ', text, :yellow)
   end
 end

data/lib/deadfinder/utils.rb

@@ -4,41 +4,24 @@ require 'uri'
 
 def generate_url(text, base_url)
   node = text.to_s
+  return node if node.start_with?('http://', 'https://')
+
   begin
-    unless node.start_with?('http://', 'https://')
-      uri = URI(base_url)
-      if node.start_with? '//'
-        return "#{uri.scheme}:#{node}"
-      elsif node.start_with? '/'
-        return "#{uri.scheme}://#{uri.host}#{node}"
-      elsif ignore_scheme? node
-        return nil
-      else
-        return "#{extract_directory(uri)}#{node}"
-      end
+    uri = URI(base_url)
+    if node.start_with?('//')
+      "#{uri.scheme}:#{node}"
+    elsif node.start_with?('/')
+      "#{uri.scheme}://#{uri.host}#{node}"
+    elsif ignore_scheme?(node)
+      nil
+    else
+      URI.join(base_url, node).to_s
     end
   rescue StandardError
-    # puts e
+    nil
   end
-  node
 end
 
 def ignore_scheme?(url)
   url.start_with?('mailto:', 'tel:', 'sms:', 'data:', 'file:')
 end
-
-def extract_directory(uri)
-  return "#{uri.scheme}://#{uri.host}#{uri.path}" if uri.path.end_with?('/')
-
-  path_components = uri.path.split('/')
-  path_components.last
-  path_components.pop
-
-  directory_path = path_components.join('/')
-
-  if directory_path.start_with?('/')
-    "#{uri.scheme}://#{uri.host}#{directory_path}/"
-  else
-    "#{uri.scheme}://#{uri.host}/#{directory_path}/"
-  end
-end

data/lib/deadfinder/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-VERSION = '1.5.0'
+VERSION = '1.6.0'

data/lib/deadfinder.rb

@@ -10,6 +10,8 @@ require 'deadfinder/version'
 require 'concurrent-edge'
 require 'sitemap-parser'
 require 'json'
+require 'yaml'
+require 'csv'
 
 Channel = Concurrent::Channel
 CACHE_SET = Concurrent::Map.new
@@ -22,6 +24,7 @@ class DeadFinderRunner
       'concurrency' => 50,
       'timeout' => 10,
       'output' => '',
+      'output_format' => 'json',
       'headers' => [],
       'worker_headers' => [],
       'silent' => true,
@@ -188,19 +191,40 @@ def run_sitemap(sitemap_url, options)
 end
 
 def gen_output(options)
+  return if options['output'].empty?
+
   output_data = OUTPUT.to_h
-  File.write(options['output'], JSON.pretty_generate(output_data)) unless options['output'].empty?
+  format = options['output_format'].to_s.downcase
+
+  content = case format
+            when 'yaml', 'yml'
+              output_data.to_yaml
+            when 'csv'
+              CSV.generate do |csv|
+                csv << ['target', 'url']
+                output_data.each do |target, urls|
+                  Array(urls).each do |url|
+                    csv << [target, url]
+                  end
+                end
+              end
+            else
+              JSON.pretty_generate(output_data)
+            end
+
+  File.write(options['output'], content)
 end
 
 class DeadFinder < Thor
   class_option :include30x, aliases: :r, default: false, type: :boolean, desc: 'Include 30x redirections'
   class_option :concurrency, aliases: :c, default: 50, type: :numeric, desc: 'Number of concurrency'
   class_option :timeout, aliases: :t, default: 10, type: :numeric, desc: 'Timeout in seconds'
-  class_option :output, aliases: :o, default: '', type: :string, desc: 'File to write JSON result'
+  class_option :output, aliases: :o, default: '', type: :string, desc: 'File to write result (e.g., json, yaml, csv)'
+  class_option :output_format, aliases: :f, default: 'json', type: :string, desc: 'Output format'
   class_option :headers, aliases: :H, default: [], type: :array,
                          desc: 'Custom HTTP headers to send with initial request'
   class_option :worker_headers, default: [], type: :array, desc: 'Custom HTTP headers to send with worker requests'
-  class_option :user_agent, default: 'Mozilla/5.0 (compatible; DeadFinder/1.5.0;)', type: :string,
+  class_option :user_agent, default: 'Mozilla/5.0 (compatible; DeadFinder/1.6.0;)', type: :string,
                             desc: 'User-Agent string to use for requests'
   class_option :proxy, aliases: :p, default: '', type: :string, desc: 'Proxy server to use for requests'
   class_option :silent, aliases: :s, default: false, type: :boolean, desc: 'Silent mode'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: deadfinder
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - hahwul
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-17 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -190,7 +189,6 @@ licenses:
 metadata:
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/hahwul/deadfinder
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,8 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Find dead-links (broken links)
 test_files: []