minep-request 0.0.6 → 0.0.7

data/.gitignore

@@ -14,6 +14,8 @@ test/version_tmp
 tmp
 archives
 *-debug.rb
+.rvmrc
+Gemfile.lock
 
 # YARD artifacts
 .yardoc

data/bin/minep-request

@@ -5,6 +5,8 @@ require 'socket'
 require 'WEBSocket'
 require 'minep-request'
 
+$buflist = {}
+
 $options = {
   :host => "localhost",
   :port => 8080,
@@ -15,17 +17,25 @@ $goon = true
 $commands = {
   "authenticate" => Proc.new { |s| Minep::Request.authenticate s},
   "signup" => Proc.new { |s| Minep::Request.signup s},
-  "exec" => Proc.new { |s| Minep::Request.exec s},
-  "insert" => Proc.new { |s| Minep::Request.insert s},
-  "move" => Proc.new { |s| Minep::Request.move s},
-  "backspace" => Proc.new { |s| Minep::Request.backspace s},
-  "delete" => Proc.new { |s| Minep::Request.delete s},
-  "load" => Proc.new { |s| Minep::Request.load s, $options[:type]},
+  "exec" => Proc.new { |s| Minep::Request.exec s, $buflist},
+  "insert" => Proc.new { |s| Minep::Request.insert s, $buflist},
+  "move" => Proc.new { |s| Minep::Request.move s, $buflist},
+  "backspace" => Proc.new { |s| Minep::Request.backspace s, $buflist},
+  "delete" => Proc.new { |s| Minep::Request.delete s, $buflist},
+  "load" => Proc.new { |s| Minep::Request.load s, $options[:type], $buflist},
+  "list" => Proc.new { |s| list s},
   "help" => Proc.new { |s| help s},
   "exit" => Proc.new { |s| quit s},
   "quit" => Proc.new { |s| quit s}
 }
 
+def list socket = nil
+  puts "Buffers are :"
+  $buflist.each_key do |buf|
+    puts buf
+  end
+end
+
 def quit socket = nil
   $goon = false
   puts "Exiting"
@@ -86,14 +96,32 @@ end
 
 while $goon do
   printf ">> "
-  begin
-    cmd = Minep.read
-    if $commands.key? cmd
-      $commands[cmd].call socket
-    else
-      $stderr.puts "Error : unknown command"
+  rs = select [$stdin, socket]
+  rs.each do |r, w, e|
+    if r == $stdin
+      begin
+        cmd = Minep.read
+        if $commands.key? cmd
+          $commands[cmd].call socket
+        else
+          $stderr.puts "Error : unknown command"
+        end
+      rescue EOFError
+        quit
+      end
+    elsif r == socket
+      begin
+        str = socket.readpartial 4096
+      rescue EOFError
+        puts ""
+        quit
+      end
+      if str.nil?
+        quit
+      else
+        tab = str.strip.split
+        puts "/!\\ Received a message from server :\n\t#{str.strip}"
+      end
     end
-  rescue EOFError
-    quit
   end
 end

data/lib/minep-request/minep.rb

@@ -4,7 +4,7 @@ module Minep
     input = input.strip
   end
 
-  def self.makeMsg request, args
+  def self.makeMsg request, args, buflist = nil
     args.each_key do |k|
       if k == :args
         printf "#{k} as a space-separated list : "
@@ -21,6 +21,11 @@ module Minep
         args[k] = read
       end
     end
+    if buflist and args[:buffer]
+      bufferName = args[:buffer]
+      args[:buffer] = buflist[bufferName]
+      return $stderr.puts "Error : This buffer doesn't exists" if args[:buffer].nil?
+    end
     args["id"] = SecureRandom.uuid
     "#{request.upcase}=#{JSON.dump args}"
   end

data/lib/minep-request/requests.rb

@@ -31,6 +31,23 @@ module Minep
       CommandsInfo
     end
 
+    def self.sendFile port, path, type
+      file = File.new path
+      content = file.read
+      file.close
+      server = nil
+      if type == :tcp
+        server = TCPServer.new "0.0.0.0", port
+      elsif type == :websocket
+        server = WEBSocket::Server.new "0.0.0.0", port
+      end
+      socket = server.accept
+      socket.write content
+      socket.shutdown :RDWR
+      socket.close
+      server.close
+    end
+
     def self.readAndParseResponse request, socket
       responsetab = socket.readpartial(4096).split '='
       return $stderr.puts "Error while parsing response"if responsetab[0] != "RESPONSE"
@@ -50,7 +67,7 @@ module Minep
       response
     end
 
-    def self.load socket, type
+    def self.load socket, type, buflist
       args = {
         :path => "",
         :size => 0,
@@ -64,40 +81,27 @@ module Minep
       printf "port : "
       args[:port] = Minep.read.to_i
       args[:id] = SecureRandom.uuid
-      if File.exist? args[:path]
-        f = File.new args[:path]
-        args[:size] = f.size
-        f.close
-        Thread.start args[:port], args[:path] do |port, path|
-          file = File.new args[:path]
-          content = file.read
-          file.close
-          server = nil
-          if type == :tcp
-            server = TCPServer.new "0.0.0.0", port
-          elsif type == :websocket
-            server = WEBSocket::Server.new "0.0.0.0", port
-          end
-          socket = server.accept
-          socket.write content
-          socket.shutdown :RDWR
-          socket.close
-          server.close
-          Thread.stop
-        end
-        sleep 2
-        socket.write "LOAD=#{JSON.dump args}"
-        response = readAndParseResponse "LOAD", socket
-        return if response.nil?
-        if response["info"]["uuid"]
-          puts "Buffer id : #{response["info"]["uuid"]}"
-          return response["status"]
-        else
-          return $stderr.puts "Error while parsing response"
-        end
-      else
-        $stderr.puts "File #{args[:path]} doesn't exists"
+      unless File.exist? args[:path]
+        return $stderr.puts "File #{args[:path]} doesn't exists"
+      end
+      f = File.new args[:path]
+      args[:size] = f.size
+      f.close
+      Thread.start args[:port], args[:path], type do |port, path, type|
+        sendFile port, path, type
+        Thread.stop
       end
+      sleep 2
+      socket.write "LOAD=#{JSON.dump args}"
+      response = readAndParseResponse "LOAD", socket
+      return if response.nil?
+      unless response["info"]["uuid"]
+        return $stderr.puts "Error while parsing response"
+      end
+      puts "Buffer id : #{response["info"]["uuid"]}"
+      buflist[response["info"]["uuid"]] = response["info"]["uuid"]
+      buflist[args[:path]] = response["info"]["uuid"]
+      response["status"]
     end
 
     def self.authenticate socket
@@ -105,7 +109,9 @@ module Minep
         :name => "",
         :pass => ""
       }
-      socket.write Minep.makeMsg("AUTHENTICATE", args)
+      ret = Minep.makeMsg("AUTHENTICATE", args)
+      return if ret.nil?
+      socket.write ret
       response = readAndParseResponse "AUTHENTICATE", socket
       return if response.nil?
       response["status"]
@@ -118,64 +124,76 @@ module Minep
         :email => "",
         :website => ""
       }
