mayl 0.1.0 → 0.2.0

data/lib/mayl/commands.rb

@@ -2,6 +2,17 @@ module Mayl
   # Public: The Commands module is a namespace for all the commands that Mayl
   # uses.
   module Commands
+    def self.autocomplete(line, env)
+      key = line.split.first || ''
+
+      # Try to get namespaces or keys
+      keys = env.autocomplete(key)
+      return keys if keys.any?
+
+      # If not, autocomplete commands
+      opts = constants.map(&:to_s).map(&:downcase)
+      opts.grep(/^#{Regexp.escape(key)}/)
+    end
   end
 end
 

data/lib/mayl/commands/cd.rb

@@ -14,6 +14,7 @@ module Mayl
       # path - the path to cd in
       def initialize(env, path)
         @env  = env
+        path = path.split('.').reject(&:empty?).compact.join('.') if path =~ /\w/
         @path = path
       end
 
@@ -29,6 +30,8 @@ module Mayl
         when "."
           @env.namespace = ""
         else
+          check_namespace!
+
           if @env.namespace.empty?
             @env.namespace = @path
           else
@@ -37,6 +40,19 @@ module Mayl
         end
         nil
       end
+
+      # Public: Checks that you're not trying to enter a leaf.
+      #
+      # Raises an ArgumentError if you are.
+      def check_namespace!
+        namespace = [@env.namespace, @path].reject(&:empty?).join('.')
+        matches   = @env.peek(namespace).compact
+
+        if matches.empty?
+          key = @path.split('.').last
+          raise ArgumentError, "Can't cd to #{key} -- it's a leaf"
+        end
+      end
     end
   end
 end

data/lib/mayl/commands/ls.rb

@@ -19,9 +19,7 @@ module Mayl
       #
       # Returns nil.
       def execute
-        locales.map { |locale|
-          locale.peek(@env.namespace)
-        }.flatten.uniq.each do |option|
+        @env.peek.each do |option|
           print "#{option} "
         end
         nil

data/lib/mayl/env.rb

@@ -6,6 +6,25 @@ module Mayl
     attr_accessor :last_value
     attr_accessor :namespace
 
+    # Public: Autocompletes a key looking at the current namespace and
+    # their contents.
+    #
+    # key - the partial key to consult in the namespace.
+    #
+    # Returns an Array of results.
+    def autocomplete(key)
+      peek.grep(/^#{Regexp.escape(key)}/)
+    end
+
+    # Public: Returns the keys inside a namespace, by default ours.
+    #
+    # namespace - the namespace to peek in. It's ours by default.
+    #
+    # Returns an Array of results.
+    def peek(namespace=self.namespace)
+      locales.map { |locale| locale.peek(namespace) }.flatten.uniq
+    end
+
     # Public: Initializes a new Env loading the locales from a path.
     def initialize(path)
       @locales    = Loader.load(path)

data/lib/mayl/repl.rb

@@ -1,3 +1,5 @@
+require "readline"
+
 module Mayl
   # Public: The class responsible for reading user input, interpreting it and
   # executing associated commands.
@@ -18,19 +20,31 @@ module Mayl
     # Returns nothing.
     def start
       locales = @env.locales.map(&:name)
+      stty_save = `stty -g`.chomp
       prompt = "> "
       puts "Detected locales: #{locales.join(', ')}"
-      while (print prompt; input = $stdin.gets)
-        begin
-          value = @parser.parse(input.chomp).execute
-          @env.last_value = value
-          @env.commit
-          prompt = [@env.namespace, '> '].reject(&:empty?).join ' '
-        rescue => e
-          print "Error: #{e.message}"
-        ensure
-          print "\n"
+
+      env = @env
+      Readline.completion_proc = proc { |s| Commands.autocomplete(s, env) }
+      Readline.completion_append_character = ''
+      # Readline.completer_word_break_characters = 23.chr
+
+      begin
+        while input = Readline.readline(prompt, true)
+          begin
+            value = @parser.parse(input.chomp).execute
+            @env.last_value = value
+            @env.commit
+            prompt = [@env.namespace, '> '].reject(&:empty?).join ' '
+          rescue => e
+            print "Error: #{e.message}"
+          ensure
+            print "\n"
+          end
         end
+      rescue Interrupt
+        system("stty", stty_save)
+        exit
       end
     end
   end

data/lib/mayl/version.rb

@@ -1,4 +1,4 @@
 module Mayl
   # The version of the Mayl gem.
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/mayl/commands/cd_test.rb

@@ -12,21 +12,30 @@ module Mayl
 
       it 'enters a directory' do
         @command = Cd.new @env, 'post.attributes'
+        @command.stubs(:check_namespace!)
         @command.execute
         @env.namespace.must_equal 'activerecord.models.post.attributes'
       end
 
       it 'goes down one level' do
         @command = Cd.new @env, '..'
+        @command.stubs(:check_namespace!)
         @command.execute
         @env.namespace.must_equal 'activerecord'
       end
 
       it 'goes to the root level' do
         @command = Cd.new @env, '.'
+        @command.stubs(:check_namespace!)
         @command.execute
         @env.namespace.must_equal ''
       end
+
+      it 'does not enter leaves' do
+        @env.stubs(:peek).returns []
+        @command = Cd.new @env, 'activerecord.models.post'
+        proc { @command.execute }.must_raise ArgumentError
+      end
     end
   end
 end

data/test/mayl/commands/ls_test.rb

@@ -11,8 +11,7 @@ module Mayl
       end
 
       it 'prints the current keys inside the namespace' do
-        @locales.first.expects(:peek).with('activerecord').returns ['models']
-        @locales.last.expects(:peek).with('activerecord').returns ['attributes', 'models']
+        @env.expects(:peek).returns ['models', 'attributes']
 
         @command.expects(:print).with('models ')
         @command.expects(:print).with('attributes ')

data/test/mayl/env_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Mayl
   describe Env do
     before do
-      @locales = [stub, stub]
+      @locales = [stub(peek: [:baz]), stub(peek: [:bar])]
       Loader.expects(:load).with('my/path').returns @locales
       @env = Mayl::Env.new('my/path')
     end
@@ -19,6 +19,14 @@ module Mayl
 
       @env.commit
     end
+
+    it 'peeks in the locales' do
+      @env.peek.must_equal [:baz, :bar]
+    end
+
+    it 'autocompletes from a key' do
+      @env.autocomplete('ba').must_equal [:baz, :bar]
+    end
   end
 end
 

data/test/mayl/repl_test.rb

@@ -12,7 +12,7 @@ module Mayl
       @baz = stub
       @baz.expects(:execute)
 
-      $stdin.expects(:gets).times(3).returns("foo bar\n", "baz lol\n", nil)
+      Readline.expects(:readline).times(3).returns("foo bar\n", "baz lol\n", nil)
 
       @repl.parser.expects(:parse).with('foo bar').returns @foo
       @repl.parser.expects(:parse).with('baz lol').returns @baz

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mayl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard