arbi 1.0.4 → 1.0.5

data/lib/arbi.rb

@@ -13,7 +13,7 @@ module Arbi
     require 'getopt/long'
     include Getopt
 
-    VERSION = "1.0.2"
+    VERSION = "1.0.5"
 
     @cmd = []
 
@@ -30,6 +30,26 @@ module Arbi
         exit 0
     end
 
+    def self.connect address = '127.0.0.1', port = '6969'
+        @@connection = TCPSocket.new address, port
+        @@connection.print "SERIAL\r\n"
+    end
+
+    def self.connected?
+        return true if @@connection
+        false
+    end
+
+    def self.connection
+        @@connection
+    end
+
+    def self.get what
+        raise "Arbi isn't connected to the server" unless self.connected?
+        @@connection.print what + "\r\n"
+        eval @@connection.gets.strip
+    end
+
     class Server
         require 'socket'
 
@@ -73,6 +93,10 @@ module Arbi
             @servert.kill
         end
 
+        def finalize
+            close
+        end
+
     private
 
         def parse_args
@@ -80,8 +104,8 @@ module Arbi
                 opts = Arbi::Long.getopts(
                     ["--bind-address", "-a", Arbi::REQUIRED],
                     ["--port", "-p", Arbi::REQUIRED],
-                    ["--help", "-h", Arbi::BOOLEAN],
-                    ["--version", "-v", Arbi::BOOLEAN]
+                    ["--help"],
+                    ["--version"]
                 )
             rescue Getopt::Long::Error => e
                 puts "Arguments error: #{e}"
@@ -96,12 +120,13 @@ module Arbi
 
         def new_client session
             @threads.push Thread.start(session){ |session|
+                ser = false
                 while message = session.gets
                     toggle = true
                     message = message.strip
                     break if message =~ /^QUIT$/i
 
-                    if message =~ /^HELP$/i
+                    if message =~ /^HELP$/i and !ser
                         session.print "help:\r\n"
                         Arbi::cmd.each { |pair|
                             session.print "#{pair[0]}\r\n"
@@ -113,18 +138,27 @@ module Arbi
                         toggle = !toggle
                     end
 
-                    if message =~ /^VERSION$/i
+                    if message =~ /^VERSION$/i and !ser
                         session.print "version:\r\nArbi (Client|Server) v#{VERSION}\r\nEND\r\n"
                         toggle = !toggle
                     end
 
+                    if message =~ /^SERIAL$/i
+                        ser = !ser
+                        toggle = !toggle
+                    end
+
                     Arbi::cmd.each { |pair|
                         if message =~ pair[0]
-                            session.print (pair[1].class == Class ? pair[1].protocolize(pair[1].get_infos) : pair[1].class.protocolize(pair[1].get_infos))
+                            if ser
+                                session.print pair[1].get_infos.inspect + "\r\n"
+                            else
+                                session.print (pair[1].class == Class ? pair[1].protocolize(pair[1].get_infos) : pair[1].class.protocolize(pair[1].get_infos))
+                            end
                             toggle = !toggle
                         end
                     }
-                    session.print "error:\r\nCommand doesn't exist\r\nEND\r\n" if toggle
+                    session.print (ser ? "{'error' => 'command desn\\'t exist'}" : "error:\r\nCommand doesn't exist\r\nEND\r\n") if toggle
                 end
                 @sessions -= [session]
                 session.close
@@ -172,6 +206,10 @@ module Arbi
             @sock.close
         end
 
+        def finalize
+            close
+        end
+
         def show_help
             puts "Arbi client:"
             puts "\tUSAGE: #{$0} [switches]"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: arbi
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - shura
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +02:00
+date: 2010-08-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -80,7 +77,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -89,7 +85,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"