room 0.1.0 → 0.1.1

data/Gemfile

@@ -3,6 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
+gem "highline"
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
+    highline (1.6.1)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -13,4 +14,5 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  highline
   jeweler (~> 1.5.2)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/room

@@ -2,6 +2,8 @@
 
 require "rubygems"
 require "optparse"
+require "readline"
+require "highline"
 
 # for testing inside gem dir
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
@@ -28,7 +30,13 @@ reload!
 3.times { Printer.puts }
 
 Room.do "look"
-while line = Readline.readline('> ', true)
+loop do
+  line = if $secretive
+    $secretive = false
+    HighLine.new.ask("> ") { |q| q.echo = false }
+  else
+    Readline.readline("> ", true)
+  end
   Room.do line.chomp
 end
 

data/examples/example1.rb

@@ -97,7 +97,7 @@ class Bedroom < Room
       lose :pencil
       "You whittle the pencil to nothing."
     else
-      unknown_command
+      huh?
     end
   end
   dup :sharpen_the_pencil
@@ -106,7 +106,7 @@ class Bedroom < Room
     if have? :pencil
       "That's a mighty fine pencil sharpener. Red."
     else
-      unknown_command
+      huh?
     end
   end
   
@@ -117,7 +117,7 @@ class Bedroom < Room
       "hurtling down a snow-covered slope at break-neck speed!" |
       go("skiing1")
     else
-      unknown_command
+      huh?
     end
   end
   dup :jump_into_the_chute
@@ -139,6 +139,10 @@ class Closet < Room
      end)
   end
   
+  def stub_toe
+    "You already did that!"
+  end
+  
   def open_door
     "The door won't budge."
   end
@@ -146,7 +150,7 @@ class Closet < Room
   
   def look_pencil
     if @got_pencil
-      unknown_command
+      huh?
     else
       "It's too dark to see, so you settle for stubbing your" |
       "foot on it again. Definitely a No. 3 pencil." |
@@ -163,6 +167,7 @@ class Closet < Room
       "Awesome, a pencil! You place the pencil in your pocket."
     end
   end
+  dup :get_the_pencil
   
   def exit
     "You somehow manage to leave the closet." |

data/lib/room.rb

@@ -1,13 +1,12 @@
 
 require "thread"
-require "readline"
 
 def reload!
   $commands = {}
   
-  old_count = Room.rooms.keys.count
+  old_count = Room.rooms.keys.length
   load FILENAME
-  Room.rooms.keys.count - old_count
+  Room.rooms.keys.length - old_count
 end
 
 class String
@@ -41,6 +40,10 @@ class Room
     Room.go key
   end
   
+  def be_secretive
+    $secretive = true
+  end
+  
   def inventory
     $inventory ||= []
   end
@@ -60,24 +63,28 @@ class Room
   def do action
     Printer.puts
     if action.strip == ""
-    elsif (r = self.class.commands.detect { |c, m| c =~ action })
-      command, method = r
-      args = command.match(action).to_a.drop(1)
-      Printer.puts self.send(method, *args).to_s.rstrip
     elsif action == "reload!"
       d = reload!
       Printer.puts "A great wave of relief washes over you."
       Printer.puts "The world seems larger by about #{d}." if d > 0
+    elsif (r = self.class.commands.detect { |c, m| c =~ action })
+      command, method = r
+      args = command.match(action).to_a.drop(1)
+      Printer.puts self.send(method, *args).to_s.rstrip
     else
-      Printer.puts unknown_command(action)
+      Printer.puts huh?(action)
     end
   end
   
+  def immediate *text
+    Printer.puts *text
+  end
+  
   def look
     "A nondescript room."
   end
   
-  def unknown_command action = nil
+  def huh? action = nil
     "I don't understand."
   end
   

data/room.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{room}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Lieber"]
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/alltom/room}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{the game is making the game}
   s.test_files = [
     "examples/example1.rb"
@@ -41,13 +41,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<highline>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
     else
+      s.add_dependency(%q<highline>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     end
   else
+    s.add_dependency(%q<highline>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: room
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tom Lieber
@@ -19,7 +19,21 @@ date: 2011-03-17 00:00:00 -07:00
 default_executable: room
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: highline
+  version_requirements: *id001
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +44,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id001
-  prerelease: false
   name: bundler
+  version_requirements: *id002
+  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,9 +60,9 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id002
-  prerelease: false
   name: jeweler
+  version_requirements: *id003
+  prerelease: false
   type: :development
 description: the game is making the game
 email: tom@alltom.com
@@ -99,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: the game is making the game