minecraftctl 2.0.0 → 2.0.1

data/Gemfile.lock

@@ -4,10 +4,10 @@ GEM
     arrayfields (4.7.4)
     cgi_multipart_eof_fix (2.5.0)
     chronic (0.6.4)
-    daemon (1.0.0)
+    daemon (1.1.0)
     daemons (1.1.4)
     diff-lcs (1.1.3)
-    fastthread (1.0.1)
+    fastthread (1.0.7)
     fattr (2.2.0)
     gem_plugin (0.2.3)
     git (1.2.5)
@@ -16,7 +16,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    main (4.7.3)
+    main (4.7.7)
       arrayfields (~> 4.7.4)
       chronic (~> 0.6.2)
       fattr (~> 2.2.0)
@@ -27,7 +27,7 @@ GEM
       daemons (>= 1.0.3)
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
-    rack (1.3.2)
+    rack (1.3.3)
     rake (0.9.2)
     rcov (0.9.10)
     reek (1.2.8)
@@ -44,15 +44,15 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    ruby2ruby (1.3.0)
+    ruby2ruby (1.3.1)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.3.0)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.6)
+    sexp_processor (3.0.7)
     sinatra (1.2.6)
       rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+      tilt (< 2.0, >= 1.2.2)
     tilt (1.3.3)
 
 PLATFORMS

data/README.rdoc

@@ -46,6 +46,13 @@ Some cURL examples:
 
 == Changelog
 
+=== v2.0.1
+* increased startup and command timeout
+* startup and command timeout values are now configurable via -t and -s switches
+* minecraftctl will not rise exception when command does not start with /
+* initial minecraft server startup will now be logged
+* shutdown messages logged in real time
+
 === v2.0.0
 * New cleaner API - more REST like
 * New API commands: pid, pid_file, dir, out...

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/bin/minecraftctl

@@ -22,6 +22,7 @@ Main do
 
 	argument 'command' do
 		description 'command to send to control server: try "/" for available commands'
+		validate{|cmd| cmd =~ /^\//}
 	end
 
 	argument 'arguments' do
@@ -33,13 +34,7 @@ Main do
 		c = HTTPClient.new
 
 		begin
-			command = case params['command'].value
-				when 'serverhelp'
-					'help'
-				else
-					params['command'].value
-			end
-
+			command = params['command'].value
 			args = params['arguments'].values
 
 			if args.empty?

data/bin/minecraftctlserver

@@ -161,6 +161,20 @@ Main do
 		argument_required
 	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
+
+	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
+	end
+
 	argument 'minecraft-dir' do
 		description 'directory path to mincraft server installation directory'
 		argument_required
@@ -178,8 +192,12 @@ Main do
 			Daemon.daemonize(pid_file, log_file)
 		end
 
-		minecraft = Minecraft.new(params['command'].value)
-		minecraft.start
+		minecraft = Minecraft.new(params['command'].value, :startup_timeout => params['startup-timeout'].value, :command_timeout => params['command-timeout'].value)
+		TextCollector.for(minecraft) do
+			start
+		end.each do |msg|
+			puts msg
+		end
 
 		sinatra = Sinatra.new
 		sinatra.set :port, params['port'].value

data/lib/minecraft.rb

@@ -102,11 +102,14 @@ class Minecraft
 		end
 	end
 
-	def initialize(cmd)
+	def initialize(cmd, options)
 		@cmd = cmd
 		@in_queue = Queue.new
 		@message_queue = MessageQueue.new
 
+		@startup_timeout = (options[:startup_timeout] or 120)
+		@command_timeout = (options[:command_timeout] or 40)
+
 		@server_pid = nil
 
 		@collector = nil
@@ -191,7 +194,7 @@ class Minecraft
 						end
 					end
 
-					wait_msg do |m|
+					wait_msg(false, @startup_timeout) do |m|
 						m.msg =~ /Done \(([^n]*)ns\)!/ or m.msg =~ /Minecraft exits/
 					end
 
@@ -213,12 +216,11 @@ class Minecraft
 		else
 			command('stop') do
 				time_operation("Server stop") do
+					wait_msg{|m| m.msg == "Minecraft exits"}
 					Process.wait(@server_pid)
 					@server_pid = nil
 					log "Server stopped"
 				end
-
-				wait_msg{|m| m.msg == "Minecraft exits"}
 			end
 		end
 	end
@@ -267,7 +269,8 @@ class Minecraft
 		log "#{name} finished in #{(Time.now - start).to_f}"
 	end
 
-	def wait_msg(discard = false, timeout = 20)
+	def wait_msg(discard = false, timeout = nil)
+		timeout ||= @command_timeout
 		Timeout::timeout(timeout) do
 			loop do
 				msg = @message_queue.pop

data/minecraftctl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "minecraftctl"
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-09-26"
+  s.date = "2011-09-28"
   s.description = "Allows to send messages, start and stop Minecraft server"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["minecraftctl", "minecraftctlserver", "minecraftctl", "minecraftctlserver"]

data/spec/stub_server/minecraft

@@ -1,13 +1,17 @@
 #!/usr/bin/ruby
 
+$delay = ARGV[0]
+
 def out(line)
 	STDOUT << line + "\n"
 	STDOUT.flush
+	sleep $delay.to_f if $delay
 end
 
 def err(line)
 	STDERR << line + "\n"
 	STDERR.flush
+	sleep $delay.to_f if $delay
 end
 
 $expects = {}
@@ -90,7 +94,7 @@ expect 'stream' do
 end
 
 loop do
-	cmd, *args = gets.split(' ')
+	cmd, *args = STDIN.gets.split(' ')
 	if $expects.member? cmd
 		$expects[cmd].call(*args)    
 	else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minecraftctl
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-26 00:00:00 Z
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement