minecraftctl 1.1.0 → 2.0.0

data/Gemfile

@@ -6,17 +6,17 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
-  gem "reek", "~> 1.2.8"
-  gem "roodi", "~> 2.1.0"
-  gem "sinatra", ">= 1.2.6"
-  gem "main", ">= 4.7.3"
-  gem "haml", ">= 3.1.3"
-  gem "httpclient", ">= 2.2.1"
-  gem "open4", ">= 1.1.0"
-  gem "mongrel", ">= 1.1.5"
+	gem "rspec", "~> 2.3.0"
+	gem "bundler", "~> 1.0.0"
+	gem "jeweler", "~> 1.6.4"
+	gem "rcov", ">= 0"
+	gem "reek", "~> 1.2.8"
+	gem "roodi", "~> 2.1.0"
+	gem "sinatra", ">= 1.2.6"
+	gem "main", ">= 4.7.3"
+	gem "httpclient", ">= 2.2.1"
+	gem "mongrel", ">= 1.1.5"
+	gem "mongrel", ">= 1.1.5"
+	gem "daemon", "~> 1"
 end
 

data/Gemfile.lock

@@ -4,13 +4,13 @@ GEM
     arrayfields (4.7.4)
     cgi_multipart_eof_fix (2.5.0)
     chronic (0.6.4)
+    daemon (1.0.0)
     daemons (1.1.4)
     diff-lcs (1.1.3)
     fastthread (1.0.1)
     fattr (2.2.0)
     gem_plugin (0.2.3)
     git (1.2.5)
