gamebox 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 596c34ae3dddc838592f0ad6446aa76e9707566f
-  data.tar.gz: 9841d8e860c8eb0d21843cde072b64d9cdd5855a
+  metadata.gz: 487cfbc0092a899c74c2f07629e61103cf260b04
+  data.tar.gz: af6c816285ad7ec45b7c2d55210a440678369da3
 SHA512:
-  metadata.gz: 383de6900d2dff39287008d85a5e4633eefbac6207ae290d0340007b6326645bbb276d25d74e5af5a3d8817a9c296fd73e92cfa4491c651956cbb4b5ff691557
-  data.tar.gz: 412dbf66737bb8ca48f32de711626eab89c958ff2f7faba758ef1da6cc53fe4e1f682f041f49d3144671041a01677a440ed69a3984093d0588ae2aebbed4c358
+  metadata.gz: d5697dae2d2c4445f3ad9a3f80d934d7441f7c366e67385b7e217b834c06032e14a591f8b8b3ad3ae2fe69a479b9b1ab6c843acf0e0b5dfa5b1ce51ebb6949ea
+  data.tar.gz: a919445492b6544466be9732f41db72f0700dfe5034aa8ae4f6350b0618f71f07ef9cbcb0e7d0754e899317b3aa9308aea47e04a508b3fd684cbd8a4f1029e85

data/README.md

@@ -1,5 +1,6 @@
 # Gamebox
 
+[![Gem Version](https://badge.fury.io/rb/gamebox.svg)](http://badge.fury.io/rb/gamebox)
 [![Gamebox Build Status](https://secure.travis-ci.org/shawn42/gamebox.png)](http://travis-ci.org/shawn42/gamebox)
 [![Gamebox Deps Status](https://gemnasium.com/shawn42/gamebox.png)](https://gemnasium.com/shawn42/gamebox)
 [![Code Climate](https://codeclimate.com/github/shawn42/gamebox.png)](https://codeclimate.com/github/shawn42/gamebox)

data/gamebox.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "pry", '~>0.9.7'
   s.add_development_dependency "pry-remote"
-  s.add_development_dependency "rspec-core"
-  s.add_development_dependency "rspec-mocks"
-  s.add_development_dependency "rspec-expectations"
+  s.add_development_dependency "rspec-core", '~>2.13.0'
+  s.add_development_dependency "rspec-mocks", "~>2.13.0"
+  s.add_development_dependency "rspec-expectations", '~>2.13.0'
   s.add_development_dependency "mocha"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"

data/lib/gamebox/core/tween_manager.rb

@@ -0,0 +1,23 @@
+class TweenManager
+  construct_with :director
+
+  def initialize
+    @tweens = []
+    director.when :update, &method(:update)
+  end
+
+  def tween_properties(actor, properties, time, tween_style=Tween::Linear)
+    tween = TweenWrapper.new(actor, properties, time, tween_style)
+    @tweens << tween
+    # return it so we can cancel it
+    tween
+  end
+
+  def update(time, time_in_secs)
+    @tweens.each do |tween|
+      tween.update time unless tween.done?
+    end
+    @tweens.reject! &:done?
+  end
+
+end

data/lib/gamebox/core/tween_wrapper.rb

@@ -0,0 +1,28 @@
+class TweenWrapper
+
+  def initialize(actor, property_targets, time, style)
+    @actor = actor
+    @actor.when :remove_me, &method(:cancel!)
+    @props = property_targets.keys
+    initial_values = @props.map{|pr|actor.send(pr)}
+    target_values = @props.map{|pr|property_targets[pr]}
+    @tween = Tween.new(initial_values, target_values, style, time)
+  end
+
+  def update(time)
+    @tween.update time
+    @props.each.with_index do |prop, i|
+      # maybe use update_attributes instead?
+      @actor.send("#{prop}=", @tween[i])
+    end
+  end
+
+  def cancel!
+    @cancel = true
+  end
+
+  def done?
+    @tween.done || @cancel
+  end
+end
+

data/lib/gamebox/lib/rect.rb

@@ -498,10 +498,9 @@ class Rect < Array
 
   # True if the caller and the given Rect overlap (or touch) at all.
   def collide_rect?(rect)
-    nself = self #.normalize
-    rect  = Rect.new_from_object(rect)#.normalize!
-    return ((nself.l >= rect.l && nself.l <= rect.r) or (rect.l >= nself.l && rect.l <= nself.r)) &&
-           ((nself.t >= rect.t && nself.t <= rect.b) or (rect.t >= nself.t && rect.t <= nself.b))
+    rect = Rect.new_from_object(rect)
+    ((l >= rect.l && l <= rect.r) or (rect.l >= l && rect.l <= r)) &&
+    ((t >= rect.t && t <= rect.b) or (rect.t >= t && rect.t <= b))
   end
 
   # True if the given Rect is totally within the caller. Borders may

data/lib/gamebox/tasks/gamebox_tasks.rake

@@ -22,7 +22,12 @@ end
 desc "Bundle in all required gems"
 task :bundle do |t|
   sh "bundle package"
-  sh "bundle install vendor/bundle --disable-shared-gems"
+
+  if Bundler::VERSION =~ /^0/
+    sh "bundle install vendor/bundle --disable-shared-gems"
+  else
+    sh "bundle install --deployment"
+  end
 end
 
 desc "Run specs"

data/lib/gamebox/version.rb

@@ -2,7 +2,7 @@ module Gamebox
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 1
+    TINY  = 2
     RC    = 0
 
     if RC > 0

data/spec/lib/rect_spec.rb

@@ -0,0 +1,28 @@
+require 'helper'
+
+describe Rect do  
+  describe "#collide_rect?" do
+    subject { Rect.new 0,0,3,4 }
+
+    it 'finds collisions' do
+      collides_with(0,0,3,4)
+      collides_with(1,0,3,4)
+      collides_with(0,1,3,4)
+      collides_with(1,1,2,3)
+
+      does_not_collide_with(4,5,2,3)
+      does_not_collide_with(-2,-2,1,1)
+      does_not_collide_with(-2,2,1,1)
+    end
+
+    private
+    def collides_with(x,y,w,h)
+      subject.collide_rect?(Rect.new(x,y,w,h)).should be_true
+    end
+
+    def does_not_collide_with(x,y,w,h)
+      subject.collide_rect?(Rect.new(x,y,w,h)).should be_false
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamebox
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Shawn Anderson
@@ -10,286 +10,286 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: publisher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: conject
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: tween
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kvo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: polaris
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chipmunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Framework for building and distributing games using Gosu
@@ -377,6 +377,8 @@ files:
 - lib/gamebox/core/stage_manager.rb
 - lib/gamebox/core/svg_document.rb
 - lib/gamebox/core/timer_manager.rb
+- lib/gamebox/core/tween_manager.rb
+- lib/gamebox/core/tween_wrapper.rb
 - lib/gamebox/core/viewport.rb
 - lib/gamebox/core/wrapped_screen.rb
 - lib/gamebox/data/fonts/Asimov.ttf
@@ -466,6 +468,7 @@ files:
 - spec/fixtures/snelpling/jump/3.png
 - spec/helper.rb
 - spec/lib/class_finder_spec.rb
+- spec/lib/rect_spec.rb
 - spec/views/graphical_actor_view_spec.rb
 - templates/actor_template.erb
 - templates/app/.gitignore
@@ -496,12 +499,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -558,4 +561,5 @@ test_files:
 - spec/fixtures/snelpling/jump/3.png
 - spec/helper.rb
 - spec/lib/class_finder_spec.rb
+- spec/lib/rect_spec.rb
 - spec/views/graphical_actor_view_spec.rb