unsavory 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bae6a0b70cb546a3f264489c758033807f3e4e78
-  data.tar.gz: c005ba81e51809b6b14f541fdea099a8c4e37cfa
+  metadata.gz: 6003a2ee811476e80f9203f4064fb5479e9447ae
+  data.tar.gz: 6b92d8fd928058d879b4d2fe77a82bcc53895f75
 SHA512:
-  metadata.gz: 4262f12d74d044d5a696f97cffda5fcc05e86139946da98bb4d24f7e8d93ee3ddd267b0415f8cae12cdacce7fefab7eb4a2ff14030a18fbbf626c90f5e65d4b1
-  data.tar.gz: 63599f53345ade64bf63b73fc76a0ad0fcbb58fd1434728783e38398e36403074840938cf43ef7055ac1862ff47b86597061c6f42deda15e950ca7ae9a4aa504
+  metadata.gz: b2a74acb97b11f5367ec363a32909c0c98bf556543ad6cd1640263992738b43b313c832cd84e5052993dddcac3aaf057680e369d0cf242b67234a0036a9f9632
+  data.tar.gz: 420bcb560f56f9093d3349bc4ec1319dd2c9f2bb7949f96a99efea211047e19495d1928735dfa8472ac0980fb7c947956e56bb390a65a9462142f81e2f23b33b

data/README.rdoc

@@ -38,6 +38,32 @@ Any link that returns an HTTP status code of 404 will be deleted without warning
 # Use tests to clean up code.
 # Add option to replace links with Archive.org links
 
+== Thanks
+
+# thelibrarian[https://github.com/thelibrarian]: for implementing HTTPS support and the '--dry-run' option
+
 == Author
 
 Michael Kohl <citizen428[at]gmail[dot]com>
+
+== License
+
+Copyright (c) 2009-2014 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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/bin/unsavory

@@ -1,5 +1,5 @@
 #! /usr/bin/env ruby
-# Copyright (c) 2009-2013 Michael Kohl
+# Copyright (c) 2009-2014 Michael Kohl
 
 require "rubygems" # for the 1.8 users
 require "logger"
@@ -8,8 +8,8 @@ require "progressbar"
 require_relative "../lib/pinboard_client.rb"
 require_relative "../lib/utilities.rb"
 
-user, pass = Utilities.get_credentials
-pinboard_client = PinboardClient.new(user, pass)
+opts = Utilities.get_options
+pinboard_client = PinboardClient.new(opts[:user], opts[:pass])
 logger = Logger.new('unsavory.log')
 
 logger.info "Unsavory started: #{Time.now.strftime('%Y-%m-%d %H:%M')}"
@@ -20,7 +20,8 @@ unless urls
   puts "\nCould not retrieve URLs!\nPlease check your login credentials."
   exit 1
 end
-puts "\n#{user} has #{urls.length} bookmarks."
+puts "\n#{opts[:user]} has #{urls.length} bookmarks."
+puts "You are using dry run mode. No links will be deleted!\n\n" if opts[:dry_run]
 
 pbar = ProgressBar.new("URLs", urls.size)
 moved = 0
@@ -28,12 +29,16 @@ moved = 0
 urls.each_with_index do |url, idx|
   pbar.inc
   delete = false
+  use_ssl = false
 
   # Hackety fix for issue #1
   uri = URI.parse(url) rescue next
+  if uri.scheme == "https"
+    use_ssl = true
+  end
 
   begin
-    Net::HTTP.start(uri.host, uri.port) do |http|
+    Net::HTTP.start(uri.host, uri.port, :use_ssl => use_ssl) do |http|
       response = http.head(uri.path.empty? ? '/' : uri.path)
 
       # handle redirects
@@ -43,17 +48,21 @@ urls.each_with_index do |url, idx|
         next
       end
 
-      if response.code == '404'
+      if response.code == '404' && !opts[:dry_run]
         delete = true
       elsif response.code != '200'
         logger.info "#{response.code}: #{url}"
       end
     end
-  rescue Errno::ENOENT
-    delete = true
+  rescue Errno::ENOENT => e
+    if opts[:dry_run]
+      logger.info "#{e.message}: #{url}"
+    else
+      delete = true
+    end
   # In 1.8, TimeoutError does not inherit from StandardError
   rescue StandardError, Timeout::Error => e
-    logger.error "#{e.message} - #{url}"
+    logger.error "#{e.message}: #{url}"
   end
 
   if delete

data/lib/utilities.rb

@@ -1,7 +1,14 @@
+require 'getoptlong'
+
 module Utilities
   class << self
     CFG_FILE = File.join(ENV['HOME'], ".#{File.basename($0)}")
 
+    def get_options
+      get_credentials.merge(parse_options)
+    end
+
+    private
     def get_credentials
       if File.exists?(CFG_FILE)
         puts "Using config file '#{CFG_FILE}'"
@@ -17,7 +24,20 @@ module Utilities
           exit 1
         end
       end
-      [user, pass]
+      {:user => user, :pass => pass}
+    end
+
+    def parse_options
+      options = {}
+      opts = GetoptLong.new(['--dry-run', '-n', GetoptLong::NO_ARGUMENT])
+
+      opts.each do |opt, _|
+        case opt
+        when '--dry-run'
+          options[:dry_run] = true
+        end
+      end
+      options
     end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: unsavory
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Michael Kohl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
 description: unsavory is a little Ruby script which checks your Pinboard bookmarks
@@ -47,11 +47,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- "./README.rdoc"
+- bin/unsavory
 - lib/pinboard_client.rb
 - lib/utilities.rb
-- bin/unsavory
-- ./LICENSE
-- ./README.rdoc
 homepage: http://github.com/citizen428/unsavory
 licenses:
 - MIT
@@ -62,18 +61,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Removes outdated links from your Pinboard bookmarks
 test_files: []
+has_rdoc: false

data/LICENSE

@@ -1,19 +0,0 @@
-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
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.