couch-shell 0.0.3 → 0.0.4

data/lib/couch-shell/json_value.rb

@@ -25,8 +25,16 @@ module CouchShell
       end
     end
 
-    attr_reader :type
-    attr_reader :ruby_value
+    def self.parse(str)
+      if str.start_with?("[") || str.start_with?("{") # optimization
+        wrap(::JSON.parse(str))
+      else
+        # JSON parses only JSON documents, i.e. an object or an array. Thus we
+        # box the given json value in an array and unbox it after parsing to
+        # allow parsing of any json value.
+        wrap(::JSON.parse("[#{str}]")[0])
+      end
+    end
 
     def initialize(value, ruby_value)
       @value = value
@@ -47,15 +55,15 @@ module CouchShell
               when nil
                 :null
               else
-                raise "#{value.class} is not a valid json type"
+                ::Kernel.raise "#{value} is not of a valid json type"
               end
     end
 
     def respond_to?(msg)
       msg == :format || msg == :couch_shell_format_string ||
         msg == :type || msg == :ruby_value || msg == :to_s ||
-        (@type == :object && @value.has_key?(msg.to_s)) ||
-        @value.respond_to?(msg)
+        msg == :couch_shell_ruby_value! ||
+        (@type == :object && @value.has_key?(msg.to_s))
     end
 
     def method_missing(msg, *args)
@@ -65,11 +73,16 @@ module CouchShell
           return @value[msg_str]
         end
       end
-      @value.__send__(msg, *args)
+      super
+    end
+
+    def [](i)
+      ::Kernel.raise ::TypeError unless @type == :array
+      @value[i]
     end
 
     def to_s
-      case type
+      case @type
       when :object, :array
         ::JSON.generate(@ruby_value)
       when :null
@@ -80,7 +93,7 @@ module CouchShell
     end
 
     def format
-      case type
+      case @type
       when :object, :array
         ::JSON.pretty_generate(@ruby_value)
       when :null
@@ -94,6 +107,33 @@ module CouchShell
       format
     end
 
+    def delete_attr!(name)
+      ::Kernel.raise ::TypeError unless @type == :object
+      @ruby_value.delete(name)
+      @value.delete(name)
+    end
+
+    def set_attr!(name, value)
+      ::Kernel.raise ::TypeError unless @type == :object
+      v = value.respond_to?(:couch_shell_ruby_value!) ?
+        value.couch_shell_ruby_value! : value
+      @ruby_value[name] = v
+      @value[name] = JsonValue.wrap(v)
+    end
+
+    def couch_shell_ruby_value!
+      @ruby_value
+    end
+
+    def nil?
+      false
+    end
+
+    def attr_or_nil!(name)
+      return nil unless @type == :object
+      @value[name]
+    end
+
   end
 
 end

data/lib/couch-shell/response.rb

@@ -11,7 +11,8 @@ module CouchShell
       "application/json", "text/plain"
     ].freeze
 
-    # +response+ is a HTTP::Message from httpclient library
+    # +response+ is a HTTP::Message from httpclient library, or a Net::HTTP
+    # response
     def initialize(response)
       @res = response
       @json = nil
@@ -36,11 +37,11 @@ module CouchShell
     end
 
     def code
-      @res.status.to_s
+      @res.respond_to?(:status) ? @res.status.to_s : @res.code
     end
 
     def message
-      @res.reason
+      @res.respond_to?(:message) ? @res.message : @res.reason
     end
 
     def ok?
@@ -48,11 +49,13 @@ module CouchShell
     end
 
     def body
-      @res.content
+      @res.respond_to?(:content) ? @res.content : @res.body
     end
 
     def content_type
-      @res.contenttype.sub(/;[^;]*\z/, '')
+      @res.respond_to?(:content_type) ?
+        @res.content_type :
+        @res.contenttype.sub(/;[^;]*\z/, '')
     end
 
     def attr(name, altname = nil)

data/lib/couch-shell/shell.rb

