minecraft 0.3.2 → 0.3.3

data/CHANGES.md

@@ -1,3 +1,11 @@
+0.3.3 (2011-09-03)
+------------------
+
+* Refactored tests.
+* Word wrapped more commands (should be all long outputs now).
+* Source file reading bug fixed.
+* Fixed an `all` style command bug.
+
 0.3.2 (2011-08-31)
 ------------------
 

data/lib/minecraft/commands.rb

@@ -143,7 +143,7 @@ module Minecraft
         @server.puts "say Disco ends."
         @disco = false
       else
-        @server.puts "say #{user} has requested disco, s/he likely can't actually dance."
+        say("#{user} has requested disco, s/he likely can't actually dance.")
         @disco = true
       end
     end
@@ -157,10 +157,10 @@ module Minecraft
     def dnd(user)
       user.downcase!
       if @userdnd.include? user
-        @server.puts "say #{user} is ready to be disturbed. *cough*"
+        say("#{user} is ready to be disturbed. *cough*")
         @userdnd.reject! { |u| u == user }
       else
-        @server.puts "say #{user} does not wish to be disturbed."
+        say("#{user} does not wish to be disturbed.")
         @userdnd << user
       end
     end
@@ -173,7 +173,7 @@ module Minecraft
     #   disturb("basicxman", "mike_n_7")
     # @note ops: op
     def disturb(user, target_user)
-      @server.puts "say #{target_user} is being disturbed by #{user}!"
+      say("#{target_user} is being disturbed by #{user}!")
       @userdnd.reject! { |u| u == target_user.downcase }
     end
 
@@ -182,7 +182,7 @@ module Minecraft
     # @param [String] user The requesting user.
     # @example
     #   printdnd()
-    # @note: ops: op
+    # @note ops: op
     def printdnd()
       @server.puts "say #{@userdnd.join(", ")}"
     end
@@ -201,7 +201,7 @@ module Minecraft
       target_user = target_user.downcase
       num_points = num_points.to_i
       if user.downcase == target_user
-        @server.puts "say Did you just try to give yourself points? Sure, minus twenty."
+        say("Did you just try to give yourself points? Sure, minus twenty.")
         @userpoints[target_user] ||= 0
         @userpoints[target_user] -= 20
         return
@@ -214,7 +214,7 @@ module Minecraft
       num_points = [num_points, cap_points(user)].min
       @userpoints[target_user] ||= 0
       @userpoints[target_user] += num_points
-      @server.puts "say #{user} has given #{target_user} #{num_points} points for a total of #{@userpoints[target_user]}."
+      say("#{user} has given #{target_user} #{num_points} points for a total of #{@userpoints[target_user]}.")
     end
 
     # Checks a users points or displays the leaderboard.
@@ -262,14 +262,14 @@ module Minecraft
       return @server.puts "say No user #{target_user} exists." unless @users.include? target_user
       return vote(user) if target_user.nil?
       unless submit_vote(user, target_user)
