sinatra-rocketio-linda 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31a118c0a7dd050df9ff68429e62d871f841eab1
-  data.tar.gz: 1e6aefe006ff873c1bee490bd0dcfae4e2a53129
+  metadata.gz: 0294f5d3a02665a4a387de3e3881901f5d7f6608
+  data.tar.gz: c09d1bb3e75e86f21f3076970865596362be56f0
 SHA512:
-  metadata.gz: 6afcf2504b94e184e810a57eb61f5f96ea8390ff8a454fd47f142d6aec9021c68a687deab263f42f510420fabe6f7e424163002b67f6a422b30d3ed8ec33240e
-  data.tar.gz: 96e4efa069b6b9e6ebc717696ebfa04aeac411056804afd09c4618f90f57f1120ad9c7ce0d0699bd8e5f0cf5b54533246bc9ef87fa00620c287c8590f99b11e0
+  metadata.gz: 11388a5aa10b0a23ee081d3ddc12d25bfa5744d2bbb274aba6f2b98aa4368fe0f3e5a3953da9ff145943203b1346b1d9d819527dde0e6cf3b8a5e4cd94fbac59
+  data.tar.gz: 4b29d75a5a3c4b744f00671ca5e40ac7fad9a150a486177ffad010af44f03fdcbf3407e0a05a851df73aa590c47f510ecdf8bf1d1d4364223c32ebf4c260cde3

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.0 2013-06-10
+
+* changed linda-rocketio command options
+
 === 0.1.4 2013-06-09
 
 * bugfix linda-rocketio command

data/README.md

@@ -151,7 +151,8 @@ linda-rocketio command
 ----------------------
 
     % lidna-rocketio --help
-    % linda-rocketio --write '["say","hello"]' --base http://example.com --space test
+    % linda-rocketio write -tuple '["say","hello"]' -base http://example.com -space test
+    % linda-rocketio read  -tuple '["say","hello"]' -base http://example.com -space test
 
 
 JavaScript Lib for browser

data/bin/linda-rocketio

@@ -6,12 +6,9 @@ require 'args_parser'
 $stdout.sync = true
 
 args = ArgsParser.parse ARGV do
-  arg :write, 'write Tuple(s)'
-  arg :read, 'read a Tuple'
-  arg :take, 'take a Tuple'
-  arg :watch, 'watch Tuples'
-  arg :base, 'linda base URL', :default => 'http://linda.shokai.org'
-  arg :space, 'linda space name', :default => 'test'
+  arg :tuple, 'tuple(s)'
+  arg :base, 'linda base URL'
+  arg :space, 'linda space name'
   arg :timeout, 'wait (sec)', :default => 10
   arg :verbose, 'verbose mode', :alias => :v
   arg :help, 'show help', :alias => :h
@@ -20,10 +17,8 @@ args = ArgsParser.parse ARGV do
     v =~ /^https?:\/\/.+/
   end
 
-  [:write, :read, :take, :watch].each do |arg|
-    filter arg do |v|
-      JSON.parse v
-    end
+  filter :tuple do |v|
+    JSON.parse v
   end
 end
 
@@ -47,7 +42,8 @@ end
 
 Console.enable = args.has_option? :verbose
 
-if args.has_option? :help or !args.has_param? :base, :space
+if args.has_option? :help or !args.has_param?(:base, :space) or
+    !["read","write","take","watch"].include?(args.first)
   bin = $0.split("/").last
   STDERR.puts "RocketIO::Linda v#{Sinatra::RocketIO::Linda::VERSION}"
   STDERR.puts " - https://github.com/shokai/sinatra-rocketio-linda"
@@ -55,11 +51,11 @@ if args.has_option? :help or !args.has_param? :base, :space
   STDERR.puts args.help
   STDERR.puts
   STDERR.puts "e.g."
