matthewtodd-settlers 0.1.2 → 0.2.0

data/Rakefile

@@ -2,12 +2,15 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name             = 'settlers'
-  s.version          = '0.1.2'
+  s.version          = '0.2.0'
   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']
   s.author           = 'Matthew Todd'
   s.email            = 'matthew.todd@gmail.com'
+
+  s.add_dependency 'dnssd'
+  s.add_dependency 'highline'
 end
 
 desc 'Generate a gemspec file'

data/bin/settlers

@@ -3,4 +3,4 @@
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'settlers'
 
-Settlers::Game.new(*ARGV).play
+Settlers::Application.new(*ARGV).run

data/lib/settlers.rb

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

data/lib/settlers/application.rb

@@ -0,0 +1,129 @@
+require 'optparse'
+require 'set'
+require 'shellwords'
+
+require 'rubygems'
+require 'dnssd'
+require 'highline/import'
+
+module Settlers
+  class Application
+    attr_accessor :server, :client, :style
+
+    def initialize(*args)
+      self.server = Server.new
+      self.client = Client.new
+      self.style  = StandaloneGame
+      parse_options(args)
+    end
+
+    def run
+      style.new(self).run
+    end
+
+    def start_server
+      server.start
+    end
+
+    def start_client(server)
+      client.start(server)
+    end
+
+    def find_server
+      choose(*available_servers)
+    end
+
+    private
+
+    def parse_options(args)
+      # TODO it would be nice to provide a quick tabtab definition here.
+      OptionParser.new do |opts|
+        opts.on('-c', '--client') { self.style = BonjourClientGame }
+        opts.parse!(args)
+      end
+    end
+
+    class StandaloneGame < Struct.new(:app)
+      def run
+        app.start_server
+        app.start_client(app.server)
+      end
+    end
+
+    class BonjourClientGame < Struct.new(:app)
+      def run
+        app.start_client(app.find_server)
+      end
+    end
+
+    def available_servers(timeout = 3)
+      servers = Set.new
+
+      dns = DNSSD.browse('_settlers._tcp') do |reply|
+        DNSSD.resolve(reply.name, reply.type, reply.domain) do |resolve_reply|
+          servers << RemoteServer.new(reply.name, resolve_reply.target, resolve_reply.port)
+        end
+      end
+
+      puts 'Looking for settlers servers nearby...'
+      sleep timeout
+      dns.stop
+
+      return servers
+    end
+
+    class Server
+      # Maybe we can change these to attr_writer as we'd like to make them command-line configurable.
+      attr_reader :name, :host, :port, :startup_delay, :maximum_connections, :username, :password, :robot_names
+
+      def initialize
+        @name = "#{`hostname -s`.chomp}-#{`whoami`.chomp}"
+        @host = 'localhost'
+        @port = 8880
+        @startup_delay = 4
+        @maximum_connections = 12
+        @username = 'root'
+        @password = ''
+        @robot_names = %w(Leonardo Humperdink Elwood)
+      end
+
+      def start
+        announce
+        serve
+        sleep(startup_delay)
+        start_robots
+      end
+
+      private
+
+      def announce
+        # Maybe it would be nice to include a TextRecord here providing something of a description?
+        DNSSD.register(name, '_settlers._tcp', 'local', port) do |rr|
+          puts "Announcing settlers server available on port #{port}."
+        end
+      end
+
+      def serve
+        Jar.new('JSettlersServer.jar').running('soc.server.SOCServer').start(port, maximum_connections, username, Shellwords.escape(password))
+      end
+
+      def start_robots
+        robot_names.each do |name|
+          Jar.new('JSettlersServer.jar').running('soc.robot.SOCRobotClient').start(host, port, name, Shellwords.escape(password))
+        end
+      end
+    end
+
+    class RemoteServer < Struct.new(:name, :host, :port)
+      def to_s
+        "#{name} (#{host}:#{port})"
+      end
+    end
+
+    class Client
+      def start(server)
+        Jar.new('JSettlers.jar').running('soc.client.SOCPlayerClient').run(server.host, server.port)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matthewtodd-settlers
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matthew Todd
@@ -9,10 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-12 00:00:00 -07:00
+date: 2009-05-02 00:00:00 -07:00
 default_executable: settlers
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: dnssd
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: matthew.todd@gmail.com
 executables: 
@@ -24,7 +43,7 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - bin/settlers
-- lib/settlers/game.rb
+- lib/settlers/application.rb
 - lib/settlers/jar.rb
 - lib/settlers/java_command.rb
 - lib/settlers.rb
@@ -58,7 +77,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Provides a simple command-line executable for playing Robb Thomas' JSettlers game.
 test_files: []
 

data/lib/settlers/game.rb

@@ -1,34 +0,0 @@
-module Settlers
-  class Game
-    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
-      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').running('soc.server.SOCServer')
-    end
-
-    def robot
-      Jar.new('JSettlersServer.jar').running('soc.robot.SOCRobotClient')
-    end
-
-    def human
-      Jar.new('JSettlers.jar').running('soc.client.SOCPlayerClient')
-    end
-  end
-end