-        @kickvotes[target_user] = {
+        @userkickvotes[target_user] = {
           :tally => kick_influence(user),
           :votes => [user],
           :start => Time.now
         }
         @last_kick_vote = target_user
-        @server.puts "say A kickvote has been initiated for #{target_user}."
-        @server.puts "say To vote enter !kickvote #{target_user}."
+        say("A kickvote has been initiated for #{target_user}.")
+        say("To vote enter !kickvote #{target_user}.")
       end
     end
 
@@ -293,11 +293,11 @@ module Minecraft
     #   cancelvote("basicxman", "blizzard4U")
     # @note ops: op
     def cancelvote(user, target_user)
-      if @kickvotes.has_key? target_user
-        @kickvotes.delete(target_user)
-        @server.puts "say #{user} has cancelled the kickvote on #{target_user}."
+      if @userkickvotes.has_key? target_user
+        @userkickvotes.delete(target_user)
+        say("#{user} has cancelled the kickvote on #{target_user}.")
       else
-        @server.puts "say There is no kickvote against #{target_user} dummy."
+        say("There is no kickvote against #{target_user} dummy.")
       end
     end
 
@@ -308,8 +308,8 @@ module Minecraft
     #   kickvotes("basicxman")
     # @note ops: op
     def kickvotes(user)
-      @kickvotes.each do |target_user, data|
-        @server.puts "say #{target_user}: #{data[:tally]} #{data[:votes].map { |u| u[0] + u[-1] }.join(", ")}"
+      @userkickvotes.each do |target_user, data|
+        say("#{target_user}: #{data[:tally]} #{data[:votes]}")
       end
     end
 
@@ -323,7 +323,7 @@ module Minecraft
     def roulette(user)
       users = @users + [user] * 3
       picked_user = users.sample
-      @server.puts "say #{user} has requested a roulette kick, s/he has a higher chance of being kicked."
+      say("#{user} has requested a roulette kick, s/he has a higher chance of being kicked.")
       @server.puts "kick #{picked_user}"
     end
 
@@ -450,11 +450,9 @@ module Minecraft
     # @note ops: op
     def property(user, key = nil)
       if key.nil?
-        (@server_properties.length / 3.0).ceil.times do |n|
-          @server.puts "say #{@server_properties.keys[n * 3, 3].join(", ")}"
-        end
+        say(@server_properties.keys.join(", "))
       else
-        @server.puts "say #{key} is currently #{@server_properties[key]}" if @server_properties.include? key
+        say ("#{key} is currently #{@server_properties[key]}") if @server_properties.include? key
       end
     end
 
@@ -472,9 +470,9 @@ module Minecraft
       target_user ||= user
       unless @users.include? target_user
         if @userlog.has_key? target_user
-          @server.puts "say #{target_user} has #{format_uptime(@userlog[target_user])} minutes of logged time."
+          say("#{target_user} has #{format_uptime(@userlog[target_user])} minutes of logged time.")
         else
-          @server.puts "say #{target_user} Does not exist."
+          say("#{target_user} Does not exist.")
         end
         return
       end
@@ -483,7 +481,7 @@ module Minecraft
       if @userlog.has_key? target_user
         total = "  Out of a total of #{format_uptime(@userlog[target_user] + time_spent)} minutes."
       end
-      @server.puts "say #{target_user} has been online for #{format_uptime(time_spent)} minutes.#{total}"
+      say("#{target_user} has been online for #{format_uptime(time_spent)} minutes.#{total}")
     end
 
     # Will print the server rules to all connected players.
@@ -492,7 +490,7 @@ module Minecraft
     #   rules()
     # @note ops: none
     def rules()
-      @server.puts "say #{@rules}"
+      say(@rules)
     end
 
     # Lists the currently connecting players, noting which is the requesting
@@ -514,7 +512,7 @@ module Minecraft
         s + "#{", " unless s.empty?}#{pre}#{u}#{suf}"
       end
 
-      @server.puts "say #{l}"
+      say(l)
     end
 
     # Adds a timer to the requesting users timers, the item and frequency in
@@ -534,7 +532,7 @@ module Minecraft
       return @server.puts "say Timer was not added." if item.nil?
       @timers[user] ||= {}
       @timers[user][item] = duration
-      @server.puts "say Timer added for #{user}.  Giving item id #{item} every #{duration} seconds."
+      say("Timer added for #{user}.  Giving item id #{item} every #{duration} seconds.")
     end
 
     # Deletes a timer from the requesting user.
@@ -594,17 +592,17 @@ module Minecraft
     def s(user, *args)
       shortcut_name = args.slice! 0
       if args.length == 0
-        unless @shortcuts.has_key? user and @shortcuts[user].has_key? shortcut_name
+        unless @usershortcuts.has_key? user and @usershortcuts[user].has_key? shortcut_name
           return kit(user, shortcut_name) if KITS.include? shortcut_name.to_sym
-          @server.puts "say #{shortcut_name} is not a valid shortcut for #{user}."
+          return say("#{shortcut_name} is not a valid shortcut for #{user}.")
         end
-        return call_command(user, @shortcuts[user][shortcut_name].first, *@shortcuts[user][shortcut_name][1..-1]) if args.length == 0
+        return call_command(user, @usershortcuts[user][shortcut_name].first, *@usershortcuts[user][shortcut_name][1..-1]) if args.length == 0
       end
 
       command_string = args
-      @shortcuts[user] ||= {}
-      @shortcuts[user][shortcut_name] = command_string
-      @server.puts "say Shortcut labelled #{shortcut_name} for #{user} has been added."
+      @usershortcuts[user] ||= {}
+      @usershortcuts[user][shortcut_name] = command_string
+      say("Shortcut labelled #{shortcut_name} for #{user} has been added.")
     end
 
     # Prints the requested users shortcuts.
@@ -614,8 +612,8 @@ module Minecraft
     #   shortcuts("basicxman")
     # @note ops: hop
     def shortcuts(user)
-      labels = @shortcuts[user].keys.join(", ") if @shortcuts.has_key? user
-      @server.puts "say Shortcuts for #{user}: #{labels}."
+      labels = @usershortcuts[user].keys.join(", ") if @usershortcuts.has_key? user
+      say("Shortcuts for #{user}: #{labels}.")
     end
 
     # Prints the available commands for the user.
@@ -734,6 +732,14 @@ module Minecraft
       end
     end
 
+    # Validates a kit group, if the kit cannot be found it executes the
+    # !kitlist command.
+    def validate_kit(group = "")
+      return true if KITS.include? group.to_sym
+      @server.puts "say #{group} is not a valid kit."
+      kitlist
+    end
+
     private
 
     # Prints the command signature options for a specified command.
@@ -789,14 +795,6 @@ module Minecraft
       end
     end
 
-    # Validates a kit group, if the kit cannot be found it executes the
-    # !kitlist command.
-    def validate_kit(group = "")
-      return true if KITS.include? group.to_sym
-      @server.puts "say #{group} is not a valid kit."
-      kitlist
-    end
-
     # Changes the time of day.
     #
     # @param [String] time The time of day to change it to.
@@ -816,10 +814,10 @@ module Minecraft
     # @example
     #   check_kickvote("blizzard4U")
     def check_kickvote(user)
-      if @kickvotes[user][:tally] >= @vote_threshold
+      if @userkickvotes[user][:tally] >= @vote_threshold
         @server.puts "say Enough votes have been given to kick #{user}."
         @server.puts "kick #{user}"
-        @kickvotes.delete(user)
+        @userkickvotes.delete(user)
       end
     end
 
@@ -837,10 +835,10 @@ module Minecraft
 
     # Checks to see if any kickvotes are expired.
     def expire_kickvotes
-      @kickvotes.each do |target_user, data|
+      @userkickvotes.each do |target_user, data|
         if Time.now > data[:start] + @vote_expiration
           @server.puts "say The kickvote for #{target_user} has expired."
-          @kickvotes.delete(target_user)
+          @userkickvotes.delete(target_user)
         end
       end
     end
@@ -854,12 +852,12 @@ module Minecraft
     #   submit_vote("basicxman", "blizzard4U")
     def submit_vote(user, target_user)
       return unless @users.include? target_user
-      if @kickvotes.has_key? target_user
-        if @kickvotes[target_user][:votes].include? user
+      if @userkickvotes.has_key? target_user
+        if @userkickvotes[target_user][:votes].include? user
           @server.puts "say You have already voted."
         else
-          @kickvotes[target_user][:votes] << user
-          @kickvotes[target_user][:tally] += kick_influence(user)
+          @userkickvotes[target_user][:votes] << user
+          @userkickvotes[target_user][:tally] += kick_influence(user)
           check_kickvote(target_user)
         end
         return true

data/lib/minecraft/extensions.rb

@@ -13,9 +13,9 @@ module Minecraft
     def initialize(server, opts)
       @ops = File.readlines("ops.txt").map { |s| s.chomp } if File.exists? "ops.txt"
       get_json :hops, []
-      get_json :uptime
+      get_json :useruptime
       get_json :timers
-      get_json :shortcuts
+      get_json :usershortcuts
       get_json :userlog
       get_json :userpoints
       get_json :userdnd, []
@@ -26,7 +26,7 @@ module Minecraft
       @counter = 0
       @logon_time = {}
       @server = server
-      @kickvotes = {}
+      @userkickvotes = {}
       @last_kick_vote = nil
       load_server_properties
 
@@ -40,19 +40,19 @@ module Minecraft
       # Initialize the set of commands.
       @commands = {}
       commands = Minecraft::Commands.public_instance_methods
-      @command_info = File.read(method(commands.first).source_location.first).split("\n")
+      @command_info = File.read(method(commands.first).source_location.first).split(/$/)
       @enums = [ :ops ]
       commands.each do |sym|
         next if sym.to_s.end_with? "all"
-        meth  = method(sym)
+        meth = method(sym)
         src_b, src_e = get_comment_range(meth.source_location.last)
 
         @commands[sym] = {
           :help => "",
-          :ops => :none,
           :params => meth.parameters
         }
         parse_comments(src_b, src_e, sym)
+        @commands.delete sym if @commands[sym][:ops].nil?
       end
     end
 
@@ -105,7 +105,7 @@ module Minecraft
     # Save instance variables to their respective JSON files.
     def save
       save_file :timers
-      save_file :shortcuts
+      save_file :usershortcuts
       save_file :hops
       save_file :userpoints
       save_file :userdnd
@@ -176,7 +176,7 @@ module Minecraft
         return unless send("validate_" + root.to_s, *args)
       end
 
-      is_all = @commands[root][:all] if is_all
+      is_all = !@commands[root][:all].nil? if is_all
       rest_param = @commands[root][:params].count { |a| a.first == :rest }
       reg_params = @commands[root][:params].count { |a| a.last != :user }
 
@@ -213,15 +213,15 @@ module Minecraft
       params = @commands[command.to_sym][:params][1..-1].map { |a| [a[0], a[1].to_s.gsub("_", " ")] }
       return unless args.length < reg_params
 
-      return @server.puts "say Expected at least one argument." if rest_param == 1
+      return say("Expected at least one argument.") if rest_param == 1
       req_params = params.count { |a| a.first == :req }
       if args.length < req_params
         args.length.times { params.slice! 0 }
         if params.length == 1
-          return @server.puts "say Expected the argument '#{params[0][1]}'"
+          return say("Expected the argument '#{params[0][1]}'")
         else
           temp = params.map { |a| "'#{a[1]}'" }
-          return @server.pust "say Expected additional arguments, #{temp.join(", ")}"
+          return say("Expected additional arguments, #{temp.join(", ")}")
         end
       end
     end
@@ -411,7 +411,7 @@ module Minecraft
       time_spent = calculate_uptime(user)
       @userlog[user] ||= 0
       @userlog[user] += time_spent
-      @server.puts "say #{user} spent #{format_uptime(time_spent)} minutes in the server, totalling to #{format_uptime(@userlog[user])}."
+      say("#{user} spent #{format_uptime(time_spent)} minutes in the server, totalling to #{format_uptime(@userlog[user])}.")
       save_file :userlog
     end
 
@@ -475,7 +475,7 @@ module Minecraft
     # @return [Boolean] Returns true if the user is an op.
     def validate_ops(user, command, message = true)
       return true if is_op? user.downcase
-      @server.puts "say #{user} is not an op, cannot use !#{command}." if message
+      say("#{user} is not an op, cannot use !#{command}.") if message
     end
 
     # Check if a user has half op privileges and print a privilege error if not.
@@ -485,7 +485,7 @@ module Minecraft
     # @return [Boolean] Returns true if the user is an op.
     def validate_hops(user, command, message = true)
       return true if is_hop? user.downcase
-      @server.puts "say #{user} is not a half-op, cannot use !#{command}." if message
+      say("#{user} is not a half-op, cannot use !#{command}.") if message
     end
 
     # An error message for invalid commands.

data/lib/minecraft/version.rb

@@ -1,5 +1,5 @@
 # Global Minecraft module.
 module Minecraft
   # Yay, keep these versions coming!
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/commands_test.rb

@@ -82,46 +82,42 @@ eof
   end
 
   sandbox_test "give command should give kits for wools" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.hops = ["basicxman"]
-    @ext.call_command("basicxman", "give", "lightgray", "2m")
-    t = @ext.server.string.gsub("\n", " ")
-    assert_match "give basicxman 35 64", t
-    assert_match "give basicxman 351", t
+    ext :hops => ["basicxman"]
+    call "basicxman give lightgray 2m"
+    assert_match "give basicxman 35 64", output_line
+    assert_match "give basicxman 351", output_line
   end
 
   # User points system testing.
   sandbox_test "should give a user points" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "mike_n_7", "blizzard4U", "Ian_zers"]
-    @ext.ops  = ["basicxman"]
-    @ext.hops = ["mike_n_7"]
-    @ext.call_command("basicxman", "points", "Ian_zers", "1001")
+    ext :ops => ["basicxman"], :hops => ["mike_n_7"], :users => ["blizzard4U", "Ian_zers"]
+    call "basicxman points Ian_zers 1001"
     assert_equal 1000, @ext.userpoints["ian_zers"]
-    @ext.call_command("mike_n_7", "points", "Ian_zers", "501")
+
+    call "mike_n_7 points Ian_zers 501"
     assert_equal 1500, @ext.userpoints["ian_zers"]
-    @ext.call_command("blizzard4U", "points", "Ian_zers", "2")
+
+    call "blizzard4U points Ian_zers 2"
     assert_equal 1501, @ext.userpoints["ian_zers"]
   end
 
   sandbox_test "should not a let a user give herself points" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman"]
+    ext :users => ["basicxman"]
     @ext.userpoints = { "basicxman" => 0 }
-    @ext.call_command("basicxman", "points", "basicxman")
+    call "basicxman points basicxman"
     assert @ext.userpoints["basicxman"] < 0
   end
 
   sandbox_test "should print a users points" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
+    ext :users => ["basicxman"]
     @ext.userpoints = { "basicxman" => 50 }
-    @ext.call_command("basicxman", "board")
-    assert_match "basicxman", @ext.server.string
-    assert_match "50", @ext.server.string
+    call "basicxman board"
+    assert_match "basicxman", output
+    assert_match "50", output
   end
 
   sandbox_test "should print a leaderboard" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
+    ext
     @ext.userpoints = {
       "basicxman" => 150,
       "mike_n_7" => 150,
@@ -131,7 +127,7 @@ eof
       "someguy" => 10
     }
     @ext.board("basicxman")
-    leaderboard = @ext.server.string.split("\n")
+    leaderboard = output_lines
     assert_match "150", leaderboard[0]
     assert_match "150", leaderboard[1]
     assert_match "Ian_zers", leaderboard[2]
@@ -141,247 +137,207 @@ eof
 
   # Kickvote testing.
   sandbox_test "should initiate a kickvote against a user" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "mike_n_7", "blizzard4U", "Ian_zers"]
-    @ext.ops  = ["basicxman"]
-    @ext.hops = ["mike_n_7"]
-    @ext.call_command("basicxman", "kickvote", "blizzard4U")
-    assert_equal 3, @ext.kickvotes["blizzard4U"][:tally]
+    ext :ops => ["basicxman"], :hops => ["mike_n_7"], :users => ["blizzard4U", "Ian_zers"]
+    call "basicxman kickvote blizzard4U"
+    assert_equal 3, @ext.userkickvotes["blizzard4U"][:tally]
     assert_equal "blizzard4U", @ext.last_kick_vote
   end
 
   sandbox_test "should expire a kickvote against a user" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "blizzard4U"]
-    @ext.call_command("basicxman", "kickvote", "blizzard4U")
+    ext :users => ["basicxman", "blizzard4U"]
+    call "basicxman kickvote blizzard4U"
     @ext.counter = 9
-    @ext.kickvotes["blizzard4U"][:start] = Time.now - 300
+    @ext.userkickvotes["blizzard4U"][:start] = Time.now - 300
     @ext.periodic
-    assert_match "expire", @ext.server.string
+    assert_match "expire", output
   end
 
   sandbox_test "should add the correct number of votes per user type" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "mike_n_7", "blizzard4U", "Ian_zers"]
-    @ext.ops  = ["basicxman"]
-    @ext.hops = ["mike_n_7"]
+    ext :ops => ["basicxman"], :hops => ["mike_n_7"], :users => ["blizzard4U", "Ian_zers"]
     @ext.vote_threshold = 7
-    @ext.call_command("Ian_zers", "kickvote", "blizzard4U")
-    assert_equal 1, @ext.kickvotes["blizzard4U"][:tally]
-    @ext.call_command("mike_n_7", "vote")
-    assert_equal 3, @ext.kickvotes["blizzard4U"][:tally]
-    @ext.call_command("basicxman", "vote")
-    assert_equal 6, @ext.kickvotes["blizzard4U"][:tally]
+    call "Ian_zers kickvote blizzard4U"
+    assert_equal 1, @ext.userkickvotes["blizzard4U"][:tally]
+
+    call "mike_n_7 vote"
+    assert_equal 3, @ext.userkickvotes["blizzard4U"][:tally]
+
+    call "basicxman vote"
+    assert_equal 6, @ext.userkickvotes["blizzard4U"][:tally]
   end
 
   sandbox_test "should kick a user who has enough votes" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "mike_n_7", "blizzard4U", "Ian_zers"]
-    @ext.ops  = ["basicxman"]
-    @ext.hops = ["mike_n_7"]
-    @ext.call_command("basicxman", "kickvote", "Ian_zers")
-    @ext.call_command("mike_n_7", "vote")
-    assert_match "kick Ian_zers", @ext.server.string
+    ext :ops => ["basicxman"], :hops => ["mike_n_7"], :users => ["blizzard4U", "Ian_zers"]
+    call "basicxman kickvote Ian_zers"
+    call "mike_n_7 vote"
+    assert_match "kick Ian_zers", output
   end
 
   # Timer test.
   sandbox_test "should not add a timer if the item does not exist" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.hops = ["basicxman"]
-    @ext.call_command("basicxman", "addtimer", "foo")
+    ext :hops => ["basicxman"]
+    call "basicxman addtimer foo"
     assert_nil @ext.timers["basicxman"]
-    assert_match "not added", @ext.server.string
+    assert_match "not added", output
   end
 
   # Stop timer test.
   sandbox_test "should stop all timers" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman"]
-    @ext.hops = ["basicxman"]
-    @ext.call_command("basicxman", "addtimer", "cobblestone")
-    @ext.call_command("basicxman", "addtimer", "arrow")
-    @ext.server.string = ""
-    @ext.call_command("basicxman", "stop")
+    ext :hops => ["basicxman"]
+    call "basicxman addtimer cobblestone"
+    call "basicxman addtimer arrow"
+    clear
+
+    call "basicxman stop"
     assert_nil @ext.timers["basicxman"]
-    assert_match "stopped", @ext.server.string
+    assert_match "stopped", output
   end
 
   # Time commands.
   sandbox_test "should change time with time commands" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.ops = ["basicxman"]
+    ext :ops => ["basicxman"]
     %w( morning evening night dawn dusk day ).each do |time|
-      @ext.call_command("basicxman", time)
-      assert_match "time set #{Minecraft::Data::TIME[time.to_sym]}", @ext.server.string
-      @ext.server.string = ""
+      call "basicxman #{time}"
+      assert_match "time set #{Minecraft::Data::TIME[time.to_sym]}", output
+      clear
     end
   end
 
   # Half op privileges and !list.
   sandbox_test "should revoke and add half op privileges" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "blizzard4U", "mike_n_7"]
