delicious-cli 0.1.4 → 0.2.0

data/README.rdoc

@@ -1,22 +1,49 @@
 = Delicious.com Command-line Interface
 
-Locally mirror your delicious links, and search them. Usage:
+== Concept
+
+This program lets you locally mirror your delicious links, and quickly search them (with pretty colour-coded results).
+
+Usage:
+
+    delicious <search query>
+         or
+    dels <search query> (if you're into the brevity thing)
 
-    dels <search query>
 
 == Installation
 
     gem sources --add http://gemcutter.org
     gem install delicious-cli
 
-== Example:
 
-=== Set your delicious login information:
+== Configuration
+
+Just run "delicious" with no options and it will prompt you for your login and password and save the settings to ~/.delicious.  
+
+
+== Commandline options:
+
+Usage: delicious [options] <search query>
+
+Specific options:
+    -s, --sync                       Synchronize links
+    -r, --redownload                 Erase database and redownload all links
+    -c, --config                     Configure login info (set delicious username/password)
+    -t, --test-auth                  Test that authentication info works
+    -d, --debug                      Debug info
+
+Common options:
+    -v, --version                    Version information
+    -h, --help                       Show this message
+
+    
+== Common Tasks
+
 
-(If you have never configured delicious-cli before, this will automatically
-happen the first time you run it.)
+=== Change your login information:
 
-    epi@fizz$ dels -c
+    epi@fizz$ delicious -c
     
     Delicious login info
     ---------------------------
@@ -31,36 +58,27 @@ happen the first time you run it.)
       |_ Login successful! Saving config...
 
 
-=== Download all your delicious links:
+=== Download new links (since last update):
 
-    epi@fizz$ dels -r
-
-    * Redownloading database...
-    * Retrieving all links... (3465 links found)
-    * Inserting links into database...done!
-
-=== Download new links (since last sync):
-
-    epi@fizz$ dels -s
+    epi@fizz$ delicious -s
     
     * Synchronizing database...
-    * Retrieving new links... (5 links found)
-    * Inserting links into database...done!
+      |_ Retrieving new links... (5 links found)
+      |_ Processing links...done!
+      |_ Saving database...done!
 
-== Commandline options:
+      
+=== Clear the database and redownload all links:
 
-Usage: dels [options] <search query>
+    epi@fizz$ delicious -r
 
-Specific options:
-    -d, --debug                      Debug info
-    -s, --sync                       Synchronize links
-    -r, --redownload                 Erase database and redownload all links
-    -c, --config                     Configure app (set delicious username/password)
-    -t, --test-auth                  Test that authentication info works
+    * Redownloading database...
+      |_ Retrieving all links... (3483 links found)
+      |_ Processing links...done!
+      |_ Saving database...done!
 
-Common options:
-    -h, --help                       Show this message
 
 == Copyright
 
-Copyright (c) 2009 Chris Gahan. See LICENSE for details.
+Copyright (c) 2009 Chris Gahan. See LICENSE for more details.
+

data/bin/delicious

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path(File.dirname(__FILE__))
+
+require 'delicious-cli'
+main

data/lib/delicious-cli/api.rb

@@ -23,10 +23,10 @@ class Delicious
     [result["posts"]["post"]].flatten  # ensure it's an array
   end
   
-  def self.posts_since(time)
-    $log.debug "Retrieving links newer than #{time}"
-    results = posts_all(:fromdt=>time)
-    results.select { |r| r["time"] != time }
+  def self.posts_since(time_string)
+    $log.debug "Retrieving links newer than #{time_string}"
+    results = posts_all(:fromdt=>time_string)
+    results.select { |r| r["time"] != time_string }
   end
 
   def self.valid_auth?

data/lib/delicious-cli/db.rb

@@ -1,17 +1,8 @@
-require 'sequel'
-require 'sequel/extensions/blank'
-
 require 'delicious-cli/settings'
 require 'delicious-cli/api'
 
 #################################################################
 
-$log.debug "Loading database..."
-DB = Sequel.sqlite(configfile('delicious.db'))
-$log.debug "done."
-
-#################################################################
-
 =begin
 Sample record:
 
@@ -29,43 +20,40 @@ Sample record:
 #################################################################
 
 class Database
-  @@posts = DB[:posts]
 
+  @@filename = configfile('delicious.marshal')
+  @@posts = []
+  
+  def self.posts
+    @@posts
+  end
+  
   def self.init!
-    create_posts! unless DB.table_exists?(:posts)
-  end  
-
+    $log.debug "Loading database..."
+    @@posts = Marshal.load(open(@@filename)) if File.exists? @@filename
+    $log.debug "done."
+  end
+  
   def self.clear!
-    DB.drop_table(:posts)
-    create_posts!
+    File.delete @@filename if File.exists? @@filename
+    @@posts = []
   end
 
-  def self.create_posts!
-    DB.create_table :posts do
-      primary_key :id
-      
-      string :href
-      string :time
-      string :tag
-      string :description
-      text :extended
-      string :hash
-      string :meta
-      
-      index :hash, {:unique=>true}
-      index [:description, :extended, :tag]
+  def self.save!
+    open(@@filename, "w") do |f|
+      f.write Marshal.dump(@@posts)
     end
   end
-  
+
   def self.sync(all=false)
     all = true if @@posts.empty?
     
     if all
-      print "* Retrieving all links..."
+      print "  |_ Retrieving all links..."
       STDOUT.flush
       posts = Delicious.posts_all
     else
-      print "* Retrieving new links..."
+      print "  |_ Retrieving new links..."
       STDOUT.flush
       posts = Delicious.posts_since(most_recent_time)
     end      
