gosu 0.11.2-x86-mingw32 → 0.11.3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5cce2123fbc80fcacc531a3b251de79c59b6c98
-  data.tar.gz: 04d187898fb6334855e90fff6be5b618bc45591b
+  metadata.gz: 41dc7f5ff7fb2ab36d6ef380b59bd9170603d720
+  data.tar.gz: 42430746cfd434a8eeeeef53f9f83c806d9c581a
 SHA512:
-  metadata.gz: a22022a8d48056143c2918412ed1b228ab8152a01e89a074b7680930c65d1d6443865dae18f03158a640f7329ef9e442e926b8cdbc7becd44567480d8d94ea5c
-  data.tar.gz: 0dcb5c22c435c612acb113e7775b49212a527fe84d1689de451b48ac6b978336e7a358bf67075905ea3d188f3ad762643c3fdfd96b0aed26b30668c2dd2a959c
+  metadata.gz: 9acc963a16b4547e41108329e99113a4788656f4c81ff2ff1a65e50190400661d47c80d50a21e5cd040f5ea421c10d08464be250e27100c14370e6480b9d4e1b
+  data.tar.gz: bfe0a3fcba8cb3dc9369136fcc74ad8b192bc7db4950c51a432e1e9e0384e3591cb2f0f04ed39bd1179020bec323bfbf4961595889fd65a60eb0947309f13433

data/lib/gosu.rb

@@ -1,19 +1,21 @@
-require 'rbconfig'
+require "rbconfig"
 
 if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/
   binary_path = File.dirname(__FILE__)
   # 64-bit builds of Windows use "x64-mingw32" as RUBY_PLATFORM
-  binary_path += '64' if RUBY_PLATFORM =~ /^x64-/
+  binary_path += "64" if RUBY_PLATFORM =~ /^x64-/
   
   # Add this gem to the PATH on Windows so that bundled DLLs can be found.
-  ENV['PATH'] = "#{binary_path};#{ENV['PATH']}"
+  # When running through Ocra on Windows, we need to be careful to preserve the ENV["PATH"]
+  # encoding (see #385).
+  ENV["PATH"] = "#{binary_path.encode ENV["PATH"].encoding};#{ENV["PATH"]}"
   
-  # Add the correct directory 
-  RUBY_VERSION =~ /(\d+.\d+)/
-  $LOAD_PATH.unshift "#{binary_path}/#{$1}"
+  # Add the correct lib directory for the current version of Ruby (major.minor).
+  $LOAD_PATH.unshift File.join(binary_path, RUBY_VERSION[/^\d+.\d+/])
 end
 
-require "gosu.#{RbConfig::CONFIG['DLEXT']}"
+require "gosu.#{RbConfig::CONFIG["DLEXT"]}"
 
 require "gosu/swig_patches"
 require "gosu/patches"
+require "gosu/compat"

data/lib/gosu/compat.rb

@@ -0,0 +1,183 @@
+# This whole file is about backward compatibility.
+
+# Define some helpers to deprecate code.
+module Gosu
+  DEPRECATION_STACKTRACE_LINES = 1
+
+  # Adapted from RubyGems, but without the date part.
+  def self.deprecate(klass, name, repl)
+    klass.class_eval {
+      old = "_deprecated_#{name}"
+      alias_method old, name
+      define_method name do |*args, &block|
+        Gosu.deprecation_message(self, name, repl)
+        send old, *args, &block
+      end
+    }
+  end
+
+  def self.deprecate_const(name, repl)
+    send(:remove_const, name) if const_defined?(name)
+
+    @@_deprecated_constants ||= {}
+    @@_deprecated_constants[name] = repl
+  end
+
+  # Constant deprecation works by undefining the original constant and then re-adding it in
+  # const_missing, so that each deprecation warning is only printed once.
+  def self.const_missing(const_name)
+    if @@_deprecated_constants && repl = @@_deprecated_constants[const_name]
+      Gosu.deprecation_message(self, const_name, repl)
+      const_get(repl)
+    else
+      super
+    end
+  end
+
+  def self.deprecation_message(klass_or_full_message, name=nil, repl=nil)
+    @@_deprecations_shown ||= {}
+
+    msg = if klass_or_full_message.is_a?(String) and name.nil? and repl.nil?
+      [ "DEPRECATION WARNING: #{klass_or_full_message},
+        \n#Called from #{caller[1, DEPRECATION_STACKTRACE_LINES]}"
+      ]
+    else
+      # Class method deprecation warnings result in something like this:
+      # #<Class:Gosu::Window>::button_id_to_char is deprecated
+      # Remove the instance-inspect stuff to make it look a bit better:
+      if klass_or_full_message.kind_of?(Module)
+        target = "#{klass_or_full_message.to_s.gsub(/#<Class:(.*)>/, '\1')}::"
+      else
+        "#{klass_or_full_message.class}#"
+      end
+      [ "DEPRECATION WARNING: #{target}#{name} is deprecated",
+        repl == :none ? " with no replacement." : "; use #{repl} instead.",
+        "\n#{target}#{name} called from #{Gosu.deprecation_caller.join("\n")}",
+      ]
+    end
+    return if @@_deprecations_shown.has_key?(msg[0])
+    @@_deprecations_shown[msg[0]] = true
+
+    warn "#{msg.join}."
+  end
+
+  # This method removes the deprecation methods themselves from the stacktrace.
+  def self.deprecation_caller
+    caller.delete_if { |trace_line| trace_line =~ /(deprecat|const_missing)/ }
+      .first(DEPRECATION_STACKTRACE_LINES)
+  end
+end
+
+# No need to pass a Window to Image.
+class Gosu::Image
+  alias initialize_without_window initialize
+
+  def initialize(*args)
+    if args[0].is_a? Gosu::Window
+      Gosu.deprecation_message("Passing a Window to Image#initialize has been deprecated in Gosu 0.9 and this method now uses an options hash, see https://www.libgosu.org/rdoc/Gosu/Image.html.")
+      if args.size == 7
+        initialize_without_window args[1], :tileable => args[2], :rect => args[3..-1]
+      else
+        initialize_without_window args[1], :tileable => args[2]
+      end
+    else
+      initialize_without_window(*args)
+    end
+  end
+
+  class << self
+    alias from_text_without_window from_text
+  end
+
+  def self.from_text(*args)
+    if args.size == 4
+      Gosu.deprecation_message("Passing a Window to Image.from_text has been deprecated in Gosu 0.9 and this method now uses an options hash, see https://www.libgosu.org/rdoc/Gosu/Image.html.")
+      from_text_without_window(args[1], args[3], :font => args[2])
+    elsif args.size == 7
+      Gosu.deprecation_message("Passing a Window to Image.from_text has been deprecated in Gosu 0.9 and this method now uses an options hash, see https://www.libgosu.org/rdoc/Gosu/Image.html.")
+      from_text_without_window(args[1], args[3], :font => args[2],
+        :spacing => args[4], :width => args[5], :align => args[6])
+    else
+      from_text_without_window(*args)
+    end
+  end
+end
+
+# No need to pass a Window to Sample.
+class Gosu::Sample
+  alias initialize_without_window initialize
+
+  def initialize(*args)
+    if args.first.is_a? Gosu::Window
+      args.shift
+      Gosu.deprecation_message("Passing a Window to Sample#initialize has been deprecated in Gosu 0.7.17.")
+    end
+    initialize_without_window(*args)
+  end
+end
+
+# No need to pass a Window to Song.
+class Gosu::Song
+  alias initialize_without_window initialize
+
+  def initialize(*args)
+    if args.first.is_a? Gosu::Window
+      args.shift
+      Gosu.deprecation_message("Passing a Window to Song#initialize has been deprecated in Gosu 0.7.17.")
+    end
+    initialize_without_window(*args)
+  end
+end
+
+# Moved some Window-methods to the Gosu::Module
+class Gosu::Window
+  # Class methods that have been turned into module methods.
+  class << self
+    def button_id_to_char(id)
+      Gosu.button_id_to_char(id)
+    end
+
+    def char_to_button_id(ch)
+      Gosu.char_to_button_id(ch)
+    end
+  end
+
+  # Instance methods that have been turned into module methods.
+  %w(draw_line draw_triangle draw_quad
+     flush gl clip_to record
+     transform translate rotate scale
+     button_id_to_char char_to_button_id button_down?).each do |method|
+    define_method method.to_sym do |*args, &block|
+      Gosu.send method, *args, &block
+    end
+  end
+end
+
+# Constants
+module Gosu
+  Gosu.deprecate Window, :set_mouse_position, "Window#mouse_x= and Window#mouse_y="
+  Gosu.deprecate Font, :draw_rot, "Font#draw with Gosu.rotate"
+  
+  # This was renamed because it's not actually a "copyright notice".
+  # (https://en.wikipedia.org/wiki/Copyright_notice)
+  deprecate_const :GOSU_COPYRIGHT_NOTICE, :LICENSES
+  
+  module Button; end
+
+  # Support for KbLeft instead of KB_LEFT and Gp3Button2 instead of GP_3_BUTTON_2.
+  Gosu.constants.grep(/^KB_|MS_|GP_/).each do |new_name|
+    old_name = case new_name
+    when :KB_ISO then "KbISO"
+    when :KB_NUMPAD_PLUS then "KbNumpadAdd"
+    when :KB_NUMPAD_MINUS then "KbNumpadSubtract"
+    when :KB_EQUALS then "KbEqual"
+    when :KB_LEFT_BRACKET then "KbBracketLeft"
+    when :KB_RIGHT_BRACKET then "KbBracketRight"
+    else new_name.to_s.capitalize.gsub(/_(.)/) { $1.upcase }
+    end
+    Gosu.const_set old_name, new_name
+
+    # Also import old-style constants into Gosu::Button.
+    Gosu::Button.const_set old_name, Gosu.const_get(new_name)
+  end
+end

data/lib/gosu/patches.rb

@@ -18,79 +18,6 @@ class ::Numeric
   end
 end
 
-# Backwards compatibility:
-# Support for KbLeft instead of KB_LEFT and Gp3Button2 instead of GP_3_BUTTON_2.
-# Also import old-style constants into Gosu::Button.
-module Gosu::Button; end
-Gosu.constants.grep(/^KB_|MS_|GP_/).each do |c|
-  old_name = case c
-  when :KB_ISO then "KbISO"
-  when :KB_NUMPAD_PLUS then "KbNumpadAdd"
-  when :KB_NUMPAD_MINUS then "KbNumpadSubtract"
-  when :KB_EQUALS then "KbEqual"
-  when :KB_LEFT_BRACKET then "KbBracketLeft"
-  when :KB_RIGHT_BRACKET then "KbBracketRight"
-  else c.to_s.capitalize.gsub(/_(.)/) { $1.upcase }
-  end
-  Gosu.const_set old_name, Gosu.const_get(c)
-  Gosu::Button.const_set old_name, Gosu.const_get(c)
-end
-
-# Backwards compatibility:
-# Passing a Window to initialize and from_text has been deprecated in Gosu 0.9.
-class Gosu::Image
-  alias initialize_without_window initialize
-
-  def initialize(*args)
-    if args[0].is_a? Gosu::Window
-      if args.size == 7
-        initialize_without_window args[1], :tileable => args[2], :rect => args[3..-1]
-      else
-        initialize_without_window args[1], :tileable => args[2]
-      end
-    else
-      initialize_without_window(*args)
-    end
-  end
-
-  class << self
-    alias from_text_without_window from_text
-  end
-
-  def self.from_text(*args)
-    if args.size == 4
-      from_text_without_window(args[1], args[3], :font => args[2])
-    elsif args.size == 7
-      from_text_without_window(args[1], args[3], :font => args[2],
-        :spacing => args[4], :width => args[5], :align => args[6])
-    else
-      from_text_without_window(*args)
-    end
-  end
-end
-
-# Backwards compatibility:
-# Passing a Window to Sample#initialize has been deprecated in Gosu 0.7.17.
-class Gosu::Sample
-  alias initialize_without_window initialize
-
-  def initialize(*args)
-    args.shift if args.first.is_a? Gosu::Window
-    initialize_without_window(*args)
-  end
-end
-
-# Backwards compatibility:
-# Passing a Window to Song#initialize has been deprecated in Gosu 0.7.17.
-class Gosu::Song
-  alias initialize_without_window initialize
-
-  def initialize(*args)
-    args.shift if args.first.is_a? Gosu::Window
-    initialize_without_window(*args)
-  end
-end
-
 # Color constants.
 # This is cleaner than having SWIG define them.
 module Gosu
@@ -119,29 +46,6 @@ module Gosu
 end
 
 class Gosu::Window
-  # Backwards compatibility:
-  # Class methods that have been turned into module methods.
-
-  def self.button_id_to_char(id)
-    Gosu.button_id_to_char(id)
-  end
-
-  def self.char_to_button_id(ch)
-    Gosu.char_to_button_id(ch)
-  end
-
-  # Backwards compatibility:
-  # Instance methods that have been turned into module methods.
-
-  %w(draw_line draw_triangle draw_quad
-     flush gl clip_to record
-     transform translate rotate scale
-     button_id_to_char char_to_button_id button_down?).each do |method|
-    define_method method.to_sym do |*args, &block|
-      Gosu.send method, *args, &block
-    end
-  end
-
   # Call Thread.pass every tick, which may or may not be necessary for friendly co-existence with
   # Ruby's Thread class.
 
@@ -153,10 +57,6 @@ class Gosu::Window
   end
 end
 
-# Backwards compatibility:
-# This was renamed, because it's not actually a "copyright notice" (Wikipedia: https://en.wikipedia.org/wiki/Copyright_notice).
-Gosu::GOSU_COPYRIGHT_NOTICE = Gosu::LICENSES
-
 # Release OpenAL resources during Ruby's shutdown, not Gosu's.
 at_exit do
   begin

data/lib/gosu/swig_patches.rb

@@ -28,7 +28,7 @@ class Gosu::Window
         # Conveniently turn the return value into a boolean result (for needs_cursor? etc).
         defined?(@_exception) ? false : !!send(callback, *args)
       rescue Exception => e
-        # Exit the message loop naturally, then re-throw
+        # Exit the message loop naturally, then re-throw during the next tick.
         @_exception = e
         close
         false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: x86-mingw32
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-03-26 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -30,6 +30,7 @@ files:
 - lib/OpenAL32.dll
 - lib/SDL2.dll
 - lib/gosu.rb
+- lib/gosu/compat.rb
 - lib/gosu/patches.rb
 - lib/gosu/preview.rb
 - lib/gosu/run.rb