text2048 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185c956718085eb81aef19c630b8cee21e67d71f
-  data.tar.gz: efb909b378a7c05e887ac9f6a4a45c84dd47e9c2
+  metadata.gz: 9db309419e40329c97f3490cacf5b307023929e5
+  data.tar.gz: 24055097be1b6246422694cb75b2b72685d37253
 SHA512:
-  metadata.gz: 253d485900f6ea785acd1de33bbdab69f46126319640062ffd80cc5779bb7efa8b3f7a7f750d65141bbeb86bfd60805865f966c4db10402cfbace5c381bdc494
-  data.tar.gz: 91f25760bb10e3b313263ec88cc6006a38d077325296b4086eadbdd5cb909452c2161ff996ad7cf8f8c0eef9d0c0426bb43ffafb54b91a367c5723a764eca79a
+  metadata.gz: d8d9031ff6562432a491aab20592ad4f81148522417e1f5ef08a13686bcf13e7ba5301da9d403ad302601ca43cc874532dae8958f43a56658b3fa4fbc1587cf6
+  data.tar.gz: 16d316b287ac2bd945e2e428026ad40990fac2d06fadfd9c742ef5cc7088d1ee9752fe9c23e713dc3337176d3e967551d65d91996cbfde0a6d440372fc2739f1

data/README.md

@@ -1,24 +1,25 @@
 text2048
 ========
-[![Gem Version](http://img.shields.io/gem/v/text2048.svg)][gem]
-[![Build Status](http://img.shields.io/travis/yasuhito/text2048/develop.svg)][travis]
-[![Code Climate](http://img.shields.io/codeclimate/github/yasuhito/text2048.svg)][codeclimate]
-[![Coverage Status](http://img.shields.io/coveralls/yasuhito/text2048/develop.svg)][coveralls]
-[![Dependency Status](http://img.shields.io/gemnasium/yasuhito/text2048.svg)][gemnasium]
-[![Gittip](http://img.shields.io/gittip/yasuhito.svg)][gittip]
+[![Gem Version](http://img.shields.io/gem/v/text2048.svg?style=flat)][gem]
+[![Build Status](http://img.shields.io/travis/yasuhito/text2048/develop.svg?style=flat)][travis]
+[![Code Climate](http://img.shields.io/codeclimate/github/yasuhito/text2048.svg?style=flat)][codeclimate]
+[![Coverage Status](http://img.shields.io/codeclimate/coverage/github/yasuhito/text2048.svg?style=flat)][codeclimate]
+[![Dependency Status](http://img.shields.io/gemnasium/yasuhito/text2048.svg?style=flat)][gemnasium]
+[![Gitter chat](http://img.shields.io/badge/GITTER-text2048-blue.svg?style=flat)][gitter]
+[![Gittip](http://img.shields.io/gittip/yasuhito.svg?style=flat)][gittip]
 
 Text mode 2048 game.
 
 [gem]: https://rubygems.org/gems/text2048
 [travis]: http://travis-ci.org/yasuhito/text2048
 [codeclimate]: https://codeclimate.com/github/yasuhito/text2048
-[coveralls]: https://coveralls.io/r/yasuhito/text2048?branch=develop
 [gemnasium]: https://gemnasium.com/yasuhito/text2048
+[gitter]: https://gitter.im/yasuhito/text2048
 [gittip]: https://www.gittip.com/yasuhito/
 
 [![Screenshot](https://raw.github.com/yasuhito/text2048/develop/screen_shot.png)][screenshot]
 
-[screenshot]: https://raw.github.com/yasuhito/text2048/develop/screen_shot.png
+[screenshot]: https://asciinema.org/a/9577
 
 Installation
 ------------
@@ -34,8 +35,9 @@ How to Play
 $ 2048
 ```
 
-- Use your arrow keys to move the tiles.
-- +/- for increase or decrease the size of the tiles displayed.
+- Use your arrow keys or vi keys ('h'/'j'/'k'/'l') to move the tiles.
+- '+'/'-' to increase or decrease the size of the tiles displayed.
+- 'q' to quit.
 
 Links
 -----

data/bin/2048

@@ -4,6 +4,17 @@
 $LOAD_PATH.unshift(File.dirname(File.realpath(__FILE__)) + '/../lib')
 
 require 'text2048/app'
+require 'timeout'
+
+app = Text2048::App.new
+begin
+  timeout(60) { app.show_title }
+rescue Timeout::Error
+  loop do
+    app.demo
+    break if app.wait_any_key(0.5)
+  end
+end
 
 app = Text2048::App.new
 app.generate(2)

data/lib/text2048.rb

@@ -2,5 +2,6 @@
 
 require 'text2048/board'
 require 'text2048/curses_view'
+require 'text2048/high_score'
 require 'text2048/monkey_patch/array'
 require 'text2048/text_view'

data/lib/text2048/app.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'text2048'
+require 'timeout'
 
 # This module smells of :reek:UncommunicativeModuleName
 module Text2048
@@ -9,9 +10,23 @@ module Text2048
     attr_reader :board
     attr_reader :view
 
-    def initialize(view = CursesView.new, board = Board.new)
+    def initialize(view = CursesView.new,
+                   board = Board.new,
+                   high_score = HighScore.new)
       @view = view
       @board = board
+      @high_score = high_score
+    end
+
+    def show_title
+      @view.high_score(@high_score)
+      @view.message = 'PRESS ANY KEY TO START'
+      @board = Board.new([[0, 0, 0, 0],
+                          [2, 0, 4, 8],
+                          [0, 0, 0, 0],
+                          [0, 0, 0, 0]])
+      @view.update(@board)
+      @view.wait_any_key
     end
 
     def generate(num_tiles = 1)
@@ -24,6 +39,20 @@ module Text2048
       @view.win if @board.win?
       @view.game_over if @board.lose?
       input @view.command
+      @view.high_score(@high_score)
+    end
+
+    def wait_any_key(seconds)
+      begin
+        timeout(seconds) { @view.wait_any_key }
+      rescue Timeout::Error
+        return false
+      end
+      true
+    end
+
+    def demo
+      input [:left, :right, :up, :down][rand(5)]
     end
 
     private
@@ -42,6 +71,7 @@ module Text2048
     def move_and_generate(command)
       last = move(command)
       generate if @board.generate?(last)
+      @high_score.maybe_update(@board.score)
     end
 
     def move(command)

data/lib/text2048/curses_view.rb

@@ -20,20 +20,25 @@ module Text2048
     DEFAULT_WIDTH = (Tile::DEFAULT_WIDTH + 1) * 4 + 1
     DEFAULT_HEIGHT = (Tile::DEFAULT_HEIGHT + 1) * 4 + 2
 
+    attr_writer :message
+
     def initialize
       @tiles = {}
       @scale = 1
       @scale_min = 0.5
       @scale_step = 0.5
+      @message = nil
       @keyboard = Keyboard.new
     end
 
     def_delegator :@keyboard, :read, :command
+    def_delegators :@keyboard, :wait_any_key
 
     def update(board)
       maybe_init_curses
       draw_score(board.score)
       draw_tiles(board.to_a)
+      draw_message
       refresh
     end
 
@@ -58,13 +63,25 @@ module Text2048
     end
 
     def win
-      setpos(rows_center, cols_center - 1)
-      colorize(COLOR_RED) { addstr('WIN!') }
+      @message = 'WIN!'
+      draw_message
     end
 
     def game_over
-      setpos(rows_center, cols_center - 4)
-      colorize(COLOR_RED) { addstr('GAME OVER') }
+      @message = 'GAME OVER'
+      draw_message
+    end
+
+    def high_score(score)
+      maybe_init_curses
+      setpos(0, 15)
+      addstr("High Score: #{score.to_i}")
+    end
+
+    def draw_message
+      return unless @message
+      setpos(rows_center, cols_center - @message.length / 2)
+      colorize(COLOR_MAGENTA) { addstr(@message) }
     end
 
     private
@@ -77,7 +94,7 @@ module Text2048
     end
 
     def rows_center
-      height / 2
+      height / 2 + 1
     end
 
     def cols_center

data/lib/text2048/curses_view/keyboard.rb

@@ -22,6 +22,10 @@ module Text2048
         KEYS[getch]
       end
 
+      def wait_any_key
+        getch
+      end
+
       private
 
       def maybe_init

data/lib/text2048/curses_view/lcd.rb

@@ -6,32 +6,34 @@ module Text2048
     # Renders numbers like LCDs
     class LCD
       BITMAPS = [
-        0b1111111110111,
-        0b1010100100100,
-        0b1111111011101,
-        0b1111111101101,
-        0b1011110101110,
-        0b1111111101011,
-        0b1111111111011,
-        0b1010110100101,
-        0b1111111111111,
-        0b1111111101111
+        0b111111110101011,
+        0b101010010001000,
+        0b111111100111001,
+        0b111111110011001,
+        0b101111010011010,
+        0b111111110010011,
+        0b111111110110011,
+        0b101011010001001,
+        0b111111110111011,
+        0b111111110011011
       ]
 
       TOP = 0
       TOP_LEFT = 1
-      TOP_RIGHT = 2
-      MIDDLE = 3
-      BOTTOM_LEFT = 4
-      BOTTOM_RIGHT = 5
-      BOTTOM = 6
+      TOP_MIDDLE = 2
+      TOP_RIGHT = 3
+      MIDDLE = 4
+      BOTTOM_LEFT = 5
+      BOTTOM_MIDDLE = 6
+      BOTTOM_RIGHT = 7
+      BOTTOM = 8
 
-      CORNER_TOP_LEFT = 7
-      CORNER_TOP_RIGHT = 8
-      CORNER_MIDDLE_LEFT = 9
-      CORNER_MIDDLE_RIGHT = 10
-      CORNER_BOTTOM_LEFT = 11
-      CORNER_BOTTOM_RIGHT = 12
+      CORNER_TOP_LEFT = 9
+      CORNER_TOP_RIGHT = 10
+      CORNER_MIDDLE_LEFT = 11
+      CORNER_MIDDLE_RIGHT = 12
+      CORNER_BOTTOM_LEFT = 13
+      CORNER_BOTTOM_RIGHT = 14
 
       def initialize(number)
         @number = number
@@ -47,9 +49,9 @@ module Text2048
       def digit(number)
         lines =
           [[CORNER_TOP_LEFT, TOP, CORNER_TOP_RIGHT],
-           [TOP_LEFT, nil, TOP_RIGHT],
+           [TOP_LEFT, TOP_MIDDLE, TOP_RIGHT],
            [CORNER_MIDDLE_LEFT, MIDDLE, CORNER_MIDDLE_RIGHT],
-           [BOTTOM_LEFT, nil, BOTTOM_RIGHT],
+           [BOTTOM_LEFT, BOTTOM_MIDDLE, BOTTOM_RIGHT],
            [CORNER_BOTTOM_LEFT, BOTTOM, CORNER_BOTTOM_RIGHT]]
         lines.map { |each| line(BITMAPS[number.to_i], each) }
       end
@@ -57,13 +59,7 @@ module Text2048
       # @todo This method smells of :reek:UtilityFunction
       # @todo This method smells of :reek:FeatureEnvy
       def line(bitmap, bits)
-        bits.map do |each|
-          if each
-            (bitmap & 1 << each).zero? ? ' ' : '*'
-          else
-            ' '
-          end
-        end.join
+        bits.map { |each| (bitmap & 1 << each).zero? ? ' ' : '*' }.join
       end
     end
   end

data/lib/text2048/curses_view/tile_effects.rb

@@ -15,6 +15,7 @@ module Text2048
           refresh
           sleep 0.1
         end
+        draw_message
       end
 
       def zoom_tiles(list)
@@ -23,6 +24,7 @@ module Text2048
           refresh
           sleep 0.05
         end
+        draw_message
       end
 
       private

data/lib/text2048/high_score.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+# This module smells of :reek:UncommunicativeModuleName
+module Text2048
+  # High score manager
+  class HighScore
+    DB_FILE = File.expand_path('~/.text2048')
+
+    def initialize
+      @score = 0
+      load
+    end
+
+    def load
+      @score = IO.read(DB_FILE).to_i if FileTest.exists?(DB_FILE)
+      @score
+    end
+
+    def maybe_update(score)
+      load
+      save(score) if score > @score
+    end
+
+    def to_i
+      @score
+    end
+
+    private
+
+    def save(score)
+      File.open(DB_FILE, 'w') { |file| file.print score }
+      @score = score
+    end
+  end
+end

data/lib/text2048/version.rb

@@ -3,5 +3,5 @@
 # This module smells of :reek:UncommunicativeModuleName
 module Text2048
   # gem version.
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/spec/text2048/app_spec.rb

@@ -17,7 +17,9 @@ describe Text2048::App do
   end
 
   describe '#generate' do
-    Given(:view) { double('view', update: nil, zoom_tiles: nil) }
+    Given(:view) do
+      double('view', update: nil, zoom_tiles: nil, high_score: nil)
+    end
     Given(:app) { Text2048::App.new(view) }
 
     context 'with no arguments' do
@@ -33,18 +35,22 @@ describe Text2048::App do
 
   describe '#step' do
     Given(:new_board) do
-      double('new_board', merged_tiles: nil, generate?: nil)
+      double('new_board', merged_tiles: nil, generate?: nil, score: 0)
     end
 
     context 'with command = :larger' do
-      Given(:view) { double('view', command: :larger, larger: nil) }
+      Given(:view) do
+        double('view', command: :larger, larger: nil, high_score: nil)
+      end
       Given(:app) { Text2048::App.new(view) }
       When { app.step }
       Then { expect(view).to have_received(:larger) }
     end
 
     context 'with command = :smaller' do
-      Given(:view) { double('view', command: :smaller, smaller: nil) }
+      Given(:view) do
+        double('view', command: :smaller, smaller: nil, high_score: nil)
+      end
       Given(:app) { Text2048::App.new(view) }
       When { app.step }
       Then { expect(view).to have_received(:smaller) }
@@ -52,10 +58,12 @@ describe Text2048::App do
 
     context 'with command = :left' do
       Given(:view) do
-        double('view', command: :left, update: nil, pop_tiles: nil)
+        double('view',
+               command: :left, update: nil, pop_tiles: nil, high_score: nil)
       end
       Given(:board) { double('board', left: new_board, win?: nil, lose?: nil) }
-      Given(:app) { Text2048::App.new(view, board) }
+      Given(:high_score) { double('high_score', maybe_update: nil) }
+      Given(:app) { Text2048::App.new(view, board, high_score) }
       When { app.step }
       Then { expect(board).to have_received(:left) }
       And { expect(view).to have_received(:update) }
@@ -63,12 +71,14 @@ describe Text2048::App do
 
     context 'with command = :right' do
       Given(:view) do
-        double('view', command: :right, update: nil, pop_tiles: nil)
+        double('view',
+               command: :right, update: nil, pop_tiles: nil, high_score: nil)
       end
       Given(:board) do
         double('board', right: new_board, win?: nil, lose?: nil)
       end
-      Given(:app) { Text2048::App.new(view, board) }
+      Given(:high_score) { double('high_score', maybe_update: nil) }
+      Given(:app) { Text2048::App.new(view, board, high_score) }
       When { app.step }
       Then { expect(board).to have_received(:right) }
       And { expect(view).to have_received(:update) }
@@ -76,10 +86,12 @@ describe Text2048::App do
 
     context 'with command = :up' do
       Given(:view) do
-        double('view', command: :up, update: nil, pop_tiles: nil)
+        double('view',
+               command: :up, update: nil, pop_tiles: nil, high_score: nil)
       end
       Given(:board) { double('board', up: new_board, win?: nil, lose?: nil) }
-      Given(:app) { Text2048::App.new(view, board) }
+      Given(:high_score) { double('high_score', maybe_update: nil) }
+      Given(:app) { Text2048::App.new(view, board, high_score) }
       When { app.step }
       Then { expect(board).to have_received(:up) }
       And { expect(view).to have_received(:update) }
@@ -87,10 +99,12 @@ describe Text2048::App do
 
     context 'with command = :down' do
       Given(:view) do
-        double('view', command: :down, update: nil, pop_tiles: nil)
+        double('view',
+               command: :down, update: nil, pop_tiles: nil, high_score: nil)
       end
       Given(:board) { double('board', down: new_board, win?: nil, lose?: nil) }
-      Given(:app) { Text2048::App.new(view, board) }
+      Given(:high_score) { double('high_score', maybe_update: nil) }
+      Given(:app) { Text2048::App.new(view, board, high_score) }
       When { app.step }
       Then { expect(board).to have_received(:down) }
       And { expect(view).to have_received(:update) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text2048
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,6 +56,7 @@ files:
 - lib/text2048/curses_view/lcd.rb
 - lib/text2048/curses_view/tile.rb
 - lib/text2048/curses_view/tile_effects.rb
+- lib/text2048/high_score.rb
 - lib/text2048/monkey_patch/array.rb
 - lib/text2048/monkey_patch/array/board.rb
 - lib/text2048/monkey_patch/array/tile.rb