rbvimeo 0.1.0 → 0.2.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.1 / 2008-10-13
+* Lowered flog store
+== 0.2.0 / 2008-08-26
+* Switched to Hpricot for XML parsing.
+* Comments are now lazily loaded and include memoization.
 == 0.1.0 / 2008-04-04
-
-* Initial Release
+* Initial Release.

data/README.txt

@@ -1,6 +1,6 @@
 rbVimeo
-    by Matt Pruitt
-    www.guitsaru.com
+by Matt Pruitt
+www.guitsaru.com
 
 == DESCRIPTION:
 
@@ -17,6 +17,8 @@ vid = vimeo.video(video_id)
 
 == INSTALL:
 
+To install, run 'gem install rbvimeo'
+
 In order to run the specs, first make a test_settings.yml file (a sample is
 provided) using your api key and api secret.
 
@@ -24,7 +26,7 @@ provided) using your api key and api secret.
 
 (The MIT License)
 
-Copyright (c) 2008
+Copyright (c) 2008 Matt Pruitt
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -13,8 +13,9 @@ PROJ.name = 'rbvimeo'
 PROJ.authors = 'Matt Pruitt'
 PROJ.email = 'guitsaru@gmail.com'
 PROJ.url = 'www.guitsaru.com'
-PROJ.rubyforge_name = 'rbvimeo'
-PROJ.version = '0.1.0'
-PROJ.spec_opts << '--color'
+PROJ.rubyforge.name = 'rbvimeo'
+PROJ.version = '0.2.0'
+PROJ.spec.opts << '--color'
+PROJ.gem.dependencies << 'hpricot'
 
 # EOF

data/bin/rbVimeo

@@ -1,15 +1,5 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(
-  File.join(File.dirname(__FILE__), '..', 'lib', 'rbVimeo'))
-require File.expand_path(
-  File.join(File.dirname(__FILE__), '..', 'lib', 'Video'))
-require File.expand_path(
-    File.join(File.dirname(__FILE__), '..', 'lib', 'Comment'))
-require File.expand_path(
-    File.join(File.dirname(__FILE__), '..', 'lib', 'Thumbnail'))
-require File.expand_path(
-    File.join(File.dirname(__FILE__), '..', 'lib', 'User'))    
-# Put your code here
+require '../lib/rbVimeo'
 
 # EOF

data/lib/User.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), %w[rbVimeo])
-
 module RBVIMEO
   class User
     attr_accessor :id, :username, :fullname

data/lib/Video.rb

@@ -1,15 +1,12 @@
-require 'net/http'
-require 'rexml/document'
-require File.join(File.dirname(__FILE__), %w[rbVimeo])
-require File.join(File.dirname(__FILE__), %w[User])
-require File.join(File.dirname(__FILE__), %w[Thumbnail])
-require File.join(File.dirname(__FILE__), %w[Comment])
+require 'rubygems'
+require 'hpricot'
+require 'open-uri'
 
 module RBVIMEO
   class Video
     attr_reader :id, :title, :caption, :upload_date, :likes, :plays
     attr_reader :num_comments, :width, :height, :owner, :tags, :url
-    attr_reader :thumbs, :comments
+    attr_reader :thumbs
     
     # Fetches data about a video from the Vimeo site
     # id is the id of the the Vimeo video
@@ -19,52 +16,50 @@ module RBVIMEO
     # @vimeo = RBVIMEO::Vimeo.new api_key, api_secret
     # video = RBVIMEO::Video.new 339189, @vimeo
     def initialize id, vimeo, xml=nil
-      @thumbs = Array.new
-      @comments = Array.new
+      @thumbs = []
+      @comments = []
       @id = id
+      @vimeo = vimeo
+      
       url = vimeo.generate_url({"method" => "vimeo.videos.getInfo", 
         "video_id" => id, "api_key" => vimeo.api_key}, "read")
       unless xml
         #does not get covered by specs because we get an internal xml file
-        xml_data = Net::HTTP.get_response(URI.parse(url)).body
+        xml_doc = Hpricot(open(url))
       else
-        xml_data = File.open(xml)
+        xml_doc = open(xml) {|file| Hpricot(file)}
       end
-      xml_doc = REXML::Document.new(xml_data)
       
       return @id = -1 if parse_xml(xml_doc).nil?
-      get_comments id, vimeo, xml
-    
     end
   
     # Parses data using the xml recieved from the Vimeo REST API
     # Should not need to be called by anything other than the initialize method
     def parse_xml xml_doc
-      if xml_doc.elements["rsp/video/title"].nil?
+      if xml_doc.at("title").nil?
         return nil
-      else
-        @title = xml_doc.elements["rsp/video/title"].text
+      else  
         @id = id
-        @caption = xml_doc.elements["rsp/video/caption"].text
-        @upload_date = xml_doc.elements["rsp/video/upload_date"].text
-        @likes = xml_doc.elements["rsp/video/number_of_likes"].text.to_i
-        @plays = xml_doc.elements["rsp/video/number_of_plays"].text.to_i
-        @width = xml_doc.elements["rsp/video/width"].text.to_i
-        @height = xml_doc.elements["rsp/video/height"].text.to_i
-        @num_comments =
-          xml_doc.elements["rsp/video/number_of_comments"].text.to_i
+        @title = xml_doc.at("title").inner_html
+        @caption = xml_doc.at("caption").inner_html
+        @upload_date = xml_doc.at("upload_date").inner_html
+        @likes = xml_doc.at("number_of_likes").inner_html.to_i
+        @plays = xml_doc.at("number_of_plays").inner_html.to_i
+        @width = xml_doc.at("width").inner_html.to_i
+        @height = xml_doc.at("height").inner_html.to_i
+        @num_comments = xml_doc.at("number_of_comments").inner_html.to_i
+        
         @owner = User.new
-        @owner.id = xml_doc.elements["rsp/video/owner"].attributes["id"].to_i
-        @owner.username =
-          xml_doc.elements["rsp/video/owner"].attributes["username"]
-        @owner.fullname =
-          xml_doc.elements["rsp/video/owner"].attributes["fullname"]
-        @url = xml_doc.elements["rsp/video/urls/url"].text
-      
-        xml_doc.elements.each('rsp/video/thumbnails/thumbnail') do |thumb|
-          url = thumb.text
-          w = thumb.attributes["width"].to_i
-          h = thumb.attributes["height"].to_i
+        @owner.id = xml_doc.at("owner").attributes["id"].to_i
+        @owner.username = xml_doc.at("owner").attributes["username"]
+        @owner.fullname = xml_doc.at("owner").attributes["fullname"]
+          
+        @url = xml_doc.at("url").inner_html
+
+        (xml_doc/:thumbnail).each do |thumbnail|
+          url = thumbnail.inner_html
+          w = thumbnail.attributes['width'].to_i
+          h = thumbnail.attributes['height'].to_i
           thumbnail = Thumbnail.new(url, w, h)
           @thumbs << thumbnail
         end
@@ -77,59 +72,57 @@ module RBVIMEO
     # returns an Array of comments
     #
     # To load a movie with vimeo id 339189:
-    # @vimeo = RBVIMEO::Vimeo.new api_key, api_secret
+    #
     # comments = video.comments 339189, @vimeo
-    def get_comments id, vimeo, xml=nil
-      comments = Array.new
-      url = vimeo.generate_url({"method" => "vimeo.videos.comments.getList",
-        "video_id" => id, "api_key" => vimeo.api_key}, "read")
+    def get_comments xml=nil
+      comments = []
+      url = @vimeo.generate_url({"method" => "vimeo.videos.comments.getList",
+        "video_id" => @id, "api_key" => @vimeo.api_key}, "read")
+        
       unless xml
-        #does not get covered by specs because we get an internal xml file
-        xml_data = Net::HTTP.get_response(URI.parse(url)).body
+        # Does not get covered by specs because we get an internal xml file
+        xml_doc = Hpricot.XML(open(url))
       else
-        xml_data = File.open(File.join(File.dirname(xml), File.basename(xml, '.xml')+'.comments.xml'))
+        xml_doc = open(xml) {|file| Hpricot.XML(file)}
       end
-      xml_doc = REXML::Document.new(xml_data)
-    
-      xml_doc.elements.each('rsp/comments/comment') do |comment|
-        id = comment.attributes["id"].to_i
-        author = comment.attributes["author"]
-        authorname = comment.attributes["authorname"]
-        date = comment.attributes["datecreate"]
-        url = comment.attributes["permalink"]
-        text = comment.text
-        @portraits = Array.new
-        xml_doc.elements.each('rsp/comments/comment/portraits/portrait') do |thumb|
-          portrait_url = thumb.text
-          w = thumb.attributes["width"].to_i
-          h = thumb.attributes["height"].to_i
+      
+      (xml_doc/:comment).each do |comment|
+        text = comment.children.select{|e| e.text?}.join
+        id = comment.attributes['id'].to_i
+        author = comment.attributes['author']
+        authorname = comment.attributes['authorname']
+        date = comment.attributes['datecreate']
+        url = comment.attributes['permalink']
+        
+        @portraits = []
+        (comment/'portraits'/'portrait').each do |thumb|
+          portrait_url = thumb.inner_html          
+          w = thumb.attributes['width'].to_i
+          h = thumb.attributes['height'].to_i
           thumbnail = Thumbnail.new(portrait_url, w, h)
           @portraits << thumbnail
         end
         com = Comment.new(id, author, authorname, date, url, text, @portraits)
         @comments << com
       end
+      return self
     end
 
     # Returns the code to embed the video
     def embed width, height
-      w = width.to_s
-      h = height.to_s
-      id = @id.to_s
-      string = ''
-      string += '<object type="application/x-shockwave-flash" width='
-      string += w + '" height="' + h + '"'
-      string += 'data="http://www.vimeo.com/moogaloop.swf?clip_id=' + id
-      string += '&amp;server=www.vimeo.com&amp;fullscreen=0&amp;show_title=0'
-      string += '&amp;show_byline=0&amp;showportrait=0&amp;color=00ADEF">'
-      string += '<param name="quality" value="best" />'
-      string += '<param name="allowfullscreen" value="false" />'
-      string += '<param name="scale" value="showAll" />'
-      string += '<param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id='
-      string += id + '&amp;server=www.vimeo.com&amp;fullscreen=0&amp;'
-      string += 'show_title=0&amp;show_byline=0&amp;showportrait=0&amp;color=00ADEF" /></object>'
+      string = <<EOF
+<object type="application/x-shockwave-flash" width=#{width} height=#{height} data="http://www.vimeo.com/moogaloop.swf?clip_id=#{@id}&server=www.vimeo.com&fullscreen=0&show_title=0'&show_byline=0&showportrait=0&color=00ADEF">
+<param name="quality" value="best" />
+<param name="allowfullscreen" value="false" />
+<param name="scale" value="showAll" />
+<param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=#{@id}&server=www.vimeo.com&fullscreen=0&show_title=0&show_byline=0&showportrait=0&color=00ADEF" /></object>
+EOF
+    string.gsub("\n", "")
+    end
   
