minecraft 0.3.1 → 0.3.2

data/CHANGES.md

@@ -1,3 +1,17 @@
+0.3.2 (2011-08-31)
+------------------
+
+* Added dye kits with give support..
+* Added a tool kit.
+* Implemented command history.
+
+0.3.1 (2011-08-30)
+------------------
+
+* Misc bug fixes.
+* Revised README.
+* Removed two time quotes.
+
 0.3.0 (2011-08-29)
 ------------------
 

data/README.md

@@ -125,7 +125,7 @@ Read [https://github.com/basicxman/minecraft/wiki/Writing-tests](here) for how
 we develop code with test driven development.
 
 For any non-straightforward functionality (especially command naming and
-syntax) you are encouraged to open up an 
+syntax) you are encouraged to open up an
 [http://github.com/basicxman/minecraft/issues](issue) for discussion, issues
 will be read and commented on promptly.  Remember to report any bugs as well,
 a bug can be something as simple as a command not returning feedback to the

data/lib/minecraft/commands.rb

@@ -365,7 +365,13 @@ module Minecraft
     # @note all: is putting out.
     def give(user, *args)
       item, quantity = items_arg(1, args)
-      item = resolve_item(item)
+      # For coloured wools/dyes.
+      if WOOL_COLOURS.include? item
+        (quantity / 64.0).ceil.times { kit(user, item) }
+        item = 35
+      else
+        item = resolve_item(item)
+      end
 
       construct_give(user, item, quantity)
     end
@@ -645,7 +651,7 @@ module Minecraft
     #   kitlist()
     # @note ops: none
     def kitlist()
-      @server.puts "say Kits: #{KITS.keys.join(", ")}"
+      say("Kits: #{KITS.keys.join(", ")}")
     end
 
     # Adds or prints the current todo list items.
@@ -659,7 +665,7 @@ module Minecraft
     def todo(user, *args)
       if args.length == 0
         @todo_items.each_with_index do |item, index|
-          @server.puts "say #{index + 1}. #{item}"
+          say("say #{index + 1}. #{item}")
         end
         return
       end
@@ -689,6 +695,45 @@ module Minecraft
       @server.puts "say Hurray!"
     end
 
+    # Executes a command from a users history.
+    #
+    # @param [String] user The requesting user.
+    # @param [Integer] history The number of commands to look back.
+    # @example
+    #   last("basicxman")
+    #   last("basicxman", "2")
+    # @note ops: none
+    def last(user, history = 1)
+      user, history = user.downcase, history.to_i
+      if not @command_history.has_key? user or @command_history[user].length < history
+        return say("No command found.")
+      end
+
+      command = @command_history[user][-history]
+      t = @command_history[user].length
+      call_command(user, command.first, *command[1..-1])
+
+      # process_history_addition() will not add the same command twice in a
+      # row, so only slice if the command history length has changed.
+      @command_history[user].slice! -1 unless @command_history[user].length == t
+    end
+
+    # Prints the last three commands executed.
+    #
+    # @param [String] user The requesting user.
+    # @example
+    #   history("basicxman")
+    # @note ops: none
+    def history(user)
+      user = user.downcase
+      return say("No command history found.") if not @command_history.has_key? user or @command_history[user].length == 0
+
+      i = [@command_history[user].length, 3].min * -1
+      @command_history[user][i, 3].reverse.each_with_index do |command, index|
+        say("#{index + 1}. #{command.join(" ")}")
+      end
+    end
+
     private
 
     # Prints the command signature options for a specified command.

data/lib/minecraft/data.rb

@@ -6,6 +6,7 @@ module Minecraft
       :diamond    => [276, 277, 278, 279, 293],
       :goldarmour => [314, 315, 316, 317],
       :armour     => [310, 311, 312, 313],
+      :tools      => [277, 278],
       :ranged     => [261, [262, 320]],
       :nether     => [261, [262, 320], [89, 128], 278, 276],
       :portal     => [[49, 14], 259],
@@ -15,9 +16,41 @@ module Minecraft
       :blacksmith => [61, [263, 16], [264, 3], [265, 32], [266, 16]],
       :miner      => [278, [50, 64], 277, [65, 64]],
       :farmer     => [293, [295, 128], 277],
-      :chef       => [[297, 3], [296, 192], [320, 3], 357, [353, 64], 354, [350, 2]]
+      :chef       => [[297, 3], [296, 192], [320, 3], 357, [353, 64], 354, [350, 2]],
+      :lightgray  => [[351, 64], [352, 64]],
+      :gray       => [[351, 64], [352, 64]],
+      :black      => [[351, 64]],
+      :red        => [[38, 64]],
+      :orange     => [[38, 64], [37, 64]],
+      :yellow     => [[37, 64]],
+      :lime       => [[352, 64], [81, 64]],
+      :green      => [[81, 64]],
+      :lightblue  => [[352, 64], [22, 64]],
+      :cyan       => [[22, 64], [81, 64]],
+      :blue       => [[22, 64]],
+      :purple     => [[22, 64], [38, 64]],
+      :magenta    => [[22, 64], [38, 64], [38, 64], [352, 64]],
+      :pink       => [[352, 64], [38, 64]]
     }
 
+    # Possible wool colours.
+    WOOL_COLOURS = %w(
+      lightgray
+      gray
+      black
+      red
+      orange
+      yellow
+      lime
+      green
+      lightblue
+      cyan
+      blue
+      purple
+      magenta
+      pink
+    )
+
     # Values for time, 0 to 24000.  0 is dawn, 12000 is dusk.
     TIME = {
       :morning => 1000,

data/lib/minecraft/extensions.rb

@@ -21,6 +21,7 @@ module Minecraft
       get_json :userdnd, []
       get_json :memos
       get_json :todo_items, []
+      get_json :command_history
       @users = []
       @counter = 0
       @logon_time = {}
@@ -110,6 +111,7 @@ module Minecraft
       save_file :userdnd
       save_file :memos
       save_file :todo_items
+      save_file :command_history
     end
 
     # Save an instance hash to it's associated data file.
@@ -121,6 +123,26 @@ module Minecraft
       File.open("#{var}.json", "w") { |f| f.print instance_variable_get("@#{var}").to_json }
     end
 
+    # Process command history addition.
+    #
+    # @param [String] user The user executing the command.
+    # @param [String] command The command to potetentially add to history.
+    # @param [Array] args Command arguments.
+    # @example
+    #   process_history_addition("basicxman", "give", "cobblestone")
+    #   process_history_addition("basicxman", "history")
+    def process_history_addition(user, command, args)
+      blacklist = %w( last history s )
+      return if blacklist.include? command.to_s
+
+      history = [command] + args
+      u = user.downcase
+
+      @command_history[u] ||= []
+      return if @command_history[u].last == history
+      @command_history[u] << history
+    end
+
     # Complicated method to decide the logic of calling a command.  Checks
     # if the command requires op privileges and whether an `all` version is
     # available and has been requested.
@@ -138,6 +160,7 @@ module Minecraft
     # @example
     #   call_command("basicxman", "give", "cobblestone", "64")
     def call_command(user, command, *args)
+      process_history_addition(user, command, args)
       is_all = command.to_s.end_with? "all"
       root   = command.to_s.chomp("all").to_sym
       return send(root, user, *args) unless @commands.include? root
@@ -297,13 +320,20 @@ module Minecraft
       return if meta_check(line)
 
       # :foo should use the shortcut 'foo'.
-      line.gsub!(/^(\<.*?\>\s+):/) { |m| "#{$1}!s " }
+      line.gsub!(/^(\<.*?\>\s+),/) { |m| "#{$1}!s " }
 
       match_data = line.match /^\<(.*?)\>\s+!(.*?)$/
       return if match_data.nil?
 
       user = match_data[1]
       args = match_data[2].split(" ")
+
+      if args.length == 0
+        return call_command(user, :last)
+      elsif args.first == "!" * args.first.length
+        return call_command(user, :last, args.first.length + 1)
+      end
+
       call_command(user, args.slice!(0).to_sym, *args)
     end
 

data/lib/minecraft/version.rb

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

data/test/commands_test.rb

@@ -81,6 +81,15 @@ eof
     assert_equal result, @server.string
   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
+  end
+
   # User points system testing.
   sandbox_test "should give a user points" do
     @ext = Minecraft::Extensions.new(StringIO.new, {})
@@ -420,6 +429,59 @@ eof
     assert_match "not exist", @ext.server.string
   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.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")
+    @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")
+    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
+  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")
+    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")
+    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")
+    assert_nil @ext.command_history["basicxman"]
+  end
+
   # Remaining commands testing (should test to ensure no errors are thrown in
   # the command execution).
   sandbox_test "should run commands without failure" do

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
+    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
   end
 end
 
@@ -28,6 +28,7 @@ class Test < MiniTest::Unit::TestCase
       FileUtils.cd("mc") do
         FileUtils.touch("ops.txt")
         FileUtils.touch("server.properties")
+        FileUtils.rm_f("command_history.json")
         instance_eval(&block)
       end
     end

metadata

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