minesweeper-curses 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 413c2082203f1764e3909d9e4364ed25b74b086f
-  data.tar.gz: f9cd7100f33a34e12f5a4c3351d832a0fc64973d
+SHA256:
+  metadata.gz: b505c67f37bbf83ec7880ebfc8bcd879e386733c15640dbd469643770589e9c1
+  data.tar.gz: c82a9785a2bfda4c76f8b6c840ab83ca76376a75944bb5f830b748511750dc92
 SHA512:
-  metadata.gz: 81e33dc1686e8e98d83d839675248b294a4b44f50a0085dbf25f0cff5ab6a160fab843327c1fa18e259ed460a9a17ac31158fdc3dce44749f03b07e86476528c
-  data.tar.gz: f5b68defae4e02000e35415f66d331a611e189599000ba30ece31ff5a1a04790b908d1a251358d338a90eb06f5a4b3c108d7293b41e5ee910bce96a55c322a50
+  metadata.gz: 750e136e11cc3019c932e8d3557e608461cabdb2e316411827883ecca20f8d8068111052899b675d3d2b9d5dd18a254b5233023f71988a8730ceb11d2861525d
+  data.tar.gz: ba164d83089740fb9db67eed88e3f324fbf37f52f25703b17aa7732e177b01c91019c146fb64ac66f5aabac209d23184b9c94bc6f3d7233e11202ade66367a93

data/.rubocop.yml

@@ -1,8 +1,8 @@
 AllCops:
-  Includes:
+  Include:
     - Rakefile
     - config.ru
-  Excludes:
+  Exclude:
     - db/**
     - config/**
     - script/**

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.3

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
- - 2.4.1
+  - 2.4
+  - 2.5
+  - 2.6
 cache: bundler
 script:
   - bundle exec rspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
@@ -7,9 +9,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
-
-task :build_and_install do
-  sh('bundle install')
-  sh("gem install ./pkg/minesweeper-#{Minesweeper::VERSION}.gem")
-end
+task default: :test

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'minesweeper'

data/bin/minesweeper-curses

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)

data/lib/minesweeper.rb

@@ -11,12 +11,12 @@ require_relative 'minesweeper/board_params'
 require_relative 'minesweeper/board'
 require_relative 'minesweeper/board_builder'
 require_relative 'minesweeper/params_builder'
-require_relative 'minesweeper/base_cell'
-require_relative 'minesweeper/cell'
-require_relative 'minesweeper/bomb_cell'
+require_relative 'minesweeper/cells/base'
+require_relative 'minesweeper/cells/cell'
+require_relative 'minesweeper/cells/bomb'
 require_relative 'minesweeper/bomb_injector'
 require_relative 'minesweeper/game_initializer'
-require_relative 'minesweeper/cell_state'
+require_relative 'minesweeper/cells/state'
 
 module Minesweeper
 end

data/lib/minesweeper/board.rb

@@ -9,25 +9,23 @@ module Minesweeper
     LEFT_RIGHT_PADDING = 2
     SPACE = ' '
 
-    def_delegators :@window, :curx, :cury
     def_delegators :board_params, :height, :width
 
-    attr_reader :board_params, :cells, :window
+    attr_reader :board_params, :cells, :ui
 
     def initialize(board_params)
       @board_params = board_params
-      @window = Ui.instance.window
-      @cells  = []
+      @ui = Minesweeper::Ui
+      @cells = []
     end
 
     def play(stdy = nil, stdx = nil)
-      window.keypad = true
       draw_board
-      window.setpos(stdy, stdx) if stdx && stdy
+      ui.setpos(stdy, stdx) if stdx && stdy
       noecho
 
       loop do
-        ch = window.getch
+        ch = ui.getch
         case ch
         when KEY_UP
           move_up
@@ -42,7 +40,7 @@ module Minesweeper
         when SPACE
           toggle_bomb_flag
         end
-        play(cury, curx)
+        play(ui.cury, ui.curx)
       end
     rescue GameWon, GameOver => e
       end_game(e)
@@ -52,30 +50,30 @@ module Minesweeper
     private
 
     def draw_board
-      window.clear
+      ui.clear
       cells.each_index do |row_index|
         (0..(width * 3 - 1)).each_slice(3).with_index do |cell_ary, index|
           cell = cells[row_index][index]
-          window.setpos(row_index, cell_ary[0])
-          window.attron(color_pair(COLOR_BLUE)) { window.addstr '[' }
-          window.attron(color_pair(cell.color)) { window.addstr cell.view }
-          window.attron(color_pair(COLOR_BLUE)) { window.addstr ']' }
+          ui.setpos(row_index, cell_ary[0])
+          ui.attron(color_pair(COLOR_BLUE)) { ui.addstr '[' }
+          ui.attron(color_pair(cell.color)) { ui.addstr cell.view }
+          ui.attron(color_pair(COLOR_BLUE)) { ui.addstr ']' }
         end
       end
-      window.refresh
-      window.setpos(0, 1)
+      ui.refresh
+      ui.setpos(0, 1)
     end
 
     def cell_x
-      curx / STEP
+      ui.curx / STEP
     end
 
     def open_cell
-      open_original(cury, cell_x)
+      open_original(ui.cury, cell_x)
     end
 
     def toggle_bomb_flag
-      cell = cells[cury][cell_x]
+      cell = cells[ui.cury][cell_x]
       cell.toggle_bomb_flag!
       raise GameWon if game_won?
     end
@@ -111,33 +109,33 @@ module Minesweeper
     end
 
     def move_up
-      return if cury.zero?
-      window.setpos(cury - 1, curx)
+      return if ui.cury.zero?
+      ui.setpos(ui.cury - 1, ui.curx)
     end
 
     def move_down
-      return if cury + 1 >= height
-      window.setpos(cury + 1, curx)
+      return if ui.cury + 1 >= height
+      ui.setpos(ui.cury + 1, ui.curx)
     end
 
     def move_left
-      return if curx <= LEFT_RIGHT_PADDING
-      window.setpos(cury, curx - STEP)
+      return if ui.curx <= LEFT_RIGHT_PADDING
+      ui.setpos(ui.cury, ui.curx - STEP)
     end
 
     def move_right
-      return if curx >= (width * 3 - LEFT_RIGHT_PADDING)
-      window.setpos(cury, curx + STEP)
+      return if ui.curx >= (width * 3 - LEFT_RIGHT_PADDING)
+      ui.setpos(ui.cury, ui.curx + STEP)
     end
 
     def end_game(e)
       found_bombs_count = found_bombs.count
       reveal_bombs
       draw_board
-      window.setpos(height + 1, 0)
-      window.addstr e.message
-      window.setpos(height + 3, 0)
-      window.addstr <<~STR
+      ui.setpos(height + 1, 0)
+      ui.addstr e.message
+      ui.setpos(height + 3, 0)
+      ui.addstr <<~STR
         Game Stats: you have found #{found_bombs_count} out of #{bombs.count} bombs
 
         - `R` to replay with same parameters
@@ -150,7 +148,7 @@ module Minesweeper
     # used when user won/lose game & decided to begin anew
     # eventually will be moved to game initializer
     def start_or_restart_game
-      case window.getch
+      case ui.getch
       when ENTER
         echo
         game_initializer.start

data/lib/minesweeper/board_builder.rb

@@ -31,7 +31,7 @@ module Minesweeper
 
     def fill_with_cells
       height.times do
-        board.cells << Array.new(width) { Cell.new }
+        board.cells << Array.new(width) { Cells::Cell.new }
       end
     end
 

data/lib/minesweeper/bomb_injector.rb

@@ -18,7 +18,7 @@ module Minesweeper
       cell_index = random_cell
       cell = board.cells[row_index][cell_index]
       unless cell.bomb?
-        board.cells[row_index][cell_index] = BombCell.new
+        board.cells[row_index][cell_index] = Cells::Bomb.new
         number -= 1
       end
       add_bombs(number)

data/lib/minesweeper/cells/base.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Minesweeper
+  module Cells
+    class Base
+      extend Forwardable
+
+      def_delegators :@state, :view, :color, :opened?, :marked_as_bomb?
+
+      attr_reader :state
+
+      def initialize
+        @state = initial_state
+      end
+
+      def bomb?
+        raise NotImplementedError, 'defined in subclass'
+      end
+
+      def toggle_bomb_flag!
+        return if opened?
+        if marked_as_bomb?
+          state.view = ' '
+          state.color = COLOR_MAGENTA
+          state.status = :initial
+        else
+          state.view = '*'
+          state.color = COLOR_MAGENTA
+          state.status = :marked_as_bomb
+        end
+      end
+
+      def open!(*)
+        raise NotImplementedError, 'defined in subclass'
+      end
+
+      private
+
+      def initial_state
+        State.new(color: COLOR_MAGENTA, view: ' ', status: :initial)
+      end
+    end
+  end
+end

data/lib/minesweeper/cells/bomb.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Minesweeper
+  module Cells
+    class Bomb < Base
+      def bomb?
+        true
+      end
+
+      def open!(*)
+        state.view = '*'
+        state.color = marked_as_bomb? ? COLOR_WHITE : COLOR_RED
+        state.status = :opened
+      end
+    end
+  end
+end

data/lib/minesweeper/cells/cell.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Minesweeper
+  module Cells
+    class Cell < Base
+      def bomb?
+        false
+      end
+
+      def open!(number_of_boms_nearby)
+        state.view = number_of_boms_nearby.to_s
+        state.color = COLOR_CYAN
+        state.status = :opened
+      end
+    end
+  end
+end

data/lib/minesweeper/cells/state.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Minesweeper
+  module Cells
+    class State
+      attr_accessor :color, :view, :status
+
+      def initialize(color:, status:, view:)
+        @view = view
+        @color = color
+        @status = status
+      end
+
+      def opened?
+        status == :opened
+      end
+
+      def marked_as_bomb?
+        status == :marked_as_bomb
+      end
+    end
+  end
+end

data/lib/minesweeper/game_initializer.rb

@@ -2,10 +2,6 @@
 
 module Minesweeper
   class GameInitializer
-    def initialize
-      @window = nil
-    end
-
     def start
       init_curses
       Ui.greeting_message
@@ -29,8 +25,6 @@ module Minesweeper
         .play
     end
 
-    attr_reader :window
-
     def init_curses
       init_screen
       init_colors

data/lib/minesweeper/ui.rb

@@ -20,7 +20,19 @@ module Minesweeper
       instance.respond_to?(:method_name) || super
     end
 
-    def_delegators :window, :clear, :addch, :addstr, :refresh, :maxy, :maxx, :getstr, :setpos
+    def_delegators :window,
+                   :clear,
+                   :addch,
+                   :addstr,
+                   :refresh,
+                   :maxy,
+                   :maxx,
+                   :getstr,
+                   :setpos,
+                   :attron,
+                   :getch,
+                   :curx,
+                   :cury
 
     def greeting_message
       clear

data/lib/minesweeper/version.rb

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

data/readme.md

@@ -7,7 +7,7 @@
 
 #### Requirements
 
-  - ruby 2.4.1 or higher
+  - ruby 2.4 or higher
 
 #### Setup
 
@@ -17,7 +17,9 @@
 
   - `git clone git@github.com:ruba-ruba/minesweeper.git`
   - `cd minesweeper`
-  - `rake build_and_install`
+  - `gem install bundler`
+  - `bundle install`
+  - `rake install`
 
 #### Launching
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minesweeper-curses
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mykhailo Rybak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -116,14 +116,14 @@ files:
 - bin/minesweeper-curses
 - bin/setup
 - lib/minesweeper.rb
-- lib/minesweeper/base_cell.rb
 - lib/minesweeper/board.rb
 - lib/minesweeper/board_builder.rb
 - lib/minesweeper/board_params.rb
-- lib/minesweeper/bomb_cell.rb
 - lib/minesweeper/bomb_injector.rb
-- lib/minesweeper/cell.rb
-- lib/minesweeper/cell_state.rb
+- lib/minesweeper/cells/base.rb
+- lib/minesweeper/cells/bomb.rb
+- lib/minesweeper/cells/cell.rb
+- lib/minesweeper/cells/state.rb
 - lib/minesweeper/exceptions.rb
 - lib/minesweeper/game_initializer.rb
 - lib/minesweeper/params_builder.rb
@@ -151,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Minesweeper CLI game using curses

data/lib/minesweeper/base_cell.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Minesweeper
-  class BaseCell
-    extend Forwardable
-
-    def_delegators :@state, :view, :color, :opened?, :marked_as_bomb?
-
-    attr_reader :state
-
-    def initialize
-      @state = initial_state
-    end
-
-    def bomb?
-      raise NotImplementedError, 'defined in subclass'
-    end
-
-    def toggle_bomb_flag!
-      return if opened?
-      if marked_as_bomb?
-        state.view = ' '
-        state.color = COLOR_MAGENTA
-        state.status = :initial
-      else
-        state.view = '*'
-        state.color = COLOR_MAGENTA
-        state.status = :marked_as_bomb
-      end
-    end
-
-    def open!(*)
-      raise NotImplementedError, 'defined in subclass'
-    end
-
-    private
-
-    def initial_state
-      CellState.new(color: COLOR_MAGENTA, view: ' ', status: :initial)
-    end
-  end
-end

data/lib/minesweeper/bomb_cell.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Minesweeper
-  class BombCell < BaseCell
-    def bomb?
-      true
-    end
-
-    def open!(*)
-      state.view = '*'
-      state.color = marked_as_bomb? ? COLOR_WHITE : COLOR_RED
-      state.status = :opened
-    end
-  end
-end

data/lib/minesweeper/cell.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Minesweeper
-  class Cell < BaseCell
-    def bomb?
-      false
-    end
-
-    def open!(number_of_boms_nearby)
-      state.view = number_of_boms_nearby.to_s
-      state.color = COLOR_CYAN
-      state.status = :opened
-    end
-  end
-end

data/lib/minesweeper/cell_state.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Minesweeper
-  class CellState
-    attr_accessor :color, :view, :status
-
-    def initialize(color:, status:, view:)
-      @view = view
-      @color = color
-      @status = status
-    end
-
-    def opened?
-      status == :opened
-    end
-
-    def marked_as_bomb?
-      status == :marked_as_bomb
-    end
-  end
-end