settlers 0.3.0 → 0.3.1

data/lib/settlers.rb

@@ -3,7 +3,7 @@ require 'rbconfig'
 require 'rbconfig/datadir'
 
 module Settlers
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 
   autoload :Address,     'settlers/address'
   autoload :Application, 'settlers/application'

data/lib/settlers/application.rb

@@ -1,3 +1,5 @@
+require 'optparse/defaults'
+
 module Settlers
   class Application
     DEFAULT_PORT = 7777
@@ -6,10 +8,9 @@ module Settlers
       @collector = Collector.new
       @ui        = UI.new
 
-      @defaults = %w(--server)
-
-      @options = OptionParser.new do |opts|
+      @options = OptionParser.with_defaults do |opts|
         opts.banner  = "Usage: #{File.basename($0)} [--client]"
+        opts.defaults = %w(--server)
         opts.separator ''
         opts.version = Settlers::VERSION
 
@@ -24,18 +25,11 @@ module Settlers
           @discoverer = NullObject.new
           @server     = Server.new(port || DEFAULT_PORT)
         end
-
-        opts.separator 'Defaults:'
-        opts.separator "#{opts.summary_indent}#{@defaults.join(' ')}"
       end
     end
 
     def run(args)
-      begin
-        @options.parse!(@defaults.dup.concat(args))
-      rescue OptionParser::ParseError
-        @options.abort($!)
-      end
+      @options.order(args)
 
       @server.add_observer(@announcer)
       @server.add_observer(@collector)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: settlers
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Matthew Todd
@@ -15,48 +15,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 +03:00
+date: 2010-06-22 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 0
+        version: 0.1.0
   requirement: *id001
-  name: shoe
+  name: optparse-defaults
   prerelease: false
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
         - 0
-        version: "0"
+        - 6
+        - 2
+        version: 0.6.2
   requirement: *id002
-  name: highline
+  name: shoe
   prerelease: false
-  type: :runtime
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
   requirement: *id003
+  name: highline
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  requirement: *id004
   name: dnssd
   prerelease: false
   type: :runtime
@@ -94,10 +116,10 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- settlers-0.3.0
+- settlers-0.3.1
 - --inline-source
 - --webcvs
-- http://github.com/matthewtodd/settlers/blob/v0.3.0/
+- http://github.com/matthewtodd/settlers/blob/v0.3.1/
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -124,6 +146,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Provides a simple command-line executable for playing Robb Thomas' JSettlers game.
+summary: Robb Thomas' JSettlers game, wrapped up in a Ruby script with Bonjour support.
 test_files: []