good_luck_wizard 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4542c554b53395dec06ab3026510aa4ad8b24511077f0820e607daa8a48eeb57
-  data.tar.gz: 6991409bd222f25a008b86716cda64f1cb06928637882ade5676e5114a126c5c
+  metadata.gz: 4263837619f78bee5caa53a56bfdb94459f936a9ac28d0b9295f5f495c9f8363
+  data.tar.gz: 99d4841207fd0ce336f71936fbba360256503eed43f580188dbd834b667898a0
 SHA512:
-  metadata.gz: acd95d8a41e16661a57ec519052d91ff93747478ba29d8b4882e1e1c7207297427df4af973f55bed324af70758aca83a078cc81f27e16939c27d334ff8212e2f
-  data.tar.gz: 5f56f58dc3a2074ab355f2694ae40356f10d5623b1f8186790c75cfbba5dd78e075017bd55d77b37bb324e027b67d624d703041d9904aee952ea6442cb4da0b1
+  metadata.gz: 8f6cf8b4eee23afe0934301b4e312a0afed3d6654c49fe59a6f1b7ee4b5b243041598f26b9fa19135145e6ac25ada4dc0292c179a0b745439cc0bb9b230c85e2
+  data.tar.gz: 577db893cc18d765420e3104a3839e1defcf71e4e7c4e2b140afe1d4e9b516203a55a755edad479b7588557f94897d231205da7be3aebaddf7fc691793ec2138

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in good_luck_wizard.gemspec
 gemspec
@@ -10,3 +10,4 @@ gem "rspec", "~> 3.4"
 gem "standard", "~> 1.45"
 
 gem "debug"
+gem "benchmark-ips"

data/lib/glw/components/input.rb

@@ -0,0 +1,21 @@
+module GLW
+  module Components
+    Input = Data.define(:events) do
+      def self.make
+        new(events: [])
+      end
+
+      def push(event)
+        events << event
+      end
+
+      def pop
+        events.pop
+      end
+
+      def peek
+        events.last
+      end
+    end
+  end
+end

data/lib/glw/input.rb

@@ -1,96 +1,102 @@
 # frozen_string_literal: true
 
 module GLW
-  module Input
-    class << self
-      ESCAPE_TIMEOUT = 0.02 # 20ms
-
-      BYTES = {
-        "\t" => :k_tab,
-        "\r" => :k_enter,
-        "\n" => :k_enter,
-        "\x7F" => :k_backspace,
-        "\b" => :k_backspace,
-        " " => :k_space,
-        "\x03" => :k_ctrl_c,
-        "[" => :k_left_bracket,
-        "]" => :k_right_bracket,
-        ";" => :k_semicolon,
-        "'" => :k_single_quote,
-        "," => :k_comma,
-        "." => :k_period
-      }.tap do |h|
-        ("a".."z").each { |c| h[c] = :"k_#{c}" }
-        ("A".."Z").each { |c| h[c] = :"k_#{c}" }
-        ("0".."9").each { |c| h[c] = :"k_#{c}" }
-      end
+  class Input
+    ESCAPE_TIMEOUT = 0.02 # 20ms
 
-      def pop
-        @queue.pop
-      end
+    BYTES = {
+      "\t" => :k_tab,
+      "\r" => :k_enter,
+      "\n" => :k_enter,
+      "\x7F" => :k_backspace,
+      "\b" => :k_backspace,
+      " " => :k_space,
+      "\x03" => :k_ctrl_c,
+      "[" => :k_left_bracket,
+      "]" => :k_right_bracket,
+      ";" => :k_semicolon,
+      "'" => :k_single_quote,
+      "," => :k_comma,
+      "." => :k_period
+    }.tap do |h|
+      ("a".."z").each { |c| h[c] = :"k_#{c}" }
+      ("A".."Z").each { |c| h[c] = :"k_#{c}" }
+      ("0".."9").each { |c| h[c] = :"k_#{c}" }
+    end
+
+    def initialize
+      @queue = nil
+    end
 
-      def start!
-        return if @queue
+    def pop
+      @queue.pop
+    end
+
+    def empty?
+      @queue.empty?
+    end
 
-        @queue = Thread::Queue.new
+    def start!
+      return if @queue
 
-        Thread.new do
-          loop do
-            byte = read_byte
+      @queue = Thread::Queue.new
 
-            if byte == "\e"
-              handle_escape byte
-            else
-              handle_byte byte
-            end
-          rescue EOFError
-            break
+      Thread.new do
+        loop do
+          byte = read_byte
+
+          if byte == "\e"
+            handle_escape byte
+          else
+            handle_byte byte
           end
+        rescue EOFError
+          break
         end
       end
+    end
 
-      private
+    private
 
-      def handle_escape(first_byte)
-        second_byte = read_byte(timeout: true)
+    def handle_escape(first_byte)
+      second_byte = read_byte(timeout: true)
 
-        if second_byte.nil?
-          @queue << :k_escape
-          nil
-        elsif second_byte == "["
-          third_byte = read_byte(timeout: true)
-
-          case third_byte
-          when "A"
-            @queue << :k_up
-          when "B"
-            @queue << :k_down
-          when "C"
-            @queue << :k_right
-          when "D"
-            @queue << :k_left
-          else
-            @queue << :k_escape
-            handle_byte second_byte
-            handle_byte third_byte if third_byte
-          end
+      if second_byte.nil?
+        @queue << :k_escape
+        nil
+      elsif second_byte == "["
+        third_byte = read_byte(timeout: true)
+
+        case third_byte
+        when "A"
+          @queue << :k_up
+        when "B"
+          @queue << :k_down
+        when "C"
+          @queue << :k_right
+        when "D"
+          @queue << :k_left
         else
           @queue << :k_escape
           handle_byte second_byte
+          handle_byte third_byte if third_byte
         end
+      else
+        @queue << :k_escape
+        handle_byte second_byte
       end
+    end
 
-      def handle_byte(byte)
-        return unless BYTES.key?(byte)
+    def handle_byte(byte)
+      return unless BYTES.key?(byte)
 
-        @queue << BYTES[byte]
-      end
+      @queue << BYTES[byte]
+    end
 
-      def read_byte(timeout: false)
-        return if timeout && !IO.select([STDIN], nil, nil, 0.02)
+    def read_byte(timeout: false)
+      return if timeout && !IO.select([STDIN], nil, nil, 0.02)
 
-        STDIN.readpartial(1)
-      end
+      STDIN.readpartial(1)
     end
   end
 end

data/lib/glw/screen.rb

@@ -1,103 +1,105 @@
 module GLW
-  module Screen
-    class << self
-      UpdateBlock = Data.define(:start_index, :cells) do
-        def self.make(start_index) = new(start_index, [])
-
-        def to_s(current_fg: nil, current_bg: nil)
-          output = ""
-          fg = current_fg
-          bg = current_bg
-
-          cells.each do |cell|
-            if cell.fg_color != fg
-              output << Terminal.set_fg(cell.fg_color)
-              fg = cell.fg_color
-            end
-
-            if cell.bg_color != bg
-              output << Terminal.set_bg(cell.bg_color)
-              bg = cell.bg_color
-            end
-
-            output << cell.char
+  class Screen
+    UpdateBlock = Data.define(:start_index, :cells) do
+      def self.make(start_index) = new(start_index, [])
+
+      def to_s(current_fg: nil, current_bg: nil)
+        output = ""
+        fg = current_fg
+        bg = current_bg
+
+        cells.each do |cell|
+          if cell.fg_color != fg
+            output << Terminal.set_fg(cell.fg_color)
+            fg = cell.fg_color
           end
 
-          [output, fg, bg]
+          if cell.bg_color != bg
+            output << Terminal.set_bg(cell.bg_color)
+            bg = cell.bg_color
+          end
+
+          output << cell.char
         end
+
+        [output, fg, bg]
       end
+    end
 
-      def start!
-        @render_queue = Thread::Queue.new
+    def initialize
+      @render_queue = nil
+    end
 
-        @render_queue.push BufferState.blank(
-          height: IO.console.winsize[0],
-          width: IO.console.winsize[1]
-        )
+    def start!
+      @render_queue = Thread::Queue.new
 
-        Thread.new do
-          STDOUT.print Terminal.hide_cursor
+      @render_queue.push BufferState.blank(
+        height: IO.console.winsize[0],
+        width: IO.console.winsize[1]
+      )
 
-          last_state = nil
+      Thread.new do
+        STDOUT.print Terminal.hide_cursor
 
-          loop do
-            state = @render_queue.pop
+        last_state = nil
 
-            # Throw away stale states until we have the newest one.
-            state = @render_queue.pop until @render_queue.empty?
+        loop do
+          state = @render_queue.pop
 
-            render(last_state, state)
-            last_state = state
-          end
+          # Throw away stale states until we have the newest one.
+          state = @render_queue.pop until @render_queue.empty?
+
+          render(last_state, state)
+          last_state = state
         end
       end
+    end
 
-      def push_state(state)
-        @render_queue.push(state)
-      end
+    def push_state(state)
+      @render_queue.push(state)
+    end
 
-      private
+    private
 
-      def render(last_state, state)
-        updates = []
-        current_block = nil
+    def render(last_state, state)
+      updates = []
+      current_block = nil
 
-        state.cells.each_with_index do |cell, index|
-          next if last_state && cell == last_state.cells[index]
+      state.cells.each_with_index do |cell, index|
+        next if last_state && cell == last_state.cells[index]
 
-          if current_block && current_block.start_index + current_block.cells.length == index
-            current_block.cells << cell
-          else
-            updates << current_block if current_block
+        if current_block && current_block.start_index + current_block.cells.length == index
+          current_block.cells << cell
+        else
+          updates << current_block if current_block
 
-            current_block = UpdateBlock.new(index, [cell])
-          end
+          current_block = UpdateBlock.new(index, [cell])
         end
+      end
 
-        updates << current_block if current_block
+      updates << current_block if current_block
 
-        current_fg = nil
-        current_bg = nil
+      current_fg = nil
+      current_bg = nil
 
-        STDOUT.print(
-          updates.flat_map do |block|
-            y = block.start_index / state.width
-            x = block.start_index % state.width
+      STDOUT.print(
+        updates.flat_map do |block|
+          y = block.start_index / state.width
+          x = block.start_index % state.width
 
-            block_output, current_fg, current_bg = block.to_s(
-              current_fg:,
-              current_bg:
-            )
+          block_output, current_fg, current_bg = block.to_s(
+            current_fg:,
+            current_bg:
+          )
 
-            [
-              Terminal.move_to(x, y),
-              block_output
-            ]
-          end.join
-        )
+          [
+            Terminal.move_to(x, y),
+            block_output
+          ]
+        end.join
+      )
 
-        STDOUT.flush
-      end
+      STDOUT.flush
     end
   end
 end

data/lib/glw/universe.rb

@@ -0,0 +1,11 @@
+module GLW
+  class Universe
+    def singletons
+      @singletons ||= Hash.new { |h, k| h[k] = k.make }
+    end
+
+    def render(width:, height:)
+      BufferState.blank(width:, height:)
+    end
+  end
+end

data/lib/glw/version.rb

@@ -1,3 +1,3 @@
 module GLW
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/glw.rb

@@ -15,17 +15,36 @@ module GLW
   class << self
     def start!
       IO.console.raw do
-        Screen.start!
-        Input.start!
+        screen = Screen.new
+        input = Input.new
+
+        screen.start!
+        input.start!
+
+        universe = Universe.new
+
+        target_fps = 20
+        frame_time = 1.0 / target_fps
 
         loop do
-          content = Input.pop
+          frame_start = Time.now
+
+          until input.empty?
+            key = input.pop
+
+            exit(0) if key == :k_escape || key == :k_ctrl_c
+
+            universe.singletons[Components::Input].push key
+          end
+
+          height, width = *IO.console.winsize
+          buffer = universe.render(width:, height:)
+          screen.push_state(buffer)
 
-          exit(0) if content == :k_escape || content == :k_ctrl_c
+          elapsed = Time.now - frame_start
+          sleep(frame_time - elapsed) if elapsed < frame_time
         end
       end
-    rescue
-      raise
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: good_luck_wizard
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jared Norman
@@ -73,11 +73,13 @@ files:
 - good_luck_wizard.gemspec
 - lib/glw.rb
 - lib/glw/buffer_state.rb
+- lib/glw/components/input.rb
 - lib/glw/input.rb
 - lib/glw/random.rb
 - lib/glw/screen.rb
 - lib/glw/screen_cell.rb
 - lib/glw/terminal.rb
+- lib/glw/universe.rb
 - lib/glw/version.rb
 - test_input.rb
 homepage: http://github.com/jarednorman/good_luck_wizard