command-set 0.8.4 → 0.9.0

data/lib/command-set/standard-commands.rb

@@ -49,7 +49,7 @@ module StdCmd
                 puts docline
               end
             else
-              command,remains = subject.command_set.find_command(*terms)
+              command = subject.command_set.find_command(terms)
               docs = command.documentation(width)
               docs.each do |docline|
                 puts docline
@@ -129,20 +129,11 @@ module StdCmd
     def self.define_commands
       return @@set ||= Command::CommandSet.define_commands do
         root_command do
-          argument(Command::FiddlyArgument.new(:mode) do |argument|
-            argument.completion do |t,s|
-              []
-            end
-
-            argument.validation do |term,s|
-              Command::CommandSet === term
-            end
-          end)
           subject_methods :interpreter
           doesnt_undo
 
           action do
-            subject.interpreter.push_mode(mode)
+            subject.interpreter.push_mode(parent)
           end
         end
 

data/lib/command-set/subject.rb

@@ -32,7 +32,8 @@ module Command
 	UndefinedField === instance_variable_get(var)
       end
       unless missing.empty?
-	raise RuntimeError, "Undefined fields: #{missing.join(", ")}" 
+        missing.map! {|m| m.sub(/^@/,"")}
+	raise RuntimeError, "Undefined subject field#{missing.length > 1 ? "s" : ""}: #{missing.join(", ")}" 
       end	
       return nil
     end
@@ -77,14 +78,17 @@ class SubjectImage
   #You shouldn't really need to ever call this - it's used by the
   #interpreter to set up the image before it's passed to the command
   def add_field(name, value)
-    meta = class << self; self; end
-
-  meta.instance_eval do
-    define_method("#{name}") do
-      return value
+    (class << self; self; end).instance_eval do
+      define_method("#{name}") do
+        return value
+      end
     end
   end
-end
+
+  def get_image(fields)
+    #TODO: fail if I don't respond to a field
+    return self
+  end
 end  
 
 

data/lib/command-set/text-interpreter.rb

@@ -119,7 +119,7 @@ module Command
        if(@complete_line)
          new_line = []
          line.each do |word|
-           word = complete(word, new_line)
+           word = complete(word, new_line.dup)
            new_line << word
          end
          line = new_line
@@ -134,7 +134,7 @@ module Command
        list = current_command_set.completion_list(line, word, build_subject)
 
        if list.length == 0
-         raise CommandException, "Unrecognized: #{word}"
+         raise CommandException, "Unrecognized term: #{word}"
        end
 
        return word if list[-1].empty?
@@ -142,7 +142,7 @@ module Command
        if list.length == 1
          return list[0]
        else
-         raise CommandException, "Ambiguous: #{word}"
+         raise CommandException, "Ambiguous term: #{word}"
        end
      end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: command-set
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
-date: 2007-12-20 00:00:00 -08:00
+  version: 0.9.0
+date: 2008-01-08 00:00:00 -08:00
 summary: Framework for interactive programs focused around a DSL for commands
 require_paths: 
 - lib
@@ -33,6 +33,7 @@ files:
 - lib/command-set
 - lib/command-set/command-set.rb
 - lib/command-set/arguments.rb
+- lib/command-set/command-common.rb
 - lib/command-set/og.rb
 - lib/command-set/text-interpreter.rb
 - lib/command-set/subject.rb
@@ -51,12 +52,11 @@ files:
 test_files: []
 
 rdoc_options: 
-- --diagram
 - --inline-source
 - --main
 - Command
 - --title
-- command-set-0.8.4 RDoc
+- command-set-0.9.0 RDoc
 extra_rdoc_files: 
 - doc/README
 - doc/GUIDED_TOUR