jgm-cloudlib 0.3.5 → 0.3.8

data/bin/cloudlib

@@ -99,7 +99,7 @@ def menu(items)
   while true
     commands = ["find KEYWORDS", "quit"]
     if items.length > 0
-      then commands = ["bib NUM", "get NUM", "del NUM", "mod NUM"] + commands
+      then commands = ["bib NUM", "get NUM", "del NUM", "mod NUM", "url NUM"] + commands
     end
     choices = commands.join(' | ')
     ans = ask("#{choices} ? ", String) { |q| q.readline = true; q.case = :downcase }
@@ -116,7 +116,7 @@ def menu(items)
        query = $1
        token, items = Cloudlib::Entry.query(query, NUMITEMS)
        show_items(items, more=(not token.empty?))
-    elsif ans =~ /^(get|del|mod|bib) *(\d+)$/
+    elsif ans =~ /^(get|del|mod|bib|url) *(\d+)$/
        num = $2.to_i
        if (num < 0) || (num >= items.length)
          next
@@ -134,6 +134,9 @@ def menu(items)
            item.delete
          when "bib":
            puts item.to_bibtex
+         when "url":
+           validminutes = ask("How long (in minutes) should the link be valid? ", Integer) { |q| q.default = 10; q.readline = true; }
+           puts item.url(validminutes)
          else
            raise "Unknown command."
          end
@@ -191,7 +194,11 @@ if ARGV.length >= 1
   end
   if ARGV[0] == "list"
     STDERR.puts "Generating list of entries (this may take a while)..."
-    dummy, entries = Cloudlib::Entry.query("", nil)
+    token, entries = Cloudlib::Entry.query("",100)
+    while not (token.empty?)
+      token, next_entries = Cloudlib::Entry.query("", 100, token)
+      entries += next_entries
+    end
     total_size = entries.inject(0) do |accum, e|
       size = e.attributes['size'][0].to_i / (1024.0 * 1024.0)
       printf "%7.2f MB  %s\n", size, e.to_s 
@@ -205,7 +212,11 @@ if ARGV.length >= 1
   if ARGV[0] == "dump"
     path = ARGV[1] || ask("Dump to which directory? ", String) { |q| q.default = "."; q.echo = true }
     new_entries = 0
-    dummy, entries = Cloudlib::Entry.query("", nil)
+    token, entries = Cloudlib::Entry.query("",100)
+    while not (token.empty?)
+      token, next_entries = Cloudlib::Entry.query("", 100, token)
+      entries += next_entries
+    end
     total_size = entries.inject(0) {|accum, e| accum + e.attributes['size'][0].to_i}
     printf("Total size is %.2f megabytes.\n", (total_size / (1024.0 * 1024.0)))
     open("#{path}/#{ENV['CLOUDLIB_LIBRARY_NAME']}.db", 'w') do |file|

data/cloudlib.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "cloudlib"
-  s.version  = "0.3.5"
-  s.date     = "2008-12-29"
+  s.version  = "0.3.8"
+  s.date     = "2009-04-26"
   s.summary  = "Tools for maintaining a library of books and articles in Amazon S3 and SimpleDB"
   s.email    = "jgm@berkeley.edu"
   s.homepage = "http://github.com/jgm/cloudlib"

data/lib/cloudlib.rb

@@ -366,8 +366,8 @@ class Entry
     Entry.fields(entry_type)
   end
 
-  def url
-    AWS::S3::S3Object.find(self.name, @@bucket).url(:expires_in => 60 * 10)  # expires in 10 min
+  def url(minutes = 10)
+    AWS::S3::S3Object.url_for(self.name, @@bucket, :expires_in => 60 * minutes)
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jgm-cloudlib
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.8
 platform: ruby
 authors: 
 - John MacFarlane
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-29 00:00:00 -08:00
+date: 2009-04-26 00:00:00 -07:00
 default_executable: cloudlib
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: aws-sdb
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: highline
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: