rubygame 2.4.0 → 2.4.1

data/NEWS

@@ -1,5 +1,28 @@
 = NEWS
 
+== Rubygame 2.4.1
+
+Release focus: Bug fixes; Ruby 1.9 compatibility.
+
+=== Fixes
+
+- Fixed: Module scope problems with EventHandler and triggers.
+  They were trying to find the Events module, which only worked if
+  you had done 'include Rubygame' somewhere.
+
+- Fixed: Compiler warning in unmake_symbol().
+
+=== Other Stuff
+
+- Rubygame is compatible with Ruby 1.9.
+
+- Build system is compatible with Ruby 1.9.
+
+- Minor cleanup to build system internals.
+
+
+
+
 == Rubygame 2.4.0
 
 Release focus: Events.

data/Rakefile

@@ -6,7 +6,7 @@
 
 
 # The version number for Rubygame.
-RUBYGAME_VERSION = [2,4,0]
+RUBYGAME_VERSION = [2,4,1]
 
 
 # 
@@ -37,7 +37,6 @@ RUBYGAME_VERSION = [2,4,0]
 
 
 require 'rubygems'
-Gem::manage_gems
 
 require 'rake'
 require 'rake/gempackagetask'
@@ -51,10 +50,20 @@ require 'English'
 class ShellCommandError < RuntimeError
 end
 
-# Execute the block (which is supposed to perform a shell command),
-# then raise ShellCommandError if the command failed.
-def try_shell( &block )
-  result = yield
+# Execute the shell command and raise ShellCommandError if
+# the command failed.
+# 
+# If verbose is true, outputs the command string to the console.
+# If it's false, it outputs the pretty string to the console instead.
+# 
+def try_shell( command, pretty="", verbose=false )
+  if verbose
+    puts command
+  else
+    puts pretty unless pretty.empty?
+  end
+
+  result = `#{command}`
   
   unless $CHILD_STATUS.exitstatus == 0
     raise ShellCommandError, "Command failed. Aborting."
@@ -66,7 +75,7 @@ end
 def try_sdl_config( flag )
   begin
     if $options[:"sdl-config"]
-      return try_shell { `sdl-config #{flag}`.chomp }
+      return try_shell("sdl-config #{flag}").chomp
     else
       return String.new
     end
