webarchive 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ea626a8537199a8b4f730e4ab84eee077ca1e25f313e9d462ecee76a4092f56
-  data.tar.gz: 60947d9c28e327f0d13dffbc3bfab081c9abe6f6159a6ede5862a2b018ae6435
+  metadata.gz: 6b8de1dbf19298def2d098e10af00c9e0f7a01b69720af1edd73622a8ecea35c
+  data.tar.gz: 76963d9744f2105055dda1e4b82482c6c63b78f570033c6437e1990958a6ab9b
 SHA512:
-  metadata.gz: 7c562804e40aa5974ba89431bdccc6d539e9b29779bf5eb081f62e9a8c852c0ba189a5e2f8d4bd85d085b3ff125a851f939426bfe86fe6317badee455e979290
-  data.tar.gz: 30f27ce0947b62e359f91f9c0507742a3e829fdb90cd5a2cfbd585f8f0d0740e085b23342b97a9fb3c30341f1895552b1de61b5593dfc94da61496b945ac60ec
+  metadata.gz: 51c74e71a5594e9d7380b38196077af19e31687ab471dc510797c6f5399c6842c24cc700364a17112cdb60d22ce130418b812d1e3f969178ac19a327ddf0ba02
+  data.tar.gz: 9a9ad84a61416fc8975e3120e5ab933b33fcf1001ef725d3f71bf93081d5695d4b5bedbd7272fe2bdf3bf0d21ea7a79ba624747c2ec2d06bb7741ce78780b38f

data/bin/webarchive

@@ -7,16 +7,18 @@ require 'optparse'
 wait = 4.0
 debug = false
 verbose = false
+history = true
 Version = WebArchive::VERSION
 OptionParser.new do |opt|
   opt.on('-w', '--wait=SECS', 'wait for SECS before sending a request') { |v| wait = v.to_f }
   opt.on('-d', '--debug', 'add debug output, implies verbose') { debug = true }
+  opt.on('--[no-]history', 'record history (enabled by default)') { |v| history = v }
   opt.on('--verbose') { verbose = true }
-  opt.on('--version') {
-    puts opt.ver
+  opt.on('-h', '--help', 'show help') do
+    puts opt
     exit
-  }
+  end
 end.parse!(ARGV)
 
 warn "#{WebArchive} #{WebArchive::VERSION}" if verbose
-WebArchive.launch(wait_secs: wait, debug: debug, verbose: verbose)
+WebArchive.launch(wait_secs: wait, debug: debug, verbose: verbose, history: history)

data/lib/webarchive.rb

@@ -43,7 +43,9 @@ module WebArchive
           begin
             yield uri
           rescue StandardError => e
-            WebArchive.warn_archive_fail(uri, name, ([e.inspect] + e.backtrace).join("\n"))
+            WebArchive.warn_archive_fail(
+              uri, name, ([e.inspect] + e.backtrace).join("\n")
+            )
           ensure
             @in_process -= 1
             break if @all_sent && self.empty?
@@ -124,8 +126,7 @@ module WebArchive
           @trie.add x.strip
         end
       else
-        File.open(@file, 'w', encoding: 'utf-8') do |f|
-        end
+        File.new(@file, 'w', encoding: 'utf-8').flush
       end
       @lastupdate = Time.now
     end
@@ -136,15 +137,25 @@ module WebArchive
         @trie.children(s)
       end
     end
+
+    def append_to_history(str)
+      File.open(@file, mode: 'a', encoding: 'utf-8') do |f|
+        f.puts str
+      end
+    end
   end
 
   HISTORY_FILE = '~/.webarchive_history'
 
-  def self.launch(wait_secs: 1, debug: false, verbose: false, redirect: false, canonical_uri: true)
+  def self.launch(wait_secs: 1, debug: false, verbose: false, redirect: false, canonical_uri: true, history: true)
     verbose = true if debug
     Thread.abort_on_exception = true
-    Readline.completion_proc = Completer.new(HISTORY_FILE).to_proc
-    Readline.completion_append_character = ''
+    completer = nil
+    if history
+      completer = Completer.new(HISTORY_FILE)
+      Readline.completion_proc = completer.to_proc
+      Readline.completion_append_character = ''
+    end
 
     queues = []
 
@@ -223,9 +234,7 @@ module WebArchive
         warn "skipping canonical/redirect for #{uri}: #{e.message}"
       end
 
-      File.open(File.expand_path(HISTORY_FILE), mode: 'a', encoding: 'utf-8') do |f|
-        f.puts uri
-      end
+      completer.append_to_history(uri) if completer
     end
 
     queues.each(&:done_sending)

data/lib/webarchive/version.rb

@@ -1,3 +1,3 @@
 module WebArchive
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webarchive
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Yusuke Matsubara