minecraftctl 2.0.1 → 2.0.2

data/Gemfile

@@ -13,7 +13,7 @@ group :development do
 	gem "reek", "~> 1.2.8"
 	gem "roodi", "~> 2.1.0"
 	gem "sinatra", ">= 1.2.6"
-	gem "main", ">= 4.7.3"
+	gem "micro-optparse", "~> 1"
 	gem "httpclient", ">= 2.2.1"
 	gem "mongrel", ">= 1.1.5"
 	gem "mongrel", ">= 1.1.5"

data/Gemfile.lock

@@ -1,14 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    arrayfields (4.7.4)
     cgi_multipart_eof_fix (2.5.0)
-    chronic (0.6.4)
     daemon (1.1.0)
     daemons (1.1.4)
     diff-lcs (1.1.3)
     fastthread (1.0.7)
-    fattr (2.2.0)
     gem_plugin (0.2.3)
     git (1.2.5)
     httpclient (2.2.1)
@@ -16,12 +13,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    main (4.7.7)
-      arrayfields (~> 4.7.4)
-      chronic (~> 0.6.2)
-      fattr (~> 2.2.0)
-      map (~> 4.3.0)
-    map (4.3.0)
+    micro-optparse (1.1.5)
     mongrel (1.1.5)
       cgi_multipart_eof_fix (>= 2.4)
       daemons (>= 1.0.3)
@@ -63,7 +55,7 @@ DEPENDENCIES
   daemon (~> 1)
   httpclient (>= 2.2.1)
   jeweler (~> 1.6.4)
-  main (>= 4.7.3)
+  micro-optparse (~> 1)
   mongrel (>= 1.1.5)
   rcov
   reek (~> 1.2.8)

data/README.rdoc

@@ -46,6 +46,9 @@ Some cURL examples:
 
 == Changelog
 
+=== v2.0.2
+* better help message and switch related error handling
+
 === v2.0.1
 * increased startup and command timeout
 * startup and command timeout values are now configurable via -t and -s switches

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/bin/minecraftctl

@@ -1,54 +1,50 @@
 #!/usr/bin/ruby
 require 'rubygems'
-require 'main'
+require 'micro-optparse'
 require 'httpclient'
 require 'thread'
 Thread.abort_on_exception = true
 
-Main do
-	description 'controls minecraft server via minecraftctlserver'
+options = Parser.new do |p|
+	p.banner = <<EOF
+Controls minecraft server started via minecraftctlserver
 
-	option 'server', 's' do
-		default 'localhost'
-		description 'minecraft control server address'
-		argument_required
-	end
+Usage: #{$0} [options] command [arguments]
 
-	option 'port', 'p' do
-		default 25560
-		description 'minecraft control server port'
-		argument_required
-	end
+Command has to start with '/'
+For available server commands type '#{$0} /'
 
