remote-dcl 0.2.0 → 0.3.0

data/README.rdoc

@@ -5,22 +5,22 @@
 Remote-DCL is a Ruby script to execute a script at a remote server.
 DCL calles in the script creates PNG images at the remote,
 and send them to local and then display the images.
-It avoid X connection between the local and the remote,
+It avoids X connection between the local and the remote,
 so could reduce execution time.
 
 
 == Requires
 * At remote server
-  * <a href="http://www.ruby-lang.org/">Ruby</a>
+  * Ruby (http://www.ruby-lang.org/)
   * Ruby libraries which are required in your script (including DCL)
   * stdbuf command
   * ssh server
   * Xvfb
     xvfb-run command (optional)
 * At local
-  * <a href="http://www.ruby-lang.org/">Ruby</a>
-  * <a href="http://ruby-gnome2.sourceforge.jp/ja/">Ruby/GTK2,Ruby/GdkPixbuf2</a>
-  * ssh client
+  * Ruby (http://www.ruby-lang.org/)
+  * Ruby/GTK2, Ruby/GdkPixbuf2 (http://ruby-gnome2.sourceforge.jp/ja/)
+  * Net::SSH (http://net-ssh.rubyforge.org/)
 
 
 == Install / Download
@@ -45,7 +45,7 @@ Note: xvfb-run command lounch Xvfb server internally, and the lounching is occue
 It takes some seconds, so lounching Xvfb server by your self reduces execution time of remote-dcl.
 
 ==== At local
- % remote-dcl [--display=] [--dir=] [--remote] server_name script_name [args]
+ % remote-dcl [--display=] [--dir=] [--user=] [--password=] [--remote] server_name script_name [args]
 * server_name:
   server name at which the script is execued
 * script_name:
@@ -56,9 +56,15 @@ It takes some seconds, so lounching Xvfb server by your self reduces execution t
 * dir (optional):
   directory name of the remote server at which the script is executed
   If this is ommited, the script is executed at the home directory.
+* user (optional)
+  user name of remote server for ssh connection.
+  User name can be specified by username@server_name format as server_name
+* password (optional)
+  password of user for ssh connection
+  If this is ommited, password is asked in prompt.
 * remote (optional):
   If --remote option is set, the script should be at the remote server,
-  else at local.
+  otherwise at local.
 
 === User Interface
 Actions with key and mouse events are the followings:

data/bin/remote-dcl

@@ -13,14 +13,16 @@ usage if ARGV.index("--help") || ARGV.index("-h")
 opts = {
   "display" => nil,
   "dir" => nil,
-  "remote" => false
+  "user" => nil,
+  "password" => nil,
+  "remote" => false,
 }
 opts.keys.each do |name|
   ARGV.dup.each do |opt|
     next unless /\A--#{name}/ =~ opt
     val = $' && $'[1..-1]
     case name
-    when "display", "dir"
+    when "display", "dir", "user", "password"
       opts[name] = val
     when "remote"
       opts[name] = true
@@ -146,23 +148,35 @@ Process.wait(pid)
 EOC
 
 
-def escape(str)
+def escape_ruby(str) # escape special charactors
+  str.gsub!(/\$/, '\$')
+end
+def escape(str) # escape semi-colon and back-slash
   str.gsub!("\\"){"\\\\"}
   str.gsub!(/"/,'\"')
 end
 
 escape remote_code
+escape_ruby remote_code
 #cmd = "ruby -e \"#{remote_code}\""
 cmd = "stdbuf -i0 -o0 -e0 ruby -e \"#{remote_code}\" #{ARGV.join(' ')}"
 
 class Viewer
-  def initialize(io)
+  @@exist = false
+  def initialize(channel)
+    if @@exist
+      raise "already exist an instance"
+    end
+    @@exist = true
+    @wait = false # true when a frame was rendered and waiting user's action
+    @skip = false
+
+    Gtk.init
     @window = Gtk::Window.new
     @window.realize
     @drawable = @window.window
     @gc = Gdk::GC.new(@drawable)
     @pixbuf = nil
-    @wait = true
     @window.add_events(Gdk::Event::BUTTON_RELEASE_MASK)
     @window.signal_connect("expose_event") do |w,e|
       expose
@@ -177,46 +191,53 @@ class Viewer
       when "Return", "space", "n"
         next_fig
       when "s"
-        print "skip waiting\n"
-        @io.puts c
+        unless @skip
+          print "skip waiting\n"
+          @channel.send_data("s\n")
+          @skip = true
+        end
       when "q"
-        quit
+        quit!
       end
       true
     end
     @window.signal_connect("delete_event") do
-      quit
+      quit!
       false
     end
-    @io = io
+    @channel = channel
   end
   def eof=(boolean)
-    @eof = true
+    @eof = boolean
   end
   def eof
     return @eof if @eof
-    @eof = @io.closed?
+    @eof = !@channel.active?
   end
   def next_fig
     if eof
-      quit
+      quit!
     elsif @wait
 #      print "next\n"
-      @io.puts "n"
-      @io.flush
+      @channel.send_data "n\n"
       @wait = false
     end
   end
   def quit
+    quit! unless @wait
+  end
+  def quit!
     unless @quit
 #      print "quit\n"
       begin
-        @io.puts("q") unless eof
-        @io.flush
+        unless eof
+          @channel.send_data "q\n"
+        end
       rescue
       end
-      Gtk.main_quit
+      @channel.eof! unless @channel.eof?
       @quit = true
+      Gtk.main_quit
     end
   end
   def expose
@@ -240,47 +261,92 @@ class Viewer
 end
 
 
-escape cmd
-cmd = "cd #{opts["dir"]} ; " + cmd if opts["dir"]
+
 if opts["display"]
   cmd = "DISPLAY=#{opts["display"]} #{cmd}"
 else
-  cmd = "xvfb-run sh -c \"#{cmd} 2> /dev/null\""
   escape cmd
+  cmd = "xvfb-run sh -c \"#{cmd} 2> /dev/null\""
 end
-cmd = "ssh #{host} \"#{cmd}\""
+cmd = "cd #{opts["dir"]} ; " + cmd if opts["dir"]
 
-IO.popen(cmd, "r+") do |io|
-  begin
-    require "rubygems"
-  rescue LoadError
+
+begin
+  require "rubygems"
+rescue LoadError
+end
+require "gtk2"
+require "base64"
+require "net/ssh"
+include Net::SSH::Prompt
+module Net::SSH::Authentication::Methods
+  class Password
+    alias :__authenticate :authenticate
+    def authenticate(next_service, username, password=nil)
+      password ||= prompt("input #{username}'s password:", false)
+      __authenticate(next_service, username, password)
+    end
   end
-  require "gtk2"
-  require "base64"
-  io.sync = true
-  str = ""
-  Gtk.init
-  viewer = Viewer.new(io)
-  t = Thread.new {
-    Thread.pass
-    Gtk.main
-  }
-  begin
-    any = false
-    while (c = io.gets)
-      any = true
-      if c == "\n"
-        png = Base64.decode64(str)
-        viewer.render(png)
-        str = ""
-      else
-        str << c
+end
+
+if opts["user"]
+  user = opts["user"]
+elsif /\A([^@]+)@([^@]+)\Z/ =~ host
+  user = $1
+  host = $2
+else
+  user = ENV["USER"]
+end
+
+
+ssh_opts = Hash.new
+ssh_opts[:password] = opts["password"] if opts["password"]
+Net::SSH.start(host, user, ssh_opts) do |ssh|
+  ssh.open_channel do |channel|
+    channel.exec(cmd) do |ch, success|
+      unless success
+        Gtk.main_quit
+        abort "could not execute command"
+      end
+
+      channel[:data] = ""
+      channel.on_data do |ch, data|
+        channel[:data] << data
+        while channel[:data] =~ /\n\n/
+          str = $`
+          channel[:data] = $'
+          png = Base64.decode64(str)
+          @viewer.render(png)
+        end
       end
+#      channel.on_process do |ch|
+#      end
+      channel.on_extended_data do |ch, type, data|
+        print data
+      end
+      channel.on_eof do |ch|
+        @viewer.eof = true
+      end
+      channel.on_close do |ch|
+        @viewer.eof = true
+      end
+      channel.on_request("exit-status") do |ch, data|
+        @viewer.quit! unless data.read_long == 0
+      end
+
     end
-    viewer.eof = true
-    viewer.quit unless any
+
+    @viewer = Viewer.new(channel)
+  end
+
+  begin
+    t = Thread.new {
+      Thread.pass
+      Gtk.main
+    }
+    ssh.loop(1)
   ensure
-    io.close
+    @viewer.quit
   end
   t.join
 end

data/lib/remote-dcl/version.rb

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

data/remote-dcl.gemspec

@@ -28,4 +28,7 @@ so could reduce execution time.}
   # specify any dependencies here; for example:
   #s.add_development_dependency "rspec"
   s.add_runtime_dependency "gtk2"
+  s.add_runtime_dependency "highline"
+  s.add_runtime_dependency "net-ssh"
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remote-dcl
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Seiya Nishizawa
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 Z
+date: 2012-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gtk2
@@ -31,6 +31,34 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: |-
   Remote-DCL is a Ruby script to execute a script at a remote server.
   DCL calles in the script creates PNG images at the remote,