hasu 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a45d0dbe556192cdd7439d67b88b687a6169161b
-  data.tar.gz: 6f286b979b972a9f4329892d0f0e31280749894f
+  metadata.gz: 89e96997e9e719db654653cd173a498b3305b4da
+  data.tar.gz: 4e0929abf8fca155cf9c5df2f67bda0b938e66bd
 SHA512:
-  metadata.gz: d22f2e8e1f42f3dc0cca7f44bb42d125b8519e8a3518ac1bf7be26888d1c1b277a1888133e62ba2a369f899f58809b82d684317db5bcd8eabcb2f70afb1b062d
-  data.tar.gz: f0b3fe40df87ac9840e4a7ed5b6a5d111ca14c52542f45adb199915f4d7b8bc0f51bd864b5463937048e5d78875207a15fdbf83bb2b5ae6ff6dd520f4fb17e68
+  metadata.gz: 2d9b059732fc224e354955f7185add04fa1b0777a0dc5237faff70d510fd67f0498236e176454909d65da7485dfc488c68e3a6f48e24b1ff76609ff9ecefc2e7
+  data.tar.gz: 5f2b5f95aa172a674ff0fc33dcd52be08e012e6afb9ef9ff68e27c3b193565c5ce6897215b8b5423f90f860a81724f27742beb7bf2af451b039c1dcf3d29646e

data/lib/hasu/guard.rb

@@ -0,0 +1,55 @@
+module Hasu
+  module Guard
+    def update(*)
+      if Hasu.reload!
+        Hasu.error = nil
+      end
+      unless Hasu.error
+        super
+      end
+    rescue => e
+      Hasu.error = e
+    end
+
+    def reset
+      super  if defined?(super)
+      Hasu.error = nil
+    rescue => e
+      Hasu.error = e
+    end
+
+    def draw(*)
+      if Hasu.error
+        ([Hasu.error.inspect] + Hasu.error.backtrace).each_with_index do |line, i|
+          _hasu_font.draw(line.gsub("\n",''), 10, 10 + i * 16, 0)
+        end
+      else
+        begin
+          super
+        rescue => e
+          Hasu.error = e
+          draw
+        end
+      end
+    end
+
+    def _hasu_font
+      @_hasu_font ||= Gosu::Font.new(self, Gosu::default_font_name, 16)
+    end
+
+    def button_down(id)
+      case id
+      when Gosu::KbEscape
+        close
+      when Gosu::Window.char_to_button_id('r')
+        reset
+      else
+        begin
+          super(id)
+        rescue => e
+          Hasu.error = e
+        end
+      end
+    end
+  end
+end

data/lib/hasu/version.rb

@@ -1,3 +1,3 @@
 module Hasu
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/hasu/window.rb

@@ -1,71 +1,27 @@
 require "gosu"
-
-class Hasu::Window < Gosu::Window
-  def self.inherited(other)
-    includer = caller.first.split(":").first
-    Hasu.reloads[includer] = File.mtime(includer)
-  end
-
-  def self.run
-    unless @running
-      @running = true
-      new.show
+require "hasu/guard"
+
+module Hasu
+  class Window < Gosu::Window
+    def self.inherited(other)
+      includer = caller.first.split(":").first
+      Hasu.reloads[includer] = File.mtime(includer)
+      if other.respond_to?(:prepend, true)
+        other.send(:prepend, Hasu::Guard)
+      else
+        warn "Most of Hasu's nifty features (e.g. error catching, file reloading) are only available on Ruby >= 2.0."
+      end
     end
-  end
 
-  def initialize(*)
-    super
-    reset
-  end
-
-  def update(*)
-    if Hasu.reload!
-      Hasu.error = nil
-    end
-    unless Hasu.error
+    def initialize(*)
       super
+      reset
     end
-  rescue => e
-    Hasu.error = e
-  end
-
-  def reset
-    super  if defined?(super)
-    Hasu.error = nil
-  rescue => e
-    Hasu.error = e
-  end
-
-  def draw(*)
-    if Hasu.error
-      ([Hasu.error.inspect] + Hasu.error.backtrace).each_with_index do |line, i|
-        _hasu_font.draw(line.gsub("\n",''), 10, 10 + i * 16, 0)
-      end
-    else
-      begin
-        super
-      rescue => e
-        Hasu.error = e
-        draw
-      end
-    end
-  end
 
-  def _hasu_font
-    @_hasu_font ||= Gosu::Font.new(self, Gosu::default_font_name, 16)
-  end
-
-  def button_down(id)
-    case id
-    when Gosu::KbEscape
-      close
-    when Gosu::Window.char_to_button_id('r')
-      reset
-    else
-      begin
-        super(id)
-      rescue => e
-        Hasu.error = e
+    def self.run
+      unless @running
+        @running = true
+        new.show
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hasu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michael Fairley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -68,6 +68,7 @@ files:
 - example/rect.rb
 - hasu.gemspec
 - lib/hasu.rb
+- lib/hasu/guard.rb
 - lib/hasu/version.rb
 - lib/hasu/window.rb
 homepage: https://github.com/michaelfairley/hasu