couchup 0.0.12 → 0.0.13

data/Gemfile

@@ -1,3 +1,4 @@
 source :rubygems
 gem 'couchrest'
+gem 'awesome_print'
 gem 'yajl-ruby'

data/Readme.markdown

@@ -63,6 +63,18 @@ To use a specific database switch with.
 Most Couchup commands need you to be on a specific database.
 
 
+Shortcuts
+----------
+
+last_result or __ are short hands to the last result returned by couch operations. These are typically json document( or array of documents)
+Most commands that are in the form of <operation> <:view|| :database || :doc> have short hands like <operation>_<view> or <operation>_database
+    
+eg. *create_database :foo*  is same as  *create :database, :foo*
+
+or *create_view 'Rider/test'* is the same as *create :view, 'Rider/test'*
+
+    
+
 # Getting documents
 --------------------
 
@@ -120,6 +132,20 @@ Will pop a textmate/emacs/vi window with some templates. If the view exists it w
 
 To cancel creation of the view, just empty the contents of the file and save.
 
+# Modifying Documents
+-----------------------
+
+We use the last_result that is described in the Basics section, and leverage ruby to do the save. 
+
+get("<id>")
+last_result[:number] = 100
+last_result.save
+
+
+You could do this with the view results as well.    
+
+
+
 
 
 

data/TODO

@@ -1,3 +1,5 @@
-Replication
+Pretty print
+Paging
+Decent Editor -> https://github.com/jberkel/interactive_editor
 Conflicts
-Attachments
+Attachments

data/bin/couchup

@@ -41,7 +41,7 @@ port = options[:port] || "5984"
 Couchup::Commands::Connect.new.run(host, port)
 Couchup::Commands::Use.new.run(options[:db]) unless  options[:db].nil?
 Couchup.debug = true if options[:bug]
-puts "Type help to view the list of things you can do. And Yeah Relax."
+ap "Type help to view the list of things you can do. And Yeah Relax."
 
 ARGV.clear
 

data/couchup.gemspec

@@ -8,16 +8,16 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["V Sreekanth"]
   s.email       = ["sreeix@gmail.com"]
-  s.homepage    = ""
-  s.summary     = %q{Command line inteface to a couchdb deployment.}
-  s.description = %q{Command line inteface to a couchdb deployment.}
+  s.homepage    = "http://blog.activesphere.com/introducing-couchup-an-interactive-couchdb-co"
+  s.summary     = %q{Command line interface to a couchdb deployment.}
+  s.description = %q{Command line interface to a couchdb deployment.}
 
   s.rubyforge_project = "couchup"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.default_executable = "ey"
+  s.default_executable = "couchup"
 
   s.require_paths = ["lib"]
   
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency('json')
   s.add_dependency('mime-types')
   s.add_dependency('rest-client')
+  s.add_dependency('awesome_print')
   
   s.add_development_dependency('rspec', '1.3.0')
   s.add_development_dependency('rake')

data/lib/couchup.rb

@@ -1,5 +1,12 @@
 # require 'yajl-ruby'
 require 'couchrest'
+begin
+  require 'ap'
+rescue LoadError
+  puts "'gem install awesome_print' for nicer formatting"
+  alias ap puts
+end
+
 require  File.expand_path '../couchup/couchup', __FILE__
 Dir[File.expand_path('../couchup/commands/*.rb',__FILE__)].each { |file| require file}
 Dir[File.expand_path('../couchup/extensions/*.rb',__FILE__)].each { |file| require file}
@@ -8,13 +15,19 @@ Dir[File.expand_path('../couchup/*.rb',__FILE__)].each { |file| require file}
 
 Couchup::Commands.constants.each do |c|
   instance_eval "