-      return string
+    def comments xml=nil
+      get_comments(xml) if @comments.empty?
+      return @comments
     end
   end
 end

data/lib/rbVimeo.rb

@@ -5,7 +5,12 @@
 require 'digest/md5'
 require 'net/http'
 require 'rexml/document'
-require File.join(File.dirname(__FILE__), %w[Video])
+
+require 'Video'
+require 'Thumbnail'
+require 'User'
+require 'Comment'
+
 
 module RBVIMEO
   class Vimeo
@@ -14,6 +19,7 @@ module RBVIMEO
     @@API_REST_URL  = "http://www.vimeo.com/api/rest"
     @@API_AUTH_URL   = "http://www.vimeo.com/services/auth/"
     @@API_UPLOAD_URL = "http://www.vimeo.com/services/upload/"
+    
     # api_key and api_secret should both be generated on www.vimeo.com
     def initialize api_key, api_secret
       @api_key = api_key
@@ -24,12 +30,12 @@ module RBVIMEO
     #   "video_id" => "339189", "api_key" => @vimeo.api_key})
     # This example returns a url to the xml for the Vimeo video with id 339189
     def generate_url parameters, permissions = nil
-      url = @@API_REST_URL + "?api_key=" + @api_key
+      url = "#{@@API_REST_URL}?api_key=#{@api_key}"
       params = parameters.sort
       params.each do |param|
-        url += "&" + param[0].to_s + "=" + param[1].to_s unless param[0].to_s == "api_key"
+        url += "&#{param[0]}=#{param[1]}" unless param[0].to_s == "api_key"
       end
-      url += "&api_sig=" + generate_signature(parameters)
+      url += "&api_sig=#{generate_signature(parameters)}"
       return url
     end
     
@@ -51,8 +57,11 @@ module RBVIMEO
       return nil if vid.id == -1
       return vid
     end
+    
+    # Provides easier access to RBVIMEO::User
+    # user = @vimeo.user
     def user
       return User.new
     end
   end
-end
+end

data/spec/Video_spec.rb

@@ -47,7 +47,7 @@ describe Video, "initialization" do
     @vid.comments[0].author.should eql("ctd3")
     @vid.comments[0].authorname.should eql("CTD3")
     @vid.comments[0].date.should eql("2007-10-12 17:47:13")
-    @vid.comments[0].url.should eql("http://www.vimeo.com/339189#comment_265313")
+    @vid.comments[0].url.should eql("http://vimeo.com/339189#comment_265313")
     @vid.comments[0].text.should eql("Sure is! Great changes!")
     @vid.comments[0].portraits[0].url.should eql("http://80.media.vimeo.com/d1/5/35/44/42/portrait-35444268.jpg")
     @vid.comments[0].portraits[0].width.should eql(24)

data/tasks/ann.rake

@@ -9,12 +9,16 @@ require 'time'
 
 namespace :ann do
 
-  file PROJ.ann_file do
-    puts "Generating #{PROJ.ann_file}"
-    File.open(PROJ.ann_file,'w') do |fd|
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
+  file PROJ.ann.file do
+    ann = PROJ.ann
+    puts "Generating #{ann.file}"
+    File.open(ann.file,'w') do |fd|
       fd.puts("#{PROJ.name} version #{PROJ.version}")
       fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
-      fd.puts("    #{PROJ.url}") if PROJ.url
+      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
       fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
       fd.puts
       fd.puts("== DESCRIPTION")
@@ -23,23 +27,24 @@ namespace :ann do
       fd.puts
       fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
       fd.puts
-      PROJ.ann_paragraphs.each do |p|
+      ann.paragraphs.each do |p|
         fd.puts "== #{p.upcase}"
         fd.puts
         fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
         fd.puts
       end
-      fd.puts PROJ.ann_text if PROJ.ann_text
+      fd.puts ann.text if ann.text
     end
   end
 
   desc "Create an announcement file"
-  task :announcement => PROJ.ann_file
+  task :announcement => ['ann:prereqs', PROJ.ann.file]
 
   desc "Send an email announcement"
-  task :email => PROJ.ann_file do
-    from = PROJ.ann_email[:from] || PROJ.email
-    to   = Array(PROJ.ann_email[:to])
+  task :email => ['ann:prereqs', PROJ.ann.file] do
+    ann = PROJ.ann
+    from = ann.email[:from] || PROJ.email
+    to   = Array(ann.email[:to])
 
     ### build a mail header for RFC 822
     rfc822msg =  "From: #{from}\n"
@@ -49,11 +54,11 @@ namespace :ann do
     rfc822msg << "\n"
     rfc822msg << "Date: #{Time.new.rfc822}\n"
     rfc822msg << "Message-Id: "
-    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{PROJ.ann_email[:domain]}>\n\n"
-    rfc822msg << File.read(PROJ.ann_file)
+    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
+    rfc822msg << File.read(ann.file)
 
     params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
-      PROJ.ann_email[key]
+      ann.email[key]
     end
 
     params[3] = PROJ.email if params[3].nil?
@@ -71,6 +76,6 @@ end  # namespace :ann
 desc 'Alias to ann:announcement'
 task :ann => 'ann:announcement'
 
-CLOBBER << PROJ.ann_file
+CLOBBER << PROJ.ann.file
 
 # EOF

data/tasks/annotations.rake

@@ -9,7 +9,7 @@ task :notes do
 end
 
 namespace :notes do
