couchup 0.0.13 → 0.1.0

data/Gemfile

@@ -2,3 +2,7 @@ source :rubygems
 gem 'couchrest'
 gem 'awesome_print'
 gem 'yajl-ruby'
+gem 'ripl'
+gem 'aruba'
+gem 'rspec'
+gem 'bond'

data/Rakefile

@@ -1,2 +1,10 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |r|
+	r.rspec_opts = ["--color", "--format", "progress"]
+end
+
+task :default => :spec

data/Readme.markdown

@@ -4,7 +4,7 @@ Couchup
 This is a command line interface to CouchDb.
 
 
-Installaton
+Installation
 ===========
 
 gem install couchup
@@ -15,6 +15,7 @@ Usage
 ======
 
 Couchup is a command line utility piggybacking on the irb. So you can do all the ruby stuff in it.
+
 Type help on command line to list the stuff you can do with couchup.
 
 
@@ -23,11 +24,12 @@ $ couchup
 
 
 You see a bunch of commands that you can use.
+
 Remember this is just an IRB, so the command syntax is a little verbose.
 
 create :database, :riders (Note the commas and symbols)
 
-Also symbols and strings can be used interchangebly, So the above is the same as
+Also symbols and strings can be used interchangeably, So the above is the same as
 
 create "database", "riders"
 
@@ -40,9 +42,16 @@ Command line Params
 > couchup --help will print the help
  
  use -h (or--host) to set the host machine to connect to
+
  use -p (or --port) to set the port of the host couchdb
+
  use -d (or --database) to set the database to use by default
 
+ use -u (or --username) to use a specific user login (when in admin mode)
+
+ use -a (or --password) to specify the password (when in admin mode)
+
+
 
 Basics
 --------
