james 0.0.4-universal-darwin-10 → 0.0.5-universal-darwin-10

data/lib/james/controller.rb

@@ -15,6 +15,9 @@ module James
 
     attr_reader :visitor
 
+    # This puts together the core dialogue and the user
+    # ones that are hooked into it.
+    #
     def initialize
       user_visitor   = initialize_dialogues.visitor
       system_visitor = Visitor.new CoreDialogue.new.state_for(:awake)
@@ -23,16 +26,10 @@ module James
 
     def applicationDidFinishLaunching notification
       load_voices
-
       start_output
       start_input
-
-      visitor.enter { |text| say text }
-
-      @input.listen
     end
     def windowWillClose notification
-      puts "James is going to bed."
       exit
     end
 
@@ -53,11 +50,10 @@ module James
       # male: com.apple.speech.synthesis.voice.Bruce
     end
 
+    # Initialize and "parse" the
+    # dialogues.
+    #
     def initialize_dialogues
-      # Create the main dialogue.
-      #
-      # Everybody hooks into this, then.
-      #
       dialogues = Dialogues.new
       dialogues.resolve
       dialogues
@@ -66,6 +62,7 @@ module James
     #
     def start_input
       @input = Inputs::Audio.new self
+      @input.listen
     end
     # Start speaking.
     #
@@ -84,9 +81,7 @@ module James
       end
     end
     def expects
-      possibilities = @visitor.expects
-      puts "Possibilities:\n  #{possibilities.join("\n  ")}"
-      possibilities
+      @visitor.expects
     end
 
     def listen
@@ -112,8 +107,6 @@ module James
       # window.display
       # window.orderFrontRegardless
 
-      app.delegate.applicationDidFinishLaunching nil
-
       app.run
     end
     # Simply put, if there is a controller, it is listening.

data/lib/james/dialogue_api.rb

@@ -19,7 +19,7 @@ module James
   class << self
 
     def dialogue &block
-      dialogue = Class.new { include Dialogue }
+      dialogue = Class.new { include James::Dialogue }
       dialogue.class_eval &block
       dialogue
     end

data/lib/james/inputs/audio.rb

@@ -9,12 +9,12 @@ module James
         @recognizer = NSSpeechRecognizer.alloc.init
         @recognizer.setBlocksOtherRecognizers true
         @recognizer.setListensInForegroundOnly false
-        recognize_new_commands
         @recognizer.setDelegate self
       end
 
       def listen
         @recognizer.startListening
+        recognize_new_commands
       end
       def heard command
         super
@@ -30,7 +30,9 @@ module James
         heard command
       end
       def recognize_new_commands
-        @recognizer.setCommands controller.expects
+        possibilities = controller.expects
+        puts "Possibilities:\n  #{possibilities.join("\n  ")}"
+        @recognizer.setCommands possibilities
       end
 
     end

data/lib/james/inputs/terminal.rb

@@ -8,10 +8,11 @@ module James
 
       def listen
         loop do
-          puts %Q{What would you like? Possibilities include\n"#{controller.expects.join('", "')}"}
+          possibilities = controller.expects
+          puts "Possibilities:\n  #{possibilities.join("\n  ")}"
           command = gets.chop
           puts "I heard '#{command}'."
-          heard command if controller.expects.include? command
+          heard command if possibilities.include? command
         end
       end
 

metadata

@@ -5,15 +5,15 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: universal-darwin-10
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-09 00:00:00 +10:00
+date: 2011-05-10 00:00:00 +10:00
 default_executable: james
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -34,8 +34,8 @@ dependencies:
         segments:
         - 0
         version: "0"
-description: Modular Electronic Butler. Add Dialog(ue)s to it to add more abilities
-  to it.
+description: Modular Electronic Butler. Using a simple dialogue system where you can
+  easily add more dialogues.
 email: florian.hanke+james@gmail.com
 executables:
 - james
@@ -87,7 +87,7 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: 'James: Modular Electronic Butler.'
+summary: 'James: Modular Electronic Butler with modular Dialogues.'
 test_files:
 - spec/aux/james/cli_spec.rb
 - spec/integration/test_dialogue_spec.rb