ruby_snake 0.0.5 → 0.1.0

data/lib/ruby_snake/client.rb

@@ -6,36 +6,23 @@ module RubySnake
       attr_accessor :message, :receive
 
       def connect(host='127.0.0.1')
-        @message = '0'
+        @message ||= '0'
   
-        loop do
-          sleep 0.1
+        server = TCPSocket.new host, 2000 
 
-          begin
-            server = TCPSocket.new host, 2000 
-          rescue => err
-            @message = '10'
-            break
-          end
+        server.send @message, 0
+        server_message = server.recv(4096) 
 
-          server.send @message, 0
-          server_message = server.recv(4096) 
-
-          case server_message
-          when '0'
-            @message = '1'
-          when '1'
-            @message = ([Game.snake.food] + Game.snake.body).join(',').to_s if Game.snake
-          when '2'
-            Game.win
-            break
-          when '3'
-            Game.lose
-            break
-          else
-            @message = ([Game.snake.food] + Game.snake.body).join(',').to_s if Game.snake
-            @receive = server_message.split(',').map(&:to_i).each_slice(2).to_a if server_message
-          end
+        case server_message
+        when '0'
+          @message = ([Game.snake.food] + Game.snake.body).join(',').to_s if Game.snake
+        when '1'
+          Game.win
+        when '2'
+          Game.lose
+        else
+          @message = ([Game.snake.food] + Game.snake.body).join(',').to_s if Game.snake
+          @receive = server_message.split(',').map(&:to_i).each_slice(2).to_a if server_message
         end
       end
     end

data/lib/ruby_snake/game.rb

@@ -6,15 +6,16 @@ module RubySnake
       # common
        
       def start(role=nil)
-        self.role = role unless role.nil?
+        self.role = role
         @time_flag = Time.now.to_f
-        if role == 'server'
-          start_server_thread
+        if role.nil?
+          UI.draw
+        elsif role == 'server'
+          Server.start
         elsif role == 'client'
-          start_client_thread
+          get_host
+          UI::Two.draw
         end
-
-        UI.draw
       end
        
       def choise_role
@@ -145,14 +146,14 @@ module RubySnake
       end
 
       def operation
-        @operation
+        @operation ||= RIGHT
       end
 
       def direction_opposite? o 
-        return true if @operation == UP && o == DOWN
-        return true if @operation == DOWN  && o == UP
-        return true if @operation == LEFT && o == RIGHT
-        return true if @operation == RIGHT && o == LEFT
+        return true if operation == UP && o == DOWN
+        return true if operation == DOWN  && o == UP
+        return true if operation == LEFT && o == RIGHT
+        return true if operation == RIGHT && o == LEFT
       end
 
       def pause?
@@ -189,7 +190,7 @@ module RubySnake
       end
 
       def win!
-        role_class.message = '3'
+        role_class.message = '1'
         Ncurses.nodelay window, false
         UI::Two.draw_win
         sleep 1
@@ -205,7 +206,6 @@ module RubySnake
       end
 
       def lose!
-        role_class.message = '2'
         Ncurses.nodelay window, false
         UI::Two.draw_lose
         sleep 1
@@ -242,37 +242,16 @@ module RubySnake
         !!self.role
       end
 
-      def countdown
-        3.times do |i|
-          puts 3 - i
-          sleep 1
-        end
+      def host
+        @host
       end
 
-      def start_server_thread
+      def get_host
         system 'clear'
-        puts '=' * 40
-        puts 'Waiting for a connection...' 
-        puts '=' * 40
-        Thread.new { Server.start }
-        loop do
-          sleep 0.2
-          if Server.message != '0'
-            countdown
-            break
-          end
-        end
-      end
-
-      def start_client_thread
-        host = connected_host
-        Thread.new { Client.connect host }
-        sleep 0.35
-        raise 'Connect failed' if Client.message == '10'
+        @host = connected_host
         puts '=' * 40
         puts "Connect to #{host}..." 
         puts '=' * 40
-        countdown
       end
     end
   end

data/lib/ruby_snake/server.rb

@@ -9,28 +9,51 @@ module RubySnake
         @message = '0'
 
         server = TCPServer.new 2000
-        loop do
-          client = server.accept
-          if client
-            client_message = client.recv(4096)
-            client.send @message, 0
-
-            case client_message
-            when '0'
-              @message = '1'
-            when '1'
-              @message = ([Game.snake.food] + Game.snake.body).join(',').to_s if Game.snake
-            when '2'
-              Game.win
-              break
-            when '3'
-              Game.lose
-              break
-            else
-              @message = ([Game.snake.food] + Game.snake.body).join(',').to_s if Game.snake
-              @receive = client_message.split(',').map(&:to_i).each_slice(2).to_a if client_message
+
+        UI::Two.init_windows
+        Ncurses.nodelay UI::Two.window, true
+
+        begin 
+          system 'clear'
+          puts '=' * 40
+          puts 'Waiting for a connection...' 
+          puts '=' * 40
+          loop do
+            client = server.accept
+
+            if client
+              client_message = client.recv(4096)
+              client.send @message, 0
+
+              case client_message
+              when '0'
+                @message = ([Game.snake.food] + Game.snake.body).join(',').to_s if Game.snake
+              when '1'
+                Game.win
+              when '2'
+                Game.lose
+              else
+                @message = ([Game.snake.food] + Game.snake.body).join(',').to_s if Game.snake
+                @receive = client_message.split(',').map(&:to_i).each_slice(2).to_a if client_message
+              end
+
+              UI::Two.draw_map
+              operation = Game.listen_operation
+              if Game.lose?
+                Game.lose!
+                break
+              elsif Game.win?
+                Game.win!
+                break
+              elsif !UI::Two.snake.move(operation)
+                @message = '1'
+              elsif UI::Two.score == 0
+                @message = '2'
+              end
             end
           end
+        ensure
+          Ncurses.endwin
         end
       end
     end

data/lib/ruby_snake/ui/two.rb

@@ -7,6 +7,7 @@ module RubySnake
           remote_window.border *([0]*8) 
           local_window.noutrefresh
           remote_window.noutrefresh
+          @snake ||= Snake.new local_window.getmaxx, local_window.getmaxy
         end
 
         def local_window
@@ -26,7 +27,7 @@ module RubySnake
         end
 
         def snake
-          @snake ||= Snake.new local_window.getmaxx, local_window.getmaxy
+          @snake 
         end
 
         def window
@@ -102,16 +103,9 @@ module RubySnake
             remote_window.color_set 2, nil
             head = snake.shift
             remote_display head, '@'
-            snake.each do |body|
-              remote_display body, 'o'
-            end
 
             remote_window.noutrefresh
-            remote_display head, ' '
-
-            snake.each do |body|
-              remote_display body, ' '
-            end
+            remote_display snake.last, ' '
           rescue
             nil
           end
@@ -129,24 +123,19 @@ module RubySnake
           Ncurses.nodelay window, true
           begin 
             loop do
-              draw_map
-              operation = Game.listen_operation
+              Client.connect Game.host
 
-              if Game.win?
-                draw_win
-                sleep 1
-                window.getch
-                break
-              elsif Game.lose?
-                draw_lose
-                sleep 1
-                window.getch
-                break
-              end
-              if !snake.move(operation)
+              draw_map 
+
+              operation = Game.listen_operation
+              if !snake.move(operation) || Game.lose?
+                Game.role_class.message = '1'
+                Client.connect
                 Game.lose!
                 break
-              elsif score == 0
+              elsif score == 0 || Game.win?
+                Game.role_class.message = '2'
+                Client.connect Game.host
                 Game.win!
                 break
               end

data/lib/ruby_snake/version.rb

@@ -1,3 +1,3 @@
 module RubySnake
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_snake
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ncurses-ruby