@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 
+require "tempfile"
 require "uri"
+require "net/http"
 require "httpclient"
 require "highline"
 require "couch-shell/response"
@@ -59,7 +61,7 @@ module CouchShell
       @highline = HighLine.new(@stdin, @stdout)
       @responses = RingBuffer.new(10)
       @eval_context = EvalContext.new(self)
-      @httpclient = HTTPClient.new
+      @viewtext = nil
     end
 
     def normalize_server_url(url)
@@ -96,10 +98,15 @@ module CouchShell
         else
           @pathstack.pop
         end
+      when %r{\A/\z}
+        @pathstack = []
       when %r{\A/}
-        @pathstack = path[1..-1].split("/")
+        @pathstack = []
+        cd path[1..-1], false
+      when %r{/}
+        path.split("/").each { |elem| cd elem, false }
       else
-        @pathstack.concat path.split("/")
+        @pathstack << path
       end
       if get
         if request("GET", nil) != "200"
@@ -122,36 +129,74 @@ module CouchShell
     end
 
 
-    def print_response(res, label = "")
+    def print_response(res, label = "", show_body = true)
       @stdout.print @highline.color("#{res.code} #{res.message}", :cyan)
       msg " #{label}"
-      if res.json
-        @stdout.puts res.json.format
+      if show_body
+        if res.json
+          @stdout.puts res.json.format
+        elsif res.body
+          @stdout.puts res.body
+        end
       elsif res.body
-        @stdout.puts res.body
+        msg "body has #{res.body.bytesize} bytes"
       end
     end
 
-    def request(method, path, body = nil)
+    def request(method, path, body = nil, show_body = true)
       unless @server_url
         errmsg "Server not set - can't perform request."
         return
       end
-      fpath = full_path(path)
+      fpath = URI.encode(full_path(path))
       msg "#{method} #{fpath} ", false
       if @server_url.scheme != "http"
         errmsg "Protocol #{@server_url.scheme} not supported, use http."
         return
       end
-      res = http_client_request(method, expand(path), body)
+      # HTTPClient and CouchDB don't work together with simple put/post
+      # requests to due some Keep-alive mismatch.
+      #
+      # Net:HTTP doesn't support file upload streaming.
+      if body.kind_of?(FileToUpload) || method == "GET"
+        res = http_client_request(method, URI.encode(expand(path)), body)
+      else
+        res = net_http_request(method, fpath, body)
+      end
       @responses << res
       rescode = res.code
       vars = ["r#{@responses.index}"]
       vars << ["j#{@responses.index}"] if res.json
-      print_response res, "  vars: #{vars.join(', ')}"
+      print_response res, "  vars: #{vars.join(', ')}", show_body
       res.code
     end
 
+    def net_http_request(method, fpath, body)
+      res = nil
+      Net::HTTP.start(@server_url.host, @server_url.port) do |http|
+        req = (case method
+               when "GET"
+                 Net::HTTP::Get
+               when "PUT"
+                 Net::HTTP::Put
+               when "POST"
+                 Net::HTTP::Post
+               when "DELETE"
+                 Net::HTTP::Delete
+               else
+                 raise "unsupported http method: `#{method}'"
+               end).new(fpath)
+        if body
+          req.body = body
+          if req.content_type.nil? && req.body =~ JSON_DOC_START_RX
+            req.content_type = "application/json"
+          end
+        end
+        res = Response.new(http.request(req))
+      end
+      res
+    end
+
     def http_client_request(method, absolute_url, body)
       file = nil
       headers = {}
@@ -163,7 +208,7 @@ module CouchShell
       elsif body && body =~ JSON_DOC_START_RX
         headers['Content-Type'] = "application/json"
       end
-      res = @httpclient.request(method, absolute_url, body, headers)
+      res = HTTPClient.new.request(method, absolute_url, body, headers)
       Response.new(res)
     ensure
       file.close if file
@@ -193,6 +238,22 @@ module CouchShell
       end
     end
 