-    haml (3.1.3)
     httpclient (2.2.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -27,7 +27,6 @@ GEM
       daemons (>= 1.0.3)
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
-    open4 (1.1.0)
     rack (1.3.2)
     rake (0.9.2)
     rcov (0.9.10)
@@ -61,12 +60,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  haml (>= 3.1.3)
+  daemon (~> 1)
   httpclient (>= 2.2.1)
   jeweler (~> 1.6.4)
   main (>= 4.7.3)
   mongrel (>= 1.1.5)
-  open4 (>= 1.1.0)
   rcov
   reek (~> 1.2.8)
   roodi (~> 2.1.0)

data/README.rdoc

@@ -4,16 +4,53 @@ Allows running Minecraft server in background (daemon) and send commands, stop,
 
 == Usage
 
-Lounch Minecraft server with:
+Launch Minecraft server with:
 
     $ minecraftctlserver <path to minecraft server install dir>
 
 And control it with 'minecraftctl', for help try:
 
-    $ minecraftctl serverhelp
+    $ minecraftctl /
+
+Executing console commands:
+
+    $ minecraftctl /server console help
+    $ minecraftctl /server console say hello world
+    $ minecraftctl /server console list
+    $ minecraftctl /server console kick kazuya
+
+Stopping and starting minecraft server:s
+
+    $ minecraftctl /server stop
+    $ minecraftctl /server start
+
+Shutting down minecraftctlserver and minecraft server within:
+
+    $ minecraftctl / shutdown
+
+== API
+
+The minecraftctlserver exposes HTTP API on port 25560 (by default) and on localhost (by default).
+GET call will return a value for given URI or available API commands for GET / and /server.
+Use space delimited list of arguments as POST data. First argument will be threated as API command.
+
+Some cURL examples:
+
+    $ curl localhost:25560/ # GET / give list of all API calls
+    $ curl localhost:25560/pid_file # get PID file location
+    $ curl localhost:25560/ -d shutdown # POST / with shutdown POST data will stop the control server
+    $ curl localhost:25560/status # get minecraft server status
+    $ curl localhost:25560/server -d 'stop' # stop minecraft server
+    $ curl localhost:25560/server -d 'start' # stop minecraft server
+    $ curl localhost:25560/server -d 'console list' # list all connected users
 
 == Changelog
 
+=== v2.0.0
+* New cleaner API - more REST like
+* New API commands: pid, pid_file, dir, out...
+* Cleanups and fixes
+
 === v1.1.0
 * Output from server is streamed in real time
 * Fixed problem with initial pid file creation

data/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0

data/bin/minecraftctl

@@ -6,22 +6,22 @@ require 'thread'
 Thread.abort_on_exception = true
 
 Main do
-	description 'controls Minecraft via minecraftctlserver'
+	description 'controls minecraft server via minecraftctlserver'
 
 	option 'server', 's' do
 		default 'localhost'
-		description 'minecraftctlserver address'
+		description 'minecraft control server address'
 		argument_required
 	end
 
 	option 'port', 'p' do
 		default 25560
-		description 'minecraftctlserver port'
+		description 'minecraft control server port'
 		argument_required
 	end
 
 	argument 'command' do
-		description 'command to send to Minecraft server: try "serverhelp"'
+		description 'command to send to control server: try "/" for available commands'
 	end
 
 	argument 'arguments' do
@@ -42,17 +42,17 @@ Main do
 
 			args = params['arguments'].values
 
-			if ['status', 'log', 'inspect', 'list', 'help'].include? command
-				c.get_async("http://#{params['server'].value}:#{params['port'].value}/#{command}").pop.content.each do |line|
+			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|
+				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: #{e}"
+			puts "Falied to connect to minecraftctlserver; please run minecraftctlserver first: #{e}"
 		end
 	end
 end

data/bin/minecraftctlserver

@@ -4,6 +4,8 @@ require 'main'
 require 'open3'
 require 'thread'
 require 'pathname'
+require 'daemon'
+require 'sinatra/base'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
@@ -38,34 +40,87 @@ class TextCollector < MessageCollectorProcessed
 	end
 end
 
-class Daemon
-	def self.daemonize(pid_file, log_file = nil)
-		exit if fork
-		Process.setsid # become session leader
-		exit if fork # and exits
-		# now in child
+class APIBuilder
+	def initialize(sinatra, description, path = '', &block)
+		@sinatra = sinatra
+		@description = description
 
-		# try to lock before we kill stdin/out
-		lock(pid_file)
+		@dsl = DSL.new(sinatra, path, &block).data
+		@path = path
+		root = self
 
-		if log_file
-			log = File.open(log_file, 'a')
-		else
-			log = '/dev/null'
+		@sinatra.get(root_path) do
+			root.help.join("\n") + "\n"
+		end
+
+		@dsl.gets.each do |op|
+			@sinatra.get(path + '/' + op.name, &op.block)
 		end
 
-		# disconnect
-		STDIN.reopen '/dev/null'
-		STDOUT.reopen log
-		STDERR.reopen log
+		post_map = {}
+
+		@dsl.posts.each do |op|
+			post_map[op.name] = op
+		end
+
+		@sinatra.post(root_path) do
+			cmd, *args = request.body.read.split(' ')
+			op = post_map[cmd] or return [400, "Unknown argument: #{cmd} for request: #{request.path_info}\n"]
+			op.block.call(args)
+		end
 	end
 
-	def self.lock(pid_file)
-		pf = File.open(pid_file, File::RDWR | File::CREAT)
-		fail "Server already running with pid: #{pf.read}" unless pf.flock(File::LOCK_EX|File::LOCK_NB)
-		pf.truncate(0)
-		pf.write(Process.pid.to_s)
-		pf.flush
+	def root_path
+		@path.empty? ? '/' : @path
+	end
+
+	def help
+		out = []
+		out << "#{root_path} - #{@description}"
+
+		@dsl.posts.each do |op|
+			out << "#{root_path} #{op.name} - #{op.description}"
+		end
+
+		@dsl.gets.each do |op|
+			out << "#{@path}/#{op.name} - #{op.description}"
+		end
+
+		@dsl.paths.each do |path|
+			out += path.help
+		end
+
+		out
+	end
+
+	class DSL
+		OP = Struct.new(:name, :description, :block)
+		def initialize(sinatra, path, &block)
+			@sinatra = sinatra
+			@path = path
+
+			@gets = []
+			@posts = []
+			@paths = []
+
+			instance_eval(&block)
+		end
+
+		def data
+			Struct.new(:gets, :posts, :paths).new(@gets, @posts, @paths)
+		end
+
+		def get(name, description, &block)
+			@gets << OP.new(name, description, block)
+		end
+
+		def post(name, description, &block)
+			@posts << OP.new(name, description, block)
+		end
+
+		def path(name, description, &block)
+			@paths << APIBuilder.new(@sinatra, description, @path + '/' + name, &block)
+		end
 	end
 end
 
@@ -84,6 +139,12 @@ Main do
 		argument_required
 	end
 
+	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
+	end
+
 	option 'foreground', 'f' do
 		description 'don\'t daemonize'
 	end
@@ -106,8 +167,10 @@ Main do
 	end
 
 	run do
-		pid_file = Pathname.new(params['minecraft-dir'].value) + params['pid-file'].value
-		log_file = Pathname.new(params['minecraft-dir'].value) + params['log-file'].value
+		pid_file = Pathname.new(params['pid-file'].value)
+		log_file = Pathname.new(params['log-file'].value)
+
+		Dir.chdir(params['minecraft-dir'].value)
 
 		if params['foreground'].given?
 			Daemon.lock(pid_file)
@@ -115,128 +178,108 @@ Main do
 			Daemon.daemonize(pid_file, log_file)
 		end
 
-		require 'sinatra/base'
-		require 'haml'
-
-		Dir.chdir(params['minecraft-dir'].value)
-
 		minecraft = Minecraft.new(params['command'].value)
-
 		minecraft.start
 
-		s = Sinatra.new
-		s.set :port, params['port'].value
-		s.set :environment, 'production'
-		s.set :server, ['mongrel']
-		s.set :lock, true
+		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
 
-		s.post '/save-all' do
-			TextCollector.for(minecraft) do
-				save_all
-			end
-		end
+		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
 
-		s.post '/start' do
-			TextCollector.for(minecraft) do
-				start
+			get 'dir', 'minecraft directory' do
+				Dir.pwd + "\n"
 			end
-		end
 
-		s.post '/stop' do
-			TextCollector.for(minecraft) do
-				stop
+			get 'pid', 'minecraft control server PID' do
+				Process.pid.to_s + "\n"
 			end
-		end
 
-		s.post '/shutdown' do
-			TextCollector.for(minecraft) do
-				stop
-
-				pid = Process.pid
-				Thread.new{ sleep 1; Process.kill(15, pid)}
+			get 'pid_file', 'minecraft control server PID file' do
+				pid_file.realpath.to_s + "\n"
 			end
-		end
 
-		s.post %r{/(.+)} do |cmd|
-			args = request.body.read.split("\n")
-			TextCollector.for(minecraft) do
-				send(cmd.tr('-', '_').to_sym, *args)
+			get 'log_file', 'minecraft control server log file' do
+				log_file.realpath.to_s + "\n"
 			end
-		end
-
-		s.get '/help' do
-			start = false
-			TextCollector.for(minecraft) do
-				help
-				log "status                    show server status"
-				log "log                       show recent server messages"
-				log "inspect                   inspect recent server messages"
-			end.process do |msg|
-				msg = msg.to_s
 
-				if msg =~ /Console commands:/
-					start = true 
-					next
-				end
-
-				next unless start
-				msg.sub(/help  or  \?/, 'serverhelp ').sub(/^( |\t)*/, '')
+			get 'out', 'output generated by control and minecraft server' do
+				minecraft.history.join("\n") + "\n"
 			end
-		end
 
-		s.get '/list' do
-			TextCollector.for(minecraft) do
-				list
-			end
-		end
+			post 'shutdown', 'shutdown minecraft and control server' do
+				TextCollector.for(minecraft) do
+					minecraft.stop if minecraft.running?
+					log "Shutting down minecraftctlserver"
 
-		s.get '/status' do
-			if minecraft.running?
-				@pid = minecraft.server_pid
-				haml :status_running
-			else
-				haml :status_stopped
+					pid = Process.pid
+					Thread.new{Process.kill(15, pid)}
+				end
 			end
-		end
-
-		s.get '/inspect' do
-			@msg = minecraft.history
-			haml :messages_inspect
-		end
 
-		s.get '/log' do
-			@msg = minecraft.history
-			haml :messages
-		end
+			path 'server', 'minecraft server API'  do
+				get 'status', 'server status' do
+					if minecraft.running?
+						"running\n"
+					else
+						"stopped\n"
+					end
+				end
 
-		s.template :status_running do
-			'= "Minecraft server is running with pid: #{@pid}"'
-		end
+				get 'pid', 'minecraft server PID' do
+					if minecraft.server_pid
+						minecraft.server_pid.to_s + "\n"
+					else
+						"Server not running\n"
+					end
+				end
 
-		s.template :status_stopped do
-			'= "Minecraft server is stopped"'
-		end
+				post 'start', 'starts minecraft server' do
+					TextCollector.for(minecraft) do
+						start
+					end
+				end
 
-		s.template :messages do
-			'= @msg.join("\n")'
-		end
+				post 'stop', 'stops minecraft server' do
+					TextCollector.for(minecraft) do
+						stop
+					end
+				end
 
-		s.template :messages_inspect do
-			'= @msg.map{|m| m.inspect}.join("\n")'
+				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
 
-		s.not_found do
-			"Request '#{env['REQUEST_PATH']}' not supported, please see '/serverhelp' for details\n"
+		sinatra.not_found do
+			"Unknown request: #{env['REQUEST_PATH']}\n"
 		end
 
-		s.error do
+		sinatra.error do
 			"Error in minecraftctlserver while processing request '#{env['REQUEST_PATH']}': #{env['sinatra.error']}\n" 
 		end
 
-		s.run!
+		sinatra.run!
 
 		# make sure we stop the server on exit
-		minecraft.stop if minecraft.running?
+		if minecraft.running?
+			puts 'stopping minecraft'
+			minecraft.stop 
+		end
 	end
 end
 

data/lib/minecraft.rb

@@ -96,6 +96,12 @@ class Minecraft
 		end
 	end
 
+	class ServerNotRunningError < RuntimeError
+		def initialize
+			super 'server not running'
+		end
+	end
+
 	def initialize(cmd)
 		@cmd = cmd
 		@in_queue = Queue.new
@@ -191,6 +197,7 @@ class Minecraft
 
 					unless running?
 						Process.wait(@server_pid)
+						@server_pid = nil
 						raise StartupFailedError, @cmd 
 					end
 				rescue Errno::ENOENT
@@ -207,10 +214,11 @@ class Minecraft
 			command('stop') do
 				time_operation("Server stop") do
 					Process.wait(@server_pid)
+					@server_pid = nil
 					log "Server stopped"
 				end
 
-				wait_msg{|m| m.msg == "Server stopped"}
+				wait_msg{|m| m.msg == "Minecraft exits"}
 			end
 		end
 	end
@@ -234,7 +242,7 @@ class Minecraft
 	end
 
 	def command(cmd)
-		raise RuntimeError, "server not running" unless running?
+		raise ServerNotRunningError unless running?
 		@in_queue << "#{cmd}\n"
 		if block_given?
 			yield 

data/minecraftctl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "minecraftctl"
-  s.version = "1.1.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-09-22"
+  s.date = "2011-09-26"
   s.description = "Allows to send messages, start and stop Minecraft server"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["minecraftctl", "minecraftctlserver", "minecraftctl", "minecraftctlserver"]
@@ -56,10 +56,10 @@ Gem::Specification.new do |s|
       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<haml>, [">= 3.1.3"])
       s.add_development_dependency(%q<httpclient>, [">= 2.2.1"])
-      s.add_development_dependency(%q<open4>, [">= 1.1.0"])
       s.add_development_dependency(%q<mongrel>, [">= 1.1.5"])
+      s.add_development_dependency(%q<mongrel>, [">= 1.1.5"])
+      s.add_development_dependency(%q<daemon>, ["~> 1"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -69,10 +69,10 @@ Gem::Specification.new do |s|
       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<haml>, [">= 3.1.3"])
       s.add_dependency(%q<httpclient>, [">= 2.2.1"])
-      s.add_dependency(%q<open4>, [">= 1.1.0"])
       s.add_dependency(%q<mongrel>, [">= 1.1.5"])
+      s.add_dependency(%q<mongrel>, [">= 1.1.5"])
+      s.add_dependency(%q<daemon>, ["~> 1"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -83,10 +83,10 @@ Gem::Specification.new do |s|
     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<haml>, [">= 3.1.3"])
     s.add_dependency(%q<httpclient>, [">= 2.2.1"])
-    s.add_dependency(%q<open4>, [">= 1.1.0"])
     s.add_dependency(%q<mongrel>, [">= 1.1.5"])
+    s.add_dependency(%q<mongrel>, [">= 1.1.5"])
+    s.add_dependency(%q<daemon>, ["~> 1"])
   end
 end
 

data/spec/minecraftctlserver_spec.rb

@@ -1,92 +1,146 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'httpclient'
-require 'open4'
 require 'timeout'
+require 'spawn'
 
+$url = 'http://localhost:25560'
 
-$url = 'http://localhost:25560/'
+def get(uri)
+	HTTPClient.new.get_content($url + uri)
+end
 
-def start_stub(wait = true)
-	pid, stdin, stdout, stderr = Open4::popen4(File.dirname(__FILE__) + '/../bin/minecraftctlserver -c ./minecraft ' + File.dirname(__FILE__) + '/stub_server')
+def get_with_status(uri)
+	res = HTTPClient.new.get($url + uri)
+	return res.status, res.body
+end
 
-	if wait
-		c = HTTPClient.new
-		Timeout.timeout(10) do
-			begin
-				c.get_content($url + "status")
-			rescue Errno::ECONNREFUSED
-				sleep 0.4
-				retry
-			end
-		end
-	end
+def post(uri, data)
+	HTTPClient.new.post_content($url + uri, data)
 end
 
-def stop_stub
-	HTTPClient.new.post_content($url + "shutdown", '')
+def post_with_status(uri, data)
+	res = HTTPClient.new.post($url + uri, data)
+	return res.status, res.body
+end
+
+def start_stub
+	pid, stdin, stdout, stderr = Spawn::spawn(File.dirname(__FILE__) + '/../bin/minecraftctlserver -c ./minecraft ' + File.dirname(__FILE__) + '/stub_server')
 
 	Timeout.timeout(10) do
 		begin
-			loop do
-				HTTPClient.new.get_content($url + "status")
-				sleep 0.4
-			end
+			@pid_file = get('/pid_file').strip
 		rescue Errno::ECONNREFUSED
-		rescue => e
-			puts "got different error: #{e}"
+			sleep 0.1
+			retry
 		end
 	end
-	sleep 0.2
+end
+
+def stop_stub
+	post('/', 'shutdown')
+
+	# wait pid lock release
+	File.open(@pid_file) do |pf|
+		pf.flock(File::LOCK_EX)
+	end
 end
 
 describe 'minecraftctlserver' do
-	describe 'text mode HTTP' do
-		describe  'server startup' do
-			before :all do
-				start_stub(false)
-			end
+	describe 'while server ready it should respond to' do
+		before :all do
+			start_stub
+		end
 
-			it 'should start the minecraft server and respond to status command when ready' do
-				Timeout.timeout(10) do
-					out = nil
-					begin
-						out = HTTPClient.new.get_content($url + "status")
-					rescue Errno::ECONNREFUSED
-						sleep 0.4
-						retry
-					end
-
-					out.should =~ /Minecraft server is running with pid:/
-				end
-			end
+		it 'GET / with API command list' do
+			get('/').should include 'minecraft control server API'
+		end
 
-			after :all do
-				stop_stub
-			end
+		it 'GET /pid_file with absolute PID file path' do
+			get('/pid_file').should match(%r{/.*spec/stub_server/minecraftctlserver.pid\n$})
+		end
+
+		it 'GET /log_file with absolute log file path' do
+			get('/log_file').should match(%r{/.*spec/stub_server/minecraftctlserver.log\n$})
+		end
+
+		it 'GET /pid with PID number of control server process' do
+			get('/pid').to_i.should > 0
+		end
+
+		it 'GET /dir with absolute directory path where minecraft server is running from' do
+			get('/dir').should match(%r{/.*spec/stub_server\n$})
+		end
+
+		it 'GET /out with content of minecraft server output' do
+			get('/out').should include "Loading properties\n"
+		end
+
+		it 'stop and start with POST /server stop and POST /server start' do
+			post('/server', 'stop').should include "Server stopped\n"
+			post('/server', 'start').should include "Done (5887241893ns)! For help, type \"help\" or \"?\"\n"
+		end
+
+		it 'POST /server start with server aleady running' do
+			post('/server', 'start').should include "Server already running\n"
+		end
+
+		it 'GET /server/status with running' do
+			get('/server/status').should == "running\n"
+		end
+
+		it 'GET /server/pid with PID number of minecraft server process' do
+			get('/server/pid').to_i.should > 0
+		end
+		
+		it 'POST /server/console list with list of connected players' do
+			post('/server', 'console list').should == "Connected players: kazuya\n"
+		end
+
+		it 'POST /server/console with error' do
+			post('/server', 'console').should == "Console command not specified; try 'console help'\n"
+		end
+
+		it 'POST / blah with error' do
+			status, body = post_with_status('/', 'blah')
+			status.should == 400
+			body.should == "Unknown argument: blah for request: /\n"
 		end
 
-		describe 'while server ready' do
+		it 'GET /blah with error' do
+			status, body = get_with_status('/blah')
+			status.should == 404
+			body.should == "Unknown request: /blah\n"
+		end
+
+		describe '(having minecraft server stopped)' do
 			before :all do
-				start_stub
+				post('/server', 'stop')
+			end
+
+			it 'POST /server stop with server aleady stopped' do
+				post('/server', 'stop').should include "Server already stopped\n"
 			end
 
-			it 'should respond to GET /list' do
-				HTTPClient.new.get_content($url + "list").should == "Connected players: kazuya\n"
+			it 'GET /server/status with stopped' do
+				get('/server/status').should == "stopped\n"
 			end
 
-			it 'should stop and start with POST /stop and POST /start' do
-				HTTPClient.new.post_content($url + "stop", '').should include "Server stopped\n"
-				HTTPClient.new.post_content($url + "start", '').should include 'Done (5887241893ns)! For help, type "help" or "?"'
+			it 'GET /server/pid with error' do
+				get('/server/pid').should == "Server not running\n"
 			end
 
-			it 'should respond to GET /help' do
-				HTTPClient.new.get_content($url + "help").should include "show server status\n"
+			it 'POST /server/console list with error' do
+				post('/server', 'console list').should == "Server not running\n"
 			end
 
 			after :all do
-				stop_stub
+				post('/server', 'start')
 			end
 		end
+
+		after :all do
+			stop_stub
+		end
 	end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minecraftctl
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 Z
+date: 2011-09-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -151,12 +151,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
-        - 3
+        - 2
+        - 2
         - 1
-        - 3
-        version: 3.1.3
+        version: 2.2.1
   version_requirements: *id009
-  name: haml
+  name: httpclient
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -165,14 +165,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 25
         segments: 
-        - 2
-        - 2
         - 1
-        version: 2.2.1
+        - 1
+        - 5
+        version: 1.1.5
   version_requirements: *id010
-  name: httpclient
+  name: mongrel
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -181,30 +181,28 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 25
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        - 5
+        version: 1.1.5
   version_requirements: *id011
-  name: open4
+  name: mongrel
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 1
         segments: 
         - 1
-        - 1
-        - 5
-        version: 1.1.5
+        version: "1"
   version_requirements: *id012
-  name: mongrel
+  name: daemon
   prerelease: false
   type: :development
 description: Allows to send messages, start and stop Minecraft server