unsavory 1.0.4 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd3e832e00db17d7347009eefc549a9823710d9e
-  data.tar.gz: 23329d350aa65f7c502015f7d866a02137949a54
+  metadata.gz: bae6a0b70cb546a3f264489c758033807f3e4e78
+  data.tar.gz: c005ba81e51809b6b14f541fdea099a8c4e37cfa
 SHA512:
-  metadata.gz: e2598ef432c7b22777e6ba4931dcf86784db9251e62639c836eb3833349624ea23e3d38f47d92ec2c545aece3e289f043debbcd90f20dae644fc72588f5944e2
-  data.tar.gz: ed52d2dc40930bf3d10bdc6cae199145e88370f2b661411a9fc80e2bb41e6e6f25d84a358c841dbafb446a223d3efe56d2c3cf76c0ce70d459a4426e6bc19ca1
+  metadata.gz: 4262f12d74d044d5a696f97cffda5fcc05e86139946da98bb4d24f7e8d93ee3ddd267b0415f8cae12cdacce7fefab7eb4a2ff14030a18fbbf626c90f5e65d4b1
+  data.tar.gz: 63599f53345ade64bf63b73fc76a0ad0fcbb58fd1434728783e38398e36403074840938cf43ef7055ac1862ff47b86597061c6f42deda15e950ca7ae9a4aa504

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Michael Kohl
+Copyright (c) 2009-2013 Michael Kohl
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/unsavory

@@ -1,88 +1,68 @@
 #! /usr/bin/env ruby
-# Copyright (c) 2009 Michael Kohl
+# Copyright (c) 2009-2013 Michael Kohl
 
-$:.unshift File.join(File.dirname(__FILE__), '../lib')
-%w{rubygems net/http pinboard logger progressbar}.each { |x| require x }
-highline = true
-begin
-  require 'highline'
-rescue LoadError
-  highline = false
-end
-
-CFG_FILE = File.join(ENV['HOME'], ".#{File.basename($0)}")
-
-if File.exists?(CFG_FILE)
-  puts "Using config file '#{CFG_FILE}'"
-  user, pass = File.new(CFG_FILE).gets.chomp.split(':', 2)
-elsif highline
-  hl = HighLine.new
-  user = hl.ask('Enter Pinboard username: ')
-  pass = hl.ask('Enter Pinboard password: ') { |q| q.echo = "*" }
-else
-  puts %{
-    Can't find config file '#{CFG_FILE}' and you
-    don't seem to have HighLine installed. Aborting!
-  }
-  exit 1
-end
+require "rubygems" # for the 1.8 users
+require "logger"
+require "net/http"
+require "progressbar"
+require_relative "../lib/pinboard_client.rb"
+require_relative "../lib/utilities.rb"
 
+user, pass = Utilities.get_credentials
+pinboard_client = PinboardClient.new(user, pass)
 logger = Logger.new('unsavory.log')
-logger.info "Unsavory started: #{Time.now.strftime('%Y-%m-%d %H:%M')}"
-pinboard = Pinboard.new(user, pass)
-moved = 0
 
-begin
-  urls = pinboard.get_all_urls
-rescue => e
-  puts %{
-  I couldn't get your posts from Pinboard!
+logger.info "Unsavory started: #{Time.now.strftime('%Y-%m-%d %H:%M')}"
 
-  Either you entered your username/password wrong,
-  or the site is temporarily unreachable.
-  }
-  exit 2
+puts "Retrieving URLs"
+urls = pinboard_client.get_urls
+unless urls
+  puts "\nCould not retrieve URLs!\nPlease check your login credentials."
+  exit 1
 end
-
 puts "\n#{user} has #{urls.length} bookmarks."
 
 pbar = ProgressBar.new("URLs", urls.size)
+moved = 0
 
 urls.each_with_index do |url, idx|
   pbar.inc
-  # Hackety fix for #1
+  delete = false
+
+  # Hackety fix for issue #1
   uri = URI.parse(url) rescue next
