zrcon 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16c2a60f4c484937922da89c305ce0713fd63eab
-  data.tar.gz: b0437351606e4d7ddfee24923fe68d46e843731b
+  metadata.gz: '08303a1a804041ed904cf38e17a0733eadea8f88'
+  data.tar.gz: f543b821ba009ac528f982fbcc37757870e4538b
 SHA512:
-  metadata.gz: 68d9a2b53a447a2d4ffb10c3e1d1c440a0fe8ea8d469d489451a721d9d0984bee81afad5bde512399f888423e6eb36423eb0d3a982ccf7c489119a776a04d1fd
-  data.tar.gz: 415351450dc9400efce7db1676e9b1e3522a4f5ec559d4b2a417603275ba081d606b95b1894adfc2717a83d02e6ab0c5731980e4a6a5773beb198b18dbdf43ba
+  metadata.gz: 2c2ee2e218d003c125f50fc151a6f9ca5d1a30e19b27508383b13f84fcaff4986a4f7df769d16e6ddab512482a3023baa61c666f2cf7100e838149102a2e1435
+  data.tar.gz: 2e10cda86e0dbdab2c3927517a8462021cc47e1a3dbab692e88dd6bae915fb5defc47d49377daf92bf8adf06aaa0b7261cc5dbbffb6763c7a9151f0bd0b98573

data/bin/zrcon

@@ -2,12 +2,32 @@
 
 require 'bundler/setup'
 require 'dotenv'
+require 'optionparser'
+require 'ostruct'
+
 require_relative '../lib/zrcon'
 
 Dotenv.load
 
-rcon = Zrcon.new
+options = OpenStruct.new(
+  host: ENV['RCON_HOST'],
+  port: ENV['RCON_PORT'],
+  password: ENV['RCON_PASSWORD']
+)
+
+OptionParser.new { |opts|
+  opts.banner = "Usage: zrcon..."
+  opts.on("-hHOSTNAME", "--host=HOSTNAME", "hostname of rcon server") { |value| options.host = value }
+  opts.on("-pPORT", "--port=PORT", "tcp port") { |value| options.port = value.to_i }
+  opts.on("-PPASS", "--password=PASS", "rcon password") { |value| options.password = value }
+}.parse!
+
+begin
+  rcon = Zrcon.new options.to_h
+  rcon.auth
 
-rcon.auth
-puts rcon.command(ARGV.first || "help")
+  puts rcon.command(ARGV.join(' '))
+rescue Zrcon::ConnectError => e
+  puts "Connect error: #{e}"
+end
 

data/lib/zrcon.rb

@@ -4,9 +4,11 @@ require_relative 'zrcon/packet'
 require_relative 'zrcon/version'
 
 class Zrcon
+  ConnectError = Class.new(StandardError)
+
   attr_accessor :host, :port, :password
 
-  def initialize(host=ENV['RCON_HOST'], port=ENV['RCON_PORT'], password=ENV['RCON_PASSWORD'])
+  def initialize(host: ENV['RCON_HOST'], port: ENV['RCON_PORT'], password: ENV['RCON_PASSWORD'])
     @host = host.to_s
     @port = port.to_i
     @password = password.to_s
@@ -27,12 +29,17 @@ class Zrcon
     response.data
   end
 
-  private
-
   def conn
     @conn ||= TCPSocket.new host, port
+  rescue SocketError
+    raise ConnectError.new "bad hostname perhaps? (#{host})"
+  rescue Errno::ETIMEDOUT
+    raise ConnectError.new "timed out connecting to #{host}:#{port}"
+  rescue Errno::ECONNREFUSED
+    raise ConnectError.new "connection refused"
   end
 
+
   def next_id
     @id ||= 0
     @id += 1

data/lib/zrcon/version.rb

@@ -1,3 +1,3 @@
 class Zrcon
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zrcon
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Libby