+    def prompt_msg(msg, newline = true)
+      @stdout.print @highline.color(msg, :yellow)
+      if newline
+        @stdout.puts
+      else
+        @stdout.flush
+      end
+    end
+
+    def continue?(msg)
+      prompt_msg(msg, false)
+      unless @stdin.gets.chomp.empty?
+        raise ShellUserError, "cancelled"
+      end
+    end
+
     def read
       lead = @pathstack.empty? ? ">>" : @pathstack.join("/") + " >>"
       begin
@@ -335,6 +396,9 @@ module CouchShell
         else
           raise ShellUserError, "no response index #{i}"
         end
+      when "viewtext"
+        @viewtext or
+          raise ShellUserError, "viewtext not set"
       else
         raise UndefinedVariable.new(var)
       end
@@ -346,7 +410,7 @@ module CouchShell
       else
         url, bodyarg= argstr.split(/\s+/, 2)
       end
-      if bodyarg.start_with?("@")
+      if bodyarg && bodyarg.start_with?("@")
         filename, content_type = bodyarg[1..-1].split(/\s+/, 2)
         body = FileToUpload.new(filename, content_type)
       else
@@ -355,6 +419,11 @@ module CouchShell
       request method, interpolate(url), body
     end
 
+    def editor_bin!
+      ENV["EDITOR"] or
+        raise ShellUserError, "EDITOR environment variable not set"
+    end
+
     def command_get(argstr)
       request "GET", interpolate(argstr)
     end
@@ -427,6 +496,190 @@ module CouchShell
       @stdout.puts expand(interpolate(argstr))
     end
 