-  PROJ.annotation_tags.each do |tag|
+  PROJ.notes.tags.each do |tag|
     desc "Enumerate all #{tag} annotations"
     task tag.downcase.to_sym do
       Bones::AnnotationExtractor.enumerate(PROJ, tag)

data/tasks/bones.rake

@@ -1,40 +1,21 @@
 # $Id$
 
-require 'pp'
-require 'stringio'
+if HAVE_BONES
 
 namespace :bones do
 
   desc 'Show the PROJ open struct'
   task :debug do |t|
-    atr = if ARGV.length == 2
+    atr = if t.application.top_level_tasks.length == 2
       t.application.top_level_tasks.pop
     end
-    sio = StringIO.new
-    sep = "\n" + ' '*27
-    fmt = "%23s => %s"
 
-    if atr
-      PP.pp(PROJ.send(atr.to_sym), sio, 49)
-      sio.seek 0
-      val = sio.read
-      val = val.split("\n").join(sep)
-
-      puts fmt % [atr, val]
-    else
-      h = PROJ.instance_variable_get(:@table)
-      h.keys.map {|k| k.to_s}.sort.each do |k|
-        sio.truncate 0
-        PP.pp(h[k.to_sym], sio, 49)
-        sio.seek 0
-        val = sio.read
-        val = val.split("\n").join(sep)
-
-        puts fmt % [k, val]
-      end
-    end
+    if atr then Bones::Debug.show_attr(PROJ, atr)
+    else Bones::Debug.show PROJ end
   end
 
 end  # namespace :bones
 
+end  # HAVE_BONES
+
 # EOF

data/tasks/doc.rake

@@ -6,12 +6,12 @@ namespace :doc do
 
   desc 'Generate RDoc documentation'
   Rake::RDocTask.new do |rd|
-    rd.main = PROJ.rdoc_main
-    rd.rdoc_dir = PROJ.rdoc_dir
+    rd.main = PROJ.rdoc.main
+    rd.rdoc_dir = PROJ.rdoc.dir
 
-    incl = Regexp.new(PROJ.rdoc_include.join('|'))
-    excl = Regexp.new(PROJ.rdoc_exclude.join('|'))
-    files = PROJ.files.find_all do |fn|
+    incl = Regexp.new(PROJ.rdoc.include.join('|'))
+    excl = Regexp.new(PROJ.rdoc.exclude.join('|'))
+    files = PROJ.gem.files.find_all do |fn|
               case fn
               when excl; false
               when incl; true
@@ -20,10 +20,10 @@ namespace :doc do
     rd.rdoc_files.push(*files)
 
     title = "#{PROJ.name}-#{PROJ.version} Documentation"
-    title = "#{PROJ.rubyforge_name}'s " + title if PROJ.rubyforge_name != title
+    title = "#{PROJ.rubyforge.name}'s " + title if PROJ.rubyforge.name != title
 
     rd.options << "-t #{title}"
-    rd.options.concat(PROJ.rdoc_opts)
+    rd.options.concat(PROJ.rdoc.opts)
   end
 
   desc 'Generate ri locally for testing'

data/tasks/gem.rake

@@ -4,84 +4,86 @@ require 'rake/gempackagetask'
 
 namespace :gem do
 
-  PROJ.spec = Gem::Specification.new do |s|
+  PROJ.gem._spec = Gem::Specification.new do |s|
     s.name = PROJ.name
     s.version = PROJ.version
     s.summary = PROJ.summary
     s.authors = Array(PROJ.authors)
     s.email = PROJ.email
     s.homepage = Array(PROJ.url).first
-    s.rubyforge_project = PROJ.rubyforge_name
-    s.post_install_message = PROJ.post_install_message
+    s.rubyforge_project = PROJ.rubyforge.name
 
     s.description = PROJ.description
 
-    PROJ.dependencies.each do |dep|
+    PROJ.gem.dependencies.each do |dep|
       s.add_dependency(*dep)
     end
 
-    s.files = PROJ.files
-    s.executables = PROJ.executables.map {|fn| File.basename(fn)}
-    s.extensions = PROJ.files.grep %r/extconf\.rb$/
+    s.files = PROJ.gem.files
+    s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)}
+    s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/
 
     s.bindir = 'bin'
     dirs = Dir["{#{PROJ.libs.join(',')}}"]
     s.require_paths = dirs unless dirs.empty?
 
-    incl = Regexp.new(PROJ.rdoc_include.join('|'))
-    excl = PROJ.rdoc_exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
+    incl = Regexp.new(PROJ.rdoc.include.join('|'))
+    excl = PROJ.rdoc.exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
     excl = Regexp.new(excl.join('|'))
-    rdoc_files = PROJ.files.find_all do |fn|
+    rdoc_files = PROJ.gem.files.find_all do |fn|
                    case fn
                    when excl; false
                    when incl; true
                    else false end
                  end
-    s.rdoc_options = PROJ.rdoc_opts + ['--main', PROJ.rdoc_main]
+    s.rdoc_options = PROJ.rdoc.opts + ['--main', PROJ.rdoc.main]
     s.extra_rdoc_files = rdoc_files
     s.has_rdoc = true
 
-    if test ?f, PROJ.test_file
-      s.test_file = PROJ.test_file
+    if test ?f, PROJ.test.file
+      s.test_file = PROJ.test.file
     else
-      s.test_files = PROJ.tests.to_a
+      s.test_files = PROJ.test.files.to_a
     end
 
     # Do any extra stuff the user wants
-#   spec_extras.each do |msg, val|
-#     case val
-#     when Proc
-#       val.call(s.send(msg))
-#     else
-#       s.send "#{msg}=", val
-#     end
-#   end
-  end
+    PROJ.gem.extras.each do |msg, val|
+      case val
+      when Proc
+        val.call(s.send(msg))
+      else
+        s.send "#{msg}=", val
+      end
+    end
+  end  # Gem::Specification.new
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
 
   desc 'Show information about the gem'
-  task :debug do
-    puts PROJ.spec.to_ruby
+  task :debug => 'gem:prereqs' do
+    puts PROJ.gem._spec.to_ruby
   end
 
   pkg = Rake::PackageTask.new(PROJ.name, PROJ.version) do |pkg|
-    pkg.need_tar = PROJ.need_tar
-    pkg.need_zip = PROJ.need_zip
-    pkg.package_files += PROJ.spec.files
+    pkg.need_tar = PROJ.gem.need_tar
+    pkg.need_zip = PROJ.gem.need_zip
+    pkg.package_files += PROJ.gem._spec.files
   end
   Rake::Task['gem:package'].instance_variable_set(:@full_comment, nil)
 
-  gem_file = if PROJ.spec.platform == Gem::Platform::RUBY
+  gem_file = if PROJ.gem._spec.platform == Gem::Platform::RUBY
       "#{pkg.package_name}.gem"
     else
-      "#{pkg.package_name}-#{PROJ.spec.platform}.gem"
+      "#{pkg.package_name}-#{PROJ.gem._spec.platform}.gem"
     end
 
   desc "Build the gem file #{gem_file}"
-  task :package => "#{pkg.package_dir}/#{gem_file}"
+  task :package => ['gem:prereqs', "#{pkg.package_dir}/#{gem_file}"]
 
-  file "#{pkg.package_dir}/#{gem_file}" => [pkg.package_dir] + PROJ.spec.files do
+  file "#{pkg.package_dir}/#{gem_file}" => [pkg.package_dir] + PROJ.gem._spec.files do
     when_writing("Creating GEM") {
-      Gem::Builder.new(PROJ.spec).build
+      Gem::Builder.new(PROJ.gem._spec).build
       verbose(true) {
         mv gem_file, "#{pkg.package_dir}/#{gem_file}"
       }
@@ -89,21 +91,29 @@ namespace :gem do
   end
 
   desc 'Install the gem'
-  task :install => [:clobber, :package] do
-    sh "#{SUDO} #{GEM} install pkg/#{PROJ.spec.full_name}"
+  task :install => [:clobber, 'gem:package'] do
+    sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
+
+    # use this version of the command for rubygems > 1.0.0
+    #sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{PROJ.gem._spec.full_name}"
   end
 
   desc 'Uninstall the gem'
   task :uninstall do
     installed_list = Gem.source_index.find_name(PROJ.name)
     if installed_list and installed_list.collect { |s| s.version.to_s}.include?(PROJ.version) then
-      sh "#{SUDO} #{GEM} uninstall -v '#{PROJ.version}' -i -x #{PROJ.name}"
+      sh "#{SUDO} #{GEM} uninstall --version '#{PROJ.version}' --ignore-dependencies --executables #{PROJ.name}"
     end
   end
 
   desc 'Reinstall the gem'
   task :reinstall => [:uninstall, :install]
 
+  desc 'Cleanup the gem'
+  task :cleanup do
+    sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
+  end
+
 end  # namespace :gem
 
 desc 'Alias to gem:package'

data/tasks/post_load.rake

@@ -3,14 +3,21 @@
 # This file does not define any rake tasks. It is used to load some project
 # settings if they are not defined by the user.
 
-PROJ.rdoc_exclude << "^#{Regexp.escape(PROJ.manifest_file)}$"
-PROJ.exclude << "^#{Regexp.escape(PROJ.ann_file)}$"
-
-PROJ.instance_variable_get(:@table).each do |key,val|
-  next unless val.instance_of? Array
-  next if key == :dependencies
-  val.flatten!
-end
+PROJ.rdoc.exclude << "^#{Regexp.escape(PROJ.manifest_file)}$"
+PROJ.exclude << ["^#{Regexp.escape(PROJ.ann.file)}$",
+                 "^#{Regexp.escape(PROJ.rdoc.dir)}/",
+                 "^#{Regexp.escape(PROJ.rcov.dir)}/"]
+
+flatten_arrays = lambda do |this,os|
+    os.instance_variable_get(:@table).each do |key,val|
+      next if key == :dependencies
+      case val
+      when Array; val.flatten!
+      when OpenStruct; this.call(this,val)
+      end
+    end
+  end
+flatten_arrays.call(flatten_arrays,PROJ)
 
 PROJ.changes ||= paragraphs_of(PROJ.history_file, 0..1).join("\n\n")
 
@@ -18,15 +25,15 @@ PROJ.description ||= paragraphs_of(PROJ.readme_file, 'description').join("\n\n")
 
 PROJ.summary ||= PROJ.description.split('.').first
 
-PROJ.files ||=
+PROJ.gem.files ||=
   if test(?f, PROJ.manifest_file)
     files = File.readlines(PROJ.manifest_file).map {|fn| fn.chomp.strip}
     files.delete ''
     files
   else [] end
 
-PROJ.executables ||= PROJ.files.find_all {|fn| fn =~ %r/^bin/}
+PROJ.gem.executables ||= PROJ.gem.files.find_all {|fn| fn =~ %r/^bin/}
 
-PROJ.rdoc_main ||= PROJ.readme_file
+PROJ.rdoc.main ||= PROJ.readme_file
 
 # EOF

data/tasks/rubyforge.rake

@@ -1,23 +1,23 @@
-# $Id$
 
-if PROJ.rubyforge_name && HAVE_RUBYFORGE
+if PROJ.rubyforge.name.valid? && HAVE_RUBYFORGE
 
 require 'rubyforge'
 require 'rake/contrib/sshpublisher'
 
 namespace :gem do
   desc 'Package and upload to RubyForge'
-  task :release => [:clobber, :package] do |t|
+  task :release => [:clobber, 'gem:package'] do |t|
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
-    pkg = "pkg/#{PROJ.spec.full_name}"
+    pkg = "pkg/#{PROJ.gem._spec.full_name}"
 
     if $DEBUG then
-      puts "release_id = rf.add_release #{PROJ.rubyforge_name.inspect}, #{PROJ.name.inspect}, #{PROJ.version.inspect}, \"#{pkg}.tgz\""
-      puts "rf.add_file #{PROJ.rubyforge_name.inspect}, #{PROJ.name.inspect}, release_id, \"#{pkg}.gem\""
+      puts "release_id = rf.add_release #{PROJ.rubyforge.name.inspect}, #{PROJ.name.inspect}, #{PROJ.version.inspect}, \"#{pkg}.tgz\""
+      puts "rf.add_file #{PROJ.rubyforge.name.inspect}, #{PROJ.name.inspect}, release_id, \"#{pkg}.gem\""
     end
 
     rf = RubyForge.new
+    rf.configure rescue nil
     puts 'Logging in'
     rf.login
 
@@ -25,14 +25,13 @@ namespace :gem do
     c['release_notes'] = PROJ.description if PROJ.description
     c['release_changes'] = PROJ.changes if PROJ.changes
     c['preformatted'] = true
-    c['processor_id'] = 8000
 
-    files = [(PROJ.need_tar ? "#{pkg}.tgz" : nil),
-             (PROJ.need_zip ? "#{pkg}.zip" : nil),
+    files = [(PROJ.gem.need_tar ? "#{pkg}.tgz" : nil),
+             (PROJ.gem.need_zip ? "#{pkg}.zip" : nil),
              "#{pkg}.gem"].compact
 
     puts "Releasing #{PROJ.name} v. #{PROJ.version}"
-    rf.add_release PROJ.rubyforge_name, PROJ.name, PROJ.version, *files
+    rf.add_release PROJ.rubyforge.name, PROJ.name, PROJ.version, *files
   end
 end  # namespace :gem
 
@@ -45,9 +44,9 @@ namespace :doc do
     )
 
     host = "#{config['username']}@rubyforge.org"
-    remote_dir = "/var/www/gforge-projects/#{PROJ.rubyforge_name}/"
-    remote_dir << PROJ.rdoc_remote_dir if PROJ.rdoc_remote_dir
-    local_dir = PROJ.rdoc_dir
+    remote_dir = "/var/www/gforge-projects/#{PROJ.rubyforge.name}/"
+    remote_dir << PROJ.rdoc.remote_dir if PROJ.rdoc.remote_dir
+    local_dir = PROJ.rdoc.dir
 
     Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
   end

data/tasks/setup.rb

@@ -6,94 +6,117 @@ require 'rake/clean'
 require 'fileutils'
 require 'ostruct'
 
-ENV['VERSION'] = '0.1.0'
-
-PROJ = OpenStruct.new
-
-PROJ.name = 'rbvimeo'
-PROJ.summary = 'Ruby Wrapper for the Vimeo API'
-PROJ.description = nil
-PROJ.changes = nil
-PROJ.authors = 'guitsaru'
-PROJ.email = 'guitsaru@gmail.com'
-PROJ.url = nil
-PROJ.version = ENV['VERSION'] || '0.1.0'
-PROJ.rubyforge_name = 'rbvimeo'
-PROJ.exclude = %w(tmp$ bak$ ~$ CVS .svn/ ^pkg/ ^doc/ .git/)
-PROJ.release_name = ENV['RELEASE']
-PROJ.history_file = 'History.txt'
-PROJ.manifest_file = 'Manifest.txt'
-PROJ.readme_file = 'README.txt'
-
-# Rspec
-PROJ.specs = FileList['spec/**/*_spec.rb']
-PROJ.spec_opts = []
-
-# Test::Unit
-PROJ.tests = FileList['test/**/test_*.rb']
-PROJ.test_file = 'test/all.rb'
-PROJ.test_opts = []
-
-# Rcov
-PROJ.rcov_dir = 'coverage'
-PROJ.rcov_opts = %w[--sort coverage -T]
-PROJ.rcov_threshold = 90.0
-PROJ.rcov_threshold_exact = false
-
-# Rdoc
-PROJ.rdoc_opts = []
-PROJ.rdoc_include = %w(^lib/ ^bin/ ^ext/ .txt$)
-PROJ.rdoc_exclude = %w(extconf.rb$)
-PROJ.rdoc_main = nil
-PROJ.rdoc_dir = 'doc'
-PROJ.rdoc_remote_dir = nil
-
-# Extensions
-PROJ.extensions = FileList['ext/**/extconf.rb']
-PROJ.ruby_opts = %w(-w)
-PROJ.libs = []
-%w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
-
-# Gem Packaging
-PROJ.files = nil
-PROJ.executables = nil
-PROJ.dependencies = []
-PROJ.need_tar = true
-PROJ.need_zip = false
-PROJ.post_install_message = nil
-
-# File Annotations
-PROJ.annotation_exclude = %w(^tasks/setup.rb$)
-PROJ.annotation_extensions = %w(.txt .rb .erb) << ''
-PROJ.annotation_tags = %w(FIXME OPTIMIZE TODO)
-
-# Subversion Repository
-PROJ.svn = false
-PROJ.svn_root = nil
-PROJ.svn_trunk = 'trunk'
-PROJ.svn_tags = 'tags'
-PROJ.svn_branches = 'branches'
-
-# Announce
-PROJ.ann_file = 'announcement.txt'
-PROJ.ann_text = nil
-PROJ.ann_paragraphs = []
-PROJ.ann_email = {
-  :from     => nil,
-  :to       => %w(ruby-talk@ruby-lang.org),
-  :server   => 'localhost',
-  :port     => 25,
-  :domain   => ENV['HOSTNAME'],
-  :acct     => nil,
-  :passwd   => nil,
-  :authtype => :plain
-}
+class OpenStruct; undef :gem; end
+
+PROJ = OpenStruct.new(
+  # Project Defaults
+  :name => nil,
+  :summary => nil,
+  :description => nil,
+  :changes => nil,
+  :authors => nil,
+  :email => nil,
+  :url => "\000",
+  :version => ENV['VERSION'] || '0.0.0',
+  :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/),
+  :release_name => ENV['RELEASE'],
+
+  # System Defaults
+  :ruby_opts => %w(-w),
+  :libs => [],
+  :history_file => 'History.txt',
+  :manifest_file => 'Manifest.txt',
+  :readme_file => 'README.txt',
+
+  # Announce
+  :ann => OpenStruct.new(
+    :file => 'announcement.txt',
+    :text => nil,
+    :paragraphs => [],
+    :email => {
+      :from     => nil,
+      :to       => %w(ruby-talk@ruby-lang.org),
+      :server   => 'localhost',
+      :port     => 25,
+      :domain   => ENV['HOSTNAME'],
+      :acct     => nil,
+      :passwd   => nil,
+      :authtype => :plain
+    }
+  ),
+
+  # Gem Packaging
+  :gem => OpenStruct.new(
+    :dependencies => [],
+    :executables => nil,
+    :extensions => FileList['ext/**/extconf.rb'],
+    :files => nil,
+    :need_tar => true,
+    :need_zip => false,
+    :extras => {}
+  ),
+
+  # File Annotations
+  :notes => OpenStruct.new(
+    :exclude => %w(^tasks/setup\.rb$),
+    :extensions => %w(.txt .rb .erb) << '',
+    :tags => %w(FIXME OPTIMIZE TODO)
+  ),
+
+  # Rcov
+  :rcov => OpenStruct.new(
+    :dir => 'coverage',
+    :opts => %w[--sort coverage -T],
+    :threshold => 90.0,
+    :threshold_exact => false
+  ),
+
+  # Rdoc
+  :rdoc => OpenStruct.new(
+    :opts => [],
+    :include => %w(^lib/ ^bin/ ^ext/ \.txt$),
+    :exclude => %w(extconf\.rb$),
+    :main => nil,
+    :dir => 'doc',
+    :remote_dir => nil
+  ),
+
+  # Rubyforge
+  :rubyforge => OpenStruct.new(
+    :name => "\000"
+  ),
+
+  # Rspec
+  :spec => OpenStruct.new(
+    :files => FileList['spec/**/*_spec.rb'],
+    :opts => []
+  ),
+
+  # Subversion Repository
+  :svn => OpenStruct.new(
+    :root => nil,
+    :path => '',
+    :trunk => 'trunk',
+    :tags => 'tags',
+    :branches => 'branches'
+  ),
+
+  # Test::Unit
+  :test => OpenStruct.new(
+    :files => FileList['test/**/test_*.rb'],
+    :file  => 'test/all.rb',
+    :opts  => []
+  )
+)
 
 # Load the other rake files in the tasks folder
 rakefiles = Dir.glob('tasks/*.rake').sort
 rakefiles.unshift(rakefiles.delete('tasks/post_load.rake')).compact!
 import(*rakefiles)
 
+# Setup the project libraries
+%w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
+
 # Setup some constants
 WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
 
@@ -107,6 +130,7 @@ def quiet( &block )
 ensure
   STDOUT.reopen io.first
   STDERR.reopen io.last
+  $stdout, $stderr = STDOUT, STDERR
 end
 
 DIFF = if WIN32 then 'diff.exe'
@@ -122,6 +146,7 @@ SUDO = if WIN32 then ''
        end
 
 RCOV = WIN32 ? 'rcov.bat' : 'rcov'
+RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
 GEM  = WIN32 ? 'gem.bat'  : 'gem'
 
 %w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
@@ -132,6 +157,10 @@ GEM  = WIN32 ? 'gem.bat'  : 'gem'
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", false}
   end
 end
+HAVE_SVN = (Dir.entries(Dir.pwd).include?('.svn') and
+            system("svn --version 2>&1 > #{DEV_NULL}"))
+HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and
+            system("git --version 2>&1 > #{DEV_NULL}"))
 
 # Reads a file at +path+ and spits out an array of the +paragraphs+
 # specified.
@@ -171,7 +200,7 @@ def depend_on( name, version = nil )
   spec = Gem.source_index.find_name(name).last
   version = spec.version.to_s if version.nil? and !spec.nil?
 
-  PROJ.dependencies << case version
+  PROJ.gem.dependencies << case version
     when nil; [name]
     when %r/^\d/; [name, ">= #{version}"]
     else [name, version] end
@@ -226,4 +255,14 @@ def manifest_files
   files.sort!
 end
 
+# We need a "valid" method thtat determines if a string is suitable for use
+# in the gem specification.
+#
+class Object
+  def valid?
+    return !(self.empty? or self == "\000") if self.respond_to?(:to_str)
+    return false
+  end
+end
+
 # EOF

data/tasks/spec.rake

@@ -8,16 +8,16 @@ namespace :spec do
   desc 'Run all specs with basic output'
   Spec::Rake::SpecTask.new(:run) do |t|
     t.ruby_opts = PROJ.ruby_opts
-    t.spec_opts = PROJ.spec_opts
-    t.spec_files = PROJ.specs
+    t.spec_opts = PROJ.spec.opts
+    t.spec_files = PROJ.spec.files
     t.libs += PROJ.libs
   end
 
   desc 'Run all specs with text output'
   Spec::Rake::SpecTask.new(:specdoc) do |t|
     t.ruby_opts = PROJ.ruby_opts
-    t.spec_opts = PROJ.spec_opts + ['--format', 'specdoc']
-    t.spec_files = PROJ.specs
+    t.spec_opts = PROJ.spec.opts + ['--format', 'specdoc']
+    t.spec_files = PROJ.spec.files
     t.libs += PROJ.libs
   end
 
@@ -25,21 +25,22 @@ namespace :spec do
     desc 'Run all specs with RCov'
     Spec::Rake::SpecTask.new(:rcov) do |t|
       t.ruby_opts = PROJ.ruby_opts
-      t.spec_opts = PROJ.spec_opts
-      t.spec_files = PROJ.specs
+      t.spec_opts = PROJ.spec.opts
+      t.spec_files = PROJ.spec.files
       t.libs += PROJ.libs
       t.rcov = true
-      t.rcov_dir = PROJ.rcov_dir
-      t.rcov_opts = PROJ.rcov_opts + ['--exclude', 'spec']
+      t.rcov_dir = PROJ.rcov.dir
+      t.rcov_opts = PROJ.rcov.opts + ['--exclude', 'spec']
     end
 
     RCov::VerifyTask.new(:verify) do |t| 
-      t.threshold = PROJ.rcov_threshold
-      t.index_html = File.join(PROJ.rcov_dir, 'index.html')
-      t.require_exact_threshold = PROJ.rcov_threshold_exact
+      t.threshold = PROJ.rcov.threshold
+      t.index_html = File.join(PROJ.rcov.dir, 'index.html')
+      t.require_exact_threshold = PROJ.rcov.threshold_exact
     end
 
     task :verify => :rcov
+    remove_desc_for_task %w(spec:clobber_rcov)
   end
 
 end  # namespace :spec
@@ -49,8 +50,6 @@ task :spec => 'spec:run'
 
 task :clobber => 'spec:clobber_rcov' if HAVE_RCOV
 
-remove_desc_for_task %w(spec:clobber_rcov)
-
 end  # if HAVE_SPEC_RAKE_SPECTASK
 
 # EOF

data/tasks/svn.rake

@@ -1,32 +1,36 @@
 # $Id$
 
+if HAVE_SVN
 
-if PROJ.svn and system("svn --version 2>&1 > #{DEV_NULL}")
-
-unless PROJ.svn_root
+unless PROJ.svn.root
   info = %x/svn info ./
   m = %r/^Repository Root:\s+(.*)$/.match(info)
-  PROJ.svn_root = (m.nil? ? '' : m[1])
+  PROJ.svn.root = (m.nil? ? '' : m[1])
 end
-PROJ.svn_root = File.join(PROJ.svn_root, PROJ.svn) if String === PROJ.svn
+PROJ.svn.root = File.join(PROJ.svn.root, PROJ.svn.path) unless PROJ.svn.path.empty?
 
 namespace :svn do
 
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
   desc 'Show tags from the SVN repository'
-  task :show_tags do |t|
-    tags = %x/svn list #{File.join(PROJ.svn_root, PROJ.svn_tags)}/
+  task :show_tags => 'svn:prereqs' do |t|
+    tags = %x/svn list #{File.join(PROJ.svn.root, PROJ.svn.tags)}/
     tags.gsub!(%r/\/$/, '')
+    tags = tags.split("\n").sort {|a,b| b <=> a}
     puts tags
   end
 
   desc 'Create a new tag in the SVN repository'
-  task :create_tag do |t|
+  task :create_tag => 'svn:prereqs' do |t|
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
 
-    trunk = File.join(PROJ.svn_root, PROJ.svn_trunk)
+    svn = PROJ.svn
+    trunk = File.join(svn.root, svn.trunk)
     tag = "%s-%s" % [PROJ.name, PROJ.version]
-    tag = File.join(PROJ.svn_root, PROJ.svn_tags, tag)
+    tag = File.join(svn.root, svn.tags, tag)
     msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
 
     puts "Creating SVN tag '#{tag}'"
@@ -39,6 +43,6 @@ end  # namespace :svn
 
 task 'gem:release' => 'svn:create_tag'
 
-end  # if PROJ.svn
+end  # if PROJ.svn.path
 
 # EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbvimeo
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matt Pruitt
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-11 00:00:00 -05:00
+date: 2008-10-13 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A ruby wrapper for the Vimeo API
 email: guitsaru@gmail.com
 executables: 
@@ -75,9 +84,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rbvimeo
-rubygems_version: 1.1.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
-summary: Ruby Wrapper for the Vimeo API
+summary: A ruby wrapper for the Vimeo API
 test_files: []