-	argument 'command' do
-		description 'command to send to control server: try "/" for available commands'
-		validate{|cmd| cmd =~ /^\//}
-	end
+Options:
+EOF
+	p.option :server, 'minecraft control server address', :default => 'localhost'
+	p.option :port, 'minecraft control server port', :default => 25560
+end.process!
 
-	argument 'arguments' do
-		required false
-		arity -1
-	end
+command = ARGV.shift
+unless command
+	puts "command not specified, see '#{$0} -h' for help"
+	exit 1
+end
+unless command =~ /^\//
+	puts "invalid command '#{command}', command has to start with '/'. Type '#{$0} /' to see available server commands"
+	exit 1 
+end
+
+args = ARGV
 
-	run do
-		c = HTTPClient.new
-
-		begin
-			command = params['command'].value
-			args = params['arguments'].values
-
-			if args.empty?
-				c.get_async("http://#{params['server'].value}:#{params['port'].value}#{command}").pop.content.each do |line|
-					puts line
-				end
-			else
-				c.post_async("http://#{params['server'].value}:#{params['port'].value}#{command}", args.join("\n")).pop.content.each do |line|
-					puts line
-				end
-			end
-		rescue Errno::ECONNREFUSED => e
-			puts "Falied to connect to minecraftctlserver; please run minecraftctlserver first: #{e}"
+c = HTTPClient.new
+
+begin
+	if args.empty?
+		c.get_async("http://#{options[:server]}:#{options[:port]}#{command}").pop.content.each do |line|
+			puts line
+		end
+	else
+		c.post_async("http://#{options[:server]}:#{options[:port]}#{command}", args.join("\n")).pop.content.each do |line|
+			puts line
 		end
 	end
+rescue SocketError, Errno::ECONNREFUSED => e
+	puts "Falied to connect to minecraft control server (to start it run 'minecraftctlserver .' in your minecraft install directory): #{e}"
 end
 

data/bin/minecraftctlserver

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 require 'rubygems'
-require 'main'
+require 'micro-optparse'
 require 'open3'
 require 'thread'
 require 'pathname'
@@ -124,180 +124,168 @@ class APIBuilder
 	end
 end
 
-Main do
-	description 'lounches Minecraft server that can be controlled via HTTP'
+options = Parser.new do |p|
+	p.banner = <<EOF
+Lounches minecraft server that can be controlled via HTTP
+
+Usage: #{$0} [options] directory
+
+Directory has to be a path to the minecraft server install directory (where you have 'minecraft_server.jar'); use '.' for current directory
+
+Options:
+EOF
+	p.option :command, 'command to be used to span server', :default => 'java -Xms256M -Xmx512M -Djava.net.preferIPv4Stack=true -jar minecraft_server.jar nogui'
+	p.option :port, 'TCP port number on which the HTTP control server will be listening', :default => 25560
+	p.option :bind, 'IP address of interface on which the HTTP control server will be listening on; use 0.0.0.0 to bind to all interfaces', :default => '127.0.0.1'
+	p.option :foreground, 'don\'t daemonize, stay in foreground'
+	p.option :pid_file, 'pid file relative to minecraft server direcotry', :default => 'minecraftctlserver.pid', :short => 'P'
+	p.option :log_file, 'log file relative to minecraft server directory where daemon messages will be written', :default => 'minecraftctlserver.log'
+	p.option :startup_timeout, 'time in seconds after which the control server will exit with error while waiting for minecraft to start up', :default => 120
+	p.option :command_timeout, 'time in seconds after which control server will exit with error while waiting for minecraft console command to finish', :default => 40
+end.process!
+
+directory = ARGV.shift
+unless directory
+	puts "directory not specified, see '#{$0} -h' for help"
+	exit 1
+end
 
-	option 'command', 'c' do
-		default 'java -Xms256M -Xmx512M -Djava.net.preferIPv4Stack=true -jar minecraft_server.jar nogui'
-		description 'command to be used to span server'
-		argument_required
-	end
+pid_file = Pathname.new(options[:pid_file])
+log_file = Pathname.new(options[:log_file])
 
-	option 'port', 'p' do
-		default 25560
-		description 'port on which the control HTTP server should be running'
-		argument_required
-	end
+Dir.chdir(directory)
 
-	option 'bind', 'b' do
-		description 'IP address of interface to listen for connections on; use 0.0.0.0 to bind to all interfaces'
-		default '127.0.0.1'
-		argument_required
+begin
+	if options[:foreground]
+		Daemon.lock(pid_file)
+	else
+		Daemon.daemonize(pid_file, log_file)
 	end
+rescue => e
+	puts "Error: failed to start daemon/lock pid: #{e}"
+	exit 2
+end
 
-	option 'foreground', 'f' do
-		description 'don\'t daemonize'
-	end
+minecraft = nil
 
-	option 'pid-file', 'P' do
-		description 'pid file relative to minecraft-dir'
-		default 'minecraftctlserver.pid'
-		argument_required
-	end
+begin
+	minecraft = Minecraft.new(options[:command], :startup_timeout => options[:startup_timeout], :command_timeout => options[:command_timeout])
 
-	option 'log-file', 'l' do
-		description 'log file relative to minecraft-dir when in not in foreground'
-		default 'minecraftctlserver.log'
-		argument_required
+	TextCollector.for(minecraft) do
+		start
+	end.each do |msg|
+		puts msg
 	end
+rescue Minecraft::StartupFailedError => e
+	puts "Error: failed to start minecraft with '#{options[:command]}' in '#{directory}': #{e}"
+	exit 3
+rescue => e
+	puts "Error: #{e}"
+	exit 4
+end
 
-	option 'startup-timeout', 's' do
-		description 'time in seconds after which control server will exit with error while waiting for minecraft to start up'
-		default 120
-		cast :float
-		argument_required
-	end
+sinatra = Sinatra.new
+sinatra.set :port, options[:port]
+sinatra.set :bind, options[:bind]
+sinatra.set :environment, 'production'
+sinatra.set :server, ['mongrel']
+sinatra.set :lock, true
+
+APIBuilder.new(sinatra, 'minecraft control server API') do
+	#get 'inspect', 'internal representation of output data' do
+		#minecraft.history.map{|m| m.inspect}.join("\n") + "\n"
+	#end
 
-	option 'command-timeout', 't' do
-		description 'time in seconds after which control server will exit with error while waiting for minecraft console command to finish'
-		default 40
-		cast :float
-		argument_required
+	get 'dir', 'minecraft directory' do
+		Dir.pwd + "\n"
 	end
 
-	argument 'minecraft-dir' do
-		description 'directory path to mincraft server installation directory'
-		argument_required
+	get 'pid', 'minecraft control server PID' do
+		Process.pid.to_s + "\n"
 	end
 
-	run do
-		pid_file = Pathname.new(params['pid-file'].value)
-		log_file = Pathname.new(params['log-file'].value)
+	get 'pid_file', 'minecraft control server PID file' do
+		pid_file.realpath.to_s + "\n"
+	end
 
-		Dir.chdir(params['minecraft-dir'].value)
+	get 'log_file', 'minecraft control server log file' do
+		log_file.realpath.to_s + "\n"
+	end
 
-		if params['foreground'].given?
-			Daemon.lock(pid_file)
-		else
-			Daemon.daemonize(pid_file, log_file)
-		end
+	get 'out', 'output generated by control and minecraft server' do
+		minecraft.history.join("\n") + "\n"
+	end
 
-		minecraft = Minecraft.new(params['command'].value, :startup_timeout => params['startup-timeout'].value, :command_timeout => params['command-timeout'].value)
+	post 'shutdown', 'shutdown minecraft and control server' do
 		TextCollector.for(minecraft) do
-			start
-		end.each do |msg|
-			puts msg
-		end
+			minecraft.stop if minecraft.running?
+			log "Shutting down minecraftctlserver"
 
-		sinatra = Sinatra.new
-		sinatra.set :port, params['port'].value
-		sinatra.set :bind, params['bind'].value
-		sinatra.set :environment, 'production'
-		sinatra.set :server, ['mongrel']
-		sinatra.set :lock, true
-
-		APIBuilder.new(sinatra, 'minecraft control server API') do
-			#get 'inspect', 'internal representation of output data' do
-				#minecraft.history.map{|m| m.inspect}.join("\n") + "\n"
-			#end
-
-			get 'dir', 'minecraft directory' do
-				Dir.pwd + "\n"
-			end
-
-			get 'pid', 'minecraft control server PID' do
-				Process.pid.to_s + "\n"
-			end
+			pid = Process.pid
+			Thread.new{Process.kill(15, pid)}
+		end
+	end
 
-			get 'pid_file', 'minecraft control server PID file' do
-				pid_file.realpath.to_s + "\n"
+	path 'server', 'minecraft server API'  do
+		get 'status', 'server status' do
+			if minecraft.running?
+				"running\n"
+			else
+				"stopped\n"
 			end
+		end
 
-			get 'log_file', 'minecraft control server log file' do
-				log_file.realpath.to_s + "\n"
+		get 'pid', 'minecraft server PID' do
+			if minecraft.server_pid
+				minecraft.server_pid.to_s + "\n"
+			else
+				"Server not running\n"
 			end
+		end
 
-			get 'out', 'output generated by control and minecraft server' do
-				minecraft.history.join("\n") + "\n"
+		post 'start', 'starts minecraft server' do
+			TextCollector.for(minecraft) do
+				start
 			end
+		end
 
-			post 'shutdown', 'shutdown minecraft and control server' do
-				TextCollector.for(minecraft) do
-					minecraft.stop if minecraft.running?
-					log "Shutting down minecraftctlserver"
-
-					pid = Process.pid
-					Thread.new{Process.kill(15, pid)}
-				end
+		post 'stop', 'stops minecraft server' do
+			TextCollector.for(minecraft) do
+				stop
 			end
+		end
 
-			path 'server', 'minecraft server API'  do
-				get 'status', 'server status' do
-					if minecraft.running?
-						"running\n"
-					else
-						"stopped\n"
-					end
-				end
-
-				get 'pid', 'minecraft server PID' do
-					if minecraft.server_pid
-						minecraft.server_pid.to_s + "\n"
-					else
-						"Server not running\n"
-					end
-				end
-
-				post 'start', 'starts minecraft server' do
-					TextCollector.for(minecraft) do
-						start
-					end
-				end
-
-				post 'stop', 'stops minecraft server' do
-					TextCollector.for(minecraft) do
-						stop
-					end
-				end
-
-				post 'console', 'send console command' do |args|
-					next "Console command not specified; try 'console help'\n" if args.empty?
-					TextCollector.for(minecraft) do
-						begin
-							send(args.shift.tr('-', '_').to_sym, *args)
-						rescue Minecraft::ServerNotRunningError
-							log "Server not running"
-						end
-					end
+		post 'console', 'send console command' do |args|
+			next "Console command not specified; try 'console help'\n" if args.empty?
+			TextCollector.for(minecraft) do
+				begin
+					send(args.shift.tr('-', '_').to_sym, *args)
+				rescue Minecraft::ServerNotRunningError
+					log "Server not running"
 				end
 			end
 		end
+	end
+end
 
-		sinatra.not_found do
-			"Unknown request: #{env['REQUEST_PATH']}\n"
-		end
-
-		sinatra.error do
-			"Error in minecraftctlserver while processing request '#{env['REQUEST_PATH']}': #{env['sinatra.error']}\n" 
-		end
+sinatra.not_found do
+	"Unknown request: #{env['REQUEST_PATH']}\n"
+end
 
-		sinatra.run!
+sinatra.error do
+	"Error in minecraftctlserver while processing request '#{env['REQUEST_PATH']}': #{env['sinatra.error']}\n" 
+end
 
-		# make sure we stop the server on exit
-		if minecraft.running?
-			puts 'stopping minecraft'
-			minecraft.stop 
-		end
+begin
+	sinatra.run!
+rescue Errno::EACCES, Errno::EADDRNOTAVAIL, SocketError => e
+	puts "Error: failed to bind HTTP server socket (#{options[:bind]}): #{e}"
+	exit 5
+ensure
+	# make sure we stop the server on exit
+	if minecraft.running?
+		puts 'stopping minecraft'
+		minecraft.stop 
 	end
 end
 

data/lib/minecraft.rb

@@ -102,7 +102,7 @@ class Minecraft
 		end
 	end
 
-	def initialize(cmd, options)
+	def initialize(cmd, options = {})
 		@cmd = cmd
 		@in_queue = Queue.new
 		@message_queue = MessageQueue.new

data/minecraftctl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "minecraftctl"
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<reek>, ["~> 1.2.8"])
       s.add_development_dependency(%q<roodi>, ["~> 2.1.0"])
       s.add_development_dependency(%q<sinatra>, [">= 1.2.6"])
