babascript 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db671bc38e7cc058d96a3a85a564913346f92da7
-  data.tar.gz: 5131878d519a7934f314275076f98f0ade0d0d72
+  metadata.gz: 20d99b91a66d5e51f4d399b53ac83c08d05abe78
+  data.tar.gz: a50d34c3084cd917a5bc349c59bdd17e093ae2b6
 SHA512:
-  metadata.gz: a94b0218a75e4432c129905ce14b98f9aba6ed09ccd4d27c68368981f797254b1410b26f015c9f8ffc63cf1bc65efadf9a7c0f4036ec09abd72d35cefcb71669
-  data.tar.gz: f536534f55415d7f197ba7da30e68eab6833c3cfd92ee9c524964203977813b4c22f788643efd397441a6144227f565cd70bee99b0a38520e8f1b25dfdc9ab2f
+  metadata.gz: 468250ac8debfecbb82859ac9a763983d5c2497bf362d7bd8bc0ddbc6bdf9d4d90930552f2cc5981c82880a2d76f490d1501a999f4be27ee8e797ac192a181dd
+  data.tar.gz: db1d8eb0d48119c883fb89191ef41b3d87a8830ec0730dda41a12b1d0a853ff86e15fb22c49583953370b67fc9af60de8a8dfd7f02acfe9a0311cb770130163d

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.3 2013-08-07
+
+* show Linda connection status on ibb and baba-vm
+
 === 0.2.2 2013-08-07
 
 * add ibb command

data/bin/baba-vm

@@ -18,10 +18,12 @@ if args.has_option? :help
 end
 
 if args.has_option? :version
-  STDERR.puts "BabaScript v#{BabaScript::VERSION} - ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  STDERR.puts "BabaScript VM v#{BabaScript::VERSION} - ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   exit 1
 end
 
+STDERR.puts "(connecting..)"
+
 EM::run do
   linda = EM::RocketIO::Linda::Client.new BabaScript.LINDA_BASE
   ts = linda.tuplespace[ BabaScript.LINDA_SPACE ]
@@ -29,7 +31,7 @@ EM::run do
   def take_task_and_run(ts)
     ts.take [:babascript, :eval] do |tuple|
       loop do
-        print %Q{"#{tuple[2]}" #{tuple[3]} >}
+        print %Q{#{tuple[2]}(#{tuple[3].join(', ')}) >}
         line = STDIN.gets.strip
         next if line.empty?
         ts.write [:babascript, :return, tuple[4]["callback"], line]
@@ -40,7 +42,11 @@ EM::run do
   end
 
   linda.io.on :connect do
-    puts "connect (#{linda.io.type}). You are now BABA."
+    STDERR.puts "(#{type} connect! You are now BABA.)"
     take_task_and_run(ts)
   end
+
+  linda.io.on :disconnect do
+    STDERR.puts "(#{type} closed)"
+  end
 end

data/bin/ibb

@@ -1,18 +1,49 @@
 #!/usr/bin/env ruby
 require 'rubygems'
+require 'args_parser'
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'babascript'
 load "#{ENV['HOME']}/.ibbrc" if File.exists? "#{ENV['HOME']}/.ibbrc"
 
-BabaScript.baba do
-  STDERR.puts "BabaScript v#{BabaScript::VERSION} - ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  print "[IBB] > "
-  while line = STDIN.gets do
-    line.strip!
-    unless line.empty?
-      puts "(waiting response)"
-      p instance_eval line
-    end
+args = ArgsParser.parse ARGV do
+  arg :version, "show version", :alias => :v
+  arg :help, "show help", :alias => :h
+end
+
+
+binname = File.basename(__FILE__)
+if args.has_option? :help
+  STDERR.puts "Interactive BabaScript  v#{BabaScript::VERSION}"
+  STDERR.puts args.help
+  exit 1
+end
+
+if args.has_option? :version
+  STDERR.puts "Interactive BabaScript v#{BabaScript::VERSION} - ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  exit 1
+end
+
+STDERR.puts "(connecting..)"
+
+EM::run do
+  BabaScript::Baba.linda.io.on :connect do
+    STDERR.puts "(#{type} connect!)"
+  end
+
+  BabaScript::Baba.linda.io.on :disconnect do
+    STDERR.puts
+    STDERR.puts "(#{type} closed)"
+  end
+
+  BabaScript.baba do
     print "[IBB] > "
+    while line = STDIN.gets do
+      line.strip!
+      unless line.empty?
+        STDERR.puts "(waiting response)"
+        p instance_eval line
+      end
+      print "[IBB] > "
+    end
   end
 end

data/lib/babascript/options.rb

@@ -0,0 +1,9 @@
+module BabaScript
+  def self.LINDA_BASE
+    ENV["LINDA_BASE"] || "http://linda.masuilab.org"
+  end
+
+  def self.LINDA_SPACE
+    ENV["BABA"] || "takumibaba"
+  end
+end

data/lib/babascript/version.rb

@@ -1,3 +1,3 @@
 module BabaScript
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/babascript.rb

@@ -1,4 +1,5 @@
 require "babascript/version"
+require "babascript/options"
 require "babascript/baba"
 require "eventmachine"
 require "em-rocketio-linda-client"
@@ -6,11 +7,4 @@ require "json"
 require 'digest/md5'
 
 module BabaScript
-  def self.LINDA_BASE
-    ENV["LINDA_BASE"] || "http://linda.masuilab.org"
-  end
-
-  def self.LINDA_SPACE
-    ENV["BABA"] || "takumibaba"
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babascript
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sho Hashimoto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-rocketio-linda-client
@@ -104,6 +104,7 @@ files:
 - bin/ibb
 - lib/babascript.rb
 - lib/babascript/baba.rb
+- lib/babascript/options.rb
 - lib/babascript/version.rb
 - samples/sample.bb
 - samples/sample.rb