babascript 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8273f8ae9cc284e08bbd9150f757d26ed6384619
-  data.tar.gz: ac3b267018cf20434db213f0dbcd02a6f8e3e4ce
+  metadata.gz: a293bf20186ddf403fc4022f152840758f7f5b81
+  data.tar.gz: d5bbc70c8519861c00a77a7e723a8cae27ba8a1e
 SHA512:
-  metadata.gz: 6145693ba511ba2f1f8f6d92ff1c78b8a51c242a982fccf1c03e0d038e95644eb79a4fd71cdac00bad2b5bb9b49d761e6d7a419ca7e64a0f2137f14e3f13cfbc
-  data.tar.gz: 7de8891b5566e5809a8276d726f7a675d61fbcd38c74b0ea082c8022c3fbaecdcaff0a1bdeb7aecc0231c5e5c84854471525c78de7e8ac89bba013f0f6069ce1
+  metadata.gz: 63efbea184e3b2cf66ac5dbb0a068cc6db2099a260092bc4edd87f94d40bde0a5ec70e25d5b0612a52c8a8565e16fa0f4d8ac0eb2a1d64decc1ed8a8f235a3ca
+  data.tar.gz: a8b7f2692fbda07a7865b5e7fba70e180436b4cdc1dda2e76b6bb004e8afb567dfaaffb037529eac4e0159f3c85bfd6dab36cc83d7ef4a251da4e97fa45be533

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.0 2013-09-22
+
+* select TupleSpace in "BabaScript.baba do"
+
 === 0.2.6 2013-08-13
 
 * bugfix callback if block given in babascript-code

data/README.md