+    def command_sh(argstr)
+      unless argstr
+        errmsg "argument required"
+        return
+      end
+      unless system(argstr)
+        errmsg "command exited with status #{$?.exitstatus}"
+      end
+    end
+
+    def command_editview(argstr)
+      if @pathstack.size != 1
+        raise ShellUserError, "current directory must be database"
+      end
+      design_name, view_name = argstr.split(/\s+/, 2)
+      if design_name.nil? || view_name.nil?
+        raise ShellUserError, "design and view name required"
+      end
+      request "GET", "_design/#{design_name}", nil, false
+      return unless @responses.current(&:ok?)
+      design = @responses.current.json
+      view = nil
+      if design.respond_to?(:views) &&
+          design.views.respond_to?(view_name.to_sym)
+        view = design.views.__send__(view_name.to_sym)
+      end
+      mapval = view && view.respond_to?(:map) && view.map
+      reduceval = view && view.respond_to?(:reduce) && view.reduce
+      t = Tempfile.new(["view", ".js"])
+      t.puts("map")
+      if mapval
+        t.puts mapval
+      else
+        t.puts "function(doc) {\n  emit(doc._id, doc);\n}"
+      end
+      if reduceval || view.nil?
+        t.puts
+        t.puts("reduce")
+        if reduceval
+          t.puts reduceval
+        else
+          t.puts "function(keys, values, rereduce) {\n\n}"
+        end
+      end
+      t.close
+      continue?(
+        "Press ENTER to edit #{view ? 'existing' : 'new'} view, " +
+        "CTRL+C to cancel ")
+      unless system(editor_bin!, t.path)
+        raise ShellUserError, "editing command failed with exit status #{$?.exitstatus}"
+      end
+      text = t.open.read
+      @viewtext = text
+      t.close
+      mapf = nil
+      reducef = nil
+      inmap = false
+      inreduce = false
+      i = 0
+      text.each_line { |line|
+        i += 1
+        case line
+        when /^map\s*(.*)$/
+          unless $1.empty?
+            msg "recover view text with `print viewtext'"
+            raise ShellUserError, "invalid map line at line #{i}"
+          end
+          unless mapf.nil?
+            msg "recover view text with `print viewtext'"
+            raise ShellUserError, "duplicate map line at line #{i}"
+          end
+          inreduce = false
+          inmap = true
+          mapf = ""
+        when /^reduce\s*(.*)$/
+          unless $1.empty?
+            msg "recover view text with `print viewtext'"
+            raise ShellUserError, "invalid reduce line at line #{i}"
+          end
+          unless reducef.nil?
+            msg "recover view text with `print viewtext'"
+            raise ShellUserError, "duplicate reduce line at line #{i}"
+          end
+          inmap = false
+          inreduce = true
+          reducef = ""
+        else
+          if inmap
+            mapf << line
+          elsif inreduce
+            reducef << line
+          elsif line =~ /^\s*$/
+            # ignore
+          else
+            msg "recover view text with `print viewtext'"
+            raise ShellUserError, "unexpected content at line #{i}"
+          end
+        end
+      }
+      mapf.strip! if mapf
+      reducef.strip! if reducef
+      mapf = nil if mapf && mapf.empty?
+      reducef = nil if reducef && reducef.empty?
+      prompt_msg "View parsed, following actions would be taken:"
+      if mapf && mapval.nil?
+        prompt_msg " Add map function."
+      elsif mapf.nil? && mapval
+        prompt_msg " Remove map function."
+      elsif mapf && mapval && mapf != mapval
+        prompt_msg " Update map function."
+      end
+      if reducef && reduceval.nil?
+        prompt_msg " Add reduce function."
+      elsif reducef.nil? && reduceval
+        prompt_msg " Remove reduce function."
+      elsif reducef && reduceval && reducef != reduceval
+        prompt_msg " Update reduce function."
+      end
+      continue? "Press ENTER to submit, CTRL+C to cancel "
+      if !design.respond_to?(:views)
+        design.set_attr!("views", {})
+      end
+      if view.nil?
+        design.views.set_attr!(view_name, {})
+        view = design.views.__send__(view_name.to_sym)
+      end
+      if mapf.nil?
+        view.delete_attr!("map")
+      else
+        view.set_attr!("map", mapf)
+      end
+      if reducef.nil?
+        view.delete_attr!("reduce")
+      else
+        view.set_attr!("reduce", reducef)
+      end
+      request "PUT", "_design/#{design_name}", design.to_s
+      unless @responses.current(&:ok?)
+        msg "recover view text with `print viewtext'"
+      end
+    ensure
+      if t
+        t.close
+        t.unlink
+      end
+    end
+
+    def command_view(argstr)
+      if @pathstack.size != 1
+        raise ShellUserError, "current directory must be database"
+      end
+      design_name, view_name = argstr.split("/", 2)
+      if design_name.nil? || view_name.nil?
+        raise ShellUserError, "argument in the form DESIGN/VIEW required"
+      end
+      request "GET", "_design/#{design_name}/_view/#{view_name}"
+    end
+
+    def command_member(argstr)
+      id, rev = nil, nil
+      json = @responses.current(&:json)
+      unless json && (id = json.attr_or_nil!("_id")) &&
+          (rev = json.attr_or_nil!("_rev")) &&
+          (@pathstack.size > 0) &&
+          (@pathstack.last == id.to_s)
+        raise ShellUserError,
+          "`cg' the desired document first, e.g.: `cg /my_db/my_doc_id'"
+      end
+      # TODO: read json string as attribute name if argstr starts with double
+      # quote
+      attr_name, new_valstr = argstr.split(/\s+/, 2)
+      unless attr_name && new_valstr
+        raise ShellUserError,
+          "attribute name and new value argument required"
+      end
+      if new_valstr == "remove"
+        json.delete_attr!(attr_name)
+      else
+        new_val = JsonValue.parse(new_valstr)
+        json.set_attr!(attr_name, new_val)
+      end
+      request "PUT", "?rev=#{rev}", json.to_s
+    end
+
   end
 
 end

data/lib/couch-shell/version.rb

@@ -2,6 +2,6 @@
 
 module CouchShell
 
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Stefan Lang
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 +01:00
+date: 2011-01-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency