minesweeper-curses 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c8e408c58b28a513a86bfbcc48106443cc104a3
-  data.tar.gz: c5b13c8d95b287852e4d10df362b91f762e50801
+  metadata.gz: 413c2082203f1764e3909d9e4364ed25b74b086f
+  data.tar.gz: f9cd7100f33a34e12f5a4c3351d832a0fc64973d
 SHA512:
-  metadata.gz: 93811881349616041adb44187a488ddda672960309ba52af80f94e38404973aeeefc19f3d8681f76f838a19aea1ab939dd414b04424e50a352546d85d8ba72fe
-  data.tar.gz: 1cea87376481e33d79a5fa443a0c1992905f93044094e6146241d25ceb980328852e3a3fc8bea628bdc88c76aa274d08472f291c49fcd001848ebe8751d14bd8
+  metadata.gz: 81e33dc1686e8e98d83d839675248b294a4b44f50a0085dbf25f0cff5ab6a160fab843327c1fa18e259ed460a9a17ac31158fdc3dce44749f03b07e86476528c
+  data.tar.gz: f5b68defae4e02000e35415f66d331a611e189599000ba30ece31ff5a1a04790b908d1a251358d338a90eb06f5a4b3c108d7293b41e5ee910bce96a55c322a50

data/lib/minesweeper.rb

@@ -6,6 +6,7 @@ include Curses
 require 'forwardable'
 require 'sequel'
 require_relative 'minesweeper/exceptions'
+require_relative 'minesweeper/ui'
 require_relative 'minesweeper/board_params'
 require_relative 'minesweeper/board'
 require_relative 'minesweeper/board_builder'

data/lib/minesweeper/board.rb

@@ -14,9 +14,9 @@ module Minesweeper
 
     attr_reader :board_params, :cells, :window
 
-    def initialize(board_params:, window:)
+    def initialize(board_params)
       @board_params = board_params
-      @window = window
+      @window = Ui.instance.window
       @cells  = []
     end
 

data/lib/minesweeper/board_builder.rb

@@ -7,8 +7,7 @@ module Minesweeper
   class BoardBuilder
     extend Forwardable
 
-    def initialize(window, flush_params:)
-      @window = window
+    def initialize(flush_params)
       @flush_params = flush_params
     end
 
@@ -27,7 +26,7 @@ module Minesweeper
     def_delegators :board_params, :height, :width, :level
 
     def create_board
-      Minesweeper::Board.new(board_params: board_params, window: window)
+      Minesweeper::Board.new(board_params)
     end
 
     def fill_with_cells
@@ -45,7 +44,7 @@ module Minesweeper
     end
 
     def params_builder
-      Minesweeper::ParamsBuilder.new(window, flush_params)
+      Minesweeper::ParamsBuilder.new(flush_params)
     end
   end
 end

data/lib/minesweeper/game_initializer.rb

@@ -3,19 +3,12 @@
 module Minesweeper
   class GameInitializer
     def initialize
-      @window = Window.new(0, 0, 0, 0)
+      @window = nil
     end
 
     def start
-      init_screen
-      init_colors
-      cbreak
-      window.keypad = true
-      window.refresh
-      window.addch("\n")
-      window.addstr("Welcome to Minesweeper \n")
-      window.addstr("screen size: rows: #{window.maxy}; columns: #{window.maxx / Minesweeper::Board::STEP} \n")
-      window.addstr("controls: `space` to mark/unmark cell as bomb, `arrow keys` to navigate \n")
+      init_curses
+      Ui.greeting_message
       play
     rescue SystemExit, Interrupt
     ensure
@@ -31,13 +24,19 @@ module Minesweeper
 
     def play(flush_params = true)
       Minesweeper::BoardBuilder
-        .new(window, flush_params: flush_params)
+        .new(flush_params)
         .build
         .play
     end
 
     attr_reader :window
 
+    def init_curses
+      init_screen
+      init_colors
+      cbreak
+    end
+
     def init_colors
       Curses.start_color
       Curses.init_pair(COLOR_RED,     COLOR_RED,     COLOR_BLACK)

data/lib/minesweeper/params_builder.rb

@@ -7,11 +7,11 @@ module Minesweeper
 
     DEFAULTS = { height: 10, width: 10, level: 'advanced' }.freeze
 
-    attr_reader :window, :flush_params
+    attr_reader :flush_params, :ui
 
-    def initialize(window, flush_params)
-      @window = window
+    def initialize(flush_params)
       @flush_params = flush_params
+      @ui = Minesweeper::Ui
     end
 
     def_delegators :entry, :height, :width, :level
@@ -28,9 +28,9 @@ module Minesweeper
     end
 
     def build(y_position = 4)
-      window.addstr('Start game with default parameters? (Y/N)')
-      window.setpos(y_position, 42)
-      str = window.getstr
+      ui.params_message
+      ui.setpos(y_position, 42)
+      str = ui.getstr
       params =
         if str.casecmp('y').zero?
           DEFAULTS
@@ -46,30 +46,27 @@ module Minesweeper
         instance.save
         instance
       else
-        window.clear
-        window.addstr("Some of the parameters were invalid \n")
-        window.addstr(instance.errors.full_messages.join("\n"))
-        window.addstr("\n")
+        ui.validation_errors(instance.errors)
         build(instance.errors.count + 1)
       end
     end
 
     def ask_x
-      window.addstr('Number of columns: ')
-      x = window.getstr
-      max_x = window.maxx / Minesweeper::Board::STEP
+      ui.col_num
+      x = ui.getstr
+      max_x = ui.maxx / Minesweeper::Board::STEP
       x.to_i > max_x ? max_x : x
     end
 
     def ask_y
-      window.addstr('Number of rows: ')
-      y = window.getstr
-      y.to_i > window.maxy ? window.maxy - 1 : y
+      ui.row_num
+      y = ui.getstr
+      y.to_i > ui.maxy ? ui.maxy - 1 : y
     end
 
     def ask_level
-      window.addstr('Your Level (beginner/advanced/expert): ')
-      window.getstr
+      ui.level
+      ui.getstr
     end
   end
 end

data/lib/minesweeper/ui.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'singleton'
+require 'forwardable'
+
+module Minesweeper
+  class Ui
+    include ::Singleton
+    extend Forwardable
+
+    def self.method_missing(method_name, *arguments, &block)
+      if instance.respond_to?(method_name)
+        instance.send(method_name, *arguments, &block)
+      else
+        super
+      end
+    end
+
+    def self.respond_to_missing?(method_name, include_private = false)
+      instance.respond_to?(:method_name) || super
+    end
+
+    def_delegators :window, :clear, :addch, :addstr, :refresh, :maxy, :maxx, :getstr, :setpos
+
+    def greeting_message
+      clear
+      enable_keypad
+      refresh
+      addch("\n")
+      addstr("Welcome to Minesweeper \n")
+      addstr("screen size: rows: #{window.maxy}; columns: #{window.maxx / Minesweeper::Board::STEP} \n")
+      addstr("controls: `space` to mark/unmark cell as bomb, `arrow keys` to navigate \n")
+    end
+
+    def params_message
+      addstr('Start game with default parameters? (Y/N)')
+    end
+
+    def col_num
+      addstr('Number of columns: ')
+    end
+
+    def row_num
+      addstr('Number of rows: ')
+    end
+
+    def level
+      addstr('Your Level (beginner/advanced/expert): ')
+    end
+
+    def validation_errors(errors)
+      clear
+      addstr("Some of the parameters were invalid \n")
+      addstr(errors.full_messages.join("\n"))
+      addstr("\n")
+    end
+
+    def window
+      @window ||= Window.new(0, 0, 0, 0)
+    end
+
+    private
+
+    def enable_keypad
+      window.keypad = true
+    end
+  end
+end

data/lib/minesweeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Minesweeper
-  VERSION = '0.3.3'
-end
+  VERSION = '0.4.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minesweeper-curses
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Mykhailo Rybak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -127,6 +127,7 @@ files:
 - lib/minesweeper/exceptions.rb
 - lib/minesweeper/game_initializer.rb
 - lib/minesweeper/params_builder.rb
+- lib/minesweeper/ui.rb
 - lib/minesweeper/version.rb
 - minesweeper.gemspec
 - readme.md