-  response = nil
 
   begin
     Net::HTTP.start(uri.host, uri.port) do |http|
-      response = http.head(uri.path.size > 0 ? uri.path : "/")
+      response = http.head(uri.path.empty? ? '/' : uri.path)
+
+      # handle redirects
+      if response.is_a?(Net::HTTPRedirection)
+        moved += 1
+        logger.info "#{url} redirects to #{response['location']}"
+        next
+      end
+
+      if response.code == '404'
+        delete = true
+      elsif response.code != '200'
+        logger.info "#{response.code}: #{url}"
+      end
     end
   rescue Errno::ENOENT
-    pinboard.delete(url)
-    logger.info "Deleted #{url}"
-    next
+    delete = true
   # In 1.8, TimeoutError does not inherit from StandardError
   rescue StandardError, Timeout::Error => e
     logger.error "#{e.message} - #{url}"
-    next
   end
 
-  # handle redirects
-  if response.is_a?(Net::HTTPRedirection)
-    new_uri = URI.parse(response['location'])
-    moved += 1
-    logger.info "#{url} redirects to #{new_uri}"
-    next
-  end
-
-  if response.code == '404'
-    pinboard.delete(url)
+  if delete
+    pinboard_client.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

data/lib/pinboard_client.rb

@@ -0,0 +1,22 @@
+require 'httparty'
+
+class PinboardClient
+  include HTTParty
+  base_uri 'https://api.pinboard.in/v1/'
+  headers "User-Agent" => "Unsavory"
+
+  def initialize(user, password)
+    @options = {:basic_auth => {:username => user, :password => password}}
+  end
+
+  def get_urls
+    response = self.class.get('/posts/all', @options)
+    if response.success?
+      response['posts']['post'].map { |post| post['href'] }
+    end
+  end
+
+  def delete(url)
+    self.class.get("/posts/delete?url=#{url}", @options)
+  end
+end

data/lib/utilities.rb

@@ -0,0 +1,23 @@
+module Utilities
+  class << self
+    CFG_FILE = File.join(ENV['HOME'], ".#{File.basename($0)}")
+
+    def get_credentials
+      if File.exists?(CFG_FILE)
+        puts "Using config file '#{CFG_FILE}'"
+        user, pass = File.new(CFG_FILE).gets.chomp.split(':', 2)
+      else
+        begin
+          require 'highline'
+          hl = HighLine.new
+          user = hl.ask('Enter Pinboard username: ')
+          pass = hl.ask('Enter Pinboard password: ') { |q| q.echo = "*" }
+        rescue LoadError
+          puts "Can't find config file '#{CFG_FILE}' and you don't seem to have HighLine installed. Aborting!"
+          exit 1
+        end
+      end
+      [user, pass]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unsavory
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: '1.1'
 platform: ruby
 authors:
 - Michael Kohl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -47,7 +47,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/pinboard.rb
+- lib/pinboard_client.rb
+- lib/utilities.rb
 - bin/unsavory
 - ./LICENSE
 - ./README.rdoc
@@ -71,9 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Removes outdated links from your Pinboard bookmarks
 test_files: []
-has_rdoc: false

data/lib/pinboard.rb

@@ -1,31 +0,0 @@
-require 'httparty'
-
-class Pinboard
-  include HTTParty
-  base_uri 'https://api.pinboard.in/v1/'
-  headers "User-Agent" => "Unsavory"
-
-  API_METHODS = {
-    :all => '/posts/all',
-    :delete => '/posts/delete?url='}
-
-  def initialize(user, password)
-    @options = {:basic_auth => {:username => user, :password => password}}
-  end
-
-  # get_all returns a nested hash, but we want an array of URLs
-  def get_all_urls
-    get_all['posts']['post'].inject([]) { |urls, post| urls << post['href'] }
-  end
-
-  def delete(url)
-    self.class.get(API_METHODS[:delete]+url, @options)
-  end
-
-  private
-  def get_all
-    self.class.get(API_METHODS[:all], @options)
-  end
-end
-
-