couchup 0.0.11 → 0.0.12

data/bin/couchup

@@ -29,6 +29,10 @@ OptionParser.new do |opts|
   opts.on("-d", "--database DATABASE", "Database to connect to.") do |db|
     options[:db] = db
   end
+
+  opts.on("-b", "--debug", "Show debugging information") do |bug|
+    options[:bug] = bug
+  end
   
 end.parse!
 
@@ -36,7 +40,7 @@ host = options[:host] || 'localhost'
 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."
 
 ARGV.clear

data/lib/couchup.rb

@@ -14,7 +14,7 @@ Couchup::Commands.constants.each do |c|
         instance.run(*args)
       rescue 
         puts $!.inspect
-        puts $!.backtrace
+        puts $!.backtrace if Couchup.debug?
       end
     end"
 end

data/lib/couchup/commands/map.rb

@@ -4,9 +4,7 @@ module Couchup
       def run(*params)
         rows = MapReduce.map(*params)
         puts "Found #{rows.size} item(s)"
-        rows.each{|r| puts r.inspect}
-        nil
-        
+        rows
       end
     
       def self.describe(p = nil)

data/lib/couchup/couchup.rb

@@ -50,6 +50,12 @@ module Couchup
       def all(options={})
         @db.documents(options)
       end
+      def debug=(value)
+        @debug = value
+      end
+      def debug?
+        @debug == true
+      end
     
       def databases
         server.databases

data/lib/couchup/mapreduce.rb

@@ -19,9 +19,13 @@ module Couchup
       view_params = {:include_docs => true}.merge(options)
       if params.size == 1
         val = params.first
-        view_params.merge!(:keys => val) if val.is_a? Array
-        view_params.merge!(val) if val.is_a? Hash
-        view_params.merge!(:key => val) unless val.nil?
+        if val.is_a? Array
+          view_params.merge!(:keys => val)
+        elsif val.is_a? Hash
+          view_params.merge!(val)
+        else 
+          view_params.merge!(:key => val) unless val.nil?
+        end
       end
       response = Couchup.database.view(name, view_params)
       rows = response["rows"]

data/lib/couchup/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: couchup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - V Sreekanth
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 +05:30
+date: 2011-02-28 00:00:00 +05:30
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency