webarchive 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9fc5065342461039496f77e140585d7023878acf1053ac820bc262fdf6917db
-  data.tar.gz: d093202d5cf905a359d7abb7af6cbf67a88898217493a7239eef5d63015ae831
+  metadata.gz: 16eba058e7574f02d9e444a6d72b2aefb41b55fb0acb9adc1b6eef492cef306d
+  data.tar.gz: 33411ba62ea808f72b930ef52a5f112f4df80b4febb1d2bd88c7017a62785550
 SHA512:
-  metadata.gz: 3eedec1586a6a33d9a6a95b63dc98ef3b0fde2a000389743b807f2a074c74b05341b2870acc3d20ee7b994f3cfcbb931e9451f02d70a5645ec327bce6ac80679
-  data.tar.gz: 1c8b60d67cce9e228c8785a79df5bc056bf88141c7bf7dd7c83018aa0fc28d11ca101bfd78af4ea9289761797fee214dfa2831be7e6acf45a6d887356927c0ba
+  metadata.gz: 8787995fe6bdc059e2275371ed33eb332a8f1c99aa099b995a20805258ed2d05983507a8f2958e104edcc31e7259bc3be68d22f838c917294687533718a799c5
+  data.tar.gz: f9e73ef39c3cb49b6bd25569cc2549292982aa47e71e1c31ce735eb350e8a1fe0882fe8cb0a3d9ee23d3b6075d33ec149a951f4d70f9095d4b8f03bc8c306e6c

data/README.md

@@ -39,6 +39,7 @@ It has optional command-line parameters:
     Usage: webarchive [options]
         -w, --wait=SECONDS               wait for SECONDS between requests [default: 5.0]
         -r, --retry=N                    retry for N times when failed [default: 5]
+        -t, --timeout=SECONDS            timeout after SECONDS [default: 60.0]
             --[no-]history               record history [default: enabled]
         -d, --debug                      add debug output, implies verbose
             --verbose

data/bin/webarchive

@@ -7,6 +7,7 @@ require 'optparse'
 
 wait = 5.0
 retry_ = 5
+timeout = 60.0
 debug = false
 verbose = false
 history = true
@@ -21,6 +22,10 @@ OptionParser.new do |opt|
          "retry for N times when failed [default: #{retry_}]") do |v|
     retry_ = v.to_i
   end
+  opt.on('-t', '--timeout=SECONDS',
+         "timeout after SECONDS [default: #{timeout}]") do |v|
+    timeout = v.to_i
+  end
   opt.on('--[no-]history',
          "record history [default: #{history ? 'enabled' : 'disabled'}]") do |v|
     history = v
@@ -41,4 +46,5 @@ tagline += ' (debug)' if debug
 warn tagline if verbose
 
 WebArchive.launch(wait_secs: wait, max_retry: retry_, history: history,
+                  read_timeout_secs: timeout,
                   debug: debug, verbose: verbose)

data/lib/webarchive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WebArchive
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/webarchive.rb

@@ -322,8 +322,13 @@ module WebArchive
   # Launch the CLI
   # @return [Concurrent::Promises::Future]
   def self.launch(wait_secs: 1, max_retry: 3,
+                  read_timeout_secs: 15,
                   redirect: false, canonical_uri: true,
                   history: true, debug: false, verbose: false)
+
+    args = method(__method__).parameters.map{ |k, v| [v, binding.local_variable_get(v)] }
+    puts "Arguments: #{args.inspect}" if verbose
+
     wait_secs = 0 if wait_secs.negative?
     max_retry = 0 if max_retry.negative?
 
@@ -341,7 +346,8 @@ module WebArchive
     # prepare queues
     client.add_queue(
       ArchiveQueue.new('archive.org (logged out)', wait_secs) do |uri|
-        URI.parse('https://web.archive.org/save/' + uri).open do |f|
+        u = URI.parse('https://web.archive.org/save/' + uri)
+        u.open(read_timeout: read_timeout_secs) do |f|
           if f.meta['content-location'] && verbose
             puts "<https://web.archive.org#{f.meta['content-location']}>"
           elsif verbose
@@ -354,6 +360,7 @@ module WebArchive
     client.add_queue(
       ArchiveQueue.new('megalodon.jp', wait_secs) do |uri|
         agent = Mechanize.new
+        agent.read_timeout = read_timeout_secs
         page = agent.get('https://megalodon.jp/pc/?' +
                          Addressable::URI.form_encode(url: uri))
         form = page.forms.first
@@ -379,6 +386,7 @@ module WebArchive
     client.add_queue(
       ArchiveQueue.new('archive.today', wait_secs) do |uri|
         agent = Mechanize.new
+        agent.read_timeout = read_timeout_secs
         agent.follow_meta_refresh = true
 
         page = agent.get('https://archive.is/')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webarchive
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Yusuke Matsubara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-30 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: fast_trie
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -128,42 +128,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: '1.70'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: '1.70'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.24'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: webarchive - CUI tool to archive URIs