snek 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9b064541769fc02d79b90d8394c226c70d34199
-  data.tar.gz: 9271b210952c5ab66e427c656bf2b8fea88aade2
+  metadata.gz: d1606a1438e6dd977c50ac59a33a5fb808fdd298
+  data.tar.gz: f6452fc4942317d8c1d5419c63b7ad0b9b87aecb
 SHA512:
-  metadata.gz: 54624bbbd428c6bf48039183ddab94c0df99988a7b26053a78ae3644cd286dfc68efca675f44bf58cf1a7381187c766096b8255cf909deb477e2049ff6addd75
-  data.tar.gz: 91a641b05a9bb3f8d3acbff651e6703b235675dfc17e7436ed9bb5e8a35fc7efa895324a7d51a9405f4218fad2ca8903d360608f84b8798cdc52c2cb195b8785
+  metadata.gz: 6c4b63abcf96d341c3603e98e4c6a91f8fc9341a9a011513b0661e1320ce539c0d60b16e69407ebfc669eb9bc533cd46980b9989efbc74db6c1708f186333302
+  data.tar.gz: f50692a188a075d175758c43516b51938d26f8f392d18a3f2d1fc5fba983f19b94f0e1c07c9c30fdc26d8cc77f59ea022f1612040c17416a795f0056fd64bd5f

data/lib/game.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require 'io/console'
+require 'terminal_game_engine'
 
 Dir[File.dirname(__FILE__) + "/**/*.rb"].each { |f| require f }
 
@@ -17,16 +18,16 @@ module Snek
     end
 
     def start
-      GameEngine::Sound.play 'startup.wav'
+      play_sound 'startup'
 
-      @network = GameEngine::Network.new logger: logger
+      @network = TerminalGameEngine::Network.new logger: logger
       @network.open_socket
 
       reset_snek
 
-      GameEngine::Frame.setup
+      TerminalGameEngine::Frame.setup
 
-      GameEngine::Engine.tick do |tick|
+      TerminalGameEngine::Engine.tick do |tick|
         @tick = tick
 
         render
@@ -82,17 +83,15 @@ module Snek
     end
 
     def rows
-      GameEngine::Window.rows
       25
     end
 
     def columns
-      GameEngine::Window.columns
       80
     end
 
     def render
-      @frame = GameEngine::Frame.new columns, rows + 10
+      @frame = TerminalGameEngine::Frame.new columns, rows + 10
 
       if @tick % 2 == 0 || %w[e w].include?(@snek.direction)
         new_position = move_snek
@@ -106,7 +105,7 @@ module Snek
         check_border_collision(border, new_position)
         check_food_collision(new_position)
 
-        GameEngine::Input.call do |key|
+        TerminalGameEngine::Input.call do |key|
           if key
             return if @tick == @input_in_tick
             @input_in_tick = @tick
@@ -115,15 +114,15 @@ module Snek
           head = @snek.last
 
           case key
-          when 'q'.ord, 27, 3 # escape, ctrl-c
+          when 'q'.ord, TerminalGameEngine::Input::Keys::ESCAPE, TerminalGameEngine::Input::Keys::CTRL_C
             exit
-          when 119 # W up
+          when 'w'.ord
             @snek.direction = 'n' if @snek.direction != 's'
-          when 115 # S down
+          when 's'.ord
             @snek.direction = 's' if @snek.direction != 'n'
-          when 100 # D right
+          when 'd'.ord
             @snek.direction = 'e' if @snek.direction != 'w'
-          when 97  # A left
+          when 'a'.ord
             @snek.direction = 'w' if @snek.direction != 'e'
           end
         end
@@ -142,7 +141,7 @@ module Snek
 
     def check_food_collision(new_position)
       if @food == new_position
-        GameEngine::Sound.play 'pickup.wav'
+        play_sound 'pickup'
         @snek.snek_length += 1
         @local_food_position = random_position
         @food_eaten_count += 1
@@ -270,8 +269,13 @@ module Snek
     end
 
     def crash_snek
-      GameEngine::Sound.play 'explosion.wav'
+      play_sound 'explosion'
       reset_snek
     end
+
+    def play_sound(name)
+      path = File.expand_path("../../assets/sounds/#{name}.wav", __FILE__)
+      TerminalGameEngine::Sound.play path
+    end
   end
 end

data/lib/snek/version.rb

@@ -1,3 +1,3 @@
 module Snek
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/snek.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'terminal_game_engine', '~> 0.1.2'
+
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'rspec'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: snek
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Odin Dutton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: terminal_game_engine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +90,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - README.markdown
 - Rakefile
 - assets/sounds/explosion.wav
@@ -84,12 +97,6 @@ files:
 - assets/sounds/startup.wav
 - bin/snek
 - lib/game.rb
-- lib/game_engine/engine.rb
-- lib/game_engine/frame.rb
-- lib/game_engine/input.rb
-- lib/game_engine/network.rb
-- lib/game_engine/sound.rb
-- lib/game_engine/window.rb
 - lib/snek.rb
 - lib/snek/version.rb
 - snek.gemspec

data/lib/game_engine/engine.rb

@@ -1,22 +0,0 @@
-module GameEngine
-  class Engine
-    attr_accessor :tick
-
-    def self.tick(&block)
-      self.new(&block).tap(&:call)
-    end
-
-    def initialize(&block)
-      @tick = 0
-      @block = block
-    end
-
-    def call
-      loop do
-        @block.call @tick
-        @tick += 1
-        sleep 0.1
-      end
-    end
-  end
-end

data/lib/game_engine/frame.rb

@@ -1,84 +0,0 @@
-module GameEngine
-  class Frame
-    attr_reader :rows
-
-    def initialize(width, height)
-      @rows = height.times.map { ' ' * width }
-    end
-
-    def width
-      @rows.first.size
-    end
-
-    def height
-      @rows.size
-    end
-
-    def draw(x, y, sprite)
-      lines = sprite.split("\n")
-
-      lines.each_with_index do |line, i|
-        if line.size > 0 && y+lines.size <= self.height && y+i >= 0
-          # crop when drawing off left
-          if x < 0
-            line = line[x.abs..-1]
-            x = 0
-          end
-
-          # crop when drawing off right
-          if x+line.size-1 >= self.width
-            line = line[0..(self.width-1)-(x+line.size)]
-          end
-
-          @rows[y+i][x..x+line.size-1] = line
-        end
-      end
-    end
-
-    def draw_center(y, sprite)
-      sprite_width = sprite.split("\n").first.size
-      x = self.width / 2 - sprite_width / 2
-      draw x, y, sprite
-    end
-
-    def render
-      @rows.each_with_index do |row, i|
-        Frame.move_cursor 0, i
-        print row
-      end
-    end
-
-    def self.move_cursor(x, y)
-      print "\033[#{y+1};#{x+1}H"
-    end
-
-    def self.clear_screen
-      print "\033[2J"
-    end
-
-    def self.disable_cursor
-      print "\x1B[?25l"
-    end
-
-    def self.enable_cursor
-      print "\x1B[?25h"
-    end
-
-    def self.setup
-      clear_screen
-      disable_cursor
-
-      $stdin.raw!
-      at_exit do
-        puts "\r"
-        enable_cursor
-        $stdin.cooked!
-        system 'stty sane'
-      end
-
-      trap 'WINCH' do
-        clear_screen
-      end
-    end
-  end
-end

data/lib/game_engine/input.rb

@@ -1,13 +0,0 @@
-module GameEngine
-  class Input
-    def self.call(&block)
-      begin
-        loop do
-          key = $stdin.read_nonblock(1).ord
-          block.call key
-        end
-      rescue Errno::EAGAIN
-      end
-    end
-  end
-end

data/lib/game_engine/network.rb

@@ -1,52 +0,0 @@
-require 'logger'
-require 'socket'
-require 'yaml'
-
-module GameEngine
-  class Network
-    PORT = 47357
-
-    attr_reader :logger
-
-    def initialize(logger: Logger.new('/dev/null'))
-      @logger = logger
-    end
-
-    def open_socket
-      @socket = UDPSocket.new
-      @socket.bind '0.0.0.0', PORT
-      @socket.setsockopt Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true
-      @socket.setsockopt Socket::SOL_SOCKET, Socket::SO_BROADCAST, true
-    rescue Errno::EADDRINUSE
-      $stderr.puts "Game is already running."
-      exit 1
-    end
-
-    def receive_updates(&block)
-      loop do
-        begin
-          data, addr = @socket.recvfrom_nonblock 8192
-          data = YAML.load(data)
-          block.call(data)
-        rescue Psych::SyntaxError => error
-          logger.error error
-        end
-      end
-    rescue Errno::EAGAIN
-    end
-
-    def send_update(data)
-      data = data.merge(hostname: hostname)
-
-      begin
-        @socket.send data.to_yaml, 0, '255.255.255.255', PORT
-      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::EMSGSIZE, Errno::ENETDOWN => error
-        logger.error error
-      end
-    end
-
-    def hostname
-      @hostname ||= `hostname -s`.strip
-    end
-  end
-end

data/lib/game_engine/sound.rb

@@ -1,12 +0,0 @@
-module GameEngine
-  class Sound
-    def self.play(sound)
-      case RUBY_PLATFORM
-      when /darwin/
-        system "afplay assets/sounds/#{sound} &"
-      when /linux/
-        system "command -v mplayer >/dev/null 2>&1 && mplayer -msglevel all=-1 -nolirc assets/sounds/#{sound} &"
-      end
-    end
-  end
-end

data/lib/game_engine/window.rb

@@ -1,11 +0,0 @@
-module GameEngine
-  class Window
-    def self.rows
-      $stdin.winsize[0]
-    end
-
-    def self.columns
-      $stdin.winsize[1]
-    end
-  end
-end