flickru 0.0.7 → 0.0.8

data/README

@@ -0,0 +1,37 @@
+Command-line tool that automatises photo/video uploads to Flickr.
+
+Entering 'flickru <directory>' in your command line, any photos under 'directory' (and subdirs)
+are uploaded to your Flickr account (interactively entered at the first time you start flickru).
+
+Photos are identified by case-insensitive extensions: GIF, JPEG, JPG, and PNG.
+Videos are identified by case-insensitive extensions: AVI, MPEG, and MPG.
+
+The following Flickr metadata for photos (as well as videos) is set:
+ (1) date-taken from the file (last) modification time
+ (2) private, visible by friends & family, hidden for public searches
+ (3) safety level to safe
+ (4) permission for friends & family to add comments to the photo and it's notes
+ (5) permission for nobody to add notes and tags to the photo
+ (6) for videos larger than the Flickr's longer than 90s (but shorter than 500MB,
+     Flickr's maximum permisible size), the description will contain an annotation
+     about its large duration.
+ (7) title, geolocation, and accuracy from the owner directory's name.
+
+Owner directory name format is given by the format 'TITLE[@LOCATION[#PRECISION]]',
+where:
+ (1) TITLE is the desired title for the photos directly stored in the directory
+ (2) LOCATION is the location of the stored photos specified as either:
+   (a) the Wikipedia page name (whitespaces allowed) of the location (if exists) or
+   (b) its coordinates LATITUDE,LONGITUDE
+ (3) PRECISION is the Flickr geolocation precision given by one of the following
+     case insentitive literals: street, city, region, country, world.
+
+Photos are classified into a photoset (existing or not) entitled with the
+second-level directory name containing the photo. The photoset is arranged by
+date taken (older first).
+
+To see some examples on the directory structure recognised by flickru, please
+explore the subdirectories under var/ts.
+
+Homepage: http://rubygems.org/gems/flickru
+GitHub: http://github.com/jesuspv/flickru

data/bin/flickru

@@ -3,10 +3,17 @@
 #$LOAD_PATH.unshift(flickru_dir) unless $LOAD_PATH.include?(flickru_dir)
 
 require 'flickru'
+require 'flickru/version'
 
-photo_dir = ARGV[0]
+photo_dir = File.expand_path ARGV[0]
 
-if ARGV.length > 1
+if ARGV[0] == "-h" or ARGV[0] == "--help"
+  Flickru.usage
+  exit
+elsif ARGV[0] == "-v" or ARGV[0] == "--version"
+  puts Flickru::VERSION
+  exit
+elsif ARGV.length > 1
   Flickru.usage
   Flickru.die __LINE__, "wrong number of arguments: #{ARGV[1,ARGV.length]}"
 elsif photo_dir.nil? or photo_dir.empty?

data/lib/flickru.rb

@@ -9,6 +9,7 @@ require 'flickru/file'
 require 'flickru/flickr'
 require 'flickru/journey'
 require 'flickru/printer'
+require 'flickru/version'
 
 FlickRaw.api_key       = "aaf7253e0f88f03aa59f9d3074bf2d4b"
 FlickRaw.shared_secret = "138ee268f76cd780"
@@ -18,9 +19,10 @@ module Flickru
 def Flickru.usage
   filename = File.basename __FILE__
   Printer.show "#{filename} -- Flickr upload command-line automator\n"
-  Printer.show "usage: #{filename} <photo directory>\n"
+  Printer.show "usage: #{filename} [-h|--help|-v|--version] <photo directory>\n"
   Printer.show "example: #{filename} my_photos\n"
-  Printer.show "\n#{IO.read('README')}\n"
+  readme = File.expand_path(File.join(File.dirname(__FILE__), '..', 'README'))
+  Printer.show "\n#{IO.read(readme)}\n"
 end
 
 def Flickru.die code, message
@@ -96,17 +98,3 @@ rescue
 end
 
 end # module Flickru
-
-if __FILE__ == $0
-  photo_dir = ARGV[0]
-
-  if ARGV.length > 1
-    Flickru.usage
-    Flickru.die __LINE__, "wrong number of arguments: #{ARGV[1,ARGV.length]}"
-  elsif not photo_dir or photo_dir.empty?
-    Flickru.usage
-    Flickru.die __LINE__, "missing photo directory"
-  end
-
-  Flickru.flickru photo_dir
-end

data/lib/flickru/flickr.rb

@@ -75,8 +75,11 @@ module Flickr
     end
     flickr.photos.setTags :photo_id => id, :tags => ''
 
+# TODO date taken should be set only for photos/videos without non EXIF metadata
     flickr.photos.setDates :photo_id => id, :date_taken => date
-    flickr.photos.setPerms :photo_id => id, :perm_comment => 1, :perm_addmeta => 0
+    flickr.photos.setPerms :photo_id => id, :is_public => 0,
+                           :is_friend => 1, :is_family => 1, # again! (mandatory) :P
+                           :perm_comment => 1, :perm_addmeta => 0
 # TODO permission MAY be configurable
     if not loc.nil?
       flickr.photos.geo.setLocation :photo_id => id, :lat => loc.latitude,

data/lib/flickru/version.rb

@@ -1,5 +1,5 @@
 module Flickru
   unless defined? VERSION
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: flickru
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Jesus Pardillo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-18 00:00:00 Z
+date: 2012-01-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: colorize
@@ -137,6 +137,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- README
 - bin/flickru
 - bin/geowiki
 - lib/flickru.rb