-      s.add_development_dependency(%q<main>, [">= 4.7.3"])
+      s.add_development_dependency(%q<micro-optparse>, ["~> 1"])
       s.add_development_dependency(%q<httpclient>, [">= 2.2.1"])
       s.add_development_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_development_dependency(%q<mongrel>, [">= 1.1.5"])
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<reek>, ["~> 1.2.8"])
       s.add_dependency(%q<roodi>, ["~> 2.1.0"])
       s.add_dependency(%q<sinatra>, [">= 1.2.6"])
-      s.add_dependency(%q<main>, [">= 4.7.3"])
+      s.add_dependency(%q<micro-optparse>, ["~> 1"])
       s.add_dependency(%q<httpclient>, [">= 2.2.1"])
       s.add_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_dependency(%q<mongrel>, [">= 1.1.5"])
@@ -82,7 +82,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<reek>, ["~> 1.2.8"])
     s.add_dependency(%q<roodi>, ["~> 2.1.0"])
     s.add_dependency(%q<sinatra>, [">= 1.2.6"])
-    s.add_dependency(%q<main>, [">= 4.7.3"])
+    s.add_dependency(%q<micro-optparse>, ["~> 1"])
     s.add_dependency(%q<httpclient>, [">= 2.2.1"])
     s.add_dependency(%q<mongrel>, [">= 1.1.5"])
     s.add_dependency(%q<mongrel>, [">= 1.1.5"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minecraftctl
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -131,16 +131,14 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 1
         segments: 
-        - 4
-        - 7
-        - 3
-        version: 4.7.3
+        - 1
+        version: "1"
   version_requirements: *id008
-  name: main
+  name: micro-optparse
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency