chingu 0.9rc4 → 0.9rc5

data/chingu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.9rc4"
+  s.version = "0.9rc5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2011-03-07}
+  s.date = %q{2011-05-28}
   s.description = %q{OpenGL accelerated 2D game framework for Ruby. Builds on Gosu (Ruby/C++) which provides all the core functionality. Chingu adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and stackable game logic.}
   s.email = %q{ippa@rubylicio.us}
   s.extra_rdoc_files = [

data/examples/example28_networking.rb

@@ -16,6 +16,7 @@ class Game < Chingu::Window
     @server = Server.new
     
     @server.start("0.0.0.0", 1234)
+    #@client.connect("192.168.0.1", 1234)
     @client.connect("127.0.0.1", 1234)
   end
   
@@ -50,6 +51,10 @@ class Client < GameStates::NetworkClient
     puts "Client Got: #{msg.inspect}"
   end
   
+  def on_connection_refused
+    puts "connection refused"
+  end
+  
 end
 
 #

data/lib/chingu.rb

@@ -38,7 +38,7 @@ require_all "#{CHINGU_ROOT}/chingu/async_tasks"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.9rc4"
+  VERSION = "0.9rc5"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/basic_game_object.rb

@@ -118,7 +118,7 @@ module Chingu
     # Disable automatic calling of update() and update_trait() each game loop
     #
     def pause!
-      @parent.game_objects.pause_game_object(self)    if @parent && @paused == false
+      @parent.game_objects.pause_game_object(self)    if @parent && !@paused
       @paused = true
     end
     alias :pause :pause!
@@ -127,7 +127,7 @@ module Chingu
     # Enable automatic calling of update() and update_trait() each game loop
     #
     def unpause!
-      @parent.game_objects.unpause_game_object(self)  if @parent && @paused == true
+      @parent.game_objects.unpause_game_object(self)  if @parent && @paused
       @paused = false
     end
     alias :unpause :unpause!

data/lib/chingu/game_states/network_client.rb

@@ -28,7 +28,7 @@ module Chingu
     # Uses nonblocking polling TCP and YAML to communicate. 
     # If your game state inherits from NetworkClient you'll have the following methods available:
     #
-    #   connect(ip, port)               # Start a blocking connection period. only connect() uses previosly given ip:port
+    #   connect(ip, port)               # Start a nonblocking connection. only connect() uses previosly given ip:port
     #   send_data(data)                 # Send raw data on the network, nonblocking
     #   send_msg(whatever ruby data)    # Will get YAML'd and sent to server
     #   handle_incoming_data(max_size)  # Nonblocking read of incoming server data
@@ -72,6 +72,8 @@ module Chingu
     class NetworkClient < Chingu::GameState
       attr_reader :latency, :socket, :packet_counter, :packet_buffer, :ip, :port
       alias_method :address, :ip
+
+      def connected?; @connected; end
       
       def initialize(options = {})
         super
@@ -82,6 +84,7 @@ module Chingu
         @max_read_per_update = options[:max_read_per_update] || 50000
         
         @socket = nil
+        @connected = false
         @latency = 0
         @packet_counter = 0
         @packet_buffer = NetworkServer::PacketBuffer.new
@@ -89,11 +92,35 @@ module Chingu
       
       #
       # Default network loop:
-      # 1) read raw data from server with #handle_incoming_data
-      # 2) #handle_incoming_data call #on_data(data)
-      # 3) #on_data(data) will call #on_msgs(msg)
+      # 1) Try to complete outgoing connection if connect() has been called
+      # 2) read raw data from server with #handle_incoming_data
+      # 3) #handle_incoming_data call #on_data(data)
+      # 4) #on_data(data) will call #on_msgs(msg)
       #
       def update
+  
+        if @socket and not @connected
+          begin
+            # Start/Check on our nonblocking tcp connection
+            @socket.connect_nonblock(@sockaddr)
+          rescue Errno::EINPROGRESS   #rescue IO::WaitWritable
+          rescue Errno::EALREADY
+            if IO.select([@socket],nil,nil,0.1).nil?
+              @socket = nil
+              on_connection_refused
+            end
+          rescue Errno::EISCONN
+            @connected = true
+            on_connect
+          rescue Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EINVAL
+            @socket = nil
+            on_connection_refused
+          rescue Errno::ETIMEDOUT
+            @socket = nil
+            on_timeout
+          end
+        end
+        
         handle_incoming_data
         super
       end
@@ -109,16 +136,9 @@ module Chingu
         @ip = ip      if ip
         @port = port  if port
     
-        begin
-          status = Timeout::timeout(@timeout) do
-            @socket = TCPSocket.new(@ip, @port)
-            on_connect
-          end
-        rescue Errno::ECONNREFUSED
-          on_connection_refused
-        rescue Timeout
-          on_timeout
-        end
+        # Set up our @socket, update() will handle the actual nonblocking connection
+        @socket = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
+        @sockaddr = Socket.sockaddr_in(@port, @ip)
         
         return self
       end
@@ -127,6 +147,7 @@ module Chingu
       # Called when connect() fails with connection refused (closed port)
       #
       def on_connection_refused
+        puts "[on_connection_refused() #{@ip}:#{@port}]"  if @debug
         connect(@ip, @port)
       end
 
@@ -134,6 +155,7 @@ module Chingu
       # Called when connect() recieves no initial answer from server
       #
       def on_timeout
+        puts "[on_timeout() #{@ip}:#{@port}]"  if @debug
         connect(@ip, @port)
       end
       
@@ -163,6 +185,8 @@ module Chingu
             packet, sender = @socket.recvfrom(amount)
             on_data(packet)        
           rescue Errno::ECONNABORTED, Errno::ECONNRESET
+            @connected = false
+            @socket = nil
             on_disconnect
           end
         end
@@ -195,6 +219,8 @@ module Chingu
           @socket.write([data.length].pack(NetworkServer::PACKET_HEADER_FORMAT))
           @socket.write(data)
         rescue Errno::ECONNABORTED, Errno::ECONNRESET, Errno::EPIPE, Errno::ENOTCONN
+          @connected = false
+          @socket = nil
           on_disconnect
         end
       end

data/lib/chingu/game_states/network_server.rb

@@ -111,8 +111,7 @@ module Chingu
         end
       end
 
-      attr_reader :socket, :sockets, :ip, :port
-
+      attr_reader :socket, :sockets, :ip, :port, :max_connections
       alias_method :address, :ip
       
       def initialize(options = {})
@@ -121,10 +120,11 @@ module Chingu
         @ip = options[:ip] || "0.0.0.0"
         @port = options[:port] || DEFAULT_PORT
         @debug = options[:debug]
+        @max_read_per_update = options[:max_read_per_update] || 20000
+        @max_connections = options[:max_connections] || 256
+        
         @socket = nil
         @sockets = []
-        @max_read_per_update = options[:max_read_per_update] || 20000
-
         @packet_buffers = Hash.new
       end
       
@@ -197,9 +197,13 @@ module Chingu
       def handle_incoming_connections
         begin
           while socket = @socket.accept_nonblock
-            @sockets << socket
-            @packet_buffers[socket] = PacketBuffer.new
-            on_connect(socket)
+            if @sockets.size < @max_connections
+              @sockets << socket
+              @packet_buffers[socket] = PacketBuffer.new
+              on_connect(socket)
+            else
+              socket.close
+            end
           end
         rescue IO::WaitReadable, Errno::EINTR
         end
@@ -215,7 +219,7 @@ module Chingu
             begin
               packet, sender = socket.recvfrom(max_size)
               on_data(socket, packet)
-            rescue Errno::ECONNABORTED, Errno::ECONNRESET
+            rescue Errno::ECONNABORTED, Errno::ECONNRESET, IOError
               @packet_buffers[socket] = nil
 
               on_disconnect(socket)
@@ -271,11 +275,21 @@ module Chingu
       #
       def disconnect_client(socket)
         socket.close
+        @sockets.delete socket
+        @packet_buffers.delete socket
+        on_disconnect(socket)
+      rescue Errno::ENOTCONN
       end
 
       # Ensure that the buffer is cleared of data to write (call at the end of update or, at least after all sends).
       def flush
-        @sockets.each {|s| s.flush }
+        @sockets.each do |socket| 
+          begin
+            socket.flush 
+          rescue IOError
+            disconnect_client(socket)
+          end
+        end
       end
       
       #
@@ -283,10 +297,12 @@ module Chingu
       #
       def stop
         return unless @socket
-        begin
+        
+        @sockets.each {|socket| disconnect_client(socket) }
+          @sockets = []
           @socket.close
+          @socket = nil
         rescue Errno::ENOTCONN
-        end
       end
       alias close stop
 

data/lib/chingu/traits/sprite.rb

@@ -71,7 +71,9 @@ module Chingu
       def to_s
         "#{self.class.to_s} @ #{x.to_i} / #{y.to_i} " <<
         "(#{width.to_i} x #{height.to_i}) - " <<
-        " ratio: #{sprintf("%.2f",width/height)} scale: #{sprintf("%.2f", factor_x)}/#{sprintf("%.2f", factor_y)} angle: #{angle.to_i} zorder: #{zorder} alpha: #{alpha}"
+        "ratio: #{sprintf("%.2f",width.to_f/height.to_f)} " << 
+        "scale: #{sprintf("%.2f", factor_x)}/#{sprintf("%.2f", factor_y)} " <<
+        "angle: #{angle.to_i} zorder: #{zorder} alpha: #{alpha}"
       end
 
       def color=(color)
@@ -205,7 +207,7 @@ module Chingu
       # Disable automatic calling of draw and draw_trait each game loop
       #
       def hide!
-        @parent.game_objects.hide_game_object(self)  if @parent && @visible == true
+        @parent.game_objects.hide_game_object(self)  if @parent && @visible
         @visible = false
       end
     
@@ -213,7 +215,7 @@ module Chingu
       # Enable automatic calling of draw and draw_trait each game loop
       #
       def show!
-        @parent.game_objects.show_game_object(self)  if @parent && @visible == false
+        @parent.game_objects.show_game_object(self)  if @parent && !@visible
         @visible = true
       end
     

data/lib/chingu/traits/timer.rb

@@ -24,16 +24,16 @@ module Chingu
   
     #
     # A chingu trait providing timer-methods to its includer, examples:
-    #   during(300) { @color = Color.new(0xFFFFFFFF) }   # forces @color to white ever update for 300 ms
-    #   after(400) { self.destroy! }                     # destroy object after 400 ms
-    #   between(1000,2000) { self.rotate(10) }           # starting after 1 second, call rotate(10) each update during 1 second
+    # during(300) { @color = Color.new(0xFFFFFFFF) } # forces @color to white ever update for 300 ms
+    # after(400) { self.destroy! } # destroy object after 400 ms
+    # between(1000,2000) { self.rotate(10) } # starting after 1 second, call rotate(10) each update during 1 second
     #
     # All the above can be combined with a 'then { do_something }'. For example, a classic shmup damage effect:
-    #   during(100) { @color.alpha = 100 }.then { @color.alpha = 255 }
+    # during(100) { @color.alpha = 100 }.then { @color.alpha = 255 }
     #
     module Timer
     
-      def setup_trait(options)        
+      def setup_trait(options)
         #
         # Timers are saved as an array of arrays where each entry contains:
         # [name, start_time, end_time (or nil if one-shot), &block]
@@ -44,7 +44,7 @@ module Chingu
       end
 
       #
-      # Executes block each update during 'time' milliseconds 
+      # Executes block each update during 'time' milliseconds
       #
       def during(time, options = {}, &block)
         if options[:name]
@@ -59,7 +59,7 @@ module Chingu
       end
       
       #
-      # Executes block after 'time' milliseconds 
+      # Executes block after 'time' milliseconds
       #
       def after(time, options = {}, &block)
         if options[:name]
@@ -89,7 +89,7 @@ module Chingu
       end
 
       #
-      # Executes block every 'delay' milliseconds 
+      # Executes block every 'delay' milliseconds
       #
       def every(delay, options = {}, &block)
         if options[:name]
@@ -98,13 +98,17 @@ module Chingu
         end
         
         ms = Gosu::milliseconds()
-        @_repeating_timers << [options[:name], ms + delay, delay, block]
+        @_repeating_timers << [options[:name], ms + delay, delay, options[:during] ? ms + options[:during] : nil, block]
+        if options[:during]
+          @_last_timer = [options[:name], nil, ms + options[:during]]
+          return self
+        end
       end
 
       #
-      # Executes block after the last timer ends 
+      # Executes block after the last timer ends
       # ...use one-shots start_time for our trailing "then".
-      # ...use durable timers end_time for our trailing "then".      
+      # ...use durable timers end_time for our trailing "then".
       #
       def then(&block)
         start_time = @_last_timer[2].nil? ? @_last_timer[1] : @_last_timer[2]
@@ -142,16 +146,20 @@ module Chingu
         ms = Gosu::milliseconds()
         
         @_timers.each do |name, start_time, end_time, block|
-          block.call  if ms > start_time && (end_time == nil || ms < end_time)
+          block.call if ms > start_time && (end_time == nil || ms < end_time)
         end
                 
         index = 0
-        @_repeating_timers.each do |name, start_time, delay, block|
+        @_repeating_timers.each do |name, start_time, delay, end_time, block|
           if ms > start_time
             block.call  
-            @_repeating_timers[index] = [name, ms + delay, delay, block]
+            @_repeating_timers[index] = [name, ms + delay, delay, end_time, block]
+          end
+          if end_time && ms > end_time
+            @_repeating_timers.delete_at index
+          else
+            index += 1
           end
-          index += 1
         end
 
         # Remove one-shot timers (only a start_time, no end_time) and all timers which have expired

data/lib/chingu/viewport.rb

@@ -159,7 +159,7 @@ module Chingu
       a = @game_area
       %/
 Vieport
- Position: #{@x}, #{y}
+ Position: #{@x}, #{@y}
  Game area: #{a.x},#{a.y},#{a.width},#{a.height}"        
  Target: #{@target_x}, #{@target_y}
       /

data/spec/chingu/game_object_list_spec.rb

@@ -63,6 +63,13 @@ module Chingu
         @game.game_objects.draw
       end
 
+      it "should keep track of visible game objects with show!()" do
+        go = GameObject.create(:visible => false)
+        go.show!
+        go.should_receive(:draw)
+        @game.game_objects.draw
+      end
+
       it "should call draw() on all visible game objects" do
         GameObject.create.should_receive(:draw)
         GameObject.create(:visible => false).should_not_receive(:draw)

data/spec/chingu/input_spec.rb

@@ -8,6 +8,7 @@ describe Chingu::Input do
     gosu_inputs = input_names.inject({}) {|hash, name| hash[name] = Gosu.const_get name; hash }
 
     gosu_inputs.each_value do |code|
+      next if code==0 # todo, check into this, spooner? ;)
       symbols = described_class::CONSTANT_TO_SYMBOL[code]
       symbols.should_not be_empty
       symbols.each {|s| s.should be_kind_of Symbol }

data/spec/chingu/network_spec.rb

@@ -22,6 +22,15 @@ module Chingu
         @server.stop
       end
 
+      it "client should timeout when connecting to blackhole ip" do
+        @client = Chingu::GameStates::NetworkClient.new(:ip => "1.2.3.4", :port => 1234, :debug => true)
+        @client.connect
+        
+        #@client.should_receive(:on_timeout) ## gives on_connection_refused instead, kind of ok.
+        @client.should_receive(:on_connection_refused)
+        @client.update while @client.socket
+      end
+
       it "should call on_start_error() if failing" do
         @server = described_class.new(:ip => "1.2.3.999", :port => 12345678) # crazy ip:port
         @server.should_receive(:on_start_error)
@@ -38,6 +47,8 @@ module Chingu
         @client.should_receive(:on_connect)
         @server.start
         @client.connect
+
+        @client.update until @client.connected?
         @server.update
         
         @client.stop
@@ -51,6 +62,7 @@ module Chingu
         @client = described_class.new(:ip => "127.0.0.1", :port => 55421) # closed we assume
         @client.should_receive(:on_connection_refused)
         @client.connect
+        5.times { @client.update }
       end
     end
     
@@ -59,6 +71,8 @@ module Chingu
         @server = Chingu::GameStates::NetworkServer.new(:port => 9999).start
         @client = Chingu::GameStates::NetworkClient.new(:ip => "127.0.0.1", :port => 9999).connect
         @client2 = Chingu::GameStates::NetworkClient.new(:ip => "127.0.0.1", :port => 9999).connect
+        @client.update until @client.connected?
+        @client2.update until @client2.connected?
       end
       
       after :each do
@@ -73,7 +87,7 @@ module Chingu
             data.each {|packet| @server.should_receive(:on_msg).with(an_instance_of(TCPSocket), packet) }
             data.each {|packet| @client.send_msg(packet) }
 
-            @server.update
+            5.times { @server.update }
           end
         end
       end
@@ -85,7 +99,7 @@ module Chingu
             @server.update # Accept the client before sending, so we know of its socket.
             data.each { |packet| @server.send_msg(@server.sockets[0], packet) }
 
-            @client.update
+            5.times { @client.update }
           end
         end
       end
@@ -102,8 +116,10 @@ module Chingu
 
             data.each {|packet| @server.broadcast_msg(packet) }
 
-            @client.update
-            @client2.update
+            5.times do
+              @client.update
+              @client2.update
+            end
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chingu
 version: !ruby/object:Gem::Version
-  version: 0.9rc4
+  version: 0.9rc5
   prerelease: 3
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-07 00:00:00.000000000 +01:00
+date: 2011-05-28 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &25121820 !ruby/object:Gem::Requirement
+  requirement: &24886884 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.7.27.1
   type: :runtime
   prerelease: false
-  version_requirements: *25121820
+  version_requirements: *24886884
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25121472 !ruby/object:Gem::Requirement
+  requirement: &24886572 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *25121472
+  version_requirements: *24886572
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &25120920 !ruby/object:Gem::Requirement
+  requirement: &24886188 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25120920
+  version_requirements: *24886188
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &25120464 !ruby/object:Gem::Requirement
+  requirement: &24885792 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25120464
+  version_requirements: *24885792
 description: OpenGL accelerated 2D game framework for Ruby. Builds on Gosu (Ruby/C++)
   which provides all the core functionality. Chingu adds simple yet powerful game
   states, prettier input handling, deployment safe asset-handling, a basic re-usable