-    @ext.ops = ["basicxman"]
-    @ext.call_command("basicxman", "hop", "blizzard4U")
-    @ext.call_command("basicxman", "hop", "mike_n_7")
-    @ext.call_command("basicxman", "dehop", "blizzard4U")
-    @ext.call_command("basicxman", "list")
-    assert_match "[@basicxman], blizzard4U, %mike_n_7", @ext.server.string.split("\n").last
+    ext :ops => ["basicxman"], :users => ["blizzard4U", "mike_n_7"]
+    call "basicxman hop blizzard4U"
+    call "basicxman hop mike_n_7"
+    call "basicxman dehop blizzard4U"
+    call "basicxman list"
+    assert_match "[@basicxman], blizzard4U, %mike_n_7", output_lines.last
   end
 
   # Help command.
   sandbox_test "should display help contents for regular users" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["blizzard4U"]
-    @ext.call_command("blizzard4U", "help")
-    t = @ext.server.string.gsub("\n", "").gsub("say", "").gsub(" ", "")
+    ext :users => ["blizzard4U"]
+    call "blizzard4U help"
+    t = output_line.gsub("say", "")
     assert_match "rules", t
     assert_match "list", t
     refute_match "give", t
   end
 
   sandbox_test "should display help contents for half ops" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["mike_n_7"]
-    @ext.hops  = ["mike_n_7"]
-    @ext.call_command("mike_n_7", "help")
-    t = @ext.server.string.gsub("\n", "").gsub("say", "").gsub(" ", "")
+    ext :hops => ["mike_n_7"]
+    call "mike_n_7 help"
+    t = output_line.gsub("say", "")
     assert_match "rules", t
     assert_match "give", t
     refute_match "morning", t
   end
 
   sandbox_test "should display help contents for ops" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman"]
-    @ext.ops   = ["basicxman"]
-    @ext.call_command("basicxman", "help")
-    t = @ext.server.string.gsub("\n", "").gsub("say", "").gsub(" ", "")
+    ext :ops => ["basicxman"]
+    call "basicxman help"
+    t = output_line.gsub("say", "")
     assert_match "rules", t
     assert_match "give", t
     assert_match "morning", t
   end
 
   sandbox_test "should display help contents for a specific command" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman"]
-    @ext.call_command("basicxman", "help", "hop")
-    assert_match "privileges to the target user", @ext.server.string.gsub("\n", "")
+    ext :users => ["basicxman"]
+    call "basicxman help hop"
+    assert_match "privileges to the target user", output_line
   end
 
   sandbox_test "should display command syntaxes" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.ops = ["basicxman"]
+    ext :ops => ["basicxman"]
 
     # opt
-    @ext.server.string = ""
-    @ext.call_command("basicxman", "help", "warptime")
-    t = @ext.server.string.split("\n")
-    assert_equal "say !warptime", t[0]
-    assert_equal "say !warptime 'time change'", t[1]
+    clear
+    call "basicxman help warptime"
+    assert_equal "say !warptime", output_lines[0]
+    assert_equal "say !warptime 'time change'", output_lines[1]
 
     # rest
-    @ext.server.string = ""
-    @ext.call_command("basicxman", "help", "welcome")
-    t = @ext.server.string.split("\n")
-    assert_equal "say !welcome 'arguments', '...'", t[0]
+    clear
+    call "basicxman help welcome"
+    assert_equal "say !welcome 'arguments', '...'", output_lines[0]
 
     # req, rest
-    @ext.server.string = ""
-    @ext.call_command("basicxman", "help", "memo")
-    t = @ext.server.string.split("\n")
-    assert_equal "say !memo 'target user', 'arguments', '...'", t[0]
+    clear
+    call "basicxman help memo"
+    assert_equal "say !memo 'target user', 'arguments', '...'", output_lines[0]
 
     # req
-    @ext.server.string = ""
-    @ext.call_command("basicxman", "help", "disturb")
-    t = @ext.server.string.split("\n")
-    assert_equal "say !disturb 'target user'", t[0]
+    clear
+    call "basicxman help disturb"
+    assert_equal "say !disturb 'target user'", output_lines[0]
 
     # req, opt
-    @ext.server.string = ""
-    @ext.call_command("basicxman", "help", "points")
-    t = @ext.server.string.split("\n")
-    assert_equal "say !points 'target user'", t[0]
-    assert_equal "say !points 'target user', 'num points'", t[1]
+    clear
+    call "basicxman help points"
+    assert_equal "say !points 'target user'", output_lines[0]
+    assert_equal "say !points 'target user', 'num points'", output_lines[1]
   end
 
   # Do not disturb testing.
   sandbox_test "should not allow users in dnd to be teleported to" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "mike_n_7"]
-    @ext.hops = ["mike_n_7"]
-    @ext.call_command("basicxman", "dnd")
+    ext :hops => ["mike_n_7"], :users => ["basicxman"]
+    call "basicxman dnd"
     assert_equal ["basicxman"], @ext.userdnd
-    @ext.server.string = ""
-    @ext.call_command("mike_n_7", "tp", "basicxman")
-    assert_match "disturbed", @ext.server.string
-    @ext.call_command("basicxman", "dnd")
+    clear
+    call "mike_n_7 tp basicxman"
+    assert_match "disturbed", output
+    call "basicxman dnd"
     assert_equal [], @ext.userdnd
   end
 
   sandbox_test "should allow ops to use the disturb command against users" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "mike_n_7"]
-    @ext.ops   = ["basicxman"]
-    @ext.call_command("mike_n_7", "dnd")
+    ext :ops => ["basicxman"], :users => ["mike_n_7"]
+    call "mike_n_7 dnd"
     assert_equal ["mike_n_7"], @ext.userdnd
-    @ext.call_command("basicxman", "disturb", "mike_n_7")
+    call "basicxman disturb mike_n_7"
     assert_equal [], @ext.userdnd
   end
 
   # Disco.
   sandbox_test "should start the disco" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman"]
-    @ext.ops = ["basicxman"]
-    @ext.call_command("basicxman", "disco")
-    assert_match "disco", @ext.server.string
-    @ext.server.string = ""
+    ext :ops => ["basicxman"]
+    call "basicxman disco"
+    assert_match "disco", output
+    clear
     12.times { @ext.periodic }
-    assert_match "time set 0", @ext.server.string
-    assert_match "time set 16000", @ext.server.string
+    assert_match "time set 0", output
+    assert_match "time set 16000", output
   end
 
   # Teleport all.
   sandbox_test "should teleport all users to an op" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "mike_n_7", "blizzard4U", "Ian_zers"]
-    @ext.ops = ["basicxman"]
-    @ext.call_command("basicxman", "tpall")
-    assert_match "mike_n_7", @ext.server.string
-    assert_match "blizzard4U", @ext.server.string
-    assert_match "Ian_zers", @ext.server.string
+    ext :ops => ["basicxman"], :users => ["mike_n_7", "blizzard4U", "Ian_zers"]
+    call "basicxman tpall"
+    assert_match "mike_n_7", output
+    assert_match "blizzard4U", output
+    assert_match "Ian_zers", output
   end
 
   # Welcome message runtime change test.
   sandbox_test "should change welcome message during runtime" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.ops = ["basicxman"]
-    @ext.call_command("basicxman", "welcome", "Foo bar.")
+    ext :ops => ["basicxman"]
+    call "basicxman welcome Foo bar."
     assert_equal "Foo bar.", @ext.welcome_message
 
-    @ext.call_command("basicxman", "welcome", "+", "%")
+    call "basicxman welcome + %"
     assert_equal "Foo bar. %", @ext.welcome_message
-    assert_match "basicxman", @ext.server.string
+    assert_match "basicxman", output
   end
 
   # Memos.
   sandbox_test "should allow users to set memos" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman"]
-    @ext.call_command("basicxman", "memo", "mike_n_7", "Hi")
+    ext :users => ["basicxman"]
+    call "basicxman memo mike_n_7 Hi"
     assert_equal ["basicxman", "Hi"], @ext.memos["mike_n_7"][0]
-
-    #@ext.check_memos("mike_n_7")
-    #assert_match "Hi", @ext.server.string
-    #assert_equal 0, @ext.memos["mike_n_7"].length
   end
 
   sandbox_test "should add and print multiple memos" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman"]
-    3.times { @ext.call_command("basicxman", "memo", "mike_n_7", "Hi") }
+    ext :users => ["basicxman"]
+    3.times { call "basicxman memo mike_n_7 Hi" }
     assert_equal 3, @ext.memos["mike_n_7"].length
 
     @ext.check_memos("mike_n_7")
@@ -389,140 +345,154 @@ eof
   end
 
   sandbox_test "should only allow five memos per user" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman"]
-    10.times { @ext.call_command("basicxman", "memo", "mike_n_7", "Hi") }
+    ext :users => ["basicxman"]
+    10.times { call "basicxman memo mike_n_7 Hi" }
     assert_equal 5, @ext.memos["mike_n_7"].length
   end
 
   # Warping time.
   sandbox_test "should warp time" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.ops = ["basicxman"]
-    @ext.call_command("basicxman", "warptime", "100")
+    ext :ops => ["basicxman"]
+    call "basicxman warptime 100"
     40.times { @ext.periodic }
-    assert_match "time add 100", @ext.server.string.gsub("\n", " ")
+    assert_match "time add 100", output_line
   end
 
   # Todo command tests.
   sandbox_test "should add, list and remove global todo items" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.call_command("basicxman", "todo", "foo", "bar")
-    @ext.call_command("basicxman", "todo", "bar")
-    assert_match "Added", @ext.server.string
+    ext :users => ["basicxman"]
+    call "basicxman todo foo bar"
+    call "basicxman todo bar"
+    assert_match "Added", output
     assert_equal "foo bar", @ext.todo_items[0]
 
-    @ext.call_command("basicxman", "todo")
-    assert_match "1. foo bar", @ext.server.string.split("\n")[-2]
-    assert_match "2. bar", @ext.server.string.split("\n")[-1]
+    call "basicxman todo"
+    assert_match "1. foo bar", output_lines[-2]
+    assert_match "2. bar", output_lines[-1]
 
-    @ext.call_command("basicxman", "finished", "foo", "bar")
-    @ext.call_command("basicxman", "finished", "1")
-    assert_match "Hurray!", @ext.server.string
+    call "basicxman finished foo bar"
+    call "basicxman finished 1"
+    assert_match "Hurray!", output
     assert_equal 0, @ext.todo_items.length
 
-    @ext.server.string = ""
-    @ext.call_command("basicxman", "finished", "2")
-    assert_match "not exist", @ext.server.string
-    @ext.server.string = ""
-    @ext.call_command("basicxman", "finished", "lolcats")
-    assert_match "not exist", @ext.server.string
+    clear
+    call "basicxman finished 2"
+    assert_match "not exist", output
+    clear
+    call "basicxman finished lolcats"
+    assert_match "not exist", output
   end
 
   # Command history.
   sandbox_test "should keep track of command history and allow users to use previous commands" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.ops = ["basicxman"]
+    ext :ops => ["basicxman"]
     @ext.command_history = {}
-    @ext.call_command("basicxman", "dusk")
-    @ext.call_command("basicxman", "dawn")
-    @ext.server.string = ""
-    @ext.call_command("basicxman", "last")
-    @ext.call_command("basicxman", "last", "2")
+    call "basicxman dusk"
+    call "basicxman dawn"
+    clear
+    call "basicxman last"
+    call "basicxman last 2"
     @ext.info_command("2011-08-30 15:52:55 [INFO] <basicxman> !")
     @ext.info_command("2011-08-30 15:52:55 [INFO] <basicxman> !!")
-    t = @ext.server.string.split("\n")
+    t = output_lines
     assert_match "time set 0", t[0]
     assert_match "time set 12000", t[1]
     assert_match "time set 0", t[2]
     assert_match "time set 12000", t[3]
 
-    @ext.server.string = ""
-    @ext.call_command("basicxman", "last", "3")
-    assert_match "No command found", @ext.server.string
+    clear
+    call "basicxman last 3"
+    assert_match "No command found", output
   end
 
   sandbox_test "should print users command history" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.ops = ["basicxman"]
