james 0.3.0-universal-darwin-10 → 0.4.0-universal-darwin-10

data/lib/james/markers/marker.rb

@@ -46,7 +46,9 @@ module James
         def transition phrase
           state_or_lambda = current.next_for phrase
           if state_or_lambda.respond_to?(:call)
-            current.__transition__ &state_or_lambda # Don't transition.
+            result = current.__transition__ &state_or_lambda # Don't transition.
+            yield result if result && block_given?
+            result
           else
             self.current = state_or_lambda
           end
@@ -63,7 +65,7 @@ module James
         def process phrase, &block
           exit_text = exit &block
           last_context = current.context
-          transition phrase
+          transition phrase, &block
           check &block
           into_text = enter &block
           last_context != current.context

data/lib/james/outputs/audio.rb

@@ -15,7 +15,12 @@ module James
 
       # Say the given text out loud.
       #
+      # Waits for the last text to be finished
+      #
       def say text
+        while @output.isSpeaking
+          sleep 0.1
+        end
         @output.startSpeakingString text
       end
 

metadata

@@ -2,7 +2,7 @@
 name: james
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: universal-darwin-10
 authors:
 - Florian Hanke