minesweeper-curses 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2039f5bcd5de35121f6f1d4018769ab714ddb044
-  data.tar.gz: 3e225649c8b9be84ea534de481f4acd24fea5843
+  metadata.gz: 64be9ef9dc42505ad9ad3ffb3fcfd36b96764b33
+  data.tar.gz: 543fecb9214ee82fe7322f912c00bd0a38649dc6
 SHA512:
-  metadata.gz: d564d8a4a4ce20bfc6f9896e7b64aad95cf39d379c2798808febb4c41b94644a13b330c40e51a0659cd4d03fed5928dcb36aed077052d66f0b0da2a3bcba9179
-  data.tar.gz: df398eded885b498bd6f0c2c80ea2815aa14b11a2a8ce4f03dde0d3350455d1bf4531d12985abeb14a6aa44036027be6cc9db7e150291074e5acc5166ee050e7
+  metadata.gz: 78a7c34b9471a412186efb69ca487ad817b597208cec909d9cd20bec4cfa4d59649e15f1680d46d432fd1229930bcfdf7cfaa276348591698705353807b89280
+  data.tar.gz: 4f84c02f4a405d629f0b6e3aeec7b7cafac85a99a249b804e3e2d84ac1268ac0eee7cd9435c6696e245ed8eecbff640dced226af69eeda14ce556e4d43c03743

data/.rubocop.yml

@@ -0,0 +1,24 @@
+Metrics/LineLength:
+  Max: 120
+  # To make it possible to copy or click on URIs in the code, we allow lines
+  # containing a URI to be longer than Max.
+  AllowHeredoc: true
+  AllowURI: true
+  URISchemes:
+    - http
+    - https
+  # The IgnoreCopDirectives option causes the LineLength rule to ignore cop
+  # directives like '# rubocop: enable ...' when calculating a line's length.
+  IgnoreCopDirectives: false
+  # The IgnoredPatterns option is a list of !ruby/regexp and/or string
+  # elements. Strings will be converted to Regexp objects. A line that matches
+  # any regular expression listed in this option will be ignored by LineLength.
+  IgnoredPatterns: []
+
+Metrics/BlockLength:
+  CountComments: false
+  Max: 25
+  ExcludedMethods: []
+  Exclude:
+    - Rakefile
+    - spec/**/*.rb

data/Gemfile

@@ -4,5 +4,6 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'coveralls', require: false
 gem 'pry'
 gem 'simplecov', '~> 0.11.2'

data/Gemfile.lock

@@ -1,12 +1,18 @@
 PATH
   remote: .
   specs:
-    minesweeper-curses (0.1.1)
+    minesweeper-curses (0.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.1)
+    coveralls (0.8.13)
+      json (~> 1.8)
+      simplecov (~> 0.11.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+      tins (~> 1.6.0)
     curses (1.0.2)
     diff-lcs (1.3)
     docile (1.1.5)
@@ -39,21 +45,26 @@ GEM
     simplecov-html (0.10.0)
     slop (3.6.0)
     sqlite3 (1.3.13)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
+    thor (0.19.4)
+    tins (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.14)
+  coveralls
   curses (~> 1.0.2)
   minesweeper-curses!
   minitest (~> 5.0)
   pry
   rake (~> 10.0)
   rspec (~> 3.6.0)
-  sequel
+  sequel (~> 4.46.0)
   simplecov (~> 0.11.2)
-  sqlite3
+  sqlite3 (~> 1.3.13)
 
 BUNDLED WITH
    1.14.6

data/lib/minesweeper/board.rb

@@ -53,7 +53,7 @@ module Minesweeper
           open_cell(cury, curx)
           play(cury, curx)
         when SPACE
-          trigger_bomb_flag(cury, curx)
+          toggle_bomb_flag(cury, curx)
           play(cury, curx)
         end
       end
@@ -79,20 +79,12 @@ module Minesweeper
       window.setpos(0, 1)
     end
 
-    def debug(args = {})
-      window.setpos(20, 20)
-      str = ''
-      args.each { |k, a| str << "| #{k} #{a} |" }
-      window.addstr(str)
-      window.setpos(cury, curx)
-    end
-
     def open_cell(y, x)
       cell_x = x / 3 # / 3 because rendered cell 3 chars
       open_original(y, cell_x)
     end
 
-    def trigger_bomb_flag(y, x)
+    def toggle_bomb_flag(y, x)
       cell_x = x / 3 # / 3 because rendered cell 3 chars
       cell = cells[y][cell_x]
       cell.toggle_bomb_flag!
@@ -168,7 +160,7 @@ Game Stats: you have found #{found_bombs_count} out of #{bombs.count} bombs
         echo
         Minesweeper::GameInitializer.new.start
       when 'r', 'R'
-        Minesweeper::BoardBuilder.from_board(self).build.play
+        Minesweeper::BoardBuilder.new(window, flush_params: false).build.play
       end
     end
 

data/lib/minesweeper/board_builder.rb

@@ -2,10 +2,6 @@ module Minesweeper
   class BoardBuilder
     extend Forwardable
 
-    def self.from_board(board)
-      new(board.window, flush_params: false)
-    end
-
     def initialize(window, flush_params:)
       @window = window
       @params_builder = Minesweeper::BoardParams.new(window, flush_params)

data/lib/minesweeper/board_params.rb

@@ -1,16 +1,5 @@
 module Minesweeper
   class BoardParams
-
-    # how about more sophisticated solution
-    DB = Sequel.sqlite
-    DB.execute <<-SQL
-      CREATE TABLE IF NOT EXISTS board_params (
-        height integer,
-        width integer,
-        level varchar(255)
-      );
-    SQL
-
     DEFAULTS = { height: 10, width: 10, level: 'advanced' }.freeze
 
     attr_reader :window, :flush_params
@@ -22,34 +11,26 @@ module Minesweeper
     end
 
     def height
-      read[:height]
+      storage.read[:height]
     end
 
     def width
-      read[:width]
+      storage.read[:width]
     end
 
     def level
-      read[:level]
-    end
-
-    def prepare
-      flush_storage if flush_params
-      read || build
+      storage.read[:level]
     end
 
     private
 
-    def table
-      DB[:board_params]
-    end
-
-    def read
-      table.first
+    def prepare
+      storage.flush if flush_params
+      storage.read || build
     end
 
-    def flush_storage
-      DB[:board_params].delete
+    def storage
+      ::Minesweeper::Storage.instance
     end
 
     def build
@@ -57,11 +38,11 @@ module Minesweeper
       window.setpos(4, 42)
       str = window.getstr
       if str.casecmp('y').zero?
-        table.insert(DEFAULTS)
+        storage.insert(DEFAULTS)
       else
-        table.insert(height: ask_y, width: ask_x, level: ask_level)
+        storage.insert(height: ask_y, width: ask_x, level: ask_level)
       end
-      read
+      storage.read
     end
 
     def ask_x

data/lib/minesweeper/game_initializer.rb

@@ -16,8 +16,11 @@ module Minesweeper
       window.addstr("Welcome to Minesweeper \n")
       window.addstr("screen size: rows: #{window.maxy}; columns: #{window.maxx} \n")
       window.addstr("controls: `space` to mark/unmark cell as bomb, `arrow keys` to navigate \n")
-      board = Minesweeper::BoardBuilder.new(window, flush_params: true).build
-      board.play
+      Minesweeper::BoardBuilder
+        .new(window, flush_params: true)
+        .build
+        .play
+    rescue SystemExit, Interrupt
     ensure
       close_screen
       at_exit { puts 'good bye' }

data/lib/minesweeper/storage.rb

@@ -0,0 +1,34 @@
+require 'singleton'
+
+module Minesweeper
+  class Storage
+    include Singleton
+
+    DB = Sequel.sqlite
+    DB.execute <<-SQL
+      CREATE TABLE IF NOT EXISTS board_params (
+        height integer,
+        width integer,
+        level varchar(255)
+      );
+    SQL
+
+    def read
+      table.first
+    end
+
+    def flush
+      table.delete
+    end
+
+    def insert(**args)
+      table.insert(args)
+    end
+
+    private
+
+    def table
+      DB[:board_params]
+    end
+  end
+end

data/lib/minesweeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Minesweeper
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/minesweeper.rb

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

data/minesweeper.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake',     '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'curses',   '~> 1.0.2'
-  spec.add_development_dependency 'sequel'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'sequel',   '~> 4.46.0'
+  spec.add_development_dependency 'sqlite3',  '~> 1.3.13'
   spec.add_development_dependency 'rspec',    '~> 3.6.0'
 end

data/readme.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/ruba-ruba/minesweeper.svg?branch=master)](https://travis-ci.org/ruba-ruba/minesweeper)
+[![Coverage Status](https://coveralls.io/repos/github/ruba-ruba/minesweeper/badge.svg?branch=master)](https://coveralls.io/github/ruba-ruba/minesweeper?branch=master)
 
 ### Minesweeper Terminal
   > Console version of [minesweeper game](https://en.wikipedia.org/wiki/Microsoft_Minesweeper) written in [ruby](https://www.ruby-lang.org/en/) & [curses gem](https://github.com/ruby/curses)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minesweeper-curses
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mykhailo Rybak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,30 +70,30 @@ dependencies:
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.46.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.13
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -136,6 +137,7 @@ files:
 - lib/minesweeper/bomb_injector.rb
 - lib/minesweeper/cell.rb
 - lib/minesweeper/game_initializer.rb
+- lib/minesweeper/storage.rb
 - lib/minesweeper/version.rb
 - minesweeper.gemspec
 - readme.md