@@ -74,30 +62,26 @@ class Database
     
     puts " (#{posts.size} links found)"
     
-    return if posts.empty?
+    if posts.size == 0
+      puts
+      return
+    end      
     
-    print "* Inserting links into database..."
+    print "  |_ Processing links..."
+    posts.each { |post| post["time_string"] = post["time"]; post["time"] = DateTime.parse(post["time_string"]) }
+    @@posts += posts.sort_by { |post| post["time"] }    
+    puts "done!"
     
-    counter = 0
-    for post in posts
-      counter += 1
-      begin
-        add post
-      rescue Sequel::DatabaseError => e
-        $log.debug "error: #{e} adding #{post.inspect}"
-      end
-      
-      if counter % 37 == 0
-        print "."
-        STDOUT.flush
-      end
-    end
+    print "  |_ Saving database..."
+    save!
     
     puts "done!"
+    puts
   end
   
   def self.most_recent_time
-    @@posts.order(:time.desc).limit(1).first[:time]
+    #@@posts.order(:time.desc).limit(1).first[:time]
+    @@posts.last["time_string"]
   end
   
   def self.add(params)
@@ -105,13 +89,18 @@ class Database
   end
   
   def self.find(words)
-    sequel_query = @@posts
-    for word in words
-      pattern = "%#{word}%" 
-      sequel_query = sequel_query.filter(:extended.like(pattern) | :description.like(pattern) | :tag.like(pattern))
+
+    finders = words.map{|word| /#{word}/i }
+    fields = %w[extended description tag]
+    
+    @@posts.select do |post|
+      finders.all? do |finder|
+        fields.any? do |field|
+          post[field].match finder
+        end
+      end
     end
-    sequel_query.order(:time)
-  end
-  
+    
+  end  
   
 end

data/lib/delicious-cli/display.rb

@@ -32,8 +32,7 @@ end
 
 #################################################################
 
-def formatdate(date, width=11)
-  dt = DateTime.parse(date)
+def formatdate(dt, width=11)
   time = "%l:%M%P"
   date = "%d %b %g"
   #dt.strftime("#{date} #{time}")
@@ -46,14 +45,14 @@ end
 def display(post, query, indent_size=11)
   indent = " " * 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   = 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)
 
   puts date + desc
-  puts indent + ext if post[:extended].any?
+  puts indent + ext if post["extended"].any?
   puts indent + url
   puts indent + "(".cyan + tags + ")".cyan
   puts

data/lib/delicious-cli/settings.rb

@@ -29,7 +29,8 @@ end
 #################################################################
 
 unless File.exists? CONFIGDIR
-  $log.info "* Creating new config directory: #{CONFIGDIR}"
+  puts
+  puts "* Creating new configuration directory: #{CONFIGDIR}"
   FileUtils.mkdir_p CONFIGDIR 
 end
 

data/lib/delicious-cli.rb

@@ -40,7 +40,7 @@ def redownload
   Database.sync
 end
 
-def config
+def config(first_time = false)
   # prompt user and stuff
   puts "Delicious login info"
   puts "---------------------------"
@@ -64,6 +64,10 @@ def config
       Settings["username"] = username
       Settings["password"] = password
       Settings.save!
+
+      sync if first_time
+      
+      puts "* Everything is ready. Search away!" 
     else
       puts "  |_ Login failed! (Please check your credentials or network.)"
     end
@@ -84,7 +88,7 @@ def main
   begin
     Settings.load!
   rescue Errno::ENOENT
-    config
+    config(true)
     retry
   end
   
@@ -96,14 +100,10 @@ def main
   
   options = OpenStruct.new
   OptionParser.new do |opts|
-    opts.banner = "Usage: dels [options] <search query>"
-    opts.separator ""
+    opts.banner = "Usage: delicious [options] <search query>"
+    opts.separator " "
     opts.separator "Specific options:"
     
-    opts.on("-d", "--debug", "Debug info") do |opt|
-      options.debug = true
-    end
-  
     opts.on("-s", "--sync", "Synchronize links") do |opt|
       options.sync = true
     end
@@ -112,7 +112,7 @@ def main
       options.redownload = true
     end
   
-    opts.on("-c", "--config", "Configure app (set delicious username/password)") do |opt|
+    opts.on("-c", "--config", "Configure login info (set delicious username/password)") do |opt|
       options.config = true
     end
 
@@ -120,8 +120,12 @@ def main
       options.test_auth = true 
     end
 
+    opts.on("-d", "--debug", "Debug info") do |opt|
+      options.debug = true
+    end
+  
 
-    opts.separator ""
+    opts.separator " "
     opts.separator "Common options:"
 
     # No argument, shows at tail.  This will print an options summary.
@@ -131,6 +135,13 @@ def main
       puts
       exit
     end
+
+    opts.on("-v", "--version", "Version information") do |opt|
+      versionfile = File.join(File.dirname(File.expand_path(__FILE__)), "..", "VERSION")
+      versionstring = open(versionfile).read
+      puts "delicious-cli v#{versionstring}"
+      puts
+    end
     
   end.parse!
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delicious-cli
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors: 
 - epitron
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-29 00:00:00 -04:00
-default_executable: dels
+date: 2009-09-10 00:00:00 -04:00
+default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: sequel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: httparty
   type: :runtime
@@ -42,20 +32,11 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: A commandline tool which lets you download all your delicious.com links into a local SQLite database and search them (with pretty color-coded results).
+description: A commandline tool which lets you download all your delicious.com links and search them (with pretty color-coded results).
 email: chris@ill-logic.com
 executables: 
 - dels
+- delicious
 extensions: []
 
 extra_rdoc_files: 
@@ -94,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Delicious.com commandline interface