@@ -66,7 +75,11 @@ 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)
+*last_result* or *__* are short hands for the last result returned by couch operations( Note this is not the same as _ that is available in irb). 
+
+These are typically json documents( 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*
@@ -91,8 +104,11 @@ gets docucment by the given ID.
 --------------
 
 There are 2 different commands.
+
 map Will just run the map function
+
 view : will run both the map and reduce.
+
 They have very similar semantics, except for where noted.
 
 > map "Rider/all"
@@ -108,16 +124,16 @@ will return only only the document matching the above key.
 
 The following will query the view with a post to get all the matching keys.
 
-map "Rider/all", ["78ea2a07be87b6fa0e4afed5d81f3729", "ee23399aad3f8685e64f455504000d49"]
+> map "Rider/all", ["78ea2a07be87b6fa0e4afed5d81f3729", "ee23399aad3f8685e64f455504000d49"]
 
 The following will query the view with a startkey and endkey semantics.
 
-map "Rider/all", :startkey=> "78ea2a07be87b6fa0e4afed5d81f3729", :endkey=> "ee23399aad3f8685e64f455504000d49"
+> map "Rider/all", :startkey=> "78ea2a07be87b6fa0e4afed5d81f3729", :endkey=> "ee23399aad3f8685e64f455504000d49"
 
 
 The same rules apply for *view* command as  well, and additionally it takes the group_level parameter as well.
 
-view "Rider/all", :startkey=> "78ea2a07be87b6fa0e4afed5d81f3729", :endkey=> "ee23399aad3f8685e64f455504000d49"
+> view "Rider/all", :startkey=> "78ea2a07be87b6fa0e4afed5d81f3729", :endkey=> "ee23399aad3f8685e64f455504000d49"
 
 
 # Creating and modifying views.
@@ -129,22 +145,50 @@ It is important to set the EDITOR variable before running couchup, because we us
 
 Will pop a textmate/emacs/vi window with some templates. If the view exists it will show the existing code. So you can modify it.
 
-
 To cancel creation of the view, just empty the contents of the file and save.
 
+If you want to specify the map and view function on couchup
+
+> create :view, 'Rider/test', "function(doc) { if( doc.name) emit(doc.name, 1);}"
+
+
 # Modifying Documents
 -----------------------
 
-We use the last_result that is described in the Basics section, and leverage ruby to do the save. 
+We use the last_result that is described in the Basics section, and leverage ruby to change documents in couchdb
 
-get("<id>")
-last_result[:number] = 100
-last_result.save
+> get("<id>")
+> last_result[:number] = 100
+> last_result.save
 
 
 You could do this with the view results as well.    
 
 
+# Non Interactive Mode
+------------------------
+
+You can just run a few commands on couch by using the -c (--command) option for couchup
+
+e.g : 
+> couchup -d riders -c map Riders/by_arrival_time
+
+Will run the Riders/by_arrival_time  map function on riders database.
+
+
+Note the absence of symbols and strings in such a mode
+
+Multi line  commands are supported by use of ';'
+
+e.g: 
+
+> couchup -c create database new_riders; use riders; replicate_to new_riders
+
+
+
+
+
+
 
 
 

data/TODO

@@ -1,5 +1,18 @@
-Pretty print
 Paging
+Temp view.
+Validation of inputs.
 Decent Editor -> https://github.com/jberkel/interactive_editor
+Scripting, piping to couchup.
 Conflicts
 Attachments
+Try and save views. Save to temp view, show results to the users and then save to real
+Username password based access
+
+Debugging information on debug
+
+Bigcouch
+Nodes Management.
+
+
+
+Lucene

data/bin/couchup

@@ -13,7 +13,6 @@ if File.exists?( File.expand_path(rcfile = "~/.couchuprc") )
   load(rcfile)
 end
 
-
 options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: example.rb [options]"
@@ -30,17 +29,39 @@ OptionParser.new do |opts|
     options[:db] = db
   end
 
+  opts.on("-u", "--username USER", "Database to connect to.") do |user|
+    options[:user] = user
+  end
+
+  opts.on("-a", "--password PASSWORD", "Database to connect to.") do |password|
+    options[:password] = password
+  end
+
   opts.on("-b", "--debug", "Show debugging information") do |bug|
     options[:bug] = bug
   end
+
+  opts.on("-c", "--command COMMAND", "Runs a specific command and prints the result, seperate with ';' to run  multiple commands") do |c|
+    options[:command] = c
+  end
   
 end.parse!
 
 host = options[:host] || 'localhost'
 port = options[:port] || "5984"
-Couchup::Commands::Connect.new.run(host, port)
+Couchup::Commands::Connect.new.run(host, port, options[:user], options[:password])
 Couchup::Commands::Use.new.run(options[:db]) unless  options[:db].nil?
-Couchup.debug = true if options[:bug]
+Couchup::Couchup.debug = true if options[:bug]
+
+unless(options[:command].nil?)
+  commands = options[:command].split( ";")
+  commands.each do |command| 
+    c, params = command.split
+    ap send(c, *params)
+  end
+  exit
+end
+
 ap "Type help to view the list of things you can do. And Yeah Relax."
 
 ARGV.clear

data/lib/couchup.rb

@@ -8,26 +8,30 @@ rescue LoadError
 end
 
 require  File.expand_path '../couchup/couchup', __FILE__
+Dir[File.expand_path('../couchup/*.rb',__FILE__)].each { |file| require 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}
-Dir[File.expand_path('../couchup/*.rb',__FILE__)].each { |file| require file}
 
+include Couchup::ShortHands
 
 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
         Couchup::Couchup.last_result = instance.run(*args)
         nil
+      rescue ArgumentError => e
+        ap e
       rescue 
-        puts $!.class
         ap $!.inspect
         ap $!.backtrace if Couchup::Couchup.debug?
       end
     end"
 end
+instance_eval "def last_result
+  Couchup::Couchup.last_result
+end
+alias __ last_result 
+"

data/lib/couchup/command_extensions.rb

@@ -0,0 +1,15 @@
+module Couchup
+  module CommandExtensions
+    module ClassMethods
+    end
+    
+    def self.included(receiver)
+      receiver.extend ClassMethods
+    end
+    
+    def needs_db!
+      raise ArgumentError, "Please select a database before executing this request" if ::Couchup::Couchup.database.nil?
+    end
+    
+  end
+end

data/lib/couchup/commands/compact.rb

@@ -1,11 +1,27 @@
 module Couchup
   module Commands
     class Compact
+      include ::Couchup::CommandExtensions      
       def run(*params)
-        Couchup.database.compact!
+        db = params.shift
+        if(db.nil?)
+          needs_db!
+          instance = Couchup.database
+        else
+          instance = Couchup.new_database(db)
+        end
+        if instance.nil?
+          ap "Database not found."
+        else
+          instance.compact!
+        end
+        
       end
       def self.describe
-        "Compacts the database. To preserve space"
+        {:description => "Compacts the current database or specified database. To preserve space.",
+        :usage => "compact [db_name]",
+        :examples =>[ "compact", "compact 'Riders/winners"]
+        }
       end
     end
   end

data/lib/couchup/commands/connect.rb

@@ -1,9 +1,11 @@
 module Couchup
   module Commands
     class Connect
-      def run(host = 'localhost', port = 5984)
+      def run(host = 'localhost', port = 5984, user = nil, pass = nil)
         Couchup.host = host
         Couchup.port = port
+        Couchup.user = user
+        Couchup.password = pass
         if(Couchup.ready?)
           ap "Connected to #{Couchup.host}:#{Couchup.port}" 
         else
@@ -11,7 +13,11 @@ module Couchup
         end
       end
       def self.describe
-        "Connects to the couch server. Takes host and port defaults to 5984"
+        {
+          :description => "Connects to the couch server. Takes host and port defaults to 5984",
+          :usage => 'connect [database], [port]',
+          :examples => ["connect", "connect bigcouch.test.com", "connect 'bigcouch.test.com', 5986"]
+        }
       end
     end
   end

data/lib/couchup/commands/create.rb

@@ -1,41 +1,56 @@
 module Couchup
   module Commands
     class Create
+      include ::Couchup::CommandExtensions
       def run(*params)
         what = params.shift.to_s
         if(what == 'view')
-          create_view(params.first)
+          needs_db!
+          create_view(params.shift, *params)
         else
-          Couchup.server.database!(params.first)
-          Use.new.run(params.first)
+          new_db = params.shift.to_s
+          Couchup.server.database!(new_db)
+          Use.new.run(new_db)
         end
       end
       
-      def create_view(name)
+      def create_view(name, *params)
         raise "Please set your EDITOR env variable before using view" if ENV['EDITOR'].nil? 
-        view = ::Couchup::View.new(name)  
-        file = Tempfile.new(name.gsub("/", "_"))
-        tmp_file_path = file.path
-        file.write("------BEGIN Map-------\n")
-        file.write( view.map? ? view.map : ::Couchup::View::MAP_TEMPLATE)
-        file.write("\n------END------\n")
+        view = ::Couchup::View.new(name)
+        if(params.size == 0)  
+          file = Tempfile.new(name.gsub("/", "_"))
+          tmp_file_path = file.path
+          file.write("------BEGIN Map-------\n")
+          file.write( view.map? ? view.map : ::Couchup::View::MAP_TEMPLATE)
+          file.write("\n------END------\n")
         
-        file.write("\n------BEGIN Reduce(Remove the function if you don't want a reduce)-------\n")
-        file.write(view.reduce? ? view.reduce: ::Couchup::View::REDUCE_TEMPLATE )
-        file.write("\n------END------\n")
-        file.write("\nDelete Everything to do nothing.\n")
-        file.close
+          file.write("\n------BEGIN Reduce(Remove the function if you don't want a reduce)-------\n")
+          file.write(view.reduce? ? view.reduce: ::Couchup::View::REDUCE_TEMPLATE )
+          file.write("\n------END------\n")
+          file.write("\nDelete Everything to do nothing.\n")
+          file.close
         
-        `#{ENV['EDITOR']} #{tmp_file_path}`
-        contents = File.open(tmp_file_path).read
-        ::Couchup::View.create(name, contents) unless contents.blank?
-        file.close
-        file.unlink
+          `#{ENV['EDITOR']} #{tmp_file_path}`
+          contents = File.open(tmp_file_path).read
+          unless contents.blank?
+            ::Couchup::View.create_from_file(name, contents) 
+          end
+          file.close
+          file.unlink
+        else
+          map = params.shift
+          reduce = params.shift
+          ::Couchup::View.create(name, map, reduce)
+        end
       end
       
       def self.describe
-        "Creates a new database and switches to the database if using create :database, :foo or a new view if using create :view,'Rider/by_number'"
+        {
+          :description => "Creates a new database and switches to the database",
+          :usage => " create :database | :view , name",
+          :examples => ["create :database, riders", "create :view, 'Riders/test'"]
+        }
       end
     end
   end
-end
+end

data/lib/couchup/commands/drop.rb

@@ -1,17 +1,21 @@
 module Couchup
   module Commands
     class Drop
+      include ::Couchup::CommandExtensions
       def run(*params)
         op_type = params.shift.to_s
-        (params.first.nil? ? Couchup.database : Couchup.database(params.first)).delete! if op_type == 'database'
+        (params.first.nil? ? Couchup.database : Couchup.new_database(params.first.to_s)).delete! 
         ::Couchup::View.new(params.first).delete! if op_type == 'view'
         Couchup.delete_doc(params.first) if op_type == 'doc'
         Couchup.delete_all_docs(params.first) if op_type == 'all_docs'
-        
       end
 
       def self.describe
-        "Drops a either of :database, :view , doc. Use it with drop :database, <dbname> or drop :view, 'Rider/test2', or drop :doc, <id> or even drop :all_docs which removes just the documents"
+        {
+          :description => "Drops specified object from couchdb",
+          :usage => "drop [:database | :view | :doc | :all_docs]",
+          :examples => ["drop :database, 'test'", "drop :view, 'Riders/top_ten'", "drop :doc, '23'", "drop :all_docs"]
+        }
       end
     end
   end

data/lib/couchup/commands/get.rb

@@ -1,14 +1,21 @@
 module Couchup
   module Commands
     class Get
+      include ::Couchup::CommandExtensions
       def run(id = nil)
+        needs_db!
         match = id.nil? ? Couchup.all.collect{|c| c["doc"]} : Couchup.get(id) 
         ap match
         match
       end
 
       def self.describe
-        "get [id] retuns the document with the id. Just 'get' retrives all documents from the current database"
+        {
+          :description => "Retrives documents from the current database",
+          :usage  => "get [:doc], [<id>]",
+          :examples => ["get :doc, '2a663b5936f98fe225d64fcaa89e3281'", "get"]
+        }
+        
       end
     end
   end

data/lib/couchup/commands/help.rb

@@ -2,17 +2,31 @@ module Couchup
   module Commands
     class Help
       def run(param = nil)
-        commands = param.nil? ? Commands.constants : [param.camelize]
-        commands.each do |stuff|
+        param.nil? ? show_all : show(param.camelize)
+        nil
+      end
+      def show(command)
+        k = Commands.const_get(command.to_s)
+        ap k.describe
+      end
+      
+      def show_all
+        Commands.constants.each do |stuff|
           k = Commands.const_get(stuff)
           print stuff.underscore
           print (stuff.underscore.size > 10) ? "\t" : "\t\t"  
-          ap k.respond_to?(:describe) ? k.describe : "No Help"
+          ap k.respond_to?(:describe) ? k.describe[:description] : "No Help"
         end
+        ap "Type help <command> for more detailed info"
       end
     
       def self.describe
-        "Help on the system, 'help :get' will provider help about using get."
+       { 
+         :description =>  "Help on the system",
+         :usage => "help [<command>]",
+         :examples => ["help", "help :get"]
+       }
+        
       end
     end
   end

data/lib/couchup/commands/map.rb

@@ -1,7 +1,9 @@
 module Couchup  
   module Commands
     class Map
+      include ::Couchup::CommandExtensions
       def run(*params)
+        needs_db!
         rows = MapReduce.map(*params)
         ap "Found #{rows.size} item(s)"
         ap rows
@@ -9,7 +11,11 @@ module Couchup
       end
     
       def self.describe(p = nil)
-        "Runs a view with just the map function and returns the results"
+        {
+          :description => "Runs a view with just the map function and returns the results",
+          :usage => 'map <view_name> [options]',
+          :examples => ["map 'Rider/top_ten'","map 'Rider/top_ten', 10", "map 'Rider/top_ten', {:startkey => '10', :endkey => '20'}","map 'Rider/top_ten', [1,2,3,10]" ]
+        }
       end
     end
   end

data/lib/couchup/commands/rename.rb

@@ -0,0 +1,22 @@
+module Couchup
+  module Commands
+    class Rename
+      def run(*params)
+        ap "Move database means that we replicate to a new db and delete the current one. if there are lots of documents, view building will be slow."
+        src_db =  CouchRest.database!("http://#{Couchup.host}:#{Couchup.port}/#{params.shift}")
+        dest_db =  CouchRest.database!("http://#{Couchup.host}:#{Couchup.port}/#{params.shift}")
+        res = src_db.replicate_to(dest_db, false, true)
+        src_db.delete! if res["ok"]
+      end
+      
+      def self.describe
+        {
+          :description => "Renames database or a view both on the same Couch instance. Replicates to new db and deletes the old. Hence slow.",
+          :usage => "rename <src_database>, <target_database>",
+          :examples => ["rename 'riders_test', 'riders_development'"]
+        }
+      end
+    end
+  end
+  
+end

data/lib/couchup/commands/replicate_to.rb

@@ -1,15 +1,21 @@
 module Couchup
   module Commands
     class ReplicateTo
+      include ::Couchup::CommandExtensions
       def run(*params)
         dest = params.shift 
         option = params.shift
-        dest_db = (dest =~ /(http:\/\/.*)\/(.*)/) ? CouchRest::Database.new(CouchRest::Server.new($1), $2) : CouchRest::Database.new(Couchup.server, dest) 
+        needs_db!
+        dest_db = (dest =~ /(http\w:\/\/.*)\/(.*)/) ? CouchRest::Database.new(CouchRest::Server.new($1), $2) : CouchRest::Database.new(Couchup.server, dest) 
         Couchup.database.replicate_to dest_db, (option.to_s == "continous")
       end
       
       def self.describe
-        "Allows replication to different databases. Try replicate_to 'http://foo.bar.com:5984/billing' :continous"
+       { 
+         :description => "Allows replication to different databases",
+         :examples => ["replicate_to :riders_dev", "replicate_to 'http://foo.bar.com:5984/billing', :continous"],
+         :usage => "replicate_to <target_db>, options"
+       }
       end
       
     end

data/lib/couchup/commands/restart.rb

@@ -6,7 +6,11 @@ module Couchup
       end
     
       def self.describe
-        "Restarts the couchdb server. Please be careful with it. It will not prompt you for anything."
+        {
+          :description => "Restarts the couchdb server. Please be careful with it. It will not prompt you for anything.",
+          :examples => ["restart"],
+          :usage => 'restart'
+        }
       end
     end
   end

data/lib/couchup/commands/show.rb

@@ -1,17 +1,23 @@
 module Couchup  
   module Commands
     class Show
+      include ::Couchup::CommandExtensions
       def run(*param)
         option = param.first.to_s
         if(option.blank? || option == 'databases' )
           ap Couchup.databases
         else
+          needs_db!
           ap Couchup.views(param.second)
         end
       end
 
       def self.describe
-        "show databases if databases is specified or views if views is specified. defaults to databases."
+        {
+          :description => "show databases or views on the current instance/database",
+          :details => "show [:databases | :views], [:design]",
+          :examples => ["show", "show :databases", "show :views"]
+        }
       end
     end
   end

data/lib/couchup/commands/use.rb

@@ -5,14 +5,20 @@ module Couchup
         db = database.to_s
         if Couchup.databases.include? db
           Couchup.database = db
-          ap Couchup.database.info
+          info = Couchup.database.info
+          ap info
+          info
         else
           ap "Database was not found"
         end
       end
     
       def self.describe
-        "Use provided database"
+       { 
+         :description => "Use provided database",
+         :detail => "use <database>",
+         :examples => ["use 'riders'"]
+       }
       end
     end
   end

data/lib/couchup/commands/view.rb

@@ -1,7 +1,9 @@
 module Couchup
   module Commands
     class View
+      include ::Couchup::CommandExtensions
       def run(*params)
+        needs_db!
         rows = MapReduce.reduce(*params)
         ap "Found #{rows.size} item(s)"
         ap rows
@@ -9,7 +11,11 @@ module Couchup
       end
     
       def self.describe(params = nil)
-        "Executes the given View. Runs Map and Reduce and retuns the results"
+        {
+          :description => "Executes the given View. Runs Map and Reduce and retuns the results",
+          :usage => "view <view_name> [options]",
+          :examples => ["view 'Riders/top_ten'", "view 'Riders/top_ten', [10,100,200]", "view 'Riders/top_ten', 10", "view 'Riders/top_ten', {:group_level=>2, :group=> true}"]
+        }
       end
     end
   end

data/lib/couchup/couchup.rb

@@ -1,20 +1,35 @@
 module Couchup
   class Couchup
     class << self
-      attr_accessor :port, :host
+      attr_accessor :port, :host, :user, :password
       attr_accessor :last_result
+
       def server
-        @server ||= CouchRest::Server.new("http://#{host}:#{port}")
+        @server ||= CouchRest::Server.new(host_string)
       end
     
       def database=(database)
-        @db  = CouchRest.database!("http://#{host}:#{port}/#{database}")
+        @db  = database.nil? ? nil : CouchRest.database!(host_string(database))
       end
-    
+      
+      
+      def host_string(database=nil)
+        base_string = using_auth? ? "#{user}:#{password}@#{host}:#{port}" : "#{host}:#{port}"
+        database.blank? ? "http://#{base_string}"  : "http://#{base_string}/#{database}"
+      end
+      def using_auth?
+        !user.blank?
+      end
+
+      def new_database(db)
+        CouchRest.database!(host_string(db))
+      end
+      
       def database
         @db
       end
       
+      
       def views(design = nil)
         params = design.nil? ? {:startkey => '_design', :endkey => '_design0'} : {:key => "_design\\#{design}"}
         designs = database.documents(params.merge(:include_docs => true))["rows"]
@@ -31,6 +46,7 @@ module Couchup
         doc = database.get(id)
         database.delete_doc(doc)
       end
+      
       def delete_all_docs(view_name)
         all_docs = view_name.nil? ? all : MapReduce.map(view_name)
         all_docs.collect{|d| d["doc"]}.each do |doc|

data/lib/couchup/extensions/symbol.rb

@@ -1,4 +1,8 @@
 class Symbol
+  def blank?
+    nil || to_s.strip.empty?
+  end
+
   def constantize
     to_s.constantize
    end

data/lib/couchup/mapreduce.rb

@@ -19,12 +19,12 @@ module Couchup
     end
 
     def self.reduce(*params)
-      view({:reduce => true}, *params)
+      view({:reduce => true,:group => true}, *params)
     end
     
   private
     def self.view(options, *params)
-      name = params.shift
+      name = params.shift.to_s
       view_params = options
       if params.size == 1
         val = params.first

data/lib/couchup/short_hands.rb

@@ -0,0 +1,40 @@
+module Couchup
+  module ShortHands
+    def included(base)
+      %w{create drop show}.each do |action|
+        ['view', 'db'].each { |on| base.send "#{action}_#{on}"}
+      end
+      alias :create_database :create_db
+      alias :drop_database :drop_db 
+      alias :show_database :show_db 
+    end
+
+    def create_view(*params)
+      create :view, *params
+    end
+    def create_db(*params)
+      create :database, *params
+    end
+
+    def show_view(*params)
+      show :view, *params
+    end
+
+    def show_db(*params)
+      show :databases, *params
+    end
+    
+    def create_db(*params)
+      create :database, *params
+    end
+    
+    def drop_view(*params)
+      drop :view, *params
+    end
+   
+    def drop_db(*params)
+      drop :database, *params
+    end
+  end
+  
+end

data/lib/couchup/version.rb

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

data/lib/couchup/view.rb

@@ -57,10 +57,13 @@ module Couchup
     end
     
     
-    def self.create(name, file_contents)
-      v = new(name)
-      
+    def self.create_from_file(name, file_contents)
       map, reduce = parse(file_contents)
+      create(name, map, reduce)
+    end
+
+    def self.create(name, map, reduce)
+      v = new(name)
       v.map = map
       v.reduce = reduce unless reduce.blank?
       ap v

data/spec/commands/compact_spec.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+module Couchup
+  module Commands
+    describe Compact do
+      before(:all) do
+        reset_data!
+      end
+      describe "without any parameter" do
+        it "should compact current database" do
+          res = Compact.new.run()
+          res["ok"].should be_true
+        end
+
+        it "should fail when on no database" do
+          Couchup.database = nil
+          begin
+            Compact.new.run()
+            fail("Expected compact to fail")
+          rescue ArgumentError => e
+          end
+        end
+      end
+
+      describe "when database is specified" do
+        it "should compact specified db when on no db" do
+          Couchup.database = nil
+          res = Compact.new.run(database.name)
+          res["ok"].should be_true
+        end
+      end
+    end
+  end
+  
+end

data/spec/commands/map_spec.rb

@@ -0,0 +1,114 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+module Couchup
+  module Commands
+    describe Map do
+      before(:all) do
+        ddoc = {
+          "_id" => "_design/Rider",
+          "views" => {
+            "all" => {
+              "map" => "function(doc){if(doc.name) emit(doc.name, 1)}",
+              "reduce" => "_sum"
+            }
+          }
+        }
+        database.save_doc(ddoc)
+      end
+      after(:each) do
+         reset_data!
+       end
+      
+      describe "simple map" do
+        it "with no documents should return empty" do
+          res = Map.new.run("Rider/all")
+          res.size.should == 0
+        end
+
+        it "with documents should find all" do
+          5.times {|n| database.save_doc({:name => "foo_#{n}"})}
+          res = Map.new.run("Rider/all")
+          res.size.should == 5
+        end
+      end
+
+      describe "map with a key" do
+        it "should return nothing when key is not found" do
+          res = Map.new.run("Rider/all", "xxx")
+          res.size.should == 0
+        end
+
+        it "should find one" do
+          database.save_doc({:name => "foo"})
+          res = Map.new.run("Rider/all", "foo")
+          foo = res.first
+          foo["_id"].should_not be_nil
+          foo["_rev"].should_not be_nil
+          foo["name"].should  == "foo"
+          
+          res.size.should == 1
+        end
+
+        it "should find all matching" do
+          database.save_doc({:name => "foo"})
+          database.save_doc({:name => "foo"})
+          database.save_doc({:name => "bar"})
+          res = Map.new.run("Rider/all", "foo")
+          res.size.should == 2
+          names = res.collect{|r| r["name"]}.uniq
+          names.size.should == 1
+          names.should include("foo")
+          names.should_not include("bar")
+        end
+      end
+      describe "map with multiple keys" do
+        it "returns all matching keys" do
+          database.save_doc({:name => "foo"})
+          database.save_doc({:name => "foo"})
+          database.save_doc({:name => "bar"})
+          res = Map.new.run("Rider/all", "foo", "bar", "tar")
+          res.size.should == 3
+          names = res.collect{|r| r["name"]}.uniq
+          names.size.should == 2
+          names.should include("foo")
+          names.should include("bar")
+          names.should_not include("tar")
+        end  
+
+        it "returns matching keys" do
+          database.save_doc({:name => "foo"})
+          database.save_doc({:name => "foo"})
+          database.save_doc({:name => "bar"})
+
+          res = Map.new.run("Rider/all", ["bar", "tar"])
+          res.size.should == 1
+        end  
+      end
+      describe "startkey and end key " do
+        it "returns matching keys from start" do
+          database.save_doc({:name => "foo"})
+          res = Map.new.run("Rider/all", {:startkey => "foo"})
+          res.size.should == 1
+        end
+
+        it "returns matching keys from start" do
+          database.save_doc({:name => "foo"})
+          database.save_doc({:name => "bar"})
+          res = Map.new.run("Rider/all", {:startkey => "bar", :endkey => 'foo'})
+          res.size.should == 2
+        end
+
+        it "returns matching keys till end" do
+          database.save_doc({:name => "foo"})
+          database.save_doc({:name => "bar"})
+          database.save_doc({:name => "gar"})
+          res = Map.new.run("Rider/all", { :endkey => 'foo'})
+          res.size.should == 2
+          names = res.collect{|r| r["name"]}
+          names.should include "foo"
+          names.should include "bar"
+          names.should_not include "gar"
+        end
+      end
+    end  
+  end
+end

data/spec/commands/use_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+module Couchup
+  module Commands
+    describe Use do
+      it "stays on the same database if db does not exist" do
+        Couchup.database.name.should == TEST_DATABASE
+        res = Use.new.run("xxxxxx")
+        res.should be_nil
+        Couchup.database.name.should == TEST_DATABASE
+      end
+    end
+  end
+  
+end

data/spec/spec_helper.rb

@@ -0,0 +1,45 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'json'
+ROOT = File.expand_path("../..", __FILE__)
+$LOAD_PATH.unshift(File.join(ROOT, "lib"))
+require 'couchup'
+
+
+# Spec stuff
+require 'awesome_print'
+require 'couchrest'
+
+HOST = ENV['HOST'] || "127.0.0.1"
+PORT = ENV['PORT'] || "5984"
+
+TEST_DATABASE = 'couchup_test'
+
+def database
+  @db ||= CouchRest.database!("http://#{HOST}:#{PORT}/#{TEST_DATABASE}")
+end
+
+def reset_data!
+  database.documents(:include_docs => true)["rows"].collect{|r| r["doc"]}.each {|d|database.delete_doc(d) unless d["_id"] =~ /_design/}
+end
+
+def ap(*params)
+  # no op
+end
+
+RSpec.configure do |config|
+  config.before(:all) do 
+    begin
+      database.delete! 
+      database.create!
+      Couchup::Couchup.host = HOST
+      Couchup::Couchup.port = PORT
+      Couchup::Couchup.database = TEST_DATABASE
+    rescue
+      ap "Looks like the couch db does not exist. Use HOST and or PORT env param to set the couchdb server"
+    end
+  end
+end
+
+

data/spec/specs.opts

@@ -0,0 +1,5 @@
+--colour
+--format
+progress
+--loadby
+mtime

metadata

@@ -2,7 +2,7 @@
 name: couchup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors: 
 - V Sreekanth
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +05:30
+date: 2011-03-31 00:00:00 +05:30
 default_executable: couchup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,6 +132,7 @@ files:
 - bin/couchup
 - couchup.gemspec
 - lib/couchup.rb
+- lib/couchup/command_extensions.rb
 - lib/couchup/commands/compact.rb
 - lib/couchup/commands/connect.rb
 - lib/couchup/commands/create.rb
@@ -139,6 +140,7 @@ files:
 - lib/couchup/commands/get.rb
 - lib/couchup/commands/help.rb
 - lib/couchup/commands/map.rb
+- lib/couchup/commands/rename.rb
 - lib/couchup/commands/replicate_to.rb
 - lib/couchup/commands/restart.rb
 - lib/couchup/commands/show.rb
@@ -150,8 +152,15 @@ files:
 - lib/couchup/extensions/string.rb
 - lib/couchup/extensions/symbol.rb
 - lib/couchup/mapreduce.rb
+- lib/couchup/short_hands.rb
 - lib/couchup/version.rb
 - lib/couchup/view.rb
+- spec/commands/compact_spec.rb
+- spec/commands/map_spec.rb
+- spec/commands/use_spec.rb
+- spec/couchup_spec.rb
+- spec/spec_helper.rb
+- spec/specs.opts
 has_rdoc: true
 homepage: http://blog.activesphere.com/introducing-couchup-an-interactive-couchdb-co
 licenses: []
@@ -176,9 +185,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: couchup
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Command line interface to a couchdb deployment.
-test_files: []
-
+test_files: 
+- spec/commands/compact_spec.rb
+- spec/commands/map_spec.rb
+- spec/commands/use_spec.rb
+- spec/couchup_spec.rb
+- spec/spec_helper.rb
+- spec/specs.opts