hjw3001-flickrx 0.1.0 → 0.1.1

data/README.rdoc

@@ -1,4 +1,4 @@
-= Uniquify
+= Flickrx
 
 Ruby gem implementation of Flickr API.
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('flickrx', '0.1.0') do |p|
+Echoe.new('flickrx', '0.1.1') do |p|
   p.description    = "Ruby implementation of Flickr API."
   p.url            = "http://github.com/hjw3001/flickrx"
   p.author         = "Henry Wagner"

data/bin/flickrxuploader

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+ 
+require File.expand_path(File.dirname(__FILE__) + "/../lib/flickrx")
+FlickxUtils::SimpleUploader.execute

data/flickrx.gemspec

@@ -1,27 +1,30 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{flickrx}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henry Wagner"]
-  s.date = %q{2009-02-12}
+  s.date = %q{2009-03-15}
   s.description = %q{Ruby implementation of Flickr API.}
   s.email = %q{hjw3001@gmail.com}
-  s.extra_rdoc_files = ["lib/flickrx.rb", "README.rdoc"]
-  s.files = ["init.rb", "lib/flickrx.rb", "Rakefile", "README.rdoc", "Manifest", "flickrx.gemspec"]
+  s.executables = ["flickrxauthorize", "flickrxdaily", "flickrxmegaadd", "flickrxordersets", "flickrxuploader"]
+  s.extra_rdoc_files = ["bin/flickrxauthorize", "bin/flickrxdaily", "bin/flickrxmegaadd", "bin/flickrxordersets", "bin/flickrxuploader", "lib/flickrx.rb", "lib/utils/AuthorizeFlickrx.rb", "lib/utils/DailyFlickr.rb", "lib/utils/MegaGroupAdd.rb", "lib/utils/OrderPhotosets.rb", "lib/utils/SimpleUploader.rb", "lib/utils/utils.rb", "README.rdoc"]
+  s.files = ["bin/flickrxauthorize", "bin/flickrxdaily", "bin/flickrxmegaadd", "bin/flickrxordersets", "bin/flickrxuploader", "flickrx.gemspec", "init.rb", "lib/flickrx.rb", "lib/utils/AuthorizeFlickrx.rb", "lib/utils/DailyFlickr.rb", "lib/utils/MegaGroupAdd.rb", "lib/utils/OrderPhotosets.rb", "lib/utils/SimpleUploader.rb", "lib/utils/utils.rb", "Manifest", "Rakefile", "README.rdoc"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/hjw3001/flickrx}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Flickrx", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{flickrx}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{Ruby implementation of Flickr API.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/flickrx.rb

@@ -630,66 +630,220 @@ class Photos < Flickr
     }
   end
   