@@ -160,7 +169,7 @@ $options = {
 # Default behavior for win32 is to skip sdl_config,
 # since it's usually not available. It can still be
 # enabled through the options, though.
-if PLATFORM =~ /win32/
+if RUBY_PLATFORM =~ /win32/
 	$options[:"sdl-config"] = false
 end
 
@@ -228,6 +237,10 @@ string_option :sitelibdir
 CFLAGS = [from_env_or_config("CFLAGS"),
           try_sdl_config("--cflags"),
           "-I. -I#{CONFIG['topdir']}",
+          (if CONFIG['rubyhdrdir']
+             "-I#{CONFIG['rubyhdrdir']} " +\
+             "-I#{File.join(CONFIG['rubyhdrdir'], CONFIG['arch'])}" 
+           end),
           "-DRUBYGAME_MAJOR_VERSION=#{RUBYGAME_VERSION[0]}",
           "-DRUBYGAME_MINOR_VERSION=#{RUBYGAME_VERSION[1]}",
           "-DRUBYGAME_PATCHLEVEL=#{RUBYGAME_VERSION[2]}"
@@ -292,12 +305,9 @@ class ExtensionModule
         link_command.gsub!("-arch ppc","")
       end
 
-      if( $options[:verbose] )
-        try_shell { sh link_command }
-      else
-        puts "Linking compiled files to create #{File.basename(@directory)}/#{File.basename(dynlib_full)}"
-        try_shell { `#{link_command}` }
-      end
+      try_shell( link_command,
+                 "Linking compiled files to create #{File.basename(@directory)}/#{File.basename(dynlib_full)}",
+                 $options[:verbose] )
     end
 
     task :build => [dynlib_full]   # Add this as a prereq of the build
@@ -326,12 +336,9 @@ class ExtensionModule
         compile_command.gsub!("-arch ppc","")
       end
 
-      if( $options[:verbose] )
-        try_shell { sh compile_command }
-      else
-        puts "Compiling #{File.basename(@directory)}/#{File.basename(t.source)}"
-        try_shell { `#{compile_command}` }
-      end
+      try_shell( compile_command,
+                 "Compiling #{File.basename(@directory)}/#{File.basename(t.source)}",
+                 $options[:verbose] )
     end
   rescue
     # Generate a .o rule for each .c file in the directory.
@@ -339,12 +346,10 @@ class ExtensionModule
       object = source.sub(".c", ".#{OBJEXT}")
       file object => ([source] + depends_headers( source )) do |t|
         compile_command = "#{CONFIG['CC']} -c #{CFLAGS} #{"-g " if $options[:debug]} #{source} -o #{t.name}"
-        if( $options[:verbose] )
-          try_shell { sh compile_command }
-        else
-          puts "Compiling #{File.basename(@directory)}/#{File.basename(source)}"
-          try_shell { `#{compile_command}` }
-        end
+
+        try_shell( compile_command,
+                   "Compiling #{File.basename(@directory)}/#{File.basename(t.source)}",
+                   $options[:verbose] )
       end
     end
   end

data/ext/rubygame/rubygame_event.c

@@ -325,7 +325,7 @@ int rg_get_keyrepeat_value( VALUE vvalue, int default_value, char *name )
 				else
 				{
 					rb_raise( rb_eArgError, "unsupported symbol '%s' for %s", 
-					          RSTRING(rb_inspect(vvalue))->ptr, name );
+					          RSTRING_PTR(rb_inspect(vvalue)), name );
 				}
 		}
 
@@ -335,7 +335,7 @@ int rg_get_keyrepeat_value( VALUE vvalue, int default_value, char *name )
 				if( value < 1 )
 				{
 					rb_raise( rb_eArgError, "%s must be at least 0.001 seconds (got %s)",
-					          name, RSTRING(rb_inspect(vvalue))->ptr);
+					          name, RSTRING_PTR(rb_inspect(vvalue)));
 				}
 
 				return value;

data/ext/rubygame/rubygame_gfx.c

