remote-dcl 0.1.0 → 0.2.0

data/README.rdoc

@@ -37,25 +37,28 @@ or the repository snapshot, <a href="./remote-dcl-snapshot.tar.gz">remote-dcl-sn
 === Usage
 ==== At remote server
 If you do not use xvfb-run command,
-you should lounch Xvfb server before execution of remote-dcl.rb.
+you should lounch Xvfb server before execution of remote-dcl.
 e.g.)
  % Xvfb :99 -screen 0 640x480x8 -nolisten tcp
 
-Note: xvfb-run command lounch Xvfb server internally, and the lounching is occuer at every execution of remote-dcl.rb.
-It takes some seconds, so lounching Xvfb server by your self reduces execution time of remote-dcl.rb.
+Note: xvfb-run command lounch Xvfb server internally, and the lounching is occuer at every execution of remote-dcl.
+It takes some seconds, so lounching Xvfb server by your self reduces execution time of remote-dcl.
 
 ==== At local
- % ruby remote-dcl.rb yourescript.rb server_name [--display=] [--dir=]
-* yourscript.rb:
-  script name which is executed at the remote server
+ % remote-dcl [--display=] [--dir=] [--remote] server_name script_name [args]
 * server_name:
-  server name at which the script is execued.
+  server name at which the script is execued
+* script_name:
+  script name which is executed at the remote server
 * display (optional):
-  x server number of Xvfb (e.g. --display=:99).
+  x server number of Xvfb (e.g. --display=:99)
   If this is ommited, xvfb-run comand is used.
 * dir (optional):
-  directory name of the remote server at which the script is executed.
+  directory name of the remote server at which the script is executed
   If this is ommited, the script is executed at the home directory.
+* remote (optional):
+  If --remote option is set, the script should be at the remote server,
+  else at local.
 
 === User Interface
 Actions with key and mouse events are the followings:

data/bin/remote-dcl

@@ -1,5 +1,7 @@
+#!/usr/bin/env ruby
+
 def usage(error = false)
-  print "Usage: ruby #$0 scriptname host [--display=:99] [--dir=directory]\n"
+  print "Usage: #$0  [--display=:99] [--dir=directory] [--remote] server_name script_name [args]\n"
   print "\n"
   print "  Note: If xvfb-run does not exit at remote server,\n"
   print "        run Xvfb at the remote server before execution of this script:\n"
@@ -10,7 +12,8 @@ end
 usage if ARGV.index("--help") || ARGV.index("-h")
 opts = {
   "display" => nil,
-  "dir" => nil
+  "dir" => nil,
+  "remote" => false
 }
 opts.keys.each do |name|
   ARGV.dup.each do |opt|
@@ -19,18 +22,35 @@ opts.keys.each do |name|
     case name
     when "display", "dir"
       opts[name] = val
+    when "remote"
+      opts[name] = true
     end
     ARGV.delete(opt)
   end
 end
 
-script = ARGV.shift || usage(true)
 host = ARGV.shift || usage(true)
+script = ARGV.shift || usage(true)
 
 
 
 
-dcl_code = File.read(script)
+if opts["remote"]
+  dcl_code = "load File.expand_path('#{script}')"
+else
+  dcl_code = File.read(script)
+  dcl_code = <<EOF
+    #{dcl_code}
+  rescue => error
+    backtrace = error.backtrace[0..-3].map do |s|
+      a = s.split(':')
+      a[0] = 'yourscript.rb' if a[0] == '-e'
+      a[1] = a[1].to_i - line
+      a.join(':')
+    end
+    raise error.class, error.message, backtrace
+EOF
+end
 remote_code = <<EOC
 pin, pout = IO.pipe
 pid = fork do
@@ -111,14 +131,6 @@ pid = fork do
   line = __LINE__ + 1
   begin
     #{dcl_code}
-  rescue => error
-    backtrace = error.backtrace[0..-3].map do |s|
-      a = s.split(':')
-      a[0] = 'yourscript.rb' if a[0] == '-e'
-      a[1] = a[1].to_i - line
-      a.join(':')
-    end
-    raise error.class, error.message, backtrace
   ensure
     Dir[REMOTE_DCL_FNAME+'_*.png'].each do |fname|
       FileUtils.rm(fname)
@@ -141,7 +153,7 @@ end
 
 escape remote_code
 #cmd = "ruby -e \"#{remote_code}\""
-cmd = "stdbuf -i0 -o0 -e0 ruby -e \"#{remote_code}\""
+cmd = "stdbuf -i0 -o0 -e0 ruby -e \"#{remote_code}\" #{ARGV.join(' ')}"
 
 class Viewer
   def initialize(io)
@@ -189,7 +201,7 @@ class Viewer
     if eof
       quit
     elsif @wait
-      print "next\n"
+#      print "next\n"
       @io.puts "n"
       @io.flush
       @wait = false
@@ -197,7 +209,7 @@ class Viewer
   end
   def quit
     unless @quit
-      print "quit\n"
+#      print "quit\n"
       begin
         @io.puts("q") unless eof
         @io.flush
@@ -214,7 +226,7 @@ class Viewer
     end
   end
   def render(png)
-    print "render\n"
+#    print "render\n"
     loader = Gdk::PixbufLoader.open("png")
     loader.last_write(png)
     @pixbuf = loader.pixbuf

data/lib/remote-dcl/version.rb

@@ -1,3 +1,3 @@
 module RemoteDCL
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remote-dcl
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Seiya Nishizawa