arbi 1.0.7 → 1.0.8

data/bin/arbi

@@ -1,7 +1,5 @@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby
 
-require 'arbi'
+require 'arbi/cli/client'
 
-client = Arbi::Client.new
-client.start
-client.close
+Arbi::Cli::Client.new

data/bin/arbid

@@ -1,13 +1,5 @@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby
 
-require 'arbi'
+require 'arbi/cli/server'
 
-server = Arbi::Server.new
-
-["KILL", "ABRT", "INT", "QUIT"].each do |sig|
-    trap(sig){
-        server.close
-    }
-end
-
-server.start
+Arbi::Cli::Server.new

data/lib/arbi.rb

@@ -1,266 +1,41 @@
-#!/usr/bin/ruby
-
-class Regexp
-    alias oldto_s to_s
-    def to_s
-        regex = oldto_s.gsub(/^\(\?|\)/, '')
-        "/#{regex.split(/:/, 2)[1]}/#{regex.split(':')[0].split('-')[0]}"
-    end
-end
+#--
+# Copyleft shura. [ shura1991@gmail.com ]
+#
+# This file is part of arbi.
+#
+# arbi is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# arbi is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with arbi. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+require 'arbi/client'
 
 module Arbi
-
-    require 'optparse'
-
-    VERSION = "1.0.7"
-
-    @cmd = []
-
-    def self.add_plugin regex, instance
-        @cmd += [[regex, instance]]
-    end
-
-    def self.cmd
-        @cmd
-    end
-
-    def self.show_version
-        puts "Arbi (Client|Server) v#{VERSION}"
-        exit 0
-    end
-
-    def self.connect address = '127.0.0.1', port = '6969'
-        @@connection = TCPSocket.new address, port
-        @@connection.print "SERIAL\r\n"
+  class << self
+    def connect(address = '127.0.0.1', port = 6969)
+      @@connection = Arbi::Client.new(address, port)
     end
 
-    def self.connected?
-        return true if @@connection
-        false
+    def connected?
+      @@connection ? true : false
     end
 
-    def self.connection
-        @@connection
-    end
-
-    def self.get what
-        self.connect unless self.connected?
-        @@connection.print what + "\r\n"
-        eval @@connection.gets.strip
-    end
-
-    class Server
-        require 'socket'
-
-        def initialize
-            @threads = Array.new
-            @sessions = Array.new
-            @address = 'localhost'
-            @port = 6969
-            parse_args
-            @server = TCPServer.new(@address, @port)
-        end
-
-        def start
-            @servert = Thread.new do
-                while(session = @server.accept)
-                    new_client session
-                end
-            end
-            @servert.join
-        end
-
-        def close
-            @sessions.each{ |session|
-                session.close
-            }
-
-            @threads.each{ |thread|
-                thread.kill
-            }
-            @server.close
-            @servert.kill
-        end
-
-        def finalize
-            close
-        end
-
-    private
-
-        def parse_args
-             OptionParser.new do |o|
-
-                 o.program_name = 'arbid'
-                 o.banner       = 'Arbi server, USAGE:'
-
-                 o.on('-a', '--bind-address ADDR', 'Address to bind, default to "127.0.0.1"') do |addr|
-                     @address = addr
-                 end
-
-                 o.on('-p', '--port PORT', 'Port to use for server, default to 6969') do |port|
-                     @port = port
-                 end
-
-                 o.on('-V', '--version', 'Print version and exit') do
-                     puts Arbi::show_version
-                     exit 0
-                 end
-
-                 o.on_tail('-h', '--help', 'Print this help and exit') do
-                     puts o.to_s
-                     exit 0
-                 end
-
-             end.parse!
-
-        rescue OptionParser::MissingArgument
-            puts "At least one argument is required for this option."
-            puts "See help for details."
-            exit -1
-        end
-
-        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 and !ser
-                        session.print "help:\r\n"
-                        Arbi::cmd.each { |pair|
-                            session.print "#{pair[0]}\r\n"
-                        }
-                        session.print "/^quit$/i\r\n"
-                        session.print "/^version$/i\r\n"
-                        session.print "/^help$/i\r\n"
-                        session.print "END\r\n"
-                        toggle = !toggle
-                    end
-
-                    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]
-                            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 (ser ? "{'error' => 'command desn\\'t exist'}" : "error:\r\nCommand doesn't exist\r\nEND\r\n") if toggle
-                end
-                @sessions -= [session]
-                session.close
-            }
-            @sessions.push session
-        end
+    def connection
+      @@connection.sock
     end
 