-    @ext.call_command("basicxman", "dawn")
-    @ext.call_command("basicxman", "dusk")
-    @ext.call_command("basicxman", "help", "list")
-    @ext.call_command("basicxman", "give", "4", "64")
-    @ext.server.string = ""
-    @ext.call_command("basicxman", "history")
-    t =  @ext.server.string.split("\n")
+    ext :ops => ["basicxman"]
+    call "basicxman dawn"
+    call "basicxman dusk"
+    call "basicxman help list"
+    call "basicxman give 4 64"
+    clear
+    call "basicxman history"
+    t = output_lines
     assert_match "1. give 4 64", t[0]
     assert_match "2. help list", t[1]
     assert_match "3. dusk", t[2]
   end
 
   sandbox_test "should not add the same command to history twice in a row" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.ops = ["basicxman"]
-    @ext.call_command("basicxman", "day")
-    @ext.call_command("basicxman", "day")
+    ext :ops => ["basicxman"]
+    call "basicxman day"
+    call "basicxman day"
     assert_equal [["day"]], @ext.command_history["basicxman"]
   end
 
   sandbox_test "should not add command history from shortucts" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.call_command("basicxman", "s", "foo", "day")
-    @ext.call_command("basicxman", "s", "foo")
+    ext :users => ["basicxan"]
+    call "basicxman s foo day"
+    call "basicxman s foo"
     assert_nil @ext.command_history["basicxman"]
   end
 
+  # Shortcuts
+  sandbox_test "should allow hops to specify and use shortcuts" do
+    ext :hops => ["basicxman"]
+    call "basicxman s ga give cobblestone"
+    call "basicxman s ga give arrow 2m" # Should override
+    call "basicxman s ka kit armour"
+    assert_match "labelled", output
+    assert_equal ["give", "arrow", "2m"], @ext.usershortcuts["basicxman"]["ga"]
+    clear
+
+    call "basicxman s ga"
+    assert_match "give basicxman 262 64", output_line
+    clear
+
+    call "basicxman shortcuts"
+    assert_match "ka", output_line
+    assert_match "ga", output_line
+  end
+
+  sandbox_test "should fall back on a kit or print an error message for shortcuts" do
+    ext :hops => ["basicxman"]
+    call "basicxman s diamond"
+    assert_match "give basicxman 278", output_line
+    clear
+
+    call "basicxman s foo"
+    assert_match "not a valid shortcut", output_line
+  end
+
+  # Kits
+  sandbox_test "should print available kits" do
+    ext :hops => ["basicxman"]
+    call "basicxman kitlist"
+    assert_match "diamond", output_line
+    clear
+
+    call "basicxman kit diamond"
+    assert_match "give basicxman 278", output_line
+    clear
+
+    call "basicxman kit doesnotexist"
+    assert_match "diamond", output_line
+  end
+
   # Remaining commands testing (should test to ensure no errors are thrown in
   # the command execution).
   sandbox_test "should run commands without failure" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "mike_n_7", "blizzard4U", "Ian_zers"]
-    @ext.ops   = ["basicxman"]
-    @ext.hops  = ["mike_n_7"]
-    @ext.call_command("basicxman", "dawn")
-    @ext.call_command("basicxman", "dusk")
-    @ext.call_command("basicxman", "day")
-    @ext.call_command("basicxman", "night")
-    @ext.call_command("basicxman", "morning")
-    @ext.call_command("basicxman", "evening")
-    @ext.call_command("basicxman", "disco")
-    @ext.call_command("mike_n_7", "dnd")
-    @ext.call_command("basicxman", "printdnd")
-    @ext.call_command("basicxman", "disturb", "mike_n_7")
-    @ext.call_command("basicxman", "roulette")
-    @ext.call_command("basicxman", "hop", "Ian_zers")
-    @ext.call_command("basicxman", "dehop", "Ian_zers")
-    @ext.call_command("basicxman", "kit", "diamond")
-    @ext.call_command("basicxman", "tp", "Ian_zers")
-    @ext.call_command("basicxman", "tpall")
-    @ext.call_command("basicxman", "nom")
-    @ext.call_command("basicxman", "om", "nom", "nom")
-    @ext.call_command("basicxman", "property", "spawn-monsters")
-    @ext.call_command("basicxman", "property")
-    @ext.call_command("basicxman", "uptime")
-    @ext.call_command("basicxman", "uptime", "mike_n_7")
-    @ext.call_command("basicxman", "rules")
-    @ext.call_command("basicxman", "list")
-    @ext.call_command("basicxman", "addtimer", "cobblestone")
-    @ext.call_command("basicxman", "addtimer", "4", "60")
-    @ext.call_command("basicxman", "deltimer", "4")
-    @ext.call_command("basicxman", "printtimer")
-    @ext.call_command("basicxman", "printtime")
-    @ext.call_command("basicxman", "s", "foo", "give", "cobblestone")
-    @ext.call_command("basicxman", "s", "foo")
-    @ext.call_command("basicxman", "shortcuts")
-    @ext.call_command("basicxman", "help")
-    @ext.call_command("basicxman", "help", "give")
-    @ext.call_command("basicxman", "kitlist")
+    ext :ops => ["basicxman"], :hops => ["mike_n_7"], :users => ["blizzard4U", "Ian_zers"]
+    call "basicxman printdnd"
+    call "basicxman roulette"
+    call "basicxman kit diamond"
+    call "basicxman tp Ian_zers"
+    call "basicxman tpall"
+    call "basicxman nom"
+    call "basicxman om nom nom"
+    call "basicxman property spawn-monsters"
+    call "basicxman property"
+    call "basicxman rules"
+    call "basicxman printtimer"
+    call "basicxman printtime"
+    call "basicxman kitlist"
   end
 end

data/test/extensions_test.rb

@@ -4,7 +4,7 @@ require "minecraft"
 class ExtensionsTest < Test
   # Coloured line testing.
   sandbox_test "should colour server side lines properly" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
+    ext
     result = "\033[0;37m2011-08-21 13:45:13\033[0m [INFO] Starting minecraft server version Beta 1.7.3"
     assert_equal result, @ext.colour("2011-08-21 13:45:13 [INFO] Starting minecraft server version Beta 1.7.3")
 
