room 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/room

@@ -10,22 +10,39 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require "room"
 
-opts = OptionParser.new
-opts.on("-h", "--help") do
+def usage
   puts "usage: room"
-  puts "       room [room-file.rb]"
+  puts "       room for [room name]"
   exit
 end
-opts.parse! ARGV
 
-FILENAME = ARGV[0] || File.join(File.dirname(__FILE__), '..', 'examples', 'example1.rb')
+def find_room name
+  files = []
+  files << "#{name}.rb"
+  files << File.join(File.dirname(__FILE__), "..", "rooms", "#{name}.rb")
+  
+  files.find { |f| File.readable? f }
+end
+
+opts = OptionParser.new
+opts.on("-h", "--help") { usage }
+opts.parse! ARGV
 
-unless File.readable?(FILENAME)
-  $stderr.puts "cannot read file #{FILENAME}"
-  exit 1
+if ARGV.length > 0
+  if ARGV[0] == "for" && !ARGV[1].nil?
+    @filename = find_room ARGV[1]
+    unless @filename
+      puts "room \"#{ARGV[1]}\" not found"
+      exit 1
+    end
+  else
+    usage
+  end
+else
+  @filename = find_room "beginners"
 end
 
-reload!
+reload! @filename
 
 3.times { Printer.puts }
 
@@ -37,6 +54,8 @@ loop do
   else
     Readline.readline("> ", true)
   end
+  
+  break unless line
   Room.do line.chomp
 end
 

data/lib/room.rb

@@ -1,11 +1,12 @@
 
 require "thread"
 
-def reload!
+def reload! filename=nil
   $commands = {}
+  $last_filename ||= filename
   
   old_count = Room.rooms.keys.length
-  load FILENAME
+  load $last_filename
   Room.rooms.keys.length - old_count
 end
 
@@ -21,6 +22,16 @@ class String
   def commandify
     Regexp.compile("^" + Regexp.escape(self.gsub("_", " ")).gsub("XXX", "(.+)") + "$")
   end
+  
+  # I actively support the inclusion of this method
+  def underscore
+    word = dup
+    word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
 end
 
 class Printer
@@ -40,7 +51,11 @@ class Room
     Room.go key
   end
   
-  def be_secretive
+  def quietly_go key
+    Room.go key, false
+  end
+  
+  def no_echo
     $secretive = true
   end
   
@@ -97,7 +112,7 @@ class Room
   
   class << self
     def key
-      self.to_s.downcase
+      self.to_s.underscore
     end
     
     def commands
@@ -109,10 +124,10 @@ class Room
       $rooms ||= {}
     end
     
-    def go key
+    def go key, look = true
       if rooms[key]
         $here = rooms[key]
-        "\n" + $here.look
+        "\n" + $here.look if look
       else
         $here.unknown_room key
       end

data/room.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{room}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Lieber"]
-  s.date = %q{2011-03-17}
+  s.date = %q{2011-04-01}
   s.default_executable = %q{room}
   s.description = %q{the game is making the game}
   s.email = %q{tom@alltom.com}
@@ -25,17 +25,14 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/room",
-    "examples/example1.rb",
     "lib/room.rb",
-    "room.gemspec"
+    "room.gemspec",
+    "rooms/beginners.rb"
   ]
   s.homepage = %q{http://github.com/alltom/room}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{the game is making the game}
-  s.test_files = [
-    "examples/example1.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: room
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tom Lieber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -07:00
+date: 2011-04-01 00:00:00 -07:00
 default_executable: room
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,9 +80,9 @@ files:
 - Rakefile
 - VERSION
 - bin/room
-- examples/example1.rb
 - lib/room.rb
 - room.gemspec
+- rooms/beginners.rb
 has_rdoc: true
 homepage: http://github.com/alltom/room
 licenses: []
@@ -117,5 +117,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: the game is making the game
-test_files: 
-- examples/example1.rb
+test_files: []
+