prompt 0.0.1 → 0.0.2

data/README.md

@@ -2,7 +2,7 @@
 
 ## What is this?
 
-Prompt makes it easy to build slick command-line applications with [Tab Completion](#tabcompletion), [Command History](#commandhistory), and [Built-in Help](#built-inhelp)
+Prompt makes it easy to build slick command-line applications with Tab Completion, Command History, and Built-in Help
 
 ## Installation
 
@@ -108,6 +108,15 @@ end
 
 Here, the variables are named `first` and `last`.  Their values are be passed as arguments to the command's block, in the order in which they appear.
 
+
+Each `:variable` only matches a single word.  If you want to match multiple words to one variable, use a `*variable`.
+
+```ruby
+command "say *sentence" do |sentence|
+  puts "You say '#{sentence}'"
+end
+```
+
 ### Defining variables
 
 It's not necessary to define a variable before using it in a command, but doing so will allow you to provide a useful description and valid values for the variable.
@@ -136,8 +145,8 @@ end
 
 ## Configuration options
 
-The default prompt `"> "` can be changed before starting the console.
+The default prompt `"> "` can be changed before starting the console, or while it's running.
 
 ```ruby
-Prompt::Console.prompt = "#{Dir.pwd}> "
+Prompt.application.prompt = "#{Dir.pwd}> "
 ```

data/examples/file_manager

@@ -4,21 +4,34 @@ require 'prompt'
 
 extend Prompt::DSL
 
+def change_prompt dir
+  Prompt.application.prompt = "#{@pwd}> "
+end
+
 @pwd = File.absolute_path Dir.pwd
+change_prompt @pwd
 
 dynamic_variable :dir, "Directory" do
   Dir.entries(@pwd).select do |e|
-    File.directory? e
+    File.directory?(File.join(@pwd, e))
   end
 end
 
 command "cd :dir", "Change directory" do |dir|
   @pwd = File.absolute_path File.join(@pwd, dir)
+  change_prompt @pwd
 end
 
 command "ls", "List files" do
   puts @pwd
-  puts Dir.entries(@pwd)
+  Dir.entries(@pwd).select do |e|
+    path = File.join(@pwd, e)
+    if File.directory?(path)
+      puts "#{e}/"
+    else
+      puts e
+    end
+  end
 end
 
 command "pwd", "Print current directory" do

data/examples/mud

@@ -30,7 +30,7 @@ command "look", "Look around" do
   end
 end
 
-command "say :something", "Say something" do |something|
+command "say *something", "Say something" do |something|
   puts "You say '#{something}'"
 end
 

data/lib/prompt/application.rb

@@ -4,9 +4,11 @@ require 'prompt/command'
 module Prompt
   class Application
     attr :command_groups
+    attr_accessor :prompt
 
     def initialize
       @command_groups = []
+      @prompt = "> "
     end
 
     def use_command_group desc

data/lib/prompt/command.rb

@@ -17,7 +17,7 @@ module Prompt
 
     def match(str)
       if m = regex.match(str.strip)
-        m[1..-1]
+        variables.map {|v| m[v.name.to_s] }
       end
     end
 
@@ -43,7 +43,7 @@ module Prompt
     private
 
     def regex
-      @regex ||= begin
+      begin
         regex_strs = words.map do |word|
            case word
            when Variable
@@ -61,6 +61,9 @@ module Prompt
          if word[0] == ":"
            sym = word[1..-1].to_sym
            @all_variables.find {|v| v.name == sym} || Variable.new(sym, sym.to_s)
+         elsif word[0] == "*"
+           sym = word[1..-1].to_sym
+           @all_variables.find {|v| v.name == sym} || GlobVariable.new(sym, sym.to_s)
          else
            word
          end

data/lib/prompt/console/console_module.rb

@@ -5,15 +5,12 @@ module Prompt
   module Console
 
     HISTORY_MAX_SIZE = 100
-    PROMPT = "> "
 
     CompletionProc = proc do |s|
       Prompt.application.completions(s)
     end
 
     def self.start(history_file = nil)
-      @prompt = PROMPT
-
       # Store the state of the terminal
       stty_save = `stty -g`.chomp
       # and restore it when exiting
@@ -28,7 +25,7 @@ module Prompt
 
       load_history history_file if history_file
 
-      while line = Readline.readline(@prompt, true)
+      while line = Readline.readline(Prompt.application.prompt, true)
         begin
           Prompt.application.exec(line).nil?
         rescue ::Prompt::CommandNotFound => e
@@ -37,14 +34,6 @@ module Prompt
       end
     end
 
-    def self.prompt= prompt
-      @prompt = prompt
-    end
-
-    def self.prompt
-      @prompt
-    end
-
     def self.save_history file
       history_no_dups = Readline::HISTORY.to_a.reverse.uniq[0,HISTORY_MAX_SIZE].reverse
       File.open(file, "w") do |f|

data/lib/prompt/dsl.rb

@@ -1,5 +1,6 @@
 require 'prompt/variable'
 require 'prompt/proc_variable'
+require 'prompt/glob_variable'
 
 module Prompt
   module DSL

data/lib/prompt/glob_variable.rb

@@ -0,0 +1,14 @@
+module Prompt
+  class GlobVariable < Variable
+
+    def initialize(name, desc, &block)
+      super(name, desc, nil)
+      @proc = block
+    end
+
+    def regex
+      "(?<#{name}>.+)"
+    end
+
+  end
+end

data/lib/prompt/prompt_module.rb

@@ -1,4 +1,6 @@
 module Prompt
+  VERSION = "0.0.2"
+
   class << self
 
     # Singleton instance

data/lib/prompt/variable.rb

@@ -13,9 +13,9 @@ module Prompt
 
     def regex
       if values
-        "(#{values.map{|v| Regexp.escape(v)}.join("|")})"
+        "(?<#{name}>#{values.map{|v| Regexp.escape(v)}.join("|")})"
       else
-        "([^\s]+)"
+        "('(?<#{name}>[^\']*)'|\"(?<#{name}>[^\"]*)\"|(?<#{name}>[^\s]+))"
       end
     end
 

data/spec/prompt/command_spec.rb

@@ -1,5 +1,6 @@
 require 'prompt/command'
 require 'prompt/variable'
+require 'prompt/glob_variable'
 
 include Prompt
 
@@ -25,6 +26,15 @@ describe Prompt::Command do
       c = Command.new("hi :name")
 
       c.match("hi guy").should == ["guy"]
+      c.match("hi 'some guy'").should == ["some guy"]
+      c.match("hi ''").should == [""]
+      c.match('hi "some guy"').should == ["some guy"]
+      c.match('hi ""').should == [""]
+
+      c.match("hi '").should == ["'"]
+      c.match('hi "').should == ['"']
+      c.match('hi \'"').should == ['\'"']
+
       c.match("higuy").should be_nil
       c.match("higuy guy").should be_nil
     end
@@ -54,6 +64,21 @@ describe Prompt::Command do
       c.match("go x").should be_nil
       c.match("go nn").should be_nil
     end
+
+    it "matches correctly with glob variable" do
+      c = Command.new("say *stuff")
+
+      c.match("say hello").should == ["hello"]
+      c.match("say hello world").should == ["hello world"]
+    end
+
+    it "matches correctly with glob variable and other variable" do
+      c = Command.new("say *stuff :adverb")
+
+      c.match("say hello").should be_nil
+      c.match("say hello loudly").should == ["hello", "loudly"]
+      c.match("say hello world loudly").should == ["hello world", "loudly"]
+    end
   end
 
   describe "#variables" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prompt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,7 @@ files:
 - lib/prompt/console/console_module.rb
 - lib/prompt/console.rb
 - lib/prompt/dsl.rb
+- lib/prompt/glob_variable.rb
 - lib/prompt/proc_variable.rb
 - lib/prompt/prompt_module.rb
 - lib/prompt/variable.rb