elasticshell 0.0.2 → 0.0.4

data/lib/elasticshell/commands/set_verb.rb

@@ -0,0 +1,23 @@
+require 'elasticshell/utils/recognizes_verb'
+
+module Elasticshell
+  module Commands
+    class SetVerb < Command
+
+      include RecognizesVerb
+      extend  RecognizesVerb
+
+      def self.matches? input
+        is_http_verb?(input)
+      end
+
+      def evaluate!
+        v = canonicalize_verb(input)
+        shell.verb = v
+        shell.scope.verb = v
+      end
+      
+    end
+  end
+end
+

data/lib/elasticshell/commands/unknown.rb

@@ -0,0 +1,17 @@
+module Elasticshell
+  module Commands
+    class Unknown < Command
+
+      def self.matches? input
+        true
+      end
+
+      def evaluate!
+        raise ArgumentError.new("Invalid command: '#{shell.input}' for scope '#{shell.scope.path}'.  Try typing 'help' for a list of available commands.")
+      end
+      
+    end
+  end
+end
+
+

data/lib/elasticshell/scopes.rb

@@ -1,4 +1,3 @@
-require 'elasticshell/error'
 require 'uri'
 
 module Elasticshell
@@ -52,12 +51,19 @@ module Elasticshell
 
   class Scope
 
-    attr_accessor :path, :client, :last_refresh_at, :contents
+    include Elasticshell::HasVerb
 
+    attr_accessor :path, :client, :last_refresh_at, :scopes
+
+    def self.requests
+      @requests ||= {}
+    end
+    
     def initialize path, options
-      self.path     = path
-      self.client   = options[:client]
-      self.contents = initial_contents
+      self.verb   = options.delete(:verb)
+      self.path   = path
+      self.client = options[:client]
+      self.scopes = initial_scopes
     end
 
     def to_s
@@ -65,89 +71,114 @@ module Elasticshell
     end
 
     def completion_proc
-      Proc.new do |prefix|
-        refresh
+      Proc.new do |shell, prefix|
+        refresh if client.connected?
         case
         when Readline.line_buffer =~ /^\s*cd\s+\S*$/
-          contents.find_all do |content|
-            content[0...prefix.length] == prefix
-          end
+          # User has typed 'cd' so we should be completing scopes only
+          completing_scope_path, prefix_within_completing_scope = completing_scope_path_and_prefix(prefix)
+          completing_scope = shell.scope_from_path(File.expand_path(completing_scope_path, shell.scope.path))
+          completing_scope.refresh if client.connected?
+          completing_scope.scopes_matching(prefix_within_completing_scope)
         when Readline.line_buffer =~ /^\s*\S*$/
-          command_names.find_all do |command_name|
-            command_name[0...prefix.length] == prefix
-          end
+          # User has started but not completed the first word in the
+          # line so it must be a request available in the current
+          # scope.
+          requests_matching(prefix)
+        when Readline.line_buffer =~ />.*$/
+          # User has started to complete the name of a filesystem path
+          # to redirect output to.
+          Dir[prefix + '*']
         else
+          # The user has finished the first word on the line so we try
+          # to match to a filesystem path.
           Dir[prefix + '*']
         end
       end
     end
 
-    def command_names
-      refresh
-      commands.keys.sort
+    def requests
+      self.class.requests[verb] || {}
     end
 
-    def commands
-      {}
+    def request_names
+      requests.keys
     end
 
+    def requests_matching prefix
+      if prefix.empty?
+        request_names.sort
+      else
+        request_names.find_all { |name| name[0...prefix.length] == prefix }.sort
+      end
+    end
+    
     def refresh
       refresh! unless refreshed?
     end
 
     def refresh!
       reset!
-      fetch_contents
+      fetch_scopes
       self.last_refresh_at = Time.now
       true
     end
 
-    def fetch_contents
+    def fetch_scopes
     end
 
-    def initial_contents
+    def initial_scopes
       []
     end
 
+    def completing_scope_path_and_prefix prefix
+      if prefix =~ %r!^/!
+        if prefix =~ %r!/$!
+          index = -1
+          prefix_within_completing_scope = ''
+        else
+          index = -2
+        end
+        completing_scope_path            = prefix.split('/')[0..index].join('/')
+        completing_scope_path            = '/' if completing_scope_path.empty?
+        prefix_within_completing_scope ||= (prefix.split('/').last || '')
+      else
+        if prefix =~ %r!/$!
+          index = -1
+          prefix_within_completing_scope = ''
+        else
+          index = -2
+        end
+        completing_scope_path            = File.join(self.path, prefix.split('/')[0..index].join('/'))
+        completing_scope_path            = self.path if completing_scope_path.empty?
+        prefix_within_completing_scope ||= (prefix.split('/').last || '')
+      end
+      [completing_scope_path, prefix_within_completing_scope]
+    end
+
+    def scopes_matching prefix
+      scopes.find_all do |scope|
+        prefix.empty? ? true : scope[0...prefix.length] == prefix
+      end.map do |scope|
+        scope =~ %r!/$! ? scope : scope + '/'
+      end.sort.map do |scope|
+        File.join(path, scope)
+      end
+    end
+
     def reset!
-      self.contents = initial_contents
+      self.scopes = initial_scopes
       true
     end
 
     def refreshed?
-      self.last_refresh_at
+      ! self.last_refresh_at.nil?
     end
 
     def exists?
       false
     end
-
-    def command? command
-      command_names.any? do |command_name|
-        command[0...command_name.length] == command_name
-      end
-    end
-
-    def execute command, shell
-      if command_names.include?(command)
-        raise NotImplementedError.new("Have not yet implemented '#{command}' for scope '#{path}'.")
-      else
-        raise ArgumentError.new("No such command '#{command}' in scope '#{path}'.")
-      end
-    end
-
-    def help
-      [].tap do |msg|
-        msg << "Commands specific to the scope '#{path}':"
-        msg << ''
-        commands.each_pair do |command_name, description|
-          msg << '  ' + command_name
-          msg << ('    ' + description)
-          msg << ''
-        end
-      end.join("\n")
-    end
-
+    
   end
   
 end

data/lib/elasticshell/scopes/cluster.rb

@@ -1,5 +1,3 @@
-require 'elasticshell/scopes'
-
 module Elasticshell
 
   module Scopes
@@ -10,26 +8,20 @@ module Elasticshell
         super("/_cluster", options)
       end
 
-      def commands
-        {
-          'health'  => "Retreive the health of the cluster.",
-          'state'   => "Retreive the state of the cluster.",
-          'settings'=> "Retreive the settings for the cluster.",
+      def self.requests
+        @requests = {
+          "GET" => 
+          {
+            'health'  => "Retreive the health of the cluster.",
+            'state'   => "Retreive the state of the cluster.",
+            'settings'=> "Retreive the settings for the cluster.",
+          }
         }
       end
 
       def exists?
         true
       end
-
-      def execute command, shell
-        case
-        when command?(command)
-          shell.request(:get, :index => '_cluster')
-        else
-          super(command, shell)
-        end
-      end
       
     end
   end

data/lib/elasticshell/scopes/global.rb

@@ -1,27 +1,41 @@
-require 'elasticshell/scopes'
-
 module Elasticshell
 
   module Scopes
 
     class Global < Scope
 
+      attr_reader :indices
+
       def initialize options={}
+        @indices = []
         super("/", options)
       end
 
-      def commands
-        {
-          '_status'  => "Retreive the status of all indices in the cluster."
+      def self.requests
+        @requests ||= {
+          "GET" => {
+            '_status'  => "Retreive the status of all indices in the cluster."
+          }
         }
       end
 
-      def initial_contents
+      def initial_scopes
         ['_cluster', '_nodes']
       end
 
-      def fetch_contents
-        self.contents += client.safely(:get, {:index => '_status'}, :return => {"indices" => {}})["indices"].keys
+      def status
+        @status ||= client.safely(:get, {:index => '_status'}, :return => {"indices" => {}}, :log => false)
+      end
+
+      def reset!
+        @indices = []
+        @status  = nil
+        super()
+      end
+
+      def fetch_scopes
+        @indices = status["indices"].keys
+        self.scopes += @indices
       end
 
       def index name, options={}
@@ -31,21 +45,6 @@ module Elasticshell
       def exists?
         true
       end
-
-      def execute command, shell
-        case
-        when command =~ /^_cluster/
-          shell.scope = Scopes.cluster(:client => client)
-        when command =~ /^_nodes/
-          shell.scope = Scopes.nodes(:client => client)
-        when command?(command)
-          shell.request(:get)
-        when index_names.include?(command)
-          shell.scope = index(command)
-        else
-          super(command, shell)
-        end
-      end
       
     end
   end

data/lib/elasticshell/scopes/index.rb

@@ -1,30 +1,27 @@
-require 'elasticshell/scopes'
-
 module Elasticshell
 
   module Scopes
 
     class Index < Scope
 
-      VALID_INDEX_NAME_RE = %r![^/]!
+      include HasName
+
+      attr_reader :mappings
 
       def initialize name, options={}
         self.name = name
+        @mappings = []
         super("/#{self.name}", options)
       end
 
-      attr_reader :name
-      def name= name
-        raise ArgumentError.new("Invalid index name: '#{name}'") unless name =~ VALID_INDEX_NAME_RE
-        @name = name
-      end
-
-      def commands
-        {
-          "_aliases" => "Find the aliases for this index.",
-          "_status"  => "Retrieve the status of this index.",
-          "_stats"   => "Retrieve usage stats for this index.",
-          "_search"  => "Search records within this index.",
+      def self.requests
+        @requests ||= {
+          "GET" => {
+            "_aliases" => "Find the aliases for this index.",
+            "_status"  => "Retrieve the status of this index.",
+            "_stats"   => "Retrieve usage stats for this index.",
+            "_search"  => "Search records within this index.",
+          }
         }
       end
 
@@ -32,28 +29,37 @@ module Elasticshell
         @global ||= Scopes.global(:client => client)
       end
 
+      def status
+        @status ||= client.safely(:get, {:index => name, :op => '_status'}, :return => {"indices" => {name => {}}}, :log => false)
+      end
+      
+      def reset!
+        @status   = nil
+        @mappings = []
+        super()
+      end
+      
       def exists?
+        return false unless client.connected?
         global.refresh
-        global.contents.include?(name)
+        global.scopes.include?(name)
       end
 
-      def fetch_contents
-        @contents = (client.safely(:get, {:index => name, :op => '_mapping'}, :return => { name => {}})[name] || {}).keys
+      def multi?
+        name.include?(',')
       end
 
-      def mapping mapping_name, options={}
-        Scopes.mapping(self.name, mapping_name, options.merge(:client => client))
+      def single?
+        ! multi?
+      end
+
+      def fetch_scopes
+        @mappings = (client.safely(:get, {:index => name, :op => '_mapping'}, :return => { name => {}}, :log => false)[name] || {}).keys
+        self.scopes += @mappings
       end
 
-      def execute command, shell
-        case
-        when command?(command)
-          shell.request(:get, :index => name)
-        when mapping_names.include?(command)
-          shell.scope = mapping(command)
-        else
-          super(command, shell)
-        end
+      def mapping mapping_name, options={}
+        Scopes.mapping(self.name, mapping_name, options.merge(:client => client))
       end
 
     end

data/lib/elasticshell/scopes/mapping.rb

@@ -1,12 +1,10 @@
-require 'elasticshell/scopes'
-
 module Elasticshell
 
   module Scopes
 
     class Mapping < Scope
 
-      VALID_MAPPING_NAME_RE = %r![^/]!
+      include HasName
 
       attr_accessor :index
 
@@ -16,38 +14,20 @@ module Elasticshell
         super("/#{index.name}/#{self.name}", options)
       end
 
-      attr_reader :name
-      def name= name
-        raise ArgumentError.new("Invalid mapping name: '#{name}'") unless name =~ VALID_MAPPING_NAME_RE
-        @name = name
-      end
-
-      def commands
-        {
-          "_search"  => "Search records within this mapping.",
-          "_mapping" => "Retrieve the mapping settings for this mapping.",
+      def self.requests
+        @requests ||= {
+          "GET" => {
+            "_search"  => "Search records within this mapping.",
+            "_mapping" => "Retrieve the mapping settings for this mapping.",
+          }
         }
       end
 
       def exists?
         index.refresh
-        index.contents.include?(name)
+        index.scopes.include?(name)
       end
 
-      def command? command
-        true
-      end
-
-      def execute command, shell
-        case
-        when command?(command)
-          shell.request(:get, :index => index.name, :type => name)
-        else
-          record = shell.request(:get, :index => index.name, :type => name)
-          shell.print(record) if record
-        end
-      end
-      
     end
   end
 end