+  # <photo id="2477196681" secret="52159254f5" server="3293" farm="4">
+  #  <exif tagspace="TIFF" tagspaceid="1" tag="271" label="Make">
+  #   <raw>Canon</raw>
+  #  </exif>
+  #  <exif tagspace="TIFF" tagspaceid="1" tag="272" label="Model">
+  #   <raw>Canon EOS 20D</raw>
+  #   </exif>
+  #  <exif tagspace="TIFF" tagspaceid="1" tag="274" label="Orientation">
+  #   <raw>1</raw>
+  #   <clean>Horizontal (normal)</clean>
+  #  </exif>
+  #  <exif tagspace="TIFF" tagspaceid="1" tag="306" label="Date and Time">
+  #   <raw>2008:05:08 22:49:53</raw>
+  #  </exif>
+  #  <exif tagspace="EXIF" tagspaceid="0" tag="33434" label="Exposure">
+  #   <raw>30/1</raw>
+  #   <clean>30 sec (30)</clean>
+  #  </exif>
+  #  <exif tagspace="EXIF" tagspaceid="0" tag="33437" label="Aperture">
+  #   <raw>71/10</raw>
+  #   <clean>f/7.1</clean>
+  #  </exif>
+  #  <exif tagspace="EXIF" tagspaceid="0" tag="34850" label="Exposure Program">
+  #   <raw>1</raw>
+  #   <clean>Manual</clean>
+  #  </exif>
+  #  <exif tagspace="EXIF" tagspaceid="0" tag="34855" label="ISO Speed">
+  #   <raw>100</raw>
+  #  </exif>
+  #  <exif tagspace="EXIF" tagspaceid="0" tag="36867" label="Date and Time (Original)">
+  #   <raw>2006:05:31 09:47:51</raw>
+  #  </exif>
+  #  <exif tagspace="EXIF" tagspaceid="0" tag="37377" label="Shutter Speed">
+  #   <raw>-4906891/1000000</raw>
+  #  </exif>
+  #  <exif tagspace="EXIF" tagspaceid="0" tag="37378" label="Aperture">
+  #   <raw>5655638/1000000</raw>
+  #  </exif>
+  #  <exif tagspace="EXIF" tagspaceid="0" tag="37386" label="Focal Length">
+  #   <raw>100/1</raw>
+  #   <clean>100 mm</clean>
+  #  </exif>
+  #  <exif tagspace="EXIF" tagspaceid="0" tag="40961" label="Color Space">
+  #   <raw>1</raw>
+  #   <clean>sRGB</clean>
+  #  </exif>
+  #  <exif tagspace="EXIF" tagspaceid="0" tag="40962" label="Pixel X-Dimension">
+  #   <raw>3504</raw>
+  #  </exif>
+  #  <exif tagspace="EXIF" tagspaceid="0" tag="40963" label="Pixel Y-Dimension">
+  #   <raw>2336</raw>
+  #  </exif>
+  # </photo>
+  def get_exif(photo_id)
+    method = 'flickr.photos.getExif'
+    api_sig = _get_api_sig(
+        {
+        'method'     => method,
+        'auth_token' => config['token'],
+        'photo_id'   => photo_id
+      }
+    )
+    data = _do_get(method, {
+          'api_sig'    => api_sig,
+          'auth_token' => config['token'],
+          'photo_id'   => photo_id
+        }
+      )
+    doc = Document.new(data)
+    doc.elements.each('rsp/photo') { |photo|
+      exif_arr = []
+      photos.elements.each('exif') { |exif|
+        exif_arr << {
+          'tagspace'   => exif.attributes['tagspace'],
+          'tagspaceid' => exif.attributes['tagspaceid'],
+          'tag'        => exif.attributes['tag'],
+          'label'      => exif.attributes['label'],
+          'raw'        => exif.elements['raw'].text,
+          'clean'      => exif.elements['clean'].text
+        }
+      }
+      return {
+        'id'     => photo.attributes['id'],
+        'secret' => photo.attributes['secret'],
+        'server' => photo.attributes['server'],
+        'farm'   => photo.attributes['farm'],
+        'exif'   => exif_arr
+      }
+    }  
+  end
+  
   def get_info(photo_id)
     method = 'flickr.photos.getInfo'
     api_sig = _get_api_sig(
         {
-        'method'    => method,
-        'auth_token'    => config['token'],
-        'photo_id'    => photo_id
+        'method'     => method,
+        'auth_token' => config['token'],
+        'photo_id'   => photo_id
       }
     )
     data = _do_get(method, {
           'api_sig'    => api_sig,
-          'auth_token'    => config['token'],
-          'photo_id'    => photo_id
+          'auth_token' => config['token'],
+          'photo_id'   => photo_id
         }
       )
     doc = Document.new(data)
     doc.elements.each('rsp/photo') { |photo|
       owner = photo.elements['owner']
-      date = photo.elements['dates']
+      visibility = photo.elements['visibility']
+      dates = photo.elements['dates']
+      permissions = photo.elements['permissions']
+      editability = photo.elements['editability']
+      usage = photo.elements['usage']
       tags = photo.elements['tags']
       tags_arr = []
       photo.elements.each('tags/tag') { |tag|
         tags_arr << {
-          'id'  => tag.attributes['id'],
-          'text'  => tag.text
+          'id'   => tag.attributes['id'],
+          'text' => tag.text
         }
       }
-      urls = photo.elements['urls']
       urls_arr = []
       photo.elements.each('urls/url') { |url|
         urls_arr << url.text
       }
       return {
-        'id'    => photo.attributes['id'],
-        'isfavorite'  => photo.attributes['isfavorite'],
-        'license'  => photo.attributes['license'],
-        'views'         => photo.attributes['views'],
-        'media'         => photo.attributes['media'],
-        'title'    => photo.elements['title'].text,
-        'owner_nsid'  => owner.attributes['nsid'],
-        'owner_username'=> owner.attributes['username'],
-        'owner_realname'=> owner.attributes['realname'],
-        'owner_location'=> owner.attributes['location'],
-        'date_posted'  => date.attributes['posted'],
-        'date_taken'  => date.attributes['taken'],
-        'tags'    => tags_arr,
-        'urls'    => urls_arr
+        'id'             => photo.attributes['id'],
+        'isfavorite'     => photo.attributes['isfavorite'],
+        'license'        => photo.attributes['license'],
+        'views'          => photo.attributes['views'],
+        'media'          => photo.attributes['media'],
+        'secret'         => photo.attributes['secret'],
+        'server'         => photo.attributes['server'],
+        'farm'           => photo.attributes['farm'],
+        'title'          => photo.elements['title'].text,
+        'description'    => photo.elements['description'].text,
+        'owner_nsid'     => owner.attributes['nsid'],
+        'owner_username' => owner.attributes['username'],
+        'owner_realname' => owner.attributes['realname'],
+        'owner_location' => owner.attributes['location'],
+        'ispublic'       => visibility.attributes['ispublic'],
+        'isfriend'       => visibility.attributes['isfriend'],
+        'isfamily'       => visibility.attributes['isfamily'],
+        'date_posted'    => dates.attributes['posted'],
+        'date_taken'     => dates.attributes['taken'],
+        'date_takengranularity'  => dates.attributes['takengranularity'],
+        'date_lastupdate'        => dates.attributes['lastupdate'],
+        'permission_permcomment' => permissions.attributes['permcomment'],
+        'permission_permaddmeta' => permissions.attributes['permaddmeta'],
+        'edit_cancomment'        => editability.attributes['cancomment'],
+        'edit_canaddmeta'        => editability.attributes['canaddmeta'],
+        'usage_candownload'      => usage.attributes['candownload'],
+        'usage_canblog'          => usage.attributes['canblog'],
+        'usage_canprint'         => usage.attributes['canprint'],
+        'tags'                   => tags_arr,
+        'urls'                   => urls_arr
       }
     }
   end
 
+  # <sizes canblog="1" canprint="1" candownload="1">
+  #   <size label="Square" width="75" height="75" source="<direct url to photo>" url="<url to flickr sizes page>" media="photo"/>
+  #   <size label="Thumbnail" width="100" height="67" source="<direct url to photo>" url="<url to flickr sizes page>" media="photo"/>
+  #   <size label="Small" width="240" height="160" source="<direct url to photo>" url="<url to flickr sizes page>" media="photo"/>
+  #   <size label="Medium" width="500" height="333" source="<direct url to photo>" url="<url to flickr sizes page>" media="photo"/>
+  #   <size label="Original" width="768" height="512" source="<direct url to photo>" url="<url to flickr sizes page>" media="photo"/>
+  # </sizes>
+  def get_sizes(photo_id)
+    method = 'flickr.photos.getSizes'
+    api_sig = _get_api_sig(
+        {
+        'method'     => method,
+        'auth_token' => config['token'],
+        'photo_id'   => photo_id
+      }
+    )
+    data = _do_get(method, {
+          'api_sig'    => api_sig,
+          'auth_token' => config['token'],
+          'photo_id'   => photo_id
+        }
+      )
+    doc = Document.new(data)
+    doc.elements.each('rsp/sizes') { |sizes|
+      size_arr = []
+      sizes.elements.each('size') { |size|
+        size_arr << {
+          'label'  => size.attributes['label'],
+          'width'  => size.attributes['width'],
+          'height' => size.attributes['height'],
+          'source' => size.attributes['source'],
+          'url'    => size.attributes['url'],
+        }
+      }
+      
+      return {
+        'canblog'     => sizes.attributes['canblog'],
+        'canprint'    => sizes.attributes['canprint'],
+        'candownload' => sizes.attributes['candownload'],
+        'sizes'       => size_arr
+      }        
+    }
+  end
+  
   def search(user_id, tags, tag_mode, page = 0, per_page = 500)
     method = 'flickr.photos.search'
     data = _do_get(method, {
           'api_key'  => @config['api_key'],
           'user_id'  => user_id,
-          'tags'    => tags,
-          'tag_mode'  => tag_mode,
-          'page'          => page,
-          'per_page'  => per_page
+          'tags'     => tags,
+          'tag_mode' => tag_mode,
+          'page'     => page,
+          'per_page' => per_page
           
         }
     )
@@ -697,14 +851,14 @@ class Photos < Flickr
     photos = []
     doc.elements.each('rsp/photos/photo') { |photo|
       photos << {
-        'id'    => photo.attributes['id'],
-        'owner'    => photo.attributes['owner']
+        'id'     => photo.attributes['id'],
+        'owner'  => photo.attributes['owner']
       }
     }
     return photos
   end
 
-        def removeTag(auth_token, tag_id)
+  def removeTag(auth_token, tag_id)
     method = 'flickr.photos.removeTag'
     api_sig = _get_api_sig(
         {
@@ -722,7 +876,7 @@ class Photos < Flickr
     if data
       return true
     end
-        end
+  end
 
 end
 
@@ -750,15 +904,15 @@ class People < Flickr
       }
       doc.elements.each('rsp/photos/photo') { |photo|
         photos << {
-          'id'    => photo.attributes['id'],
+          'id'       => photo.attributes['id'],
           'owner'    => photo.attributes['owner'],
-          'secret'  => photo.attributes['secret'],
-          'server'  => photo.attributes['server'],
-          'farm'    => photo.attributes['farm'],
+          'secret'   => photo.attributes['secret'],
+          'server'   => photo.attributes['server'],
+          'farm'     => photo.attributes['farm'],
           'title'    => photo.attributes['title'],
-          'ispublic'  => photo.attributes['ispublic'],
-          'isfriend'  => photo.attributes['isfriend'],
-          'isfamily'  => photo.attributes['isfamily']
+          'ispublic' => photo.attributes['ispublic'],
+          'isfriend' => photo.attributes['isfriend'],
+          'isfamily' => photo.attributes['isfamily']
         }
       }
       page = page + 1
@@ -802,25 +956,25 @@ class Upload < Flickr
     api_sig = _get_api_sig(
         {
         'auth_token'  => config['token'],
-        'title'    => title,
-        'description'  => description,
-        'tags'    => tags,
-        'is_public'  => is_public,
-        'is_family'  => is_family,
-        'is_friend'  => is_friend
+        'title'       => title,
+        'description' => description,
+        'tags'        => tags,
+        'is_public'   => is_public,
+        'is_family'   => is_family,
+        'is_friend'   => is_friend
       }
     )
     params = {
-      'api_key'  => config['api_key'],
-      'api_sig'  => api_sig,
+      'api_key'     => config['api_key'],
+      'api_sig'     => api_sig,
       'auth_token'  => config['token'],
-      'photo'    => file,
-      'title'    => title,
-      'description'  => description,
-      'tags'    => tags,
-      'is_public'  => is_public,
-      'is_family'  => is_family,
-      'is_friend'  => is_friend
+      'photo'       => file,
+      'title'       => title,
+      'description' => description,
+      'tags'        => tags,
+      'is_public'   => is_public,
+      'is_family'   => is_family,
+      'is_friend'   => is_friend
     }
     query, header = _prepare_query(params)
     file.close

data/lib/utils/AuthorizeFlickrx.rb

@@ -0,0 +1,14 @@
+require 'flickx'
+
+photo = PhotoSets.new
+
+frob = photo.get_frob
+link = photo.get_login_url(frob, 'read')
+
+puts
+puts link
+puts
+puts "copy and paste the above url into your browser then hit enter after viewing the page"
+gets
+
+puts photo.get_token(frob)

data/lib/utils/DailyFlickr.rb

@@ -0,0 +1,53 @@
+require 'flickrx'
+require 'c:/bat/WaldoFlickr'
+
+# DailyFlickr.rb
+#
+# Randomly add a photo each time the program is run to the following Flickr groups
+#
+#  649122@N23 - The Anything Group...
+#  67417927@N00 - anything and everything
+#  76921467@N00 - Anything Goes!
+#  86199631@N00 - Anything Goes :)
+#  76649513@N00 - ANYTHING ALLOWED!!!!!!
+#  38436807@N00 - the FlickrToday (only 1 pic per day)
+#  95309787@N00 - Flickritis
+#  34427469792@N01 -  FlickrCentral
+#  33968254@N00 - Anything and Everything
+#  96458800@N00 - Flickr Underappreciated (4 per day)
+
+class DailyFlickr
+  attr_accessor :group, :cache
+
+  def initialize
+    @group = Flickrx::Group.new
+    waldo = WaldoFlickr.new
+    @cache = waldo.cleanFilenames(waldo.loadCache)
+  end
+
+  def add_photos
+    group.poolAdd(cache.random, '649122@N23')
+    group.poolAdd(cache.random, '67417927@N00')
+    group.poolAdd(cache.random, '76921467@N00')
+    group.poolAdd(cache.random, '86199631@N00')
+    group.poolAdd(cache.random, '76649513@N00')
+    group.poolAdd(cache.random, '38436807@N00')
+    group.poolAdd(cache.random, '95309787@N00')
+    group.poolAdd(cache.random, '34427469792@N01')
+    group.poolAdd(cache.random, '33968254@N00')
+    group.poolAdd(cache.random, '96458800@N00')
+    group.poolAdd(cache.random, '96458800@N00')
+    group.poolAdd(cache.random, '96458800@N00')
+    group.poolAdd(cache.random, '96458800@N00')
+  end
+  
+end
+
+class Array
+   def random
+      self[rand(self.length)]
+   end
+end
+
+daily = DailyFlickr.new
+daily.add_photos

data/lib/utils/MegaGroupAdd.rb

@@ -0,0 +1,32 @@
+require 'WaldoFlickr'
+
+class MegaPhotoAdd
+  attr_accessor :group, :cache
+
+  def initialize
+    @group = Group.new
+    waldo = WaldoFlickr.new
+    @cache = waldo.cleanFilenames(waldo.loadCache)
+  end
+
+  def add_all_public_photos
+    cache.each_with_index {|photo, i| 
+      puts i
+
+      add_to_group(photo, '20759249@N00') # 10 Million Photos
+      add_to_group(photo, '24772180@N00') #  1 day we'll have the most photos on Flickr
+      add_to_group(photo, '40275508@N00') # Please join
+    }
+  end
+
+  def add_to_group(photo_id, group_id)
+    begin
+      group.poolAdd(photo_id, group_id)
+    rescue Exception
+      puts "#{photo_id} already in group #{group_id}"
+    end
+  end
+end
+
+mega = MegaPhotoAdd.new
+mega.add_all_public_photos

data/lib/utils/OrderPhotosets.rb

@@ -0,0 +1,10 @@
+require 'c:/bat/hwflickr'
+
+photo = PhotoSets.new
+
+photosets = photo.getList
+
+ret = ''
+#photosets.sort { |a,b| a.last['title']<=>b.last['title'] }
+photosets.sort.each {|photoset| ret += "#{photoset.last['id']},"}
+photo.orderSets(ret.chop)

data/lib/utils/SimpleUploader.rb

@@ -0,0 +1,91 @@
+require 'c:/bat/hwflickr'
+require 'yaml'
+require 'shorturl'
+require 'twitter'
+
+class SimpleUploader
+  attr_reader :photo, :ps, :group, :uploader, :config, :twitter
+  
+  def initialize
+    @photo = Photos.new
+    @ps = PhotoSets.new
+    @group = Group.new
+    @uploader = Upload.new
+    @config = load_config
+    @twitter = create_or_find_config
+  end
+  
+  def process
+    # jpgfiles = File.join('./', "*.jpg")
+    files = Dir.glob('*.jpg')
+
+    photosets = ps.getList
+    photoset = photosets[config['setname']]
+
+    files.each { |filename|
+      if (File.exists?(filename))
+        begin
+          #upload(filename)
+          exp_hap = false
+        rescue Exception
+          puts "exception on #{filename} try again"
+          print "An error occurred: ",$!, "\n"
+          exp_hap = true
+        end while exp_hap == true
+      else
+        puts "File #{filename} does not exist"
+      end
+    }
+    
+    # Create TinyURL
+    tinyurl =  ShortURL.shorten("http://www.flickr.com/photos/henrywagner/sets/#{photoset['id']}/")
+
+    # Post link to Twitter
+    message = "added #{files.size} photos to Flickr set '#{config['setname']}' at #{tinyurl}"
+    Twitter::Base.new(twitter['email'], twitter['password']).post(message)
+  end
+
+private
+
+  def upload_file(filename)
+    # If we already have a flickr id, the photo just needs to be replaced
+    photoid = uploader.upload(filename, filename, config['description'], config['tags'], config['is_public'], config['is_friend'], config['is_family'])
+    # If photoset doesn't exist, create it and add the photo as the set thumbnail
+    if (photoset == nil)
+      photoset = ps.create(config['setname'], nil, photoid).first
+    # Otherwise, the photoset already exists, so just add the photo to it
+    else
+      ps.addPhoto(photoset['id'], photoid)        
+    end
+        
+    #if (config['is_public'] == '1')
+      # Add the photo to the default groups
+      group.poolAdd(photoid, '20759249@N00') # 10 Million Photos
+      group.poolAdd(photoid, '24772180@N00') #  1 day we'll have the most photos on Flickr
+      group.poolAdd(photoid, '40275508@N00') # Please join
+    #end
+        
+    puts photoid  
+  end
+  
+  def load_config
+    begin
+      YAML::load open('data.yml')
+    rescue
+      puts "Trouble loading config"
+    end
+  end
+
+  def create_or_find_config
+    home = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH']
+    begin
+      config = YAML::load open(home + "/.twitter")
+    rescue
+      puts "Trouble loading config"
+    end          
+  end
+  
+end
+
+simple_uploader = SimpleUploader.new
+simple_uploader.process

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hjw3001-flickrx
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Henry Wagner
@@ -9,26 +9,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-12 00:00:00 -08:00
+date: 2009-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: Ruby implementation of Flickr API.
 email: hjw3001@gmail.com
-executables: []
-
+executables: 
+- flickrxauthorize
+- flickrxdaily
+- flickrxmegaadd
+- flickrxordersets
+- flickrxuploader
 extensions: []
 
 extra_rdoc_files: 
+- bin/flickrxauthorize
+- bin/flickrxdaily
+- bin/flickrxmegaadd
+- bin/flickrxordersets
+- bin/flickrxuploader
 - lib/flickrx.rb
+- lib/utils/AuthorizeFlickrx.rb
+- lib/utils/DailyFlickr.rb
+- lib/utils/MegaGroupAdd.rb
+- lib/utils/OrderPhotosets.rb
+- lib/utils/SimpleUploader.rb
+- lib/utils/utils.rb
 - README.rdoc
 files: 
+- bin/flickrxauthorize
+- bin/flickrxdaily
+- bin/flickrxmegaadd
+- bin/flickrxordersets
+- bin/flickrxuploader
+- flickrx.gemspec
 - init.rb
 - lib/flickrx.rb
+- lib/utils/AuthorizeFlickrx.rb
+- lib/utils/DailyFlickr.rb
+- lib/utils/MegaGroupAdd.rb
+- lib/utils/OrderPhotosets.rb
+- lib/utils/SimpleUploader.rb
+- lib/utils/utils.rb
+- Manifest
 - Rakefile
 - README.rdoc
-- Manifest
-- flickrx.gemspec
 has_rdoc: true
 homepage: http://github.com/hjw3001/flickrx
 post_install_message: