the_game 0.0.6 → 0.1.a

data/README.rdoc

@@ -18,6 +18,6 @@ Run the executable +the_game+.
 	    -l, --license                    Display license and exit
 	    -v, --version                    Display version and exit
 
-== Copyright
+== License
 :include:LICENSE.txt
 

data/bin/the_game

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-#:include:the_game/bin/the_game
+
 require 'the_game'
 require 'the_game/cli'
 

data/lib/the_game/cli.rb

@@ -1,11 +1,14 @@
 require 'optparse'
 
-# Command-line interface
+# TheGame::CLI is the_game's command-line interface.
+#
+# The executable +the_game+ calls this method. Here is the source of +the_game+: 
+#     :include:bin/the_game
 module TheGame::CLI
   class << self
     def start!(args = ARGV)
       @game = TheGame::Game.new
-      @game_mode = :help
+      @game_mode = nil
 
       opts = OptionParser.new(args) do |opts|
         opts.banner = "Usage: the_game [options] [mode]"
@@ -27,7 +30,7 @@ module TheGame::CLI
       when :play then @game.start!
       when :license then puts TheGame::LICENSE
       when :version then puts "the_game v#{TheGame::Version::STRING}"
-      else puts opts end
+      else puts opts end # Display help message
     end
   end
 end

data/lib/the_game/command.rb

@@ -17,13 +17,15 @@ class TheGame::Command
       end
     end
 
-    def method_missing(m, g, a)
-      "#{m.to_s.command_sanitize}: command not found"
+    def method_missing(m, g, a); "#{m.to_s.command_sanitize}: command not found"; end
+    
+    def available_methods
+      methods(false).select{ |m| m.match(/^_/) }.map{ |m| m.to_s.command_sanitize }
     end
 
-    def _args(g, a)
-      a.args.inspect
-    end
+    def _raise(g, a); raise FuntimeError, a; end
+
+    def _args(g, a); a.args.inspect; end
 
     def _echo(g, a); a; end
     
@@ -33,8 +35,7 @@ class TheGame::Command
         "Usage: set [key] [value]"
       else
         key = a.words.first.to_s.downcase
-        r = g.set(key, value)
-        r == true ? "#{key.capitalize} set to #{value.inspect}" : r
+        pretty_rescue("#{key.capitalize} set to #{value.inspect}") { g.set(key, value) }
       end
     end
     
@@ -55,30 +56,20 @@ class TheGame::Command
       end
     end
 
-    def _help(g, a)
-      commands = methods(false).select{|m|m.match(/^_/)}.map{|m|m.to_s.command_sanitize}
-      
-      "Commands available: [ #{commands.join(', ')} ]"
-    end
+    def _help(g, a); "Commands available: [ #{available_methods.join(', ')} ]"; end
     
-    def _version(g, a)
-      TheGame::Version::STRING
-    end
+    def _version(g, a); "the_game v#{TheGame::Version::STRING}"; end
     
-    def _license(g, a)
-      TheGame::LICENSE
-    end
+    def _license(g, a); TheGame::LICENSE; end
 
-    def _game(g, a)
-      g.inspect
-    end
+    def _game(g, a); g.inspect; end
     
-    def _save(g, a)
-      g.save
-    end
+    def _save(g, a); pretty_rescue { g.save; "Game saved." }; end
 
-    def _quit(g, a)
-      exit
-    end
+    def _read_savefile(g, a); pretty_rescue { g.read_savefile }; end
+
+    def _load(g, a); pretty_rescue { g.load; "Game loaded." }; end
+
+    def _quit(g, a); exit; end
   end
-end
+end

data/lib/the_game/exception.rb

@@ -0,0 +1 @@
+class FuntimeError < StandardError; end

data/lib/the_game/game.rb

@@ -8,6 +8,7 @@ class TheGame::Game
   def initialize
     TheGame.initialize!
     @created_at = Time.now
+    @saved_at   = Time.now
     @name       = "anonymous"
     @level      = 1
   end
@@ -15,36 +16,34 @@ class TheGame::Game
   def yaml_dump
     YAML.dump({
       'created_at' => @created_at,
+      'saved_at'   => @saved_at,
       'name'       => @name,
-      'level'      => @level,
-      'config'     => {},
-      'the_game'   => {
-        'version'    => TheGame::Version::STRING
-      }
+      'level'      => @level
     })
   end
+
+  def load(savefile = TheGame::SAVEFILE_PATH)
+    yaml = YAML.load(read_savefile(savefile))
+    @created_at = yaml['created_at']
+    @saved_at   = yaml['saved_at']
+    @name       = yaml['name']
+    @level      = yaml['level']
+  end
   
   def save(savefile = TheGame::SAVEFILE_PATH)
-    r = false
-    begin
-      Zlib::GzipWriter.open(savefile, Zlib::BEST_COMPRESSION) { |gz| gz << yaml_dump }
-    rescue => e
-      r = e
-    end
-    r || "Game saved."
+    @saved_at = Time.now
+    Zlib::GzipWriter.open(savefile, Zlib::BEST_COMPRESSION) { |gz| gz << yaml_dump }
   end
-  
-  # Try set name [NAME] and set level [VALUE] 
+
+  def read_savefile(savefile = TheGame::SAVEFILE_PATH)
+    Zlib::GzipReader.open(savefile) { |gz| gz.read }
+  end
+
   def set(key, value)
-    begin
-      case key.downcase.to_sym
-      when :name then @name = value
-      when :level then @level = value
-      else raise ArgumentError, "Cannot set #{key}!" end
-    rescue Exception => e
-      return e
-    end
-    true
+		case key.downcase.to_sym
+		when :name then @name = value
+		when :level then @level = value
+		else raise ArgumentError, "Cannot set #{key}!" end
   end
   
   # Names are green,
@@ -55,14 +54,18 @@ class TheGame::Game
   end
 
   def start!
-    #TheGame.opts.parse!
     puts "~ the_game.rb v#{TheGame::Version::STRING} ~\nuse `help` for available commands"
 
     trap(:INT) { puts; exit }
     
     loop do
-      output = TheGame::Command.send(self, ::Readline.readline(prompt, true))
+      input = ::Readline.readline(prompt, true)
+      output = begin
+        TheGame::Command.send(self, input)
+      rescue => e
+        e.pp
+      end
       puts output unless output.blank?
     end
   end
-end
+end

data/lib/the_game/helpers/exception.rb

@@ -0,0 +1,5 @@
+module TheGame::Helpers::ExceptionHelpers
+  def pp
+    "\e[31mError: #{inspect}\e[0m"
+  end
+end

data/lib/the_game/helpers/import.rb

@@ -1,4 +1,9 @@
 require 'the_game/helpers'
+require 'the_game/helpers/string'
+require 'the_game/helpers/object'
+require 'the_game/helpers/exception'
+
+include TheGame::Helpers
 
 class String #:nodoc:
   include TheGame::Helpers::StringHelpers
@@ -6,4 +11,8 @@ end
 
 class Object #:nodoc:
   include TheGame::Helpers::ObjectHelpers
-end
+end
+
+class Exception #:nodoc:
+  include TheGame::Helpers::ExceptionHelpers
+end

data/lib/the_game/helpers.rb

@@ -2,7 +2,18 @@
 #    require 'the_game/helpers/import'
 # will bring include these helpers within their respective classes.
 
-module TheGame::Helpers; end
-
-require 'the_game/helpers/string'
-require 'the_game/helpers/object'
+module TheGame::Helpers
+  def pretty_rescue(default_value = false, &b)
+    return_value = default_value
+    begin
+      return_value = yield if block_given?
+    rescue => error
+      return_value = error.pp
+    end
+    if default_value
+      return_value || default_value
+    else
+      return_value
+    end
+  end
+end

data/lib/the_game/item.rb

@@ -0,0 +1,7 @@
+class TheGame::Item
+  attr_accessor :name
+
+  def initialize(name = "Item")
+    @name = name
+  end
+end

data/lib/the_game/license.rb

@@ -1,11 +1,9 @@
 module TheGame
   LICENSE = "the_game Copyright (C) 2012 Shigeki Kitajima
-
 <http://shigeki.99k.org/the_game/>
 
 This program is open source: you can redistribute it and/or modify it under the
 terms of the MIT License. This program is distributed in the hope that it will
 be useful, but WITHOUT ANY WARRANTY.
-
 <http://opensource.org/licenses/MIT/>"
 end

data/lib/the_game/version.rb

@@ -1,11 +1,14 @@
-raise "Sorry, only works with ruby >= 1.9 right now." if RUBY_VERSION < "1.9"
+if RUBY_VERSION < "1.9"
+  puts "Sorry, the_game only works with ruby >= 1.9 right now."
+  exit
+end
 
 module TheGame
   module Version
-    STRING = "0.0.6"
+    STRING = "0.1.a"
     ARRAY = STRING.split('.')
     MAJOR = ARRAY[0]
     MINOR = ARRAY[1]
     BUILD = ARRAY[2]
   end
-end
+end

data/lib/the_game.rb

@@ -1,6 +1,8 @@
 require 'the_game/version'
 require 'the_game/license'
+require 'the_game/exception'
 require 'the_game/helpers/import'
+require 'the_game/item'
 require 'the_game/game'
 require 'the_game/command'
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: the_game
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.1.a
+  prerelease: 4
 platform: ruby
 authors:
 - Shigeki Kitajima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-07 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &17844180 !ruby/object:Gem::Requirement
+  requirement: &15848100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17844180
+  version_requirements: *15848100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17843140 !ruby/object:Gem::Requirement
+  requirement: &15847620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17843140
+  version_requirements: *15847620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17842440 !ruby/object:Gem::Requirement
+  requirement: &15847140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *17842440
+  version_requirements: *15847140
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &17841660 !ruby/object:Gem::Requirement
+  requirement: &15846660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17841660
+  version_requirements: *15846660
 description: the_game is a text-based game written in Ruby, but it doesn't do much
   right now.
 email: shigeki.kitajima@gmail.com
@@ -71,11 +71,14 @@ files:
 - lib/the_game.rb
 - lib/the_game/cli.rb
 - lib/the_game/command.rb
+- lib/the_game/exception.rb
 - lib/the_game/game.rb
 - lib/the_game/helpers.rb
+- lib/the_game/helpers/exception.rb
 - lib/the_game/helpers/import.rb
 - lib/the_game/helpers/object.rb
 - lib/the_game/helpers/string.rb
+- lib/the_game/item.rb
 - lib/the_game/license.rb
 - lib/the_game/version.rb
 homepage: http://shigeki.99k.org/the_game/
@@ -93,13 +96,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3503081812645725962
+      hash: 901862298871238973
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.13