settlers 0.3.1 → 0.3.3

data/bin/settlers

@@ -1,18 +1,4 @@
 #!/usr/bin/env ruby
 
-begin
-  require 'settlers'
-rescue LoadError
-  raise unless $!.message =~ /\bsettlers$/
-
-  lib = File.expand_path('../../lib', __FILE__)
-  if !$:.include?(lib)
-    warn "#{$!}. Trying again with #{lib} on the $LOAD_PATH."
-    $:.unshift(lib)
-    retry
-  end
-
-  raise
-end
-
+require 'settlers'
 Settlers::Application.new.run(ARGV)

data/lib/settlers.rb

@@ -1,10 +1,10 @@
 require 'pathname'
-require 'rbconfig'
-require 'rbconfig/datadir'
+# We need rubygems for Gem.datadir, since RbConfig.datadir has been deprecated.
+# Feels like a step backwards?
+require 'rubygems'
+require 'settlers/version'
 
 module Settlers
-  VERSION = '0.3.1'
-
   autoload :Address,     'settlers/address'
   autoload :Application, 'settlers/application'
   autoload :Bonjour,     'settlers/bonjour'
@@ -16,13 +16,6 @@ module Settlers
   autoload :UI,          'settlers/ui'
 
   def self.datadir
-    @@datadir ||= begin
-      datadir = RbConfig.datadir('settlers')
-      if !File.exist?(datadir)
-        warn "#{datadir} does not exist. Trying again with data directory relative to __FILE__."
-        datadir = File.expand_path('../../data/settlers', __FILE__)
-      end
-      Pathname.new(datadir)
-    end
+    Pathname.new(Gem.datadir('settlers'))
   end
 end

data/lib/settlers/server.rb

@@ -1,3 +1,4 @@
+require 'etc'
 require 'observer'
 
 module Settlers

data/lib/settlers/version.rb

@@ -0,0 +1,3 @@
+module Settlers
+  VERSION = '0.3.3'
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: settlers
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Matthew Todd
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 +03:00
+date: 2011-02-07 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,64 +24,64 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
-        - 0
         - 1
-        - 0
-        version: 0.1.0
-  requirement: *id001
-  name: optparse-defaults
+        - 3
+        - 1
+        version: 1.3.1
   prerelease: false
   type: :runtime
+  requirement: *id001
+  name: dnssd
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        - 6
+        - 1
+        - 5
         - 2
-        version: 0.6.2
-  requirement: *id002
-  name: shoe
+        version: 1.5.2
   prerelease: false
-  type: :development
+  type: :runtime
+  requirement: *id002
+  name: highline
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 27
         segments: 
+        - 0
         - 1
-        - 5
-        - 2
-        version: 1.5.2
-  requirement: *id003
-  name: highline
+        - 0
+        version: 0.1.0
   prerelease: false
   type: :runtime
+  requirement: *id003
+  name: optparse-defaults
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 1
         segments: 
+        - 0
+        - 7
         - 1
-        - 3
-        - 1
-        version: 1.3.1
-  requirement: *id004
-  name: dnssd
+        version: 0.7.1
   prerelease: false
-  type: :runtime
+  type: :development
+  requirement: *id004
+  name: shoe
 description: 
 email: matthew.todd@gmail.com
 executables: 
@@ -106,6 +106,7 @@ files:
 - lib/settlers/observer.rb
 - lib/settlers/server.rb
 - lib/settlers/ui.rb
+- lib/settlers/version.rb
 - lib/settlers.rb
 has_rdoc: true
 homepage: http://github.com/matthewtodd/settlers
@@ -116,10 +117,10 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- settlers-0.3.1
+- settlers-0.3.3
 - --inline-source
 - --webcvs
-- http://github.com/matthewtodd/settlers/blob/v0.3.1/
+- http://github.com/matthewtodd/settlers/blob/v0.3.3/
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -143,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - java
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Robb Thomas' JSettlers game, wrapped up in a Ruby script with Bonjour support.