@@ -52,20 +52,49 @@ end
 
 ### switch BABA
 BabaScriptはジョブ通知に[Linda](https://gihtub.com/shokai/linda-base)を使っています。
-環境変数BABAのデフォルト値は"takumibaba"で、彼のジョブは http://linda.masuilab.org/takumibaba/notifications で確認できます。
 
-    % export BABA=shokai
+クエリーを書き込むタプルスペースのデフォルト値は"takumibaba"で、彼のジョブは http://linda.masuilab.org/takumibaba/notifications で確認できます。
 
-環境変数BABAを"shokai"に切り替えると、以後のジョブの通知先が http://linda.masuilab.org/shokai/notifications になります。
+    % baba --base http://example.com --space shokai
+
+タプルスペース名を"shokai"に、Lindaサーバーをexample.comに切り替えると、以後のジョブの通知先が http://example.com/shokai/notifications になります。
+
+
+ruby上での書き込み先の変更方法
+```ruby
+BabaScript.baba :base => "http://example.com", :space => "shokai" do
+  puts そろそろ起きたほうがいいのでは？
+end
+
+```
 
 
 Test
 ----
 
+### Install Dependencies
+
     % gem install bundler
     % bundle install
+
+### Manual Test
+
+Start VM
+
+    % bundle exec bin/baba-vm --space test
+
+Run samples
+
+    % bundle exec ruby samples/sample.rb
+
+### Unit Test
+
     % bundle exec rake test
 
+or
+
+    % LINDA_BASE=http://localhost:5000 LINDA_SPACE=test bundle exec rake test
+
 
 Contributing
 ------------

data/bin/baba

@@ -6,9 +6,15 @@ $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'babascript'
 
 args = ArgsParser.parse ARGV do
-  arg :e, "one line of script"
+  arg :eval, "evaluate one line script", :alias => :e
+  arg :base, "Linda-Base URL", :default => BabaScript::DEFAULTS[:base]
+  arg :space, "Linda-Space Name", :default => BabaScript::DEFAULTS[:space]
   arg :version, "show version", :alias => :v
   arg :help, "show help", :alias => :h
+
+  validate :base, "invalid URL" do |v|
+    v =~ /^https?:\/\/.+$/
+  end
 end
 
 binname = File.basename(__FILE__)
@@ -18,6 +24,7 @@ if args.has_option? :help
   STDERR.puts "e.g:"
   STDERR.puts " % #{binname} filename.bb"
   STDERR.puts " % #{binname} -e 'アイス買ってきてよ'"
+  STDERR.puts " % #{binname} filename.bb -base http://linda-base.example.com -space test"
   exit 1
 end
 
@@ -26,15 +33,16 @@ if args.has_option? :version
   exit 1
 end
 
-if args.has_param? :e
-  puts args[:e]
-  BabaScript.baba do
-    puts instance_eval args[:e]
+if args.has_param? :eval
+  puts args[:eval]
+  BabaScript.baba :base => args[:base], :space => args[:space] do
+    puts instance_eval args[:eval]
   end
 else
   args.argv.each do |fname|
     File.open(fname) do |f|
-      BabaScript::Baba.run f.read
+      baba = BabaScript::Baba.new(:base => args[:base], :space => args[:space])
+      baba.run f.read
     end
   end
-end
+end

data/bin/baba-vm

@@ -6,8 +6,14 @@ $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'babascript'
 
 args = ArgsParser.parse ARGV do
+  arg :base, "Linda-Base URL", :default => BabaScript::DEFAULTS[:base]
+  arg :space, "Linda-Space Name", :default => BabaScript::DEFAULTS[:space]
   arg :version, "show version", :alias => :v
   arg :help, "show help", :alias => :h
+
+  validate :base, "invalid URL" do |v|
+    v =~ /^https?:\/\/.+$/
+  end
 end
 
 binname = File.basename(__FILE__)
@@ -22,11 +28,11 @@ if args.has_option? :version
   exit 1
 end
 
-STDERR.puts "(connecting..)"
+STDERR.puts "(connecting to #{args[:base]}/#{args[:space]})"
 
 EM::run do
-  linda = EM::RocketIO::Linda::Client.new BabaScript.LINDA_BASE
-  ts = linda.tuplespace[ BabaScript.LINDA_SPACE ]
+  linda = EM::RocketIO::Linda::Client.new args[:base]
+  ts = linda.tuplespace[ args[:space] ]
 
   def take_task_and_run(ts)
     ts.take [:babascript, :eval] do |tuple|

data/bin/ibb

@@ -6,10 +6,15 @@ require 'babascript'
 load "#{ENV['HOME']}/.ibbrc" if File.exists? "#{ENV['HOME']}/.ibbrc"
 
 args = ArgsParser.parse ARGV do
+  arg :base, "Linda-Base URL", :default => BabaScript::DEFAULTS[:base]
+  arg :space, "Linda-Space Name", :default => BabaScript::DEFAULTS[:space]
   arg :version, "show version", :alias => :v
   arg :help, "show help", :alias => :h
-end
 
+  validate :base, "invalid URL" do |v|
+    v =~ /^https?:\/\/.+$/
+  end
+end
 
 binname = File.basename(__FILE__)
 if args.has_option? :help
@@ -23,19 +28,21 @@ if args.has_option? :version
   exit 1
 end
 
-STDERR.puts "(connecting..)"
+STDERR.puts "(connecting to #{args[:base]}/#{args[:space]})"
 
 EM::run do
-  BabaScript::Baba.linda.io.on :connect do
+  baba = BabaScript::Baba.new :base => args[:base], :space => args[:space]
+
+  baba.linda.io.on :connect do
     STDERR.puts "(#{type} connect!)"
   end
 
-  BabaScript::Baba.linda.io.on :disconnect do
+  baba.linda.io.on :disconnect do
     STDERR.puts
     STDERR.puts "(#{type} closed)"
   end
 
-  BabaScript.baba do
+  baba.run do
     print "[IBB] > "
     while line = STDIN.gets do
       line.strip!

data/lib/babascript/baba.rb

@@ -1,24 +1,30 @@
 module BabaScript
-  def self.baba(&block)
-    self::Baba.run &block if block_given?
+  def self.baba(opts={}, &block)
+    self::Baba.new(opts).run &block if block_given?
   end
 
   class Baba
 
-    def self.linda
-      @@linda ||= EM::RocketIO::Linda::Client.new BabaScript.LINDA_BASE
+    def initialize(opts)
+      @base  = opts[:base]  || "http://linda.masuilab.org"
+      @space = opts[:space] || "takumibaba"
     end
 
-    def self.run(code=nil, &block)
+    def linda
+      @linda ||= EM::RocketIO::Linda::Client.new @base
+    end
+
+    def run(code=nil, &block)
       raise ArgumentError "block or code require" unless block_given? or code.kind_of? String
       already_eventmachine_running = EM::reactor_running?
+      this = self
       EM::run do
         linda.io.once :connect do
           EM::defer do
             if block_given?
-              ::BabaScript::Baba.instance_eval &block
+              this.instance_eval &block
             else
-              ::BabaScript::Baba.instance_eval code
+              this.instance_eval code
             end
             unless already_eventmachine_running
               EM::add_timer 1 do
@@ -30,10 +36,10 @@ module BabaScript
       end
     end
 
-    def self.method_missing(name, *args, &block)
+    def method_missing(name, *args, &block)
       cid = __create_callback_id
       tuple = [:babascript, :eval, name, args, {:callback => cid}]
-      ts = linda.tuplespace[BabaScript.LINDA_SPACE]
+      ts = linda.tuplespace[@space]
       ts.write tuple
       if block_given?
         ts.take [:babascript, :return, cid] do |result|
@@ -47,7 +53,7 @@ module BabaScript
     end
 
     private
-    def self.__create_callback_id
+    def __create_callback_id
       Digest::MD5.hexdigest "#{Time.now.to_i}_#{Time.now.usec}_#{rand 100000}"
     end
   end

data/lib/babascript/options.rb

@@ -1,9 +1,6 @@
 module BabaScript
-  def self.LINDA_BASE
-    ENV["LINDA_BASE"] || "http://linda.masuilab.org"
-  end
-
-  def self.LINDA_SPACE
-    ENV["BABA"] || "takumibaba"
-  end
+  DEFAULTS = {
+    :base => "http://linda.masuilab.org",
+    :space => "takumibaba"
+  }
 end

data/lib/babascript/version.rb

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

data/samples/sample.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'babascript'
 
-BabaScript.baba do
+BabaScript.baba :base => "http://localhost:5000", :space => "test" do
   if Time.now.hour < 12
     puts そろそろ起きたほうがいいのでは？
   else

data/test/test_babascript.rb

@@ -3,14 +3,14 @@ require File.expand_path 'test_helper', File.dirname(__FILE__)
 
 class TestBabaScript < MiniTest::Test
 
-  ENV["BABA"] = "test"
-
   def test_eval_write_tuple
+    base = ENV["LINDA_BASE"] || BabaScript::DEFAULTS[:base]
+    space = ENV["LINDA_SPACE"] || BabaScript::DEFAULTS[:space]
     tuple_ = nil
     res_ = nil
     EM::run do
-      linda = EM::RocketIO::Linda::Client.new BabaScript.LINDA_BASE
-      ts = linda.tuplespace[ BabaScript.LINDA_SPACE ]
+      linda = EM::RocketIO::Linda::Client.new base
+      ts = linda.tuplespace[ space ]
       linda.io.once :connect do
         ts.take [:babascript, :eval] do |tuple|
           tuple_ = tuple
@@ -21,7 +21,7 @@ class TestBabaScript < MiniTest::Test
         end
       end
 
-      BabaScript.baba do
+      BabaScript.baba :base => base, :space => space do
         res_ = テスト 1, 2, "かずすけ"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babascript
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Sho Hashimoto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-rocketio-linda-client