-    class Client
-        def initialize
-            @address = 'localhost'
-            @port = 6969
-            @command = "help\r\nquit\r\n"
-            parse_args
-            @sock = TCPSocket.new(@address, @port)
-            
-        rescue Errno::ECONNREFUSED
-            puts "You have to start arbid demon first, or specify a correct port."
-            exit -2
-        end
-
-        def start
-            @sock.print @command
-            @command = @command.strip.split(/\r\n/).map(&:upcase)
-            @command.pop
-            toggle = false
-            while (line = @sock.gets)
-                puts (command = @command.shift) + ":"
-                buff = ""
-                while (l = @sock.gets).strip !~ /^END$/i do; buff << l; end
-                buff.gsub!(/END\s+$/m, '')
-                case line.strip
-                when /^error:$/i
-                    puts "ERROR: #{buff}"
-                    next
-                when /^help:$/i
-                    puts buff
-                when /^version:$/i
-                    puts buff
-                end
-                Arbi::cmd.each{|cmd|
-                    puts (cmd[1].class == Class ? cmd[1].friendlize(buff) : cmd[1].class.friendlize(buff)) if command =~ cmd[0]
-                }
-                puts if @command != []
-            end
-        end
-
-        def close
-            @sock.close
-        end
-
-        def finalize
-            close
-        end
-
-    private
-
-        def parse_args
-             OptionParser.new do |o|
-
-                 o.program_name = 'arbi'
-                 o.banner       = 'Arbi client, USAGE:'
-
-                 o.on('-c', '--command COMMANDS', Array, 'Set commands to execute, default is \'help\'') do |cmd|
-                     cmd.delete('quit')
-                     @command = (cmd&cmd).push('quit').inject(''){|str, cmd| str<<"#{cmd}\r\n"}
-                 end
-
-                 o.on('-a', '--address ADDR', 'Set address to connect, default to "127.0.0.1"') do |addr|
-                     @address = addr
-                 end
-
-                 o.on('-p', '--port PORT', 'Set port to connect, default to 6969') do |port|
-                     @port = port
-                 end
-
-                 o.on('-V', '--version', 'Print version and exit') do
-                     puts Arbi::show_version
-                     exit 0
-                 end
-
-                 o.on_tail('-h', '--help', 'Print this help and exit') do
-                     @help = o.to_s
-                     puts @help
-                     exit 0
-                 end
-
-             end.parse! 
-
-        rescue OptionParser::MissingArgument
-            puts "At least one argument is required for this option."
-            puts "See help for details."
-            exit -1
-        end
+    def get(what)
+      self.connect unless self.connected?
+      @@connection.get(what)
     end
+  end
 end
-
-require 'arbi/plugins/batteries'
-require 'arbi/plugins/cpu'
-require 'arbi/plugins/diskspace'
-require 'arbi/plugins/net'
-require 'arbi/plugins/ram'
-require 'arbi/plugins/thermal'

data/lib/arbi/cli/client.rb

@@ -0,0 +1,89 @@
+#--
+# Copyleft shura. [ shura1991@gmail.com ]
+#
+# This file is part of arbi.
+#
+# arbi is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# arbi is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with arbi. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+require 'optparse'
+require 'arbi/client'
+require 'arbi/config'
+require 'arbi/version'
+
+module Arbi
+
+module Cli
+
+class Client
+  def initialize
+    @address  = Arbi::Config[:client][:address]
+    @port     = Arbi::Config[:client][:port]
+    @commands = Arbi::Config[:client][:default_cmd]
+
+    self.parse_args
+
+    @client = Arbi::Client.new(@address, @port)
+
+    @commands.each {|command|
+      puts("#{command.upcase}:\n" + @client.get(command).format + "\n\n") if command !~ /^(quit|exit)$/i
+    }
+  rescue Errno::ECONNREFUSED
+    puts "You have to start arbid daemon first, or specify a correct port."
+    exit 1
+  end
+
+protected
+  def parse_args
+    OptionParser.new do |o|
+      o.program_name  = 'arbi'
+      o.banner        = "Arbi client v#{Arbi::VERSION}, USAGE:"
+
+      o.on('-c', '--config CONF', 'Select configurations path, default to /etc/arbi.conf') do |conf|
+        Arbi::Config.parse(conf)
+      end
+
+      o.on('-c', '--command COMMANDS', Array, 'Set commands to execute, default is \'help\'') do |cmd|
+        cmd.delete('quit')
+        @commands = (cmd & cmd).push('quit')
+      end
+
+      o.on('-a', '--address ADDR', 'Set address to connect, default to "127.0.0.1"') do |addr|
+        @address = addr
+      end
+
+      o.on('-p', '--port PORT', 'Set port to connect, default to 6969') do |port|
+        @port = port
+      end
+
+      o.on('-V', '--version', 'Print version and exit') do
+        puts "Arbi client v#{Arbi::VERSION}"
+        exit 0
+      end
+
+      o.on_tail('-h', '--help', 'Print this help and exit') do
+        puts o.to_s
+        exit 0
+      end
+    end.parse!
+  rescue OptionParser::MissingArgument
+    puts "At least one argument is required fro this option."
+    puts "See help for details."
+    exit 1
+  end
+end
+
+end
+
+end

data/lib/arbi/cli/server.rb

@@ -0,0 +1,75 @@
+#--
+# Copyleft shura. [ shura1991@gmail.com ]
+#
+# This file is part of arbi.
+#
+# arbi is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# arbi is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with arbi. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+require 'optparse'
+require 'arbi/server'
+require 'arbi/version'
+
+module Arbi
+
+module Cli
+
+class Server
+  def initialize
+    @address = Arbi::Config[:server][:address]
+    @port = Arbi::Config[:server][:port]
+
+    self.parse_args
+
+    Arbi::Server.start(@address, @port)
+  end
+
+protected
+  def parse_args
+    OptionParser.new do |o|
+      o.program_name  = 'arbid'
+      o.banner        = "Arbi server v#{Arbi::VERSION}, USAGE:"
+
+      o.on('-c', '--config CONF', 'Select configurations path, default to /etc/arbi.conf') do |conf|
+        Arbi::Config.parse(conf)
+      end
+
+      o.on('-a', '--bind-address ADDR', 'Address to bind, default to "127.0.0.1"') do |addr|
+        @address = addr
+      end
+
+      o.on('-p', '--port PORT', 'Port to use for server, default to 6969') do |port|
+        @port = port
+      end
+
+      o.on('-V', '--version', 'Print version and exit') do
+        puts "Arbi server v#{Arbi::VERSION}"
+        exit 0
+      end
+
+      o.on_tail('h', '--help', 'Print this help and exit') do
+        puts o.to_s
+        exit 0
+      end
+    end.parse!
+  rescue OptionParser::MissingArgument
+    puts "At least one argument is required for this option."
+    puts "See help for detail"
+    exit 1
+  end
+end
+
+end
+
+end