unsavory 0.3.3 → 1.0.0

data/README.rdoc

@@ -6,43 +6,35 @@ unsavory is a little Ruby script which checks your Pinboard bookmarks for dead l
 
 After installing unsavory with 
 
-  $ gem install citizen428-unsavory
+  $ gem install unsavory
 
 you can start it from the command-line like this:
 
   $ unsavory
 
-First the script will check if it can find the configuration file '~/.unsavory', which should have the following format:
+It will first check if it can find the configuration file '~/.unsavory', which should have the following format:
 
   user:password
   
 In case this file doesn't exist, HighLine will be used to prompt for login credentials. If this gem isn't available, the script will display an error message and abort.
   
-When run, unsavory will generate output similar to this (the real code does show the URLs):
-
-  Enter Pinboard username: username
-  Enter Pinboard password: *********
-
-  username has 664 bookmarks.
-  Processing URL #0001: OK
-  Processing URL #0002: OK
-  Processing URL #0003: OK
-  Processing URL #0004: OK
-  Processing URL #0005: OK
-  ...
-  Processing URL #0013: 405: http://...
-  ...
-  Processing URL #0074: 302: http://...
-  ...
-  Processing URL #0086: Connection reset by peer - https://...
+When run, unsavory will generate display a progressbar and an estimate time until completion:
+  
+  Enter Pinboard username: citizen428
+  Enter Pinboard password: *************
+
+  citizen428 has 774 bookmarks.
+  URLs:            3% |o                                         | ETA:  00:09:34
+
+It will also create a logfile name 'unsavory.log' in the directory where it was started. The log contains information on deleted URLs, as well as redirects and all HTTP response codes other than 200 (OK).
   
 == Warning
 
-Any link that returns an HTTP status code of 404 will be deleted without warning! There's no undo, use at your own risk!
+Any link that returns an HTTP status code of 404 will be deleted without warning. There's no undo, use at your own risk!
 
 == Todo
 
-# None right now
+# None at the moment.
 
 == Author
 

data/bin/unsavory

@@ -2,7 +2,7 @@
 # Copyright (c) 2009 Michael Kohl
 
 $:.unshift File.join(File.dirname(__FILE__), '../lib')
-%w{rubygems net/http pinboard}.each { |x| require x }
+%w{rubygems net/http pinboard logger progressbar}.each { |x| require x }
 highline = true
 begin
   require 'highline'
@@ -27,6 +27,8 @@ else
   exit 1
 end
 
+logger = Logger.new('unsavory.log')
+logger.info "Unsavory started: #{Time.now.strftime('%Y-%m-%d %H:%M')}"
 pinboard = Pinboard.new(user, pass)
 moved = 0
 
@@ -44,8 +46,10 @@ end
 
 puts "\n#{user} has #{urls.length} bookmarks."
 
+pbar = ProgressBar.new("URLs", urls.size)
+
 urls.each_with_index do |url, idx|
-  print "Processing URL #%04d: " % (idx+1)
+  pbar.inc
   uri = URI.parse(url)
   response = nil
 
@@ -54,7 +58,7 @@ urls.each_with_index do |url, idx|
       response = http.head(uri.path.size > 0 ? uri.path : "/")
     end
   rescue => e 
-    puts "#{e.message} - #{url}" 
+    logger.error "#{e.message} - #{url}" 
     next
   end
 
@@ -62,16 +66,17 @@ urls.each_with_index do |url, idx|
   if response.is_a?(Net::HTTPRedirection)
     new_uri = URI.parse(response['location'])
     moved += 1
-    puts "URI redirects to #{new_uri}"
+    logger.info "#{url} redirects to #{new_uri}"
     next
   end
 
-  puts case response.code
-    when '200' then 'OK'
-    when '404' then 
-      pinboard.delete(url)
-      "Deleted #{url}"
-    else "#{response.code}: #{url}"
+  if response.code == '404'
+    pinboard.delete(url)
+    logger.info "Deleted #{url}"
+  elsif response.code != '200' 
+    logger.info "#{response.code}: #{url}"
   end
 end
+pbar.finish
+logger.close
 puts "\n#{moved} URIs are redirecting to new locations, you might want to fix them." if moved > 0

metadata

@@ -3,10 +3,10 @@ name: unsavory
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Michael Kohl
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 +01:00
+date: 2011-03-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,21 @@ dependencies:
         version: 0.4.3
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: progressbar
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: citizen428@gmail.com
 executables: