delicious-cli 0.2.1 → 0.3.0

data/lib/delicious-cli/db.rb

@@ -93,6 +93,10 @@ class Database
     @@posts << params
   end
   
+  def self.last(n)
+    @@posts[-n..-1]
+  end
+  
   def self.find(words)
 
     finders = words.map{|word| /#{word}/i }

data/lib/delicious-cli/display.rb

@@ -1,12 +1,18 @@
 require 'date'
+require 'open3'
 
 #################################################################
 ## Load the colorize gem, and define the "hilite" function
 begin
+  
   require 'delicious-cli/colorize'
+  
   # Colourized hilite...
   class String
+    
     def hilite(words, color=:white)
+      return self.send(color) if words.nil?
+      
       escaped_words = words.map { |word| Regexp.escape(word) }
       matcher = /(#{escaped_words.join('|')})/io
 
@@ -19,15 +25,68 @@ begin
         end
       end.join('')
     end
+    
   end
+  
 rescue LoadError
+  
   STDERR.puts "Note: You should install the 'colorize' gem for extra prettiness.\n"
   # Monochrome hilite does nothing...
   class String
     def hilite(words); self; end
   end
+  
+end
+
+
+#################################################################
+
+def term_width
+  if `stty size` =~ /(\d+) (\d+)/
+    return $2.to_i
+  else
+    return 80
+  end
 end
 
+SCREEN_WIDTH = term_width
+
+#################################################################
+
+class String
+  
+  def wrap(width=80, chop=true)
+
+    if (lines = self.split("\n")).size > 1
+      return lines.map { |line| line.wrap(width, chop) }.flatten
+    end
+    
+    lines = []
+    left = 0
+    
+    loop do
+      edge   = left + width
+      right  = self.rindex(/\s+|$/, edge)
+      
+      if right.nil? or right < left
+        if chop
+          right = edge
+        else
+          right = self.index(/\s+|$/, edge)
+        end
+      end
+      
+      line = self[left...right]
+      lines << line.strip
+      left = self.index(/[^\s]|$/, right)
+      break if right >= (self.size-1)
+    end
+    
+    lines
+  end
+
+end  
+
 #################################################################
 
 def formatdate(dt, width=11)
@@ -40,18 +99,43 @@ def formatdate(dt, width=11)
 end
 
 
-def display(post, query, indent_size=11)
-  indent = " " * indent_size
+def display(post, query=nil, indent_size=11)
+  indent    = " " * indent_size
+  wrap_size = SCREEN_WIDTH - indent_size
 
-  date   = formatdate(post["time"], indent_size)
-  desc   = post["description"].hilite(query, :light_white)
-  ext    = post["extended"].hilite(query, :white)
-  url    = post["href"].hilite(query, :light_blue)
-  tags   = post["tag"].hilite(query, :light_cyan)
+  date         = formatdate(post["time"], indent_size)
+  desc_lines   = post["description"].wrap(wrap_size).map { |line| line.hilite(query, :light_white) }
+  url          = post["href"].hilite(query, :light_blue)
+  tag_lines    = post["tag"].wrap(wrap_size-2).map { |line| line.hilite(query, :light_cyan) }
 
-  puts date + desc
-  puts indent + ext if post["extended"].any?
+  if post["extended"].any?
+    ext_lines = post["extended"].wrap(wrap_size).map { |line| line.hilite(query, :white) }
+  else
+    ext_lines = []
+  end
+  
+  # date / description
+  puts date + desc_lines.first
+  if desc_lines.size > 1
+    desc_lines[1..-1].each { |line| puts indent + line }
+  end
+  
+  # extended description
+  ext_lines.each do |line|
+    puts indent + line
+  end  
+  
+  # url
   puts indent + url
-  puts indent + "(".cyan + tags + ")".cyan
+  
+  # tags
+  print indent + "(".cyan + tag_lines.first
+  if tag_lines.size > 1
+    tag_lines[1..-1].each do |line|
+      print "\n" + indent + " " + line
+    end
+  end
+  puts ")".cyan
+  
   puts
 end

data/lib/delicious-cli.rb

@@ -29,6 +29,11 @@ def search(words)
   matches.each { |match| display(match, words) }
 end
 
+def last(n)
+  posts = Database.last(n)
+  posts.each { |post| display(post) }
+end
+
 def sync
   puts "* Synchronizing database..."
   Database.sync
@@ -112,6 +117,14 @@ def main
       options.redownload = true
     end
   
+    opts.on("-l", "--list [num]", "List the last [num] links (default 5, 0 for all)") do |opt|
+      if opt
+        options.list = opt.to_i
+      else
+        options.list = 5
+      end
+    end
+
     opts.on("-c", "--config", "Configure login info (set delicious username/password)") do |opt|
       options.config = true
     end
@@ -158,6 +171,8 @@ def main
     redownload
   elsif options.sync
     sync
+  elsif options.list
+    last(options.list)
   else
     exit 1 unless ARGV.size > 0
     search(ARGV)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delicious-cli
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - epitron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -04:00
+date: 2009-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency