arbi 1.0.6 → 1.0.7a

data/lib/arbi.rb

@@ -10,10 +10,9 @@ end
 
 module Arbi
 
-    require 'getopt/long'
-    include Getopt
+    require 'optparse'
 
-    VERSION = "1.0.5"
+    VERSION = "1.0.7a"
 
     @cmd = []
 
@@ -62,16 +61,6 @@ module Arbi
             @server = TCPServer.new(@address, @port)
         end
 
-        def show_help
-            puts "Arbi Server, USAGE:"
-            puts "\t#{$0} [switches]"
-            puts "\t\t--bind-address|-a\tAddress to bind, default to \"127.0.0.1\""
-            puts "\t\t        --port|-p\tPort to use for server, default to 40"
-            puts "\t\t     --version|-v\tPrint version and exit"
-            puts "\t\t        --help|-h\tPrint this help and exit"
-            exit 0
-        end
-
         def start
             @servert = Thread.new do
                 while(session = @server.accept)
@@ -100,22 +89,35 @@ module Arbi
     private
 
         def parse_args
-            begin
-                opts = Arbi::Long.getopts(
-                    ["--bind-address", "-a", Arbi::REQUIRED],
-                    ["--port", "-p", Arbi::REQUIRED],
-                    ["--help"],
-                    ["--version"]
-                )
-            rescue Getopt::Long::Error => e
-                puts "Arguments error: #{e}"
-                exit 0
-            end
+             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
 
-            @address = opts['a']    if opts['a']
-            @port    = opts['p']    if opts['p']
-            show_help               if opts['h']
-            Arbi::show_version      if opts['v']
+                 o.on('-p', '--port PORT', 'Port to use for server, default to 40') 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
@@ -174,6 +176,10 @@ module Arbi
             @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
@@ -210,40 +216,44 @@ module Arbi
             close
         end
 
-        def show_help
-            puts "Arbi client:"
-            puts "\tUSAGE: #{$0} [switches]"
-            puts "\t\t   --help|-h\tshow this helps"
-            puts "\t\t--version|-v\tshow version of arbi"
-            puts "\t\t--address|-a\tset the address to connect, default to 'localhost'"
-            puts "\t\t   --port|-p\tset the port to connect, default to 40"
-            puts "\t\t--command|-c\tset commands to execute, defaults is 'help'"
-            exit 0
-        end
-
     private
 
         def parse_args
-            begin
-                opts = Arbi::Long.getopts(
-                    ["--help"],
-                    ["--version"],
-                    ["--address", "-a", Arbi::REQUIRED],
-                    ["--port", "-p", Arbi::REQUIRED],
-                    ["--commands", "-c", Arbi::REQUIRED]
-                )
-            rescue Arbi::Long::Error => e
-                p ARGV
-                $stderr.puts "Arguments error: #{e}"
-                exit 1
-            end
+             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 40') 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! 
 
-            Arbi::show_version      if opts["v"]
-            show_help               if opts["h"]
-            @address    = opts["a"] if opts["a"]
-            @port       = opts["p"] if opts["p"]
-            @command    = "#{opts["c"]}".gsub(/,+/, ',').gsub(/\s+/, '').split(/,/).
-                uniq.delete_if{|x|x=~/^quit$/i}.push("quit\r\n").join("\r\n") if opts["c"]
+        rescue OptionParser::MissingArgument
+            puts "At least one argument is required for this option."
+            puts "See help for details."
+            exit -1
         end
     end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: arbi
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7a
+  version: 1.0.7a
 platform: ruby
 authors: 
 - shura
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 +02:00
+date: 2010-09-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: getopt
+  name: sys-filesystem
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,19 +30,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sys-filesystem
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 description: ""
 email: shura1991@gmail.com
 executables: 
@@ -83,11 +70,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: