delicious-cli 0.4.3 → 0.5.0

data/lib/delicious-cli.rb

@@ -25,16 +25,6 @@ end
 
 #################################################################
 
-def search(words)
-  matches = Database.find(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
@@ -110,6 +100,14 @@ def main
     opts.separator " "
     opts.separator "Specific options:"
     
+    opts.on("-c", "--config", "(Re)configure login info (set your delicious username/password)") do |opt|
+      options.config = true
+    end
+
+    opts.on("-t", "--test-auth", "Test that authentication info works") do |opt|
+      options.test_auth = true 
+    end
+
     opts.on("-s", "--sync", "Synchronize links") do |opt|
       options.sync = true
     end
@@ -117,7 +115,11 @@ def main
     opts.on("-r", "--redownload", "Erase database and redownload all links") do |opt|
       options.redownload = true
     end
-  
+
+    opts.on("-a", "--all", "Show all links.") do |opt|
+      options.list = 0
+    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
@@ -126,14 +128,10 @@ def main
       end
     end
 
-    opts.on("-c", "--config", "Configure login info (set delicious username/password)") do |opt|
-      options.config = true
-    end
-
-    opts.on("-t", "--test-auth", "Test that authentication info works") do |opt|
-      options.test_auth = true 
+    opts.on("-j", "--json", "Output results as (pretty) JSON.") do |opt|
+      options.json = true
     end
-
+  
     opts.on("-d", "--debug", "Debug info") do |opt|
       options.debug = true
     end
@@ -172,11 +170,29 @@ def main
     redownload
   elsif options.sync
     sync
-  elsif options.list
-    last(options.list)
   else
-    exit 1 unless ARGV.size > 0
-    search(ARGV)
+    
+    # get posts
+    if options.list
+      posts = Database.last(options.list)
+    else
+      words = ARGV
+      exit 1 unless words.size > 0
+      posts = Database.find(words)
+    end
+    
+    
+    if options.json
+      require 'json'
+      puts JSON.pretty_generate(posts)
+    else
+      if words
+        posts.each { |match| display(match, words) }
+      else
+        posts.each { |post| display(post) }
+      end
+    end
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delicious-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000 Z
+date: 2011-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &73716350 !ruby/object:Gem::Requirement
+  requirement: &68564890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73716350
+  version_requirements: *68564890
 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
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Delicious.com commandline interface