matthewtodd-settlers 0.1.1 → 0.1.2

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name             = 'settlers'
-  s.version          = '0.1.1'
+  s.version          = '0.1.2'
   s.summary          = "Provides a simple command-line executable for playing Robb Thomas' JSettlers game."
   s.files            = FileList['[A-Z]*', 'bin/*', 'lib/**/*.rb', 'resources/**/*']
   s.executables      = ['settlers']
@@ -11,7 +11,7 @@ spec = Gem::Specification.new do |s|
 end
 
 desc 'Generate a gemspec file'
-task :gemspec do
+task :default do
   File.open("#{spec.name}.gemspec", 'w') do |f|
     f.write spec.to_ruby
   end

data/lib/settlers.rb

@@ -1,3 +1,3 @@
+require 'settlers/java_command'
 require 'settlers/jar'
-require 'settlers/runner'
 require 'settlers/game'

data/lib/settlers/game.rb

@@ -1,26 +1,34 @@
 module Settlers
   class Game
-    def initialize(port=8880, server_delay=2)
-      @host, @port, @server_delay, @runner = 'localhost', port, server_delay, Runner.new
+    DEFAULT_PORT = 8880
+    MAXIMUM_SERVER_CONNECTIONS = 4
+    SERVER_STARTUP_DELAY = 2
+    NO_PASSWORD = "''"
+
+    def initialize(port=DEFAULT_PORT)
+      @host, @port = 'localhost', port
     end
 
     def play
-      @runner.background server.command('soc.server.SOCServer', @port, 4, 'root', ''); sleep @server_delay.to_i
-      @runner.background server.command('soc.robot.SOCRobotClient', @host, @port, 'Leonardo', '')
-      @runner.background server.command('soc.robot.SOCRobotClient', @host, @port, 'Humperdink', '')
-      @runner.background server.command('soc.robot.SOCRobotClient', @host, @port, 'Elwood', '')
-      @runner.foreground client.command('soc.client.SOCPlayerClient', @host, @port)
-      @runner.clean_up
+      server.start(@port, MAXIMUM_SERVER_CONNECTIONS, 'root', NO_PASSWORD); sleep SERVER_STARTUP_DELAY
+      robot.start(@host, @port, 'Leonardo', NO_PASSWORD)
+      robot.start(@host, @port, 'Humperdink', NO_PASSWORD)
+      robot.start(@host, @port, 'Elwood', NO_PASSWORD)
+      human.run(@host, @port)
     end
 
     private
 
     def server
-      Jar.new('JSettlersServer.jar')
+      Jar.new('JSettlersServer.jar').running('soc.server.SOCServer')
+    end
+
+    def robot
+      Jar.new('JSettlersServer.jar').running('soc.robot.SOCRobotClient')
     end
 
-    def client
-      Jar.new('JSettlers.jar')
+    def human
+      Jar.new('JSettlers.jar').running('soc.client.SOCPlayerClient')
     end
   end
 end

data/lib/settlers/jar.rb

@@ -4,8 +4,8 @@ module Settlers
       @path = path
     end
 
-    def command(*args)
-      ['java', '-cp', full_path] + args
+    def running(class_name)
+      JavaCommand.new(full_path, class_name)
     end
 
     private

data/lib/settlers/java_command.rb

@@ -0,0 +1,22 @@
+module Settlers
+  class JavaCommand
+    def initialize(class_path, class_name)
+      @class_path, @class_name = class_path, class_name
+    end
+
+    def run(*args)
+      system command(args)
+    end
+
+    def start(*args)
+      pid = fork { exec command(args) }
+      at_exit { Process.kill 'INT', pid }
+    end
+
+    private
+
+    def command(args)
+      "java -cp #{@class_path} #{@class_name} #{args.join(' ')}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matthewtodd-settlers
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Matthew Todd
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-10 00:00:00 -07:00
+date: 2008-10-12 00:00:00 -07:00
 default_executable: settlers
 dependencies: []
 
@@ -26,7 +26,7 @@ files:
 - bin/settlers
 - lib/settlers/game.rb
 - lib/settlers/jar.rb
-- lib/settlers/runner.rb
+- lib/settlers/java_command.rb
 - lib/settlers.rb
 - resources/jsettlers-1.0.6
 - resources/jsettlers-1.0.6/COPYING.txt

data/lib/settlers/runner.rb

@@ -1,25 +0,0 @@
-module Settlers
-  class Runner
-    def initialize
-      @pids = []
-    end
-
-    def background(command)
-      @pids.unshift fork { exec *ensure_strings(command) }
-    end
-
-    def foreground(command)
-      system *ensure_strings(command)
-    end
-
-    def clean_up
-      Process.kill 'INT', *@pids
-    end
-
-    private
-
-    def ensure_strings(command)
-      command.map { |arg| arg.to_s }
-    end
-  end
-end