-  STDERR.puts %Q{write   #{bin} --base http://example.com --space test --write '["say","hello"]'}
-  STDERR.puts %Q{        echo '["say","hello"]\\n["say","world"]' | #{bin} --base http://example.com --space test --write}
-  STDERR.puts %Q{read    #{bin} --base http://example.com --space test --read '["say"]'}
-  STDERR.puts %Q{take    #{bin} --base http://example.com --space test --take '["say"]'}
-  STDERR.puts %Q{watch   #{bin} --base http://example.com --space test --watch '["say"]'}
+  STDERR.puts %Q{write   #{bin} write -tuple '["say","hello"]' -base http://example.com -space test}
+  STDERR.puts %Q{        echo '["say","hello"]\\n["say","world"]' | #{bin} write -base http://example.com -space test}
+  STDERR.puts %Q{read    #{bin} read  -tuple '["say"]' -base http://example.com -space test}
+  STDERR.puts %Q{take    #{bin} take  -tuple '["say"]' -base http://example.com -space test}
+  STDERR.puts %Q{watch   #{bin} watch -tuple '["say"]' -base http://example.com -space test}
   exit 1
 end
 
@@ -69,37 +65,40 @@ ts = linda.tuplespace[ args[:space] ]
 
 linda.io.on :connect do
   Console.log "connect #{io.session} (#{io.type})"
-  if args.has_param? :write
-    Console.log "write #{args[:write].to_json}"
-    ts.write args[:write]
-    exit
-  elsif args.has_option? :write
-    while line = STDIN.gets do
-      begin
-        tuple = JSON.parse line.strip
-        Console.log "write #{tuple.to_json}"
-        puts tuple.to_json
-        ts.write tuple
-      rescue => e
-        Console.error e
+  case args.first
+  when "write"
+    if args.has_param? :tuple
+      Console.log "write #{args[:tuple].to_json}"
+      ts.write args[:tuple]
+      exit
+    else
+      while line = STDIN.gets do
+        begin
+          tuple = JSON.parse line.strip
+          Console.log "write #{tuple.to_json}"
+          puts tuple.to_json
+          ts.write tuple
+        rescue => e
+          Console.error e
+        end
       end
+      exit
     end
-    exit
-  elsif args.has_param? :read
-    Console.log "read #{args[:read].to_json}"
-    ts.read args[:read] do |tuple|
+  when "read"
+    Console.log "read #{args[:tuple].to_json}"
+    ts.read args[:tuple] do |tuple|
       puts tuple.to_json
       exit
     end
-  elsif args.has_param? :take
-    Console.log "take #{args[:take].to_json}"
-    ts.take args[:take] do |tuple|
+  when "take"
+    Console.log "take #{args[:tuple].to_json}"
+    ts.take args[:tuple] do |tuple|
       puts tuple.to_json
       exit
     end
-  elsif args.has_param? :watch
-    Console.log "watch #{args[:watch].to_json}"
-    ts.watch args[:watch] do |tuple|
+  when "watch"
+    Console.log "watch #{args[:tuple].to_json}"
+    ts.watch args[:tuple] do |tuple|
       puts tuple.to_json
     end
   else
@@ -115,7 +114,7 @@ Console.log "waiting #{args[:base]}"
 io.connect
 
 if [Fixnum, Float].include? args[:timeout].class and args[:timeout] > 0 and
-    !args.has_option?(:write) and !args.has_param?(:watch)
+    args.first != "watch" and !(args.first == "write" and !args.has_param?(:tuple))
   sleep args[:timeout]
 else
   linda.wait

data/lib/sinatra/rocketio/linda/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module RocketIO
     module Linda
-      VERSION = "0.1.4"
+      VERSION = "0.2.0"
     end
   end
 end

data/linda.js

@@ -1,4 +1,4 @@
-// Linda.js v0.1.4 (rocketio v0.2.6)
+// Linda.js v0.2.0 (rocketio v0.2.6)
 // https://github.com/shokai/sinatra-rocketio-linda
 // (c) 2013 Sho Hashimoto <hashimoto@shokai.org>
 // The MIT License

data/linda.min.js

@@ -1,4 +1,4 @@
-// Linda.js v0.1.4 (rocketio v0.2.6)
+// Linda.js v0.2.0 (rocketio v0.2.6)
 // https://github.com/shokai/sinatra-rocketio-linda
 // (c) 2013 Sho Hashimoto <hashimoto@shokai.org>
 // The MIT License

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio-linda
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Sho Hashimoto