+    def last_result
+      Couchup::Couchup.last_result
+    end
+    alias __ last_result 
     def #{c.underscore}(*args)
       begin
         instance = Couchup::Commands.const_get(:#{c}).new
-        instance.run(*args)
+        Couchup::Couchup.last_result = instance.run(*args)
+        nil
       rescue 
-        puts $!.inspect
-        puts $!.backtrace if Couchup.debug?
+        puts $!.class
+        ap $!.inspect
+        ap $!.backtrace if Couchup::Couchup.debug?
       end
     end"
 end

data/lib/couchup/commands/connect.rb

@@ -5,9 +5,9 @@ module Couchup
         Couchup.host = host
         Couchup.port = port
         if(Couchup.ready?)
-          puts "Connected to #{Couchup.host}:#{Couchup.port}" 
+          ap "Connected to #{Couchup.host}:#{Couchup.port}" 
         else
-          puts "Could not connect to #{Couchup.host}:#{Couchup.port}"
+          ap "Could not connect to #{Couchup.host}:#{Couchup.port}"
         end
       end
       def self.describe

data/lib/couchup/commands/get.rb

@@ -2,7 +2,9 @@ module Couchup
   module Commands
     class Get
       def run(id = nil)
-        id.nil? ? Couchup.all : Couchup.get(id) 
+        match = id.nil? ? Couchup.all.collect{|c| c["doc"]} : Couchup.get(id) 
+        ap match
+        match
       end
 
       def self.describe

data/lib/couchup/commands/help.rb

@@ -7,7 +7,7 @@ module Couchup
           k = Commands.const_get(stuff)
           print stuff.underscore
           print (stuff.underscore.size > 10) ? "\t" : "\t\t"  
-          puts k.respond_to?(:describe) ? k.describe : "No Help"
+          ap k.respond_to?(:describe) ? k.describe : "No Help"
         end
       end
     

data/lib/couchup/commands/map.rb

@@ -3,7 +3,8 @@ module Couchup
     class Map
       def run(*params)
         rows = MapReduce.map(*params)
-        puts "Found #{rows.size} item(s)"
+        ap "Found #{rows.size} item(s)"
+        ap rows
         rows
       end
     

data/lib/couchup/commands/show.rb

@@ -4,9 +4,9 @@ module Couchup
       def run(*param)
         option = param.first.to_s
         if(option.blank? || option == 'databases' )
-          puts Couchup.databases.inspect
+          ap Couchup.databases
         else
-          puts Couchup.views(param.second).inspect
+          ap Couchup.views(param.second)
         end
       end
 

data/lib/couchup/commands/use.rb

@@ -5,9 +5,9 @@ module Couchup
         db = database.to_s
         if Couchup.databases.include? db
           Couchup.database = db
-          puts Couchup.database.info.inspect
+          ap Couchup.database.info
         else
-          puts "Database was not found"
+          ap "Database was not found"
         end
       end
     

data/lib/couchup/commands/view.rb

@@ -3,9 +3,9 @@ module Couchup
     class View
       def run(*params)
         rows = MapReduce.reduce(*params)
-        puts "Found #{rows.size} item(s)"
-        rows.each{|r| puts r.inspect}
-        nil
+        ap "Found #{rows.size} item(s)"
+        ap rows
+        rows
       end
     
       def self.describe(params = nil)

data/lib/couchup/couchup.rb

@@ -2,6 +2,7 @@ module Couchup
   class Couchup
     class << self
       attr_accessor :port, :host
+      attr_accessor :last_result
       def server
         @server ||= CouchRest::Server.new("http://#{host}:#{port}")
       end
@@ -18,15 +19,20 @@ module Couchup
         params = design.nil? ? {:startkey => '_design', :endkey => '_design0'} : {:key => "_design\\#{design}"}
         designs = database.documents(params.merge(:include_docs => true))["rows"]
         designs.collect do |d|
-          d["doc"]["views"].keys.collect{|view| "#{d['key'].gsub('_design/','')}/#{view}"}
+          d["doc"]["views"].keys.collect do |view| 
+            map = !d["doc"]["views"][view]["map"].blank?
+            reduce = !d["doc"]["views"][view]["reduce"].blank?
+            {"#{d['key'].gsub('_design/','')}/#{view}"  => {:reduce => reduce, :map => map}}
+          end
         end.flatten
       end
+      
       def delete_doc(id)
         doc = database.get(id)
         database.delete_doc(doc)
       end
       def delete_all_docs(view_name)
-        all_docs = view_name.nil? ? all(:include_docs => true)["rows"] : MapReduce.map(view_name)
+        all_docs = view_name.nil? ? all : MapReduce.map(view_name)
         all_docs.collect{|d| d["doc"]}.each do |doc|
           database.delete_doc(doc) unless (doc["_id"] =~ /^_design/)
         end
@@ -35,10 +41,11 @@ module Couchup
       def ready?
         uuid = nil
         begin
-          puts (info = server.info)
+          ap (info = server.info)
         rescue
-          puts $!.backtrace
-          puts $!.inspect
+          ap $!.inspect
+          ap $!.backtrace if debug?
+          
         end
         !info.nil?
       end
@@ -48,8 +55,9 @@ module Couchup
       end
 
       def all(options={})
-        @db.documents(options)
+        @db.documents(options.merge(:include_docs => true))["rows"]
       end
+      
       def debug=(value)
         @debug = value
       end

data/lib/couchup/mapreduce.rb

@@ -3,10 +3,19 @@ module Couchup
     def self.map(*params)
       #FIXME. should probably get view meta data to do one view call. but this is also doing 2 calls.
       begin
-        view({}, *params)
+        response = view({:include_docs => true}, *params)
       rescue RestClient::BadRequest
-        view({:reduce => false}, *params)
+        response = view({:reduce => false, :include_docs => true}, *params)
       end
+      
+      docs = response["rows"].collect do |r|
+        r["doc"].instance_eval "def save
+          ::Couchup::Couchup.database.save_doc(self)
+        end
+        "
+        r["doc"]
+      end
+      
     end
 
     def self.reduce(*params)
@@ -16,7 +25,7 @@ module Couchup
   private
     def self.view(options, *params)
       name = params.shift
-      view_params = {:include_docs => true}.merge(options)
+      view_params = options
       if params.size == 1
         val = params.first
         if val.is_a? Array
@@ -28,7 +37,6 @@ module Couchup
         end
       end
       response = Couchup.database.view(name, view_params)
-      rows = response["rows"]
     end
   end
 end

data/lib/couchup/version.rb

@@ -1,3 +1,3 @@
 module Couchup
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/couchup/view.rb

@@ -8,7 +8,7 @@ module Couchup
       begin
         @doc = Couchup.database.get("_design/#{@design}")
       rescue
-        puts "Design #{@design} not found creating a new one"
+        ap "Design #{@design} not found creating a new one"
         @doc = {"_id" => "_design/#{@design}", :language => 'javascript', :views => {}}
         save
         @doc = Couchup.database.get("_design/#{@design}")
@@ -63,7 +63,7 @@ module Couchup
       map, reduce = parse(file_contents)
       v.map = map
       v.reduce = reduce unless reduce.blank?
-      puts v.inspect
+      ap v
       v.save
     end
     

metadata

@@ -2,7 +2,7 @@
 name: couchup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - V Sreekanth
@@ -10,8 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 +05:30
-default_executable: ey
+date: 2011-03-01 00:00:00 +05:30
+default_executable: couchup
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: couchrest
@@ -69,39 +69,50 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: awesome_print
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id008
-description: Command line inteface to a couchdb deployment.
+  version_requirements: *id009
+description: Command line interface to a couchdb deployment.
 email: 
 - sreeix@gmail.com
 executables: 
@@ -142,7 +153,7 @@ files:
 - lib/couchup/version.rb
 - lib/couchup/view.rb
 has_rdoc: true
-homepage: ""
+homepage: http://blog.activesphere.com/introducing-couchup-an-interactive-couchdb-co
 licenses: []
 
 post_install_message: 
@@ -165,9 +176,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: couchup
-rubygems_version: 1.5.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
-summary: Command line inteface to a couchdb deployment.
+summary: Command line interface to a couchdb deployment.
 test_files: []