babascript 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aeb3ba4411427fee529dcbb7fbe34688dad3a57
-  data.tar.gz: 5ece4327e81b3dee667120289c5a7fc06977d143
+  metadata.gz: 8273f8ae9cc284e08bbd9150f757d26ed6384619
+  data.tar.gz: ac3b267018cf20434db213f0dbcd02a6f8e3e4ce
 SHA512:
-  metadata.gz: 9422869567d055c38a22a3c09759bf082ee94c41a99fe57d77791f4edd54cd84c5d08d9e83af6fd2657462711d668a62513e8211e12b21771db7673ab0f3828c
-  data.tar.gz: 7989e74cba67c6fb8ff5f27c345e085b03cb6ac58eb85a7cb55eb9d2b5910d240fce031c318cfd2899ae6ebd8f0a2c206209c4b1f5104b982b144204d271e6c3
+  metadata.gz: 6145693ba511ba2f1f8f6d92ff1c78b8a51c242a982fccf1c03e0d038e95644eb79a4fd71cdac00bad2b5bb9b49d761e6d7a419ca7e64a0f2137f14e3f13cfbc
+  data.tar.gz: 7de8891b5566e5809a8276d726f7a675d61fbcd38c74b0ea082c8022c3fbaecdcaff0a1bdeb7aecc0231c5e5c84854471525c78de7e8ac89bba013f0f6069ce1

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.6 2013-08-13
+
+* bugfix callback if block given in babascript-code
+
 === 0.2.5 2013-08-08
 
 * add test

data/lib/babascript/baba.rb

@@ -30,17 +30,20 @@ module BabaScript
       end
     end
 
-    def self.method_missing(name, *args)
-      self.exec name, *args
-    end
-
-    def self.exec(name, *args)
+    def self.method_missing(name, *args, &block)
       cid = __create_callback_id
       tuple = [:babascript, :eval, name, args, {:callback => cid}]
       ts = linda.tuplespace[BabaScript.LINDA_SPACE]
       ts.write tuple
-      result = ts.take [:babascript, :return, cid]
-      return result[3]
+      if block_given?
+        ts.take [:babascript, :return, cid] do |result|
+          next if result.size < 4
+          block.call result[3]
+        end
+      else
+        result = ts.take [:babascript, :return, cid]
+        return result[3]
+      end
     end
 
     private

data/lib/babascript/version.rb

@@ -1,3 +1,3 @@
 module BabaScript
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/samples/sample_distribute.rb

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+$:.unshift File.expand_path "../lib", File.dirname(__FILE__)
+require 'babascript'
+
+EM::run do
+  BabaScript.baba do
+    count = 0
+
+    電気を消してください do |result|
+      puts result
+      count += 1
+    end
+
+    冷房を切ってください do |result|
+      puts result
+      count += 1
+    end
+
+    机の上を片付けてください do |result|
+      puts result
+      count += 1
+    end
+
+    EM::add_periodic_timer 1 do
+      if count < 3
+        puts "waiting 3 tasks (#{count} finished)"
+      else
+        EM::stop
+      end
+    end
+  end
+end
+
+puts "finish"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babascript
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Sho Hashimoto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-rocketio-linda-client
@@ -123,6 +123,7 @@ files:
 - samples/sample.bb
 - samples/sample.rb
 - samples/sample_arduino.rb
+- samples/sample_distribute.rb
 - test/test_babascript.rb
 - test/test_helper.rb
 homepage: https://github.com/masuilab/babascript