-      socket.write Minep.makeMsg("SIGNUP", args)
+      ret = Minep.makeMsg("SIGNUP", args)
+      return if ret.nil?
+      socket.write ret
       response = readAndParseResponse "SIGNUP", socket
       return if response.nil?
       response["status"]
     end
 
-    def self.exec socket
+    def self.exec socket, buflist
       args = {
         :buffer => "",
         :command => "",
         :args => []
       }
-      socket.write Minep.makeMsg("EXEC", args)
+      ret = Minep.makeMsg("EXEC", args, buflist)
+      return if ret.nil?
+      socket.write ret
       response = readAndParseResponse "EXEC", socket
       return if response.nil?
       response["status"]
     end
 
-    def self.insert socket
+    def self.insert socket, buflist
       args = {
         :buffer => "",
         :text => ""
       }
-      socket.write Minep.makeMsg("INSERT", args)
+      ret = Minep.makeMsg("INSERT", args, buflist)
+      return if ret.nil?
+      socket.write ret
       response = readAndParseResponse "INSERT", socket
       return if response.nil?
       response["status"]
     end
 
-    def self.move socket
+    def self.move socket, buflist
       args = {
         :buffer => "",
         :direction => "",
         :number => 0
       }
-      socket.write Minep.makeMsg("MOVE", args)
+      ret = Minep.makeMsg("MOVE", args, buflist)
+      return if ret.nil?
+      socket.write ret
       response = readAndParseResponse "MOVE", socket
       return if response.nil?
       response["status"]
     end
 
-    def self.backspace socket
+    def self.backspace socket, buflist
       args = {
         :buffer => "",
         :number => 0
       }
-      socket.write Minep.makeMsg("BACKSPACE", args)
+      ret = Minep.makeMsg("BACKSPACE", args, buflist)
+      return if ret.nil?
+      socket.write ret
       response = readAndParseResponse "BACKSPACE", socket
       return if response.nil?
       response["status"]
     end
 
-    def self.delete socket
+    def self.delete socket, buflist
       args = {
         :buffer => "",
         :number => 0
       }
-      socket.write Minep.makeMsg("DELETE", args)
+      ret = Minep.makeMsg("DELETE", args, buflist)
+      return if ret.nil?
+      socket.write ret
       response = readAndParseResponse "DELETE", socket
       return if response.nil?
       response["status"]

data/lib/minep-request/version.rb

@@ -1,6 +1,6 @@
 module Minep
   module Request
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
     DATE = Time.now.to_s.split[0]
   end
 end

data/minep-request.gemspec

@@ -19,5 +19,5 @@ EOS
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_runtime_dependency 'WEBSocket', '~> 0.0.1', '>= 0.0.1'
+  gem.add_runtime_dependency 'WEBSocket', '~> 0.1.0', '>= 0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minep-request
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: WEBSocket
@@ -18,10 +18,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,10 +29,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
 description: ! 'Binary allowing the communication with a MINE server. It support both
   MINE Protocol over TCP and over WebSocket.