settlers 0.3.0 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/settlers.rb +1 -1
  2. data/lib/settlers/application.rb +5 -11
  3. metadata +42 -20
data/lib/settlers.rb CHANGED
@@ -3,7 +3,7 @@ require 'rbconfig'
3
3
  require 'rbconfig/datadir'
4
4
 
5
5
  module Settlers
6
- VERSION = '0.3.0'
6
+ VERSION = '0.3.1'
7
7
 
8
8
  autoload :Address, 'settlers/address'
9
9
  autoload :Application, 'settlers/application'
data/lib/settlers/application.rb CHANGED
@@ -1,3 +1,5 @@
1
+ require 'optparse/defaults'
2
+
1
3
  module Settlers
2
4
  class Application
3
5
  DEFAULT_PORT = 7777
@@ -6,10 +8,9 @@ module Settlers
6
8
  @collector = Collector.new
7
9
  @ui = UI.new
8
10
 
9
- @defaults = %w(--server)
10
-
11
- @options = OptionParser.new do |opts|
11
+ @options = OptionParser.with_defaults do |opts|
12
12
  opts.banner = "Usage: #{File.basename($0)} [--client]"
13
+ opts.defaults = %w(--server)
13
14
  opts.separator ''
14
15
  opts.version = Settlers::VERSION
15
16
 
@@ -24,18 +25,11 @@ module Settlers
24
25
  @discoverer = NullObject.new
25
26
  @server = Server.new(port || DEFAULT_PORT)
26
27
  end
27
-
28
- opts.separator 'Defaults:'
29
- opts.separator "#{opts.summary_indent}#{@defaults.join(' ')}"
30
28
  end
31
29
  end
32
30
 
33
31
  def run(args)
34
- begin
35
- @options.parse!(@defaults.dup.concat(args))
36
- rescue OptionParser::ParseError
37
- @options.abort($!)
38
- end
32
+ @options.order(args)
39
33
 
40
34
  @server.add_observer(@announcer)
41
35
  @server.add_observer(@collector)
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: settlers
3
3
  version: !ruby/object:Gem::Version
4
- hash: 19
4
+ hash: 17
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 3
9
- - 0
10
- version: 0.3.0
9
+ - 1
10
+ version: 0.3.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Matthew Todd
@@ -15,48 +15,70 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-06-18 00:00:00 +03:00
18
+ date: 2010-06-22 00:00:00 +03:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  version_requirements: &id001 !ruby/object:Gem::Requirement
23
23
  none: false
24
24
  requirements:
25
- - - ">="
25
+ - - ~>
26
26
  - !ruby/object:Gem::Version
27
- hash: 3
27
+ hash: 27
28
28
  segments:
29
29
  - 0
30
- version: "0"
30
+ - 1
31
+ - 0
32
+ version: 0.1.0
31
33
  requirement: *id001
32
- name: shoe
34
+ name: optparse-defaults
33
35
  prerelease: false
34
- type: :development
36
+ type: :runtime
35
37
  - !ruby/object:Gem::Dependency
36
38
  version_requirements: &id002 !ruby/object:Gem::Requirement
37
39
  none: false
38
40
  requirements:
39
- - - ">="
41
+ - - ~>
40
42
  - !ruby/object:Gem::Version
41
43
  hash: 3
42
44
  segments:
43
45
  - 0
44
- version: "0"
46
+ - 6
47
+ - 2
48
+ version: 0.6.2
45
49
  requirement: *id002
46
- name: highline
50
+ name: shoe
47
51
  prerelease: false
48
- type: :runtime
52
+ type: :development
49
53
  - !ruby/object:Gem::Dependency
50
54
  version_requirements: &id003 !ruby/object:Gem::Requirement
51
55
  none: false
52
56
  requirements:
53
- - - ">="
57
+ - - ~>
54
58
  - !ruby/object:Gem::Version
55
- hash: 3
59
+ hash: 7
56
60
  segments:
57
- - 0
58
- version: "0"
61
+ - 1
62
+ - 5
63
+ - 2
64
+ version: 1.5.2
59
65
  requirement: *id003
66
+ name: highline
67
+ prerelease: false
68
+ type: :runtime
69
+ - !ruby/object:Gem::Dependency
70
+ version_requirements: &id004 !ruby/object:Gem::Requirement
71
+ none: false
72
+ requirements:
73
+ - - ~>
74
+ - !ruby/object:Gem::Version
75
+ hash: 25
76
+ segments:
77
+ - 1
78
+ - 3
79
+ - 1
80
+ version: 1.3.1
81
+ requirement: *id004
60
82
  name: dnssd
61
83
  prerelease: false
62
84
  type: :runtime
@@ -94,10 +116,10 @@ rdoc_options:
94
116
  - --main
95
117
  - README.rdoc
96
118
  - --title
97
- - settlers-0.3.0
119
+ - settlers-0.3.1
98
120
  - --inline-source
99
121
  - --webcvs
100
- - http://github.com/matthewtodd/settlers/blob/v0.3.0/
122
+ - http://github.com/matthewtodd/settlers/blob/v0.3.1/
101
123
  require_paths:
102
124
  - lib
103
125
  required_ruby_version: !ruby/object:Gem::Requirement
@@ -124,6 +146,6 @@ rubyforge_project:
124
146
  rubygems_version: 1.3.7
125
147
  signing_key:
126
148
  specification_version: 3
127
- summary: Provides a simple command-line executable for playing Robb Thomas' JSettlers game.
149
+ summary: Robb Thomas' JSettlers game, wrapped up in a Ruby script with Bonjour support.
128
150
  test_files: []
129
151