@@ -62,7 +62,7 @@ VALUE rbgm_draw_fillpolygon(VALUE, VALUE, VALUE);
 void extract_xy(VALUE point, Sint16* x, Sint16* y)
 {
 	point = convert_to_array(point);
-  if(RARRAY(point)->len < 2)
+  if(RARRAY_LEN(point) < 2)
     rb_raise(rb_eArgError,"expected argument as [x,y] form");
   *x = NUM2INT(rb_ary_entry(point,0));
   *y = NUM2INT(rb_ary_entry(point,1));
@@ -479,7 +479,7 @@ void draw_polygon(VALUE target, VALUE points, VALUE rgba, int aa, int fill)
 
   /* separate points into arrays of x and y values */
   points = convert_to_array(points);
-  length = RARRAY(points)->len;
+  length = RARRAY_LEN(points);
   x = alloca(sizeof (Sint16) * length);
   y = alloca(sizeof (Sint16) * length);
 

data/ext/rubygame/rubygame_screen.c

@@ -247,10 +247,10 @@ VALUE rbgm_screen_update(int argc, VALUE *argv, VALUE self)
 	{
 		switch( TYPE(vx) ) {
 			case T_ARRAY: {
-				if( RARRAY(vx)->len < 4 )
+				if( RARRAY_LEN(vx) < 4 )
 				{
 					rb_raise(rb_eArgError,"Array is too short to be a Rect (%s for 4)",
-									 RARRAY(vx)->len);
+									 RARRAY_LEN(vx));
 				}
 				x = NUM2INT(rb_ary_entry(vx,0));
 				y = NUM2INT(rb_ary_entry(vx,1));
@@ -311,7 +311,7 @@ VALUE rbgm_screen_updaterects(VALUE self, VALUE array_rects)
 
   /* prepare an (uninitialized) array of Rects */
   array_rects = convert_to_array(array_rects);
-  num_rects = RARRAY(array_rects)->len;
+  num_rects = RARRAY_LEN(array_rects);
   rects = ALLOCA_N(SDL_Rect, num_rects);
 
   /* initialize the array of Rects from array_rects */

data/ext/rubygame/rubygame_shared.c

@@ -54,7 +54,7 @@ VALUE make_symbol(char *string)
 /* Returns a char* string from the given symbol */
 char *unmake_symbol(VALUE symbol)
 {
-	return rb_id2name( SYM2ID(symbol) );
+	return (char *)rb_id2name( SYM2ID(symbol) );
 }
 
 
@@ -80,7 +80,7 @@ Uint32 collapse_flags(VALUE vflags)
 	{
     switch( TYPE(vflags) ){
 			case T_ARRAY: {
-				int len = RARRAY(vflags)->len;
+				int len = RARRAY_LEN(vflags);
 				for(i=0;  i < len;  i++)
         {
           flags |= NUM2UINT(  rb_ary_entry( vflags,i )  );
@@ -161,7 +161,7 @@ void extract_rgba_u8_as_u8(VALUE color, Uint8 *r, Uint8 *g, Uint8 *b, Uint8 *a)
 	*g = NUM2UINT(rb_ary_entry(color, 1));
 	*b = NUM2UINT(rb_ary_entry(color, 2));
 
-	if( RARRAY(color)->len > 3 )
+	if( RARRAY_LEN(color) > 3 )
 	{
 		*a = NUM2UINT(rb_ary_entry(color, 3));
 	}

data/ext/rubygame/rubygame_surface.c

@@ -146,14 +146,14 @@ VALUE rbgm_surface_new(int argc, VALUE *argv, VALUE class)
 	/* Get width and height for new surface from vsize */
 	vsize = convert_to_array(vsize);
 
-	if(RARRAY(vsize)->len >= 2)
+	if(RARRAY_LEN(vsize) >= 2)
 	{
 		w = NUM2INT(rb_ary_entry(vsize,0));
 		h = NUM2INT(rb_ary_entry(vsize,1));
 	}
 	else
 		rb_raise(rb_eArgError,"Array is too short for Surface size (%d for 2)",\
-			RARRAY(vsize)->len);
+			RARRAY_LEN(vsize));
 	
 	flags = collapse_flags(vflags); /* in rubygame_shared */
 

data/lib/rubygame/event_handler.rb

@@ -89,7 +89,7 @@ class Rubygame::EventHandler
 	#  the top of the stack.
 	# 
 	def append_hook( hook )
-		hook = EventHook.new( hook ) if hook.kind_of?( Hash )
+		hook = Rubygame::EventHook.new( hook ) if hook.kind_of?( Hash )
 		@hooks = (@hooks - [hook]) | [hook]
 		return hook
 	end
@@ -103,7 +103,7 @@ class Rubygame::EventHandler
 	#  If the EventHandler already has that hook, it is moved to the top.
 	# 
 	def prepend_hook( hook )
-		hook = EventHook.new( hook ) if hook.kind_of?( Hash )
+		hook = Rubygame::EventHook.new( hook ) if hook.kind_of?( Hash )
 		@hooks = [hook] | @hooks
 		return hook
 	end
@@ -324,7 +324,7 @@ module Rubygame::EventHandler::HasEventHandler
 
 	# Sets @event_handler to a new EventHandler if needed.
 	def _make_event_handler
-		@event_handler = EventHandler.new() if @event_handler.nil?
+		@event_handler = Rubygame::EventHandler.new() if @event_handler.nil?
 	end
 
 	# This method is called by #make_magic_hooks to convert an
@@ -363,10 +363,10 @@ module Rubygame::EventHandler::HasEventHandler
 		case action
 
 		when Symbol
-			EventActions::MethodAction.new(action)
+			Rubygame::EventActions::MethodAction.new(action)
 
 		when Proc, Method
-			EventActions::BlockAction.new(&action)
+			Rubygame::EventActions::BlockAction.new(&action)
 
 		else
 			if action.respond_to? :perform
@@ -418,13 +418,13 @@ module Rubygame::EventHandler::HasEventHandler
 		when Symbol
 			case(trigger.to_s)
 			when /mouse/
-				EventTriggers::MousePressTrigger.new(trigger)
+				Rubygame::EventTriggers::MousePressTrigger.new(trigger)
 			else
-				EventTriggers::KeyPressTrigger.new(trigger)
+				Rubygame::EventTriggers::KeyPressTrigger.new(trigger)
 			end
 
 		when Class
-			EventTriggers::InstanceOfTrigger.new(trigger)
+			Rubygame::EventTriggers::InstanceOfTrigger.new(trigger)
 
 		else
 			if trigger.respond_to? :match?
@@ -441,7 +441,7 @@ module Rubygame::EventHandler::HasEventHandler
 
 	def _prepare_hook( hook )
 		if( hook.kind_of? Hash )
-			hook = EventHook.new( {:owner => self}.merge(hook) )
+			hook = Rubygame::EventHook.new( {:owner => self}.merge(hook) )
 		end
 		
 		if( hook.owner == nil )

data/lib/rubygame/event_triggers.rb

@@ -374,7 +374,7 @@ class KeyPressTrigger
 	#   match either :left_alt or :right_alt.
 	#
 	def match?( event )
-		if event.kind_of?( Events::KeyPressed )
+		if event.kind_of?( Rubygame::Events::KeyPressed )
 			((@key == :any) or (event.key == @key)) and \
 			((@mods == :any) or (@mods == :none and event.modifiers == [])\
 			                 or (_mods_match?(event.modifiers)))
@@ -436,7 +436,7 @@ class KeyReleaseTrigger
 	# See KeyPressTrigger#match? for more information.
 	# 
 	def match?( event )
-		if event.kind_of?( Events::KeyReleased )
+		if event.kind_of?( Rubygame::Events::KeyReleased )
 			((@key == :any) or (event.key == @key)) and \
 			((@mods == :any) or (@mods == :none and event.modifiers == [])\
 			                 or (_mods_match?(event.modifiers)))
@@ -529,7 +529,7 @@ class MousePressTrigger
 	# (or the trigger's button is :any).
 	# 
 	def match?( event )
-		if event.kind_of?( Events::MousePressed )
+		if event.kind_of?( Rubygame::Events::MousePressed )
 			((@button == :any) or (event.button == @button))
 		else
 			false
@@ -598,7 +598,7 @@ class MouseMoveTrigger
 	# See #new for information about how events match.
 	# 
 	def match?( event )
-		if event.kind_of?( Events::MouseMoved )
+		if event.kind_of?( Rubygame::Events::MouseMoved )
 			((@buttons == :any) or 
 			 (@buttons == :none and event.buttons == []) or 
 			 (_buttons_match?(event.buttons)) or
@@ -658,7 +658,7 @@ class MouseReleaseTrigger
 	# (or the trigger's button is :any).
 	# 
 	def match?( event )
-		if event.kind_of?( Events::MouseReleased )
+		if event.kind_of?( Rubygame::Events::MouseReleased )
 			((@button == :any) or (event.button == @button))
 		else
 			false
@@ -670,7 +670,7 @@ end
 
 # class TickTrigger
 # 	def match?( event )
-# 		event.kind_of?( Events::ClockTicked )
+# 		event.kind_of?( Rubygame::Events::ClockTicked )
 # 	end
 # end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubygame
 version: !ruby/object:Gem::Version 
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors: 
 - John Croisant
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-24 00:00:00 -05:00
+date: 2009-02-08 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Clean and powerful library for game programming