squarepusher 0.0.3 → 0.0.4

data/README.md

@@ -0,0 +1,29 @@
+squarepusher downloads Flickr photosets to your local hard disk.
+
+if you are using rubygems, get started with:
+    `gem install squarepusher`
+
+you can easily start by creating a file ~/.squarepusher.yaml with this content:
+
+    key: consumer key
+    secret: consumer secret
+    token: access token
+    token_secret: access token secret
+
+then run `squarepusher` with the action that you're interested in, foe example:
+    
+    `squarepusher list_sets`
+    
+lists all of your flickr photosets.
+    
+there are a few different ways to generate an access token.  assuming you have a consumer key, here is one way:
+[http://www.flickr.com/services/api/auth.howto.mobile.html](http://www.flickr.com/services/api/auth.howto.mobile.html "flickr mobile auth instructions")
+
+dependencies:
+
+  * [flickraw](https://github.com/hanklords/flickraw "flickraw")
+
+ 
+behaviors of note:
+
+  * photoset and image names are normalized using this: `name.gsub(/[^\w_+\.=-]+/, '-')`

data/bin/squarepusher

@@ -3,91 +3,118 @@
 require 'rubygems'
 require 'squarepusher'
 
-def error_msg(msg)
-  $stderr.puts "ERROR - #{msg}"
-end
+Squarepusher::CLI.main
 
-def fail(msg, code=1)
-  error_msg(msg)
-  exit code
-end
-
-
-actions = {}
-
-actions[:list_sets] = lambda do |client, args|
-  client.each_photoset do |pset|
-    puts Squarepusher.describe_photoset(pset)
-  end
-end
-
-actions[:grab_all_sets] = lambda do |client, args|
-  if not args
-    fail("expected: <output_dir>")
-  end
-  
-  client.each_photoset do |pset|
-    puts Squarepusher.describe_photoset(pset)
-    results = client.download_photoset(pset, output_dir)
-    puts results.inspect
-  end
-end
-
-actions[:grab_set] = lambda do |client, args|
-  if args.size != 2
-    fail("expected: <photoset_id> <output_dir>")
-  end
-  
-  pset_id, output_dir = args
-  pset = client.get_photoset(pset_id)
-  client.download_photoset(pset, output_dir)
-end
-
-actions[:find_set] = lambda do |client, args|
-  if args.size != 1
-    fail("expected: <photoset_id>")
-  end
-  
-  pset_id, output_dir = args
-  pset = client.get_photoset(pset_id)
-  puts Squarepusher.describe_photoset(pset)
-end
-
-
-def action_str(actions)
-  actions.keys.join(", ")
-end
-
-
-options = { :size => :original }
-args = nil
-action = nil
-client = nil
-OptionParser.new do |opts|
-  opts.banner = "USAGE: squarepusher [options] <api-key> <api-secret> <token> <action:(#{action_str(actions)})> [args]"
-
-  # TODO: list sizing options
-  opts.on("-s", "--size SIZE", "size of photos to download (using flickr terminology)") do |v|
-    options[:size] = v.to_sym
-  end
-    
-  opts.parse!(ARGV)
-  
-  if ARGV.size < 4
-    $stderr.puts opts
-    exit 1
-  end
-  
-  key, secret, token, action = ARGV.slice!(0...4)
-  args = ARGV
-  
-  action = action.to_sym
-  if not actions.has_key?(action)
-    $stderr.puts opts
-    exit 2
-  end
-  
-  client = Squarepusher::Client.new(key, secret, token, options)
-end
-
-actions[action].call(client, args || [])
+# require 'rubygems'
+# require 'squarepusher'
+# 
+# def error_msg(msg)
+#   $stderr.puts "ERROR - #{msg}"
+# end
+# 
+# def fail(msg, code=1)
+#   error_msg(msg)
+#   exit code
+# end
+# 
+# 
+# actions = {}
+# 
+# actions[:list_sets] = lambda do |client, args|
+#   client.each_photoset do |pset|
+#     puts Squarepusher.describe_photoset(pset)
+#   end
+# end
+# 
+# actions[:grab_all_sets] = lambda do |client, args|
+#   if args.size != 1
+#     fail("expected: <output_dir>")
+#   end
+#   
+#   output_dir = args[0]
+#   
+#   total_results = {}
+#   client.each_photoset do |pset|
+#     pset_description = Squarepusher.describe_photoset(pset)
+#     puts "[set] #{pset_description}"
+#     pset_results = client.download_photoset(pset, output_dir)
+#     puts "[results] #{pset_description} #{pset_results.inspect}"
+#     total_results[pset_description] = pset_results
+#     puts
+#   end
+#   
+#   total_results.each_pair do |k, v|
+#     puts "#{k}: #{v.inspect}"
+#   end
+# end
+# 
+# actions[:grab_set] = lambda do |client, args|
+#   if args.size != 2
+#     fail("expected: <photoset_id> <output_dir>")
+#   end
+#   
+#   pset_id, output_dir = args
+#   pset = client.get_photoset(pset_id)
+#   results = client.download_photoset(pset, output_dir)
+#   puts results.inspect
+# end
+# 
+# actions[:find_set] = lambda do |client, args|
+#   if args.size != 1
+#     fail("expected: <photoset_id>")
+#   end
+#   
+#   pset_id, output_dir = args
+#   pset = client.get_photoset(pset_id)
+#   puts Squarepusher.describe_photoset(pset)
+# end
+# 
+# 
+# def action_str(actions)
+#   actions.keys.join(",")
+# end
+# 
+# def size_str
+#   Squarepusher.sizes.join(",")
+# end
+# 
+# 
+# options = { :size => :original }
+# args = nil
+# action = nil
+# client = nil
+# OptionParser.new do |opts|
+#   opts.banner = "USAGE: squarepusher [options] <api-key> <api-secret> <token> <action:(#{action_str(actions)})> [args]"
+# 
+#   opts.on("-o", "--overwrite", "overwrite already downloaded files") do |v|
+#     options[:overwrite] = v
+#   end
+# 
+#   opts.on("-s", "--size SIZE", "size of photos to download (#{size_str()})") do |v|
+#     options[:size] = v.to_sym
+#   end
+#   
+#   opts.on("-v", "--verbose", "log verbosely") do |v|
+#     options[:verbose] = v
+#   end
+#   
+#   opts.parse!(ARGV)
+#   
+#   if ARGV.size < 4
+#     $stderr.puts opts
+#     exit 1
+#   end
+#   
+#   key, secret, token, action = ARGV.slice!(0...4)
+#   args = ARGV
+#   
+#   action = action.to_sym
+#   if not actions.has_key?(action)
+#     $stderr.puts opts
+#     exit 2
+#   end
+#   
+#   client = Squarepusher::Client.new(key, secret, token, options)
+# end
+# 
+# actions[action].call(client, args || [])

data/lib/squarepusher/cli.rb

@@ -0,0 +1,167 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+
+
+module Squarepusher
+  
+class CLI
+  
+  class << self
+    
+    def error_msg(msg)
+      $stderr.puts "ERROR - #{msg}"
+    end
+
+    def fail(msg, code=1)
+      error_msg(msg)
+      exit code
+    end
+
+    def parse_config(path)
+      parsed = nil
+      open(path) do |stream|
+        parsed = YAML.load(stream)
+      end
+      if not parsed.respond_to?(:has_key?)
+        raise Exception.new("invalid YAML in #{path}; parsed #{parsed.inspect}")
+      end
+      puts "parsed config: #{parsed.inspect}"
+      required_keys = ['key', 'secret', 'token', 'token_secret']
+      missing_keys = []
+      vals = []
+      required_keys.each do |k|
+        v = parsed.fetch(k, nil)
+        if not v.nil?
+          vals << v
+        else
+          missing_keys << k 
+        end
+      end
+      if not missing_keys.empty?
+        raise Exception.new("missing keys in #{path}: #{missing_keys.inspect}")
+      end
+      vals
+    end
+
+    def main
+      actions = {}
+
+      actions[:list_sets] = lambda do |client, args|
+        client.each_photoset do |pset|
+          puts Squarepusher.describe_photoset(pset)
+        end
+      end
+
+      actions[:grab_all_sets] = lambda do |client, args|
+        if args.size != 1
+          fail("expected: <output_dir>")
+        end
+  
+        output_dir = args[0]
+  
+        total_results = {}
+        client.each_photoset do |pset|
+          pset_description = Squarepusher.describe_photoset(pset)
+          puts "[set] #{pset_description}"
+          pset_results = client.download_photoset(pset, output_dir)
+          puts "[results] #{pset_description} #{pset_results.inspect}"
+          total_results[pset_description] = pset_results
+          puts
+        end
+  
+        total_results.each_pair do |k, v|
+          puts "#{k}: #{v.inspect}"
+        end
+      end
+
+      actions[:grab_set] = lambda do |client, args|
+        if args.size != 2
+          fail("expected: <photoset_id> <output_dir>")
+        end
+  
+        pset_id, output_dir = args
+        pset = client.get_photoset(pset_id)
+        results = client.download_photoset(pset, output_dir)
+        puts results.inspect
+      end
+
+      actions[:find_set] = lambda do |client, args|
+        if args.size != 1
+          fail("expected: <photoset_id>")
+        end
+  
+        pset_id, output_dir = args
+        pset = client.get_photoset(pset_id)
+        puts Squarepusher.describe_photoset(pset)
+      end
+
+
+      def action_str(actions)
+        actions.keys.join(",")
+      end
+
+      def size_str
+        Squarepusher.sizes.join(",")
+      end
+
+      options = { :size => :original }
+      args = nil
+      action = nil
+      client = nil
+      config_path = "#{ENV['HOME']}/.squarepusher.yaml"
+      OptionParser.new do |opts|
+        opts.banner = "USAGE: squarepusher [options] <action:(#{action_str(actions)})> [args]"
+
+        opts.on("-c", "--config", "path to config file (defaults to #{config_path})") do |v|
+          options[:config] = v
+        end
+
+        opts.on("-o", "--overwrite", "overwrite already downloaded files") do |v|
+          options[:overwrite] = v
+        end
+
+        opts.on("-s", "--size SIZE", "size of photos to download (#{size_str()})") do |v|
+          options[:size] = v.to_sym
+        end
+  
+        opts.on("-v", "--verbose", "log verbosely") do |v|
+          options[:verbose] = v
+        end
+  
+        opts.parse!(ARGV)
+  
+        if ARGV.size < 1
+          $stderr.puts opts
+          exit 1
+        end
+  
+        action = ARGV.delete_at(0)
+        args = ARGV
+  
+        action = action.to_sym
+        if not actions.has_key?(action)
+          $stderr.puts opts
+          exit 2
+        end
+  
+        config_path = options[:config] || config_path
+        if not File.exists?(config_path)
+          fail "#{config_path} not found" 
+        else
+          puts "parsing #{config_path}"
+        end
+        
+        key, secret, token, token_secret = parse_config(config_path)
+        client = Squarepusher::Client.new(key, secret, token, token_secret, options)
+      end
+      
+      puts "args: #{args.inspect}"
+      actions[action].call(client, args || [])
+    end
+    
+  end
+  
+end
+
+end

data/lib/squarepusher/core.rb

@@ -0,0 +1,214 @@
+require 'fileutils'
+require 'optparse'
+
+FlickRawOptions = {}
+
+$fileutils = FileUtils::Verbose
+
+# TODO: detect "photo unavailable" and don't download image
+UNAVAILABLE_URL = 'http://l.yimg.com/g/images/photo_unavailable.gif'
+
+# TODO: keep track of failures
+
+module Squarepusher
+  
+  class << self
+    
+    def describe_photoset(pset)
+      "#{pset.id} '#{pset.title}'"
+    end
+    
+    def normalize(name)
+      name.gsub(/[^a-zA-Z0-9_+\.=-]+/, '-')
+    end
+    
+    def sizes
+       return [:original, :large, :medium_640, :medium_500, :small, :thumb, :small_square]
+    end
+        
+  end
+
+  class Client
+    
+    def initialize(key, secret, token, token_secret, args={})
+      @overwrite = args[:overwrite] || false
+      @verbose = args[:verbose] || false
+      
+      FlickRawOptions['timeout'] = args[:timeout] || 5
+      
+      require 'flickraw'
+      
+      FlickRaw.api_key = key
+      FlickRaw.shared_secret = secret
+      
+      # flickr.auth.checkToken(:auth_token => token)
+      flickr.access_token = token
+      flickr.access_secret = token_secret
+      
+      size = args[:size] || :small_square
+      
+      @url_for_photo = case size
+          when :original
+            lambda { |p| FlickRaw.url_o(p) }
+          when :large
+            lambda { |p| FlickRaw.url_b(p) }
+          when :medium_640
+            lambda { |p| FlickRaw.url_z(p) }
+          when :medium_500
+            lambda { |p| FlickRaw.url(p) }
+          when :small
+            lambda { |p| FlickRaw.url_m(p) }
+          when :thumb
+            lambda { |p| FlickRaw.url_t(p) }
+          when :small_square
+            lambda { |p| FlickRaw.url_s(p) }
+          else
+            raise Exception("unrecognized size: #{size}")
+      end
+    end
+        
+    def get_photoset(pset_id)
+      flickr.photosets.getInfo(:photoset_id => pset_id)
+    end
+    
+    def each_photoset
+      flickr.photosets.getList.each do |pset|
+        yield pset
+      end
+    end
+    
+    def download_photoset(photoset, output_dir)
+      dirname = Squarepusher.normalize(photoset.title)
+      set_dir = File.join(output_dir, dirname)
+      $fileutils.mkdir_p set_dir
+      
+      # handles socket timeout when loading photoset info
+      results = {}
+      status, photoset_result = handle_error { flickr.photosets.getPhotos(:photoset_id => photoset.id, :extras => "original_format,url_o")["photo"] }
+      if status == :error
+        error photoset_result
+        results[status] = 1
+        return results
+      else
+        photos = photoset_result
+      end
+      
+      photos.each do |p|
+        # TODO: use name of file in url since titles can be duplicate
+        # copies string?
+        name = "#{p.id}"
+        if not p.title.empty?
+          normalized_title = Squarepusher.normalize(p.title)
+          name << "-#{normalized_title}"
+        end
+        
+        url = @url_for_photo[p]
+        
+        # TODO: only add .jpg suffix if it's not in the image name already
+        path = File.join(set_dir, name)
+        path << ".jpg" if not path =~ /.jpg$/
+        
+        if not @overwrite and File.exists?(path)
+          debug "#{path} exists; skipping"
+          result = :exists
+        else
+          result = download_image(url, path)
+        end
+        
+        if results.has_key?(result)
+          results[result] = results[result] + 1
+        else
+          results[result] = 1
+        end
+      end
+      results
+    end
+ 
+    private
+    
+      # was originally sending this to stderr, but the difference in flushing between
+      # stdout and stderr was creating logging confusion
+      def error(msg)
+        puts "ERROR: #{msg}"
+      end
+    
+      def debug(msg)
+        puts msg if @verbose
+      end
+
+      def info(msg)
+        puts msg
+      end
+    
+      def download_image(url, path, args={})
+        if url == UNAVAILABLE_URL
+          redirects = args[:redirects]
+          msg = "#{url} unavailable"
+          msg << "; redirects: #{redirects}" if not redirects.nil?
+          debug msg
+          return :unavailable
+        end
+        
+        result = :unknown
+        uri = URI.parse(url)
+        begin
+          Net::HTTP.start(uri.host, uri.port) do |http|
+            full_path = uri.request_uri
+            response = http.get(full_path)
+      
+            # puts response.inspect
+            case response
+              when Net::HTTPError
+                result = :error
+              when Net::HTTPFound
+                redirects = args[:redirects] || []
+                redirects << url
+                location = response["location"]
+                if not location =~ /^http.*/
+                  location = "#{uri.scheme}://#{uri.host}:#{uri.port}#{location}"
+                end
+                result = download_image(location, path, :redirects => redirects)
+              else
+                debug "#{url} -> #{path}"
+                if @verbose
+                  response.each_header do |k, v|
+                    puts "#{k}: #{v}"
+                  end
+                  puts
+                end
+                
+                # detects weird 404 or 504 responses included in body but not HTTP status
+                content_type = response["content-type"]
+                if not (content_type =~ /text\/\w+/).nil?
+                  error "unexpected content type: #{content_type}"
+                  result = :error
+                else
+                  open(path, 'w') do |out|
+                    out << response.body
+                  end
+                  result = :success
+                end
+            end
+          end
+        rescue Exception => e
+          error e
+          result = :error
+        end
+        
+        return result
+      end
+      
+      def handle_error
+        raise Exception("block required") if not block_given?
+        begin
+          block_result = yield
+          result = [:success, block_result]
+        rescue
+          result = [:error, $!]
+        end
+        return result
+      end
+      
+  end
+  
+end

data/lib/squarepusher/version.rb

@@ -1,3 +1,3 @@
 module Squarepusher
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/squarepusher.rb

@@ -1,143 +1,210 @@
-require 'fileutils'
-require 'optparse'
+require 'squarepusher/cli'
+require 'squarepusher/core'
+require 'squarepusher/version'
 
-FlickRawOptions = {}
-
-$fileutils = FileUtils::Verbose
-
-# TODO: detect "photo unavailable" and don't download image
-UNAVAILABLE_URL = 'http://l.yimg.com/g/images/photo_unavailable.gif'
-
-# TODO: keep track of failures
-
-module Squarepusher
-  
-  class << self
-    
-    def describe_photoset(pset)
-      "#{pset.id} #{pset.title}"
-    end
-    
-  end
-
-  class Client
-    
-    def initialize(key, secret, token, args={})
-      FlickRawOptions['timeout'] = args[:timeout] || 5
-      
-      require 'flickraw'
-      
-      FlickRaw.api_key = key
-      FlickRaw.shared_secret = secret
-      
-      flickr.auth.checkToken(:auth_token => token)
-      
-      # FlickRaw.auth_token = token
-      # FlickRaw.timeout = 5
-      
-      size = args[:size] || :large
-      
-      @url_for_photo = case size
-          when :original
-            lambda { |p| FlickRaw.url_o(p) }
-          when :large
-            lambda { |p| FlickRaw.url_b(p) }
-          when :medium_640
-            lambda { |p| FlickRaw.url_z(p) }
-          when :medium_500
-            lambda { |p| FlickRaw.url(p) }
-          when :small
-            lambda { |p| FlickRaw.url_m(p) }
-          when :thumb
-            lambda { |p| FlickRaw.url_t(p) }
-          when :small_square
-            lambda { |p| FlickRaw.url_s(p) }
-          else
-            raise Exception("unrecognized size: #{size}")
-      end
-    end
-    
-    def get_photoset(pset_id)
-      flickr.photosets.getInfo(:photoset_id => pset_id)
-    end
-    
-    def each_photoset
-      flickr.photosets.getList.each do |pset|
-        yield pset
-      end
-    end
-    
-    def download_photoset(photoset, output_dir)
-      set_dir = File.join(output_dir, photoset.title.gsub(/\s+/, '-'))
-      $fileutils.mkdir_p set_dir
-      
-      results = {}
-      photos = flickr.photosets.getPhotos(:photoset_id => photoset.id, :extras => "original_format,url_o")["photo"]
-      photos.each do |p|
-        # puts p.inspect
-        name = p.title.gsub(/[^\w_+\.-]/, '-')
-        
-        url = @url_for_photo[p]
-        
-        # TODO: only add .jpg suffix if it's not in the image name already
-        path = File.join(set_dir, "#{name}")
-        path << ".jpg" if not path =~ /.jpg$/
-        
-        if File.exists?(path)
-          puts "#{path} exists; skipping"
-        else
-          result = download_image(url, path)
-          if results.has_key?(result)
-            results[result] = results[result] + 1
-          else
-            results[result] = 1
-          end
-        end
-      end
-      results
-    end
- 
-    private
-    
-      def download_image(url, path, args={})
-        if url == UNAVAILABLE_URL
-          redirects = args[:redirects]
-          msg = "#{url} unavailable"
-          msg << "; redirects: #{redirects}" if not redirects.nil?
-          puts msg
-          return :unvailable
-        end
-        
-        result = :unknown
-        # puts url
-        uri = URI.parse(url)
-        Net::HTTP.start(uri.host, uri.port) do |http|
-          full_path = uri.request_uri
-          response = http.get(full_path)
-      
-          # puts response.inspect
-          case response
-            when Net::HTTPError
-              result = :error
-            when Net::HTTPFound
-              redirects = args[:redirects] || []
-              redirects << url
-              location = response["location"]
-              if not location =~ /^http.*/
-                location = "#{uri.scheme}://#{uri.host}:#{uri.port}#{location}"
-              end
-              download_image(location, path, :redirects => redirects)
-            else
-              puts "#{url} -> #{path}"
-              open(path, 'w') do |out|
-                out << response.body
-              end
-              result = :success
-          end
-        end
-        return result
-      end
-      
-  end
-  
-end
+# require 'fileutils'
+# require 'optparse'
+# 
+# FlickRawOptions = {}
+# 
+# $fileutils = FileUtils::Verbose
+# 
+# # TODO: detect "photo unavailable" and don't download image
+# UNAVAILABLE_URL = 'http://l.yimg.com/g/images/photo_unavailable.gif'
+# 
+# # TODO: keep track of failures
+# 
+# module Squarepusher
+#   
+#   class << self
+#     
+#     def describe_photoset(pset)
+#       "#{pset.id} '#{pset.title}'"
+#     end
+#     
+#     def normalize(name)
+#       name.gsub(/[^a-zA-Z0-9_+\.=-]+/, '-')
+#     end
+#     
+#     def sizes
+#        return [:original, :large, :medium_640, :medium_500, :small, :thumb, :small_square]
+#     end
+#         
+#   end
+# 
+#   class Client
+#     
+#     def initialize(key, secret, token, args={})
+#       @overwrite = args[:overwrite] || false
+#       @verbose = args[:verbose] || false
+#       
+#       FlickRawOptions['timeout'] = args[:timeout] || 5
+#       
+#       require 'flickraw'
+#       
+#       FlickRaw.api_key = key
+#       FlickRaw.shared_secret = secret
+#       
+#       flickr.auth.checkToken(:auth_token => token)
+#       
+#       size = args[:size] || :small_square
+#       
+#       @url_for_photo = case size
+#           when :original
+#             lambda { |p| FlickRaw.url_o(p) }
+#           when :large
+#             lambda { |p| FlickRaw.url_b(p) }
+#           when :medium_640
+#             lambda { |p| FlickRaw.url_z(p) }
+#           when :medium_500
+#             lambda { |p| FlickRaw.url(p) }
+#           when :small
+#             lambda { |p| FlickRaw.url_m(p) }
+#           when :thumb
+#             lambda { |p| FlickRaw.url_t(p) }
+#           when :small_square
+#             lambda { |p| FlickRaw.url_s(p) }
+#           else
+#             raise Exception("unrecognized size: #{size}")
+#       end
+#     end
+#     
+#     def get_photoset(pset_id)
+#       flickr.photosets.getInfo(:photoset_id => pset_id)
+#     end
+#     
+#     def each_photoset
+#       flickr.photosets.getList.each do |pset|
+#         yield pset
+#       end
+#     end
+#     
+#     def download_photoset(photoset, output_dir)
+#       dirname = Squarepusher.normalize(photoset.title)
+#       set_dir = File.join(output_dir, dirname)
+#       $fileutils.mkdir_p set_dir
+#       
+#       # handles socket timeout when loading photoset info
+#       results = {}
+#       status, photoset_result = handle_error { flickr.photosets.getPhotos(:photoset_id => photoset.id, :extras => "original_format,url_o")["photo"] }
+#       if status == :error
+#         error photoset_result
+#         results[status] = 1
+#         return results
+#       else
+#         photos = photoset_result
+#       end
+#       
+#       photos.each do |p|
+#         # puts p.inspect
+#         
+#         # TODO: use name of file in url since titles can be duplicate
+#         # copies string?
+#         name = "#{p.id}"
+#         if not p.title.empty?
+#           normalized_title = Squarepusher.normalize(p.title)
+#           name << "-#{normalized_title}"
+#         end
+#         
+#         url = @url_for_photo[p]
+#         
+#         # TODO: only add .jpg suffix if it's not in the image name already
+#         path = File.join(set_dir, name)
+#         path << ".jpg" if not path =~ /.jpg$/
+#         
+#         if not @overwrite and File.exists?(path)
+#           puts "#{path} exists; skipping"
+#           result = :exists
+#         else
+#           result = download_image(url, path)
+#         end
+#         
+#         if results.has_key?(result)
+#           results[result] = results[result] + 1
+#         else
+#           results[result] = 1
+#         end
+#       end
+#       results
+#     end
+#  
+#     private
+#     
+#       # was originally sending this to stderr, but the difference in flushing between
+#       # stdout and stderr was creating logging confusion
+#       def error(msg)
+#         puts "ERROR: #{msg}"
+#       end
+#     
+#       def download_image(url, path, args={})
+#         if url == UNAVAILABLE_URL
+#           redirects = args[:redirects]
+#           msg = "#{url} unavailable"
+#           msg << "; redirects: #{redirects}" if not redirects.nil?
+#           puts msg
+#           return :unavailable
+#         end
+#         
+#         result = :unknown
+#         uri = URI.parse(url)
+#         begin
+#           Net::HTTP.start(uri.host, uri.port) do |http|
+#             full_path = uri.request_uri
+#             response = http.get(full_path)
+#       
+#             # puts response.inspect
+#             case response
+#               when Net::HTTPError
+#                 result = :error
+#               when Net::HTTPFound
+#                 redirects = args[:redirects] || []
+#                 redirects << url
+#                 location = response["location"]
+#                 if not location =~ /^http.*/
+#                   location = "#{uri.scheme}://#{uri.host}:#{uri.port}#{location}"
+#                 end
+#                 result = download_image(location, path, :redirects => redirects)
+#               else
+#                 puts "#{url} -> #{path}"
+#                 if @verbose
+#                   response.each_header do |k, v|
+#                     puts "#{k}: #{v}"
+#                   end
+#                   puts
+#                 end
+#                 
+#                 # detects weird 404 or 504 responses included in body but not HTTP status
+#                 content_type = response["content-type"]
+#                 if not (content_type =~ /text\/\w+/).nil?
+#                   error "unexpected content type: #{content_type}"
+#                   result = :error
+#                 else
+#                   open(path, 'w') do |out|
+#                     out << response.body
+#                   end
+#                   result = :success
+#                 end
+#             end
+#           end
+#         rescue Exception => e
+#           error e
+#           result = :error
+#         end
+#         
+#         return result
+#       end
+#       
+#       def handle_error
+#         raise Exception("block required") if not block_given?
+#         begin
+#           block_result = yield
+#           result = [:success, block_result]
+#         rescue
+#           result = [:error, $!]
+#         end
+#         return result
+#       end
+#       
+#   end
+#   
+# end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: squarepusher
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - mhawthorne
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -05:00
+date: 2011-10-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -43,9 +41,12 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- README.md
 - Rakefile
 - bin/squarepusher
 - lib/squarepusher.rb
+- lib/squarepusher/cli.rb
+- lib/squarepusher/core.rb
 - lib/squarepusher/version.rb
 - squarepusher.gemspec
 has_rdoc: true
@@ -62,7 +63,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -71,14 +71,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nowarning
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: downloads photos from flickr