@@ -23,90 +23,73 @@ class ExtensionsTest < Test
 
   # call_comamnd testing.
   sandbox_test "should call a command for a regular user" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman"]
-    @ext.call_command("basicxman", "list")
-    assert_equal 0, @ext.server.string.index("say")
+    ext :users => ["basicxman"]
+    call "basicxman list"
+    assert_equal 0, output.index("say")
   end
 
   sandbox_test "should not call an all command for a regular user" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman"]
-    @ext.call_command("basicxman", "giveall", "cobblestone")
-    assert_match "not a", @ext.server.string
+    ext :users => ["basicxman"]
+    call "basicxman giveall cobblestone"
+    assert_match "not a", output
   end
 
   sandbox_test "should not let regular users run privileged commands" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["blizzard4U"]
-    @ext.call_command("blizzard4U", "give", "cobblestone")
-    assert_match "not a", @ext.server.string
+    ext :users => ["blizzard4U"]
+    call "blizzard4U give cobblestone"
+    assert_match "not a", output
   end
 
   sandbox_test "should not call an all command if not available" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "blizzard4U", "mike_n_7"]
-    @ext.ops = ["basicxman"]
-    @ext.call_command("basicxman", "rouletteall")
-    assert_equal 2, @ext.server.string.split("\n").length
+    ext :users => ["blizzard4U", "mike_n_7"], :ops => ["basicxman"]
+    call "basicxman rouletteall"
+    refute_match "basicxman is", output_line
   end
 
   sandbox_test "should let ops execute an all command" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "blizzard4U", "mike_n_7"]
-    @ext.ops = ["basicxman"]
-    @ext.call_command("basicxman", "giveall", "cobblestone")
-    assert_match "basicxman is", @ext.server.string
+    ext :users => ["blizzard4U", "mike_n_7"], :ops => ["basicxman"]
+    call "basicxman giveall cobblestone"
+    assert_match "basicxman is", output
   end
 
   sandbox_test "should not let hops or execute an all command" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.users = ["basicxman", "blizzard4U", "mike_n_7"]
-    @ext.hops = ["mike_n_7"]
-    @ext.call_command("mike_n_7", "giveall", "cobblestone")
-    assert_match "not a", @ext.server.string
+    ext :users => ["blizzard4U", "basicxman"], :hops => ["mike_n_7"]
+    call "mike_n_7 giveall cobblestone"
+    assert_match "not a", output
   end
 
   sandbox_test "should not let hops run op commands" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.hops = ["mike_n_7"]
-    @ext.call_command("mike_n_7", "morning")
-    assert_match "not a", @ext.server.string
+    ext :hops => ["mike_n_7"]
+    call "mike_n_7 morning"
+    assert_match "not a", output
   end
 
   sandbox_test "should let ops run op privileged commands" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.ops = ["basicxman"]
-    @ext.call_command("basicxman", "morning")
-    refute_match "not a", @ext.server.string
+    ext :ops => ["basicxman"]
+    call "basicxman morning"
+    refute_match "not a", output
   end
 
   sandbox_test "should remove excess arguments" do
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.call_command("basicxman", "help", "foo", "bar")
-    refute_empty @ext.server.string
+    ext :users => ["basicxman"]
+    call "basicxman help foo bar"
+    refute_empty output
 
-    @ext.call_command("basicxman", "day", "foo")
-    refute_empty @ext.server.string
+    call "basicxman day foo"
+    refute_empty output
   end
 
   # Command valiation testing.
   sandbox_test "should print an arguments error if not enough arguments are given" do
     ts, $stderr = $stderr, StringIO.new
-    @ext = Minecraft::Extensions.new(StringIO.new, {})
-    @ext.ops = ["basicxman"]
-    @ext.call_command("basicxman", "give")
-    assert_match "at least one argument", @ext.server.string
-    @ext.server.string = ""
-
-    @ext.call_command("basicxman", "kit")
-    assert_match "Expected", @ext.server.string
-    assert_match "group", @ext.server.string
-    @ext.server.string = ""
-
-    @ext.call_command("basicxman", "hop")
-    assert_match "Expected", @ext.server.string
-    assert_match "target user", @ext.server.string
+    ext :ops => ["basicxman"]
+    call "basicxman give"
+    assert_match "at least one argument", output
+    clear
+
+    call "basicxman hop"
+    assert_match "Expected", output
+    assert_match "target user", output
     $stderr = ts
   end
 end

data/test/helper.rb

@@ -10,7 +10,7 @@ require "turn"
 
 module Minecraft
   class Extensions
-    attr_accessor :commands, :users, :ops, :hops, :counter, :server, :kickvotes, :last_kick_vote, :uptime, :timers, :shortcuts, :userlog, :userpoints, :vote_threshold, :userdnd, :welcome_message, :memos, :todo_items, :command_history
+    attr_accessor :commands, :users, :ops, :hops, :counter, :server, :userkickvotes, :last_kick_vote, :useruptime, :timers, :usershortcuts, :userlog, :userpoints, :vote_threshold, :userdnd, :welcome_message, :memos, :todo_items, :command_history
   end
 end
 
@@ -34,4 +34,32 @@ class Test < MiniTest::Unit::TestCase
     end
     define_method("test_#{name.gsub(/\W/, '_')}", p)
   end
+
+  def ext(opts = {})
+    @ext = Minecraft::Extensions.new(StringIO.new, {})
+    @ext.ops  = opts[:ops]  || []
+    @ext.hops = opts[:hops] || []
+    @ext.users = @ext.ops + @ext.hops + (opts[:users] || [])
+    @ext.users.uniq!
+  end
+
+  def call(string)
+    @ext.call_command(*string.split(" "))
+  end
+
+  def output
+    @ext.server.string
+  end
+
+  def output_lines
+    output.split("\n")
+  end
+
+  def output_line
+    output.gsub("\n", "")
+  end
+
+  def clear
+    @ext.server.string = ""
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: minecraft
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Andrew Horsman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 -04:00
+date: 2011-09-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency