text2048 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3a9fa828625d47123e5b5da1f648bb3469f8238
-  data.tar.gz: 686ec778c882bfbf3f2c9ae667e39a3f1aba8825
+  metadata.gz: 185c956718085eb81aef19c630b8cee21e67d71f
+  data.tar.gz: efb909b378a7c05e887ac9f6a4a45c84dd47e9c2
 SHA512:
-  metadata.gz: 7b668ba69fe2bc9ddaa776de2480b794eeedab09ed9bf3e4ef36fa9b5b579477d9f945a15422f7ed914fed1d869e10f6ce9be15137f1b54ac26359aa19eba8aa
-  data.tar.gz: a67611a3b78da79182004417ef90826b2d750fde61bd28b9cb206980469ddc055ab9ffe9f554960b9f03cf4ffaceeb2d6b02d17200b119e8877e7089db561e04
+  metadata.gz: 253d485900f6ea785acd1de33bbdab69f46126319640062ffd80cc5779bb7efa8b3f7a7f750d65141bbeb86bfd60805865f966c4db10402cfbace5c381bdc494
+  data.tar.gz: 91f25760bb10e3b313263ec88cc6006a38d077325296b4086eadbdd5cb909452c2161ff996ad7cf8f8c0eef9d0c0426bb43ffafb54b91a367c5723a764eca79a

data/README.md

@@ -5,27 +5,30 @@ text2048
 [![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]
 
 Text mode 2048 game.
 
-[![Screenshot](https://raw.github.com/yasuhito/text2048/develop/screen_shot.png)][screenshot]
-
 [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
+[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
 
 Installation
-============
+------------
 
 ```
 $ gem install text2048
 ```
 
 How to Play
-===========
+-----------
 
 ```
 $ 2048
@@ -35,7 +38,12 @@ $ 2048
 - +/- for increase or decrease the size of the tiles displayed.
 
 Links
-=====
+-----
 
  * [The official version of 2048](http://gabrielecirulli.github.io/2048/) by Gabriele Cirulli
  * [bfontaine/term2048](https://github.com/bfontaine/term2048) a terminal-based version in Python
+
+Author
+------
+
+[Yasuhito Takamiya](https://github.com/yasuhito) ([@yasuhito](http://twitter.com/yasuhito))

data/lib/text2048/board.rb

@@ -76,7 +76,7 @@ module Text2048
     # @return [Board] a new board
     def generate
       tiles = @all_tiles.dup
-      tiles[sample_zero_tile] = Tile.new(rand < 0.8 ? 2 : 4, :generated)
+      tiles[sample_zero_tile] = Tile.new(rand < 0.9 ? 2 : 4, :generated)
       new_board(tiles, @score)
     end
 

data/lib/text2048/curses_view.rb

@@ -4,6 +4,7 @@ require 'curses'
 require 'forwardable'
 require 'text2048/curses_view/colorize'
 require 'text2048/curses_view/keyboard'
+require 'text2048/curses_view/lcd'
 require 'text2048/curses_view/tile'
 require 'text2048/curses_view/tile_effects'
 
@@ -21,8 +22,8 @@ module Text2048
 
     def initialize
       @tiles = {}
-      @scale = 2
-      @scale_min = 1
+      @scale = 1
+      @scale_min = 0.5
       @scale_step = 0.5
       @keyboard = Keyboard.new
     end

data/lib/text2048/curses_view/lcd.rb

@@ -0,0 +1,70 @@
+# encoding: utf-8
+
+# This module smells of :reek:UncommunicativeModuleName
+module Text2048
+  class CursesView
+    # Renders numbers like LCDs
+    class LCD
+      BITMAPS = [
+        0b1111111110111,
+        0b1010100100100,
+        0b1111111011101,
+        0b1111111101101,
+        0b1011110101110,
+        0b1111111101011,
+        0b1111111111011,
+        0b1010110100101,
+        0b1111111111111,
+        0b1111111101111
+      ]
+
+      TOP = 0
+      TOP_LEFT = 1
+      TOP_RIGHT = 2
+      MIDDLE = 3
+      BOTTOM_LEFT = 4
+      BOTTOM_RIGHT = 5
+      BOTTOM = 6
+
+      CORNER_TOP_LEFT = 7
+      CORNER_TOP_RIGHT = 8
+      CORNER_MIDDLE_LEFT = 9
+      CORNER_MIDDLE_RIGHT = 10
+      CORNER_BOTTOM_LEFT = 11
+      CORNER_BOTTOM_RIGHT = 12
+
+      def initialize(number)
+        @number = number
+      end
+
+      def render
+        digits = @number.to_s.split(//).map { |each| digit(each) }
+        digits.transpose.map { |each| each.join(' ') }.join("\n")
+      end
+
+      private
+
+      def digit(number)
+        lines =
+          [[CORNER_TOP_LEFT, TOP, CORNER_TOP_RIGHT],
+           [TOP_LEFT, nil, TOP_RIGHT],
+           [CORNER_MIDDLE_LEFT, MIDDLE, CORNER_MIDDLE_RIGHT],
+           [BOTTOM_LEFT, nil, BOTTOM_RIGHT],
+           [CORNER_BOTTOM_LEFT, BOTTOM, CORNER_BOTTOM_RIGHT]]
+        lines.map { |each| line(BITMAPS[number.to_i], each) }
+      end
+
+      # @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
+      end
+    end
+  end
+end

data/lib/text2048/curses_view/tile.rb

@@ -2,21 +2,22 @@
 
 require 'curses'
 require 'text2048/curses_view/colorize'
+require 'text2048/curses_view/lcd'
 
 # This module smells of :reek:UncommunicativeModuleName
 module Text2048
   class CursesView
     # Shows tiles in curses.
+    # rubocop:disable ClassLength
     class Tile
       attr_reader :width
       attr_reader :height
       attr_reader :color
 
-      include Curses
       include Colorize
 
-      DEFAULT_HEIGHT = 3
-      DEFAULT_WIDTH = 5
+      DEFAULT_HEIGHT = 7
+      DEFAULT_WIDTH = 17
 
       def self.width(scale)
         @width = (DEFAULT_WIDTH * scale).to_i
@@ -34,6 +35,7 @@ module Text2048
         @row = (@height + 1) * row + 2
         @col = (@width + 1) * col + 1
         @color = color
+        @scale = scale
       end
 
       def show
@@ -69,14 +71,40 @@ module Text2048
 
       def draw_number
         return if @value == 0
-        setpos(@row + @height / 2, @col)
-        colorize(@color) do
-          addstr @value.to_s.center(@width)
+        if @scale >= 1
+          draw_lcd_number
+        else
+          setpos(@row + @height / 2, @col)
+          colorize(@color) do
+            addstr @value.to_s.center(@width)
+          end
         end
       end
 
       private
 
+      def draw_lcd_number
+        num_lcd = LCD.new(@value).render
+        num_lcd.split("\n").each_with_index do |each, index|
+          draw_lcd_line(each, @row + index + (@height - 5) / 2)
+        end
+      end
+
+      def col_padded
+        num_length = @value.to_s.length
+        @col + (@width - num_length * 4 + 1) / 2
+      end
+
+      # @todo This method smells of :reek:NestedIterators
+      # @todo This method smells of :reek:TooManyStatements
+      def draw_lcd_line(line, row)
+        line.split(//).each_with_index do |each, index|
+          setpos(row, col_padded + index)
+          color = each == '*' ? COLOR_BLACK + 100 : @color
+          colorize(color) { addstr each }
+        end
+      end
+
       def box_upper_left
         [@row - 1, @col - 1]
       end
@@ -131,5 +159,6 @@ module Text2048
         end
       end
     end
+    # rubocop:enable ClassLength
   end
 end

data/lib/text2048/version.rb

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

data/spec/text2048/curses_view/lcd_spec.rb

@@ -0,0 +1,225 @@
+# encoding: utf-8
+
+require 'text2048'
+
+describe Text2048::CursesView::LCD do
+  describe '#render' do
+    Given(:result) { Text2048::CursesView::LCD.new(number).render }
+
+    context 'with 0' do
+      When(:number) { 0 }
+      Then do
+        result ==
+          "***\n"\
+          "* *\n"\
+          "* *\n"\
+          "* *\n"\
+          '***'
+      end
+    end
+
+    context 'with 1' do
+      When(:number) { 1 }
+      Then do
+        result ==
+          "  *\n"\
+          "  *\n"\
+          "  *\n"\
+          "  *\n"\
+          '  *'
+      end
+    end
+
+    context 'with 2' do
+      When(:number) { 2 }
+      Then do
+        result ==
+          "***\n"\
+          "  *\n"\
+          "***\n"\
+          "*  \n"\
+          '***'
+      end
+    end
+
+    context 'with 3' do
+      When(:number) { 3 }
+      Then do
+        result ==
+          "***\n"\
+          "  *\n"\
+          "***\n"\
+          "  *\n"\
+          '***'
+      end
+    end
+
+    context 'with 4' do
+      When(:number) { 4 }
+      Then do
+        result ==
+          "* *\n"\
+          "* *\n"\
+          "***\n"\
+          "  *\n"\
+          '  *'
+      end
+    end
+
+    context 'with 5' do
+      When(:number) { 5 }
+      Then do
+        result ==
+          "***\n"\
+          "*  \n"\
+          "***\n"\
+          "  *\n"\
+          '***'
+      end
+    end
+
+    context 'with 6' do
+      When(:number) { 6 }
+      Then do
+        result ==
+          "***\n"\
+          "*  \n"\
+          "***\n"\
+          "* *\n"\
+          '***'
+      end
+    end
+
+    context 'with 7' do
+      When(:number) { 7 }
+      Then do
+        result ==
+          "***\n"\
+          "  *\n"\
+          "  *\n"\
+          "  *\n"\
+          '  *'
+      end
+    end
+
+    context 'with 8' do
+      When(:number) { 8 }
+      Then do
+        result ==
+          "***\n"\
+          "* *\n"\
+          "***\n"\
+          "* *\n"\
+          '***'
+      end
+    end
+
+    context 'with 9' do
+      When(:number) { 9 }
+      Then do
+        result ==
+          "***\n"\
+          "* *\n"\
+          "***\n"\
+          "  *\n"\
+          '***'
+      end
+    end
+
+    context 'with 16' do
+      When(:number) { 16 }
+      Then do
+        result ==
+          "  * ***\n"\
+          "  * *  \n"\
+          "  * ***\n"\
+          "  * * *\n"\
+          '  * ***'
+      end
+    end
+
+    context 'with 32' do
+      When(:number) { 32 }
+      Then do
+        result ==
+          "*** ***\n"\
+          "  *   *\n"\
+          "*** ***\n"\
+          "  * *  \n"\
+          '*** ***'
+      end
+    end
+
+    context 'with 64' do
+      When(:number) { 64 }
+      Then do
+        result ==
+          "*** * *\n"\
+          "*   * *\n"\
+          "*** ***\n"\
+          "* *   *\n"\
+          '***   *'
+      end
+    end
+
+    context 'with 128' do
+      When(:number) { 128 }
+      Then do
+        result ==
+          "  * *** ***\n"\
+          "  *   * * *\n"\
+          "  * *** ***\n"\
+          "  * *   * *\n"\
+          '  * *** ***'
+      end
+    end
+
+    context 'with 256' do
+      When(:number) { 256 }
+      Then do
+        result ==
+          "*** *** ***\n"\
+          "  * *   *  \n"\
+          "*** *** ***\n"\
+          "*     * * *\n"\
+          '*** *** ***'
+      end
+    end
+
+    context 'with 512' do
+      When(:number) { 512 }
+      Then do
+        result ==
+          "***   * ***\n"\
+          "*     *   *\n"\
+          "***   * ***\n"\
+          "  *   * *  \n"\
+          '***   * ***'
+      end
+    end
+
+    context 'with 1024' do
+      When(:number) { 1024 }
+      Then do
+        result ==
+          "  * *** *** * *\n"\
+          "  * * *   * * *\n"\
+          "  * * * *** ***\n"\
+          "  * * * *     *\n"\
+          '  * *** ***   *'
+      end
+    end
+
+    context 'with 2048' do
+      When(:number) { 2048 }
+      Then do
+        result ==
+          "*** *** * * ***\n"\
+          "  * * * * * * *\n"\
+          "*** * * *** ***\n"\
+          "*   * *   * * *\n"\
+          '*** ***   * ***'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text2048
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,7 @@ files:
 - lib/text2048/curses_view.rb
 - lib/text2048/curses_view/colorize.rb
 - lib/text2048/curses_view/keyboard.rb
+- lib/text2048/curses_view/lcd.rb
 - lib/text2048/curses_view/tile.rb
 - lib/text2048/curses_view/tile_effects.rb
 - lib/text2048/monkey_patch/array.rb
@@ -67,6 +68,7 @@ files:
 - spec/spec_helper.rb
 - spec/text2048/app_spec.rb
 - spec/text2048/board_spec.rb
+- spec/text2048/curses_view/lcd_spec.rb
 - text2048.gemspec
 homepage: http://github.com/yasuhito/text2048
 licenses:
@@ -97,6 +99,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/text2048/app_spec.rb
 - spec/text2048/board_spec.rb
+- spec/text2048/curses_view/lcd_spec.rb
 - features/game_over.feature
 - features/move_down.feature
 - features/move_left.feature