text2048 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e85082a7a9811119fd638e5dc7e163c670ea45fb
-  data.tar.gz: 6072216598424d89bc4ac20b4c8c62b507b87a8b
+  metadata.gz: b0e75242c094ba3e75243ce53f9c089c09da2e24
+  data.tar.gz: a0410d80241c4e0067873cc4fe1bfe9fe9acdb09
 SHA512:
-  metadata.gz: dbf18ee75d43a5c61dbe9c866f0fdcef642b7321db7fe7d1e4d441acab10f517d1bce4a0c8aa5b6cee8e82510bd95a5e2cff3de3f0db4ecdc0eee737cd892ae2
-  data.tar.gz: 30a1bca88794b26870d799cc037339dbf6214672a54a65da00221a69871125982628dca00f974c52ef4ce409f207b2dc9ece7b6636171769a51d64e17399d7af
+  metadata.gz: a1e94bc8de48cb973501983cf4c131b091362589c4c2eca09052a689111660e58557b6b344dea329641fb40b03b55477817e8191df01a28a2425bf1e7d396a4e
+  data.tar.gz: 421b6c1f62274af76bfa224c1605c4f31f81bb337586251fd667c43c2ec0a932c0f1fefc28ab6bfa969f7abac98919f43dbcb4fd0506e74488a4e811e9c3a95c

data/README.md

@@ -1,8 +1,19 @@
 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]
 
 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
+
 How to Play
 ===========
 
@@ -22,3 +33,8 @@ Installation
 ```
 $ gem install text2048
 ```
+
+Link
+====
+
+ * [The official version of 2048](http://gabrielecirulli.github.io/2048/) by Gabriele Cirulli

data/Rakefile

@@ -1,8 +1,13 @@
 # encoding: utf-8
 
 require 'bundler/gem_tasks'
+require 'coveralls/rake/task'
 
-task default: [:spec, :cucumber, :rubocop]
+task default: [:test, :reek, :rubocop]
+task test: [:spec, :cucumber, 'coveralls:push']
+task travis: :default
+
+Coveralls::RakeTask.new
 
 begin
   require 'rspec/core/rake_task'
@@ -30,3 +35,17 @@ rescue LoadError
     $stderr.puts 'Rubocop is disabled'
   end
 end
+
+begin
+  require 'reek/rake/task'
+  Reek::Rake::Task.new do |t|
+    t.fail_on_error = false
+    t.verbose = false
+    t.reek_opts = '--quiet'
+    t.source_files = FileList['lib/**/*.rb']
+  end
+rescue LoadError
+  task :reek do
+    $stderr.puts 'Reek is disabled'
+  end
+end

data/bin/2048

@@ -1,33 +1,8 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
 $LOAD_PATH.unshift(File.dirname(File.realpath(__FILE__)) + '/../lib')
 
-require 'curses'
-require 'text2048'
+require 'text2048/app'
 
-include Curses
-
-KEYS = {
-  'h' => :left!, 'l' => :right!, 'k' => :up!, 'j' => :down!,
-  Key::LEFT => :left!, Key::RIGHT => :right!,
-  Key::UP => :up!, Key::DOWN => :down!,
-  '+' => :larger!, '-' => :smaller!,
-  'q' => :quit
-}
-
-game = Text2048::Game.new(Text2048::CursesView.new)
-game.start
-game.draw
-
-loop do
-  game.game_over if game.lose?
-  command = KEYS[Curses.getch]
-  game.input(command) if command
-  case command
-  when :left!, :right!, :up!, :down!
-    game.generate
-    game.draw
-  else
-    # noop
-  end
-end
+Text2048::App.new.start

data/features/game_over.feature

@@ -0,0 +1,10 @@
+Feature: Game Over
+  Scenario: Game Over
+    When a board:
+    """
+     2  4  8  16
+     4  8 16  32
+     8 16 32  64
+    16 32 64 128
+    """
+    Then it is game over

data/features/step_definitions/2048_steps.rb

@@ -1,33 +1,40 @@
+# encoding: utf-8
+
 require 'text2048'
 
 Given(/^a board:$/) do |string|
   layout = string.split("\n").reduce([]) do |result, row|
     result << row.split(' ').map(&:to_i)
   end
-  @game = Text2048::Game.new(Text2048::TextView.new(output), layout)
+  @view = Text2048::TextView.new(output)
+  @board = Text2048::Board.new(layout)
 end
 
 When(/^I move the board to the right$/) do
-  @game.right!
+  @board = @board.right
 end
 
 When(/^I move the board to the left$/) do
-  @game.left!
+  @board = @board.left
 end
 
 When(/^I move the board up$/) do
-  @game.up!
+  @board = @board.up
 end
 
 When(/^I move the board down$/) do
-  @game.down!
+  @board = @board.down
 end
 
 Then(/^the board is:$/) do |string|
-  @game.draw
+  @view.update(@board)
   output.messages.should eq(string)
 end
 
 Then(/^the score is (\d+)$/) do |score|
-  @game.score.should eq(score.to_i)
+  @board.score.should eq(score.to_i)
+end
+
+Then(/^it is game over$/) do
+  @board.lose?.should be_true
 end

data/features/support/env.rb

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+require 'coveralls'
+Coveralls.wear_merged!
+
 # Dummy output
 class Output
   def messages

data/lib/text2048/app.rb

@@ -0,0 +1,64 @@
+# encoding: utf-8
+
+require 'curses'
+require 'text2048'
+
+# This module smells of :reek:UncommunicativeModuleName
+module Text2048
+  # Controller class.
+  class App
+    include Curses
+
+    KEYS = {
+      'h' => :left, 'l' => :right, 'k' => :up, 'j' => :down,
+      Key::LEFT => :left, Key::RIGHT => :right,
+      Key::UP => :up, Key::DOWN => :down,
+      '+' => :larger, '-' => :smaller,
+      'q' => :quit
+    }
+
+    def initialize
+      @view = CursesView.new
+      @board = Board.new
+      @view.update(@board)
+    end
+
+    def start
+      loop do
+        @view.win if @board.win?
+        @view.game_over if @board.lose?
+        input KEYS[Curses.getch]
+      end
+      sleep
+    end
+
+    private
+
+    def input(command)
+      case command
+      when :left, :right, :up, :down
+        move_and_generate(command)
+      when :larger, :smaller
+        @view.__send__ command, @board
+      when :quit
+        exit 0
+      end
+    end
+
+    def move_and_generate(command)
+      last = move(command)
+      generate if @board != last
+    end
+
+    def move(command)
+      last = @board.dup
+      @board = @board.__send__(command)
+      last
+    end
+
+    def generate
+      @board.generate
+      @view.update(@board)
+    end
+  end
+end

data/lib/text2048/board.rb

@@ -3,16 +3,19 @@
 require 'text2048/tile'
 require 'text2048/tiles'
 
+# This module smells of :reek:UncommunicativeModuleName
 module Text2048
   # Game board
   class Board
+    attr_reader :score
     attr_reader :tiles
 
-    def initialize(tiles = nil)
-      @tiles = Array.new(4) { Array.new(4) { Tile.new(0) } }
+    def initialize(tiles = nil, score = 0)
+      @score = score
       if tiles
-        load_tiles(tiles)
+        @tiles = tiles.dup
       else
+        @tiles = Array.new(4) { Array.new(4) { Tile.new(0) } }
         2.times { generate }
       end
     end
@@ -27,54 +30,54 @@ module Text2048
       end
     end
 
-    def right!
-      move! :right
+    def win?
+      numbers.select do |each|
+        each.to_i >= 2048
+      end.size > 0
     end
 
-    def left!
-      move! :left
+    def lose?
+      right.left.up.down.numbers.size == 4 * 4
     end
 
-    def up!
-      transpose { move! :left }
+    def left
+      tiles, score = move(:left)
+      self.class.new tiles, @score + score
     end
 
-    def down!
-      transpose { move! :right }
+    def right
+      tiles, score = move(:right)
+      self.class.new tiles, @score + score
+    end
+
+    def up
+      tiles, score = transpose { move(:left) }
+      self.class.new tiles, @score + score
+    end
+
+    def down
+      tiles, score = transpose { move(:right) }
+      self.class.new tiles, @score + score
     end
 
     def ==(other)
-      @tiles.zip(other.tiles).reduce(true) do |result, each|
-        result && Tiles.new(each[0]) == Tiles.new(each[1])
-      end
+      layout == other.layout
     end
 
     def merged_tiles
-      result = []
-      @tiles.each_with_index do |row, y|
-        row.each_with_index do |each, x|
-          result << [y, x] if each.status == :merged
-        end
-      end
-      result
+      find_tiles :merged
     end
 
     def generated_tiles
-      result = []
-      @tiles.each_with_index do |row, y|
-        row.each_with_index do |each, x|
-          result << [y, x] if each.status == :generated
-        end
-      end
-      result
+      find_tiles :generated
     end
 
     def generate
       loop do
-        x = rand(4)
-        y = rand(4)
-        if @tiles[y][x] == 0
-          @tiles[y][x] = Tile.new(rand < 0.8 ? 2 : 4, :generated)
+        line = rand(4)
+        col = rand(4)
+        if @tiles[line][col] == 0
+          @tiles[line][col] = Tile.new(rand < 0.8 ? 2 : 4, :generated)
           return
         end
       end
@@ -88,29 +91,32 @@ module Text2048
 
     private
 
-    def move!(direction)
+    def move(direction)
       score = 0
-      @tiles.map! do |each|
+      tiles = @tiles.map do |each|
         row, sc = Tiles.new(each).__send__ direction
         score += sc
         row
       end
-      score
+      [tiles, score]
     end
 
+    def find_tiles(status)
+      list = []
+      @tiles.each_with_index do |row, line|
+        row.each_with_index do |each, col|
+          list << [line, col] if each.status == status
+        end
+      end
+      list
+    end
+
+    # FIXME: this method is destructive.
     def transpose
       @tiles = @tiles.transpose
-      score = yield
+      @tiles, score = yield
       @tiles = @tiles.transpose
-      score
-    end
-
-    def load_tiles(tiles)
-      tiles.each_with_index do |row, y|
-        row.each_with_index do |number, x|
-          @tiles[y][x] = Tile.new(number)
-        end
-      end
+      [@tiles, score]
     end
   end
 end

data/lib/text2048/curses_tile.rb

@@ -2,6 +2,7 @@
 
 require 'curses'
 
+# This module smells of :reek:UncommunicativeModuleName
 module Text2048
   # Shows tiles in curses.
   class CursesTile
@@ -14,107 +15,102 @@ module Text2048
     DEFAULT_HEIGHT = 3
     DEFAULT_WIDTH = 5
 
-    def initialize(value, y, x, color, scale = 1)
+    def initialize(value, line, col, color, scale = 1)
       @value = value.to_i
-      @y = y
-      @x = x
-      @color = color
       @height = (DEFAULT_HEIGHT * scale).to_i
+      @box_height = @height + 2
       @width = (DEFAULT_WIDTH * scale).to_i
+      @box_width = @width + 2
+      @line = (@height + 1) * line + 2
+      @col = (@width + 1) * col + 1
+      @color = color
     end
 
     def show
       draw_box
-      attron(color_pair(@color + 100)) { fill }
-      attron(color_pair(@color)) { draw_number }
+      fill_tile_color
+      draw_number
       self
     end
 
-    def pop1
-      setpos(yc - 1, xc - 1)
-      addstr('.' * (@width + 2))
-
-      (0..(@height - 1)).each do |dy|
-        setpos(yc + dy, xc - 1)
-        addstr('.')
-        setpos(yc + dy, xc + @width)
-        addstr('.')
+    def pop
+      attron(color_pair(@color + 100)) do
+        draw_box
       end
+    end
 
-      setpos(yc + @height, xc - 1)
-      addstr('.' * (@width + 2))
+    def draw_box
+      draw_square
+      [box_upper_left, box_upper_right,
+       box_lower_left, box_lower_right].each do |line, col|
+        setpos(line, col)
+        addstr('+')
+      end
     end
 
-    def pop2
-      draw_box
-      refresh
+    def fill_tile_color
+      attron(color_pair(@color + 100)) { fill }
     end
 
-    def zoom1
+    def fill_black
       attron(color_pair(COLOR_BLACK + 100)) { fill }
-      attron(color_pair(@color)) { draw_number }
       refresh
     end
 
-    def zoom2
-      setpos(yc + @height / 2 - 1, xc + @width / 2 - 1)
-      attron(color_pair(@color + 100)) { addstr('...') }
-      setpos(yc + @height / 2, xc + @width / 2 - 1)
-      attron(color_pair(@color + 100)) { addstr('...') }
-      setpos(yc + @height / 2 + 1, xc + @width / 2 - 1)
-      attron(color_pair(@color + 100)) { addstr('...') }
+    def draw_number
+      return if @value == 0
+      setpos(@line + @height / 2, @col)
+      attron(color_pair(@color)) do
+        addstr @value.to_s.center(@width)
+      end
+    end
 
-      attron(color_pair(@color)) { draw_number }
+    private
 
-      refresh
+    def box_upper_left
+      [@line - 1, @col - 1]
     end
 
-    def zoom3
-      attron(color_pair(@color + 100)) { fill }
-      attron(color_pair(@color)) { draw_number }
-      refresh
+    def box_upper_right
+      [@line - 1, @col + @width]
     end
 
-    private
+    def box_lower_left
+      [@line + @height, @col - 1]
+    end
 
-    def yc
-      (@height + 1) * @y + 2
+    def box_lower_right
+      [@line + @height, @col + @width]
     end
 
-    def xc
-      (@width + 1) * @x + 1
+    def draw_square
+      draw_horizonal_line(*box_upper_left, @box_width)
+      draw_vertical_line(*box_upper_left, @box_height)
+      draw_vertical_line(*box_upper_right, @box_height)
+      draw_horizonal_line(*box_lower_left, @box_width)
     end
 
-    def draw_box
-      setpos(yc - 1, xc - 1)
-      addstr("+#{'-' * @width}+")
+    def draw_horizonal_line(line, col, length)
+      setpos(line, col)
+      addstr('-' * length)
+    end
 
-      (0..(@height - 1)).each do |dy|
-        setpos(yc + dy, xc - 1)
-        addstr('|')
-        setpos(yc + dy, xc + @width)
+    def draw_vertical_line(line, col, length)
+      (0..(length - 1)).each do |each|
+        setpos(line + each, col)
         addstr('|')
       end
-
-      setpos(yc + @height, xc - 1)
-      addstr("+#{'-' * @width}+")
     end
 
     def fill
-      (0..(@height - 1)).each do |dy|
-        setpos(yc + dy, xc)
-        if @value != 0 && dy == @height / 2
+      (0..(@height - 1)).each do |each|
+        setpos(@line + each, @col)
+        if @value != 0 && each == @height / 2
           addstr @value.to_s.center(@width)
         else
           addstr('.' * @width)
         end
       end
     end
-
-    def draw_number
-      return if @value == 0
-      setpos(yc + @height / 2, xc)
-      addstr @value.to_s.center(@width)
-    end
   end
 end

data/lib/text2048/curses_view.rb

@@ -3,10 +3,41 @@
 require 'curses'
 require 'text2048/curses_tile'
 
+# This module smells of :reek:UncommunicativeModuleName
 module Text2048
   # Curses UI
   class CursesView
+    # Curses tile effects
+    module TileEffects
+      def pop_tiles(list)
+        pop(list)
+        refresh
+        sleep 0.1
+        draw_box(list)
+        refresh
+      end
+
+      def zoom_tiles(list)
+        [:fill_black, :draw_number, :show].each do |each|
+          list.each { |line, col| @tiles[line][col].__send__ each }
+          refresh
+          sleep 0.05
+        end
+      end
+
+      private
+
+      def pop(list)
+        list.each { |line, col| @tiles[line][col].pop }
+      end
+
+      def draw_box(list)
+        list.each { |line, col| @tiles[line][col].draw_box }
+      end
+    end
+
     include Curses
+    include TileEffects
 
     COLORS = {
       0 => COLOR_BLACK,
@@ -23,6 +54,9 @@ module Text2048
       2048 => COLOR_RED
     }
 
+    DEFAULT_WIDTH = (CursesTile::DEFAULT_WIDTH + 1) * 4 + 1
+    DEFAULT_HEIGHT = (CursesTile::DEFAULT_HEIGHT + 1) * 4 + 2
+
     def initialize
       @tiles = Array.new(4) { Array.new(4) }
       @scale = 2
@@ -30,70 +64,66 @@ module Text2048
       @scale_step = 0.5
     end
 
-    def start
-      init_screen
-      curs_set(0)
-      start_color
-      stdscr.keypad(true)
-      noecho
-      init_color_pairs
-      at_exit { close_screen }
+    def update(board)
+      maybe_init_curses
+      draw_score(board.score)
+      draw_tiles(board.tiles)
+      refresh
+      pop_tiles(board.merged_tiles)
+      zoom_tiles(board.generated_tiles)
     end
 
-    def update(tiles, score)
-      draw_score(score)
-      tiles.each_with_index do |row, y|
-        draw_row(row, y)
-      end
+    def height
+      (@tiles[0][0].height + 1) * 4 + 2
     end
 
-    def larger!(tiles, score)
+    def width
+      (@tiles[0][0].width + 1) * 4 + 1
+    end
+
+    def larger(board)
       return if @scale > scale_max
+      maybe_init_curses
       @scale += @scale_step
       clear
-      update(tiles, score)
+      update(board)
     end
 
-    def smaller!(tiles, score)
+    def smaller(board)
       return if @scale <= @scale_min
+      maybe_init_curses
       @scale -= @scale_step
       clear
-      update(tiles, score)
+      update(board)
     end
 
-    def pop_tiles(list)
-      list.each do |y, x|
-        attron(color_pair(@tiles[y][x].color + 100)) do
-          @tiles[y][x].pop1
-        end
-      end
-      refresh
-      sleep 0.1
-
-      list.each do |y, x|
-        @tiles[y][x].pop2
-      end
-    end
-
-    def zoom_tiles(list)
-      [:zoom1, :zoom2, :zoom3].each do |each|
-        list.each do |y, x|
-          @tiles[y][x].__send__ each
-        end
-        sleep 0.05
-      end
+    def win
+      setpos(height / 2, width / 2 - 1)
+      attron(color_pair(COLOR_RED)) { addstr('WIN!') }
     end
 
     def game_over
-      width = (@tiles[0][0].width + 1) * 4 + 1
-      height = (@tiles[0][0].height + 1) * 4 + 2
-
       setpos(height / 2, width / 2 - 4)
       attron(color_pair(COLOR_RED)) { addstr('GAME OVER') }
     end
 
     private
 
+    def maybe_init_curses
+      @curses_initialized || init_curses
+      @curses_initialized = true
+    end
+
+    def init_curses
+      init_screen
+      curs_set(0)
+      start_color
+      stdscr.keypad(true)
+      noecho
+      init_color_pairs
+      at_exit { close_screen }
+    end
+
     def init_color_pairs
       COLORS.each_pair do |_key, value|
         init_pair value, COLOR_BLACK, value
@@ -102,9 +132,9 @@ module Text2048
     end
 
     def scale_max
-      w = (CursesTile::DEFAULT_WIDTH + 1) * 4 + 1
-      h = (CursesTile::DEFAULT_HEIGHT + 1) * 4 + 2
-      (cols - 1) / w < lines / h ? (cols - 1) / w : lines / h
+      ratio_width = (cols - 1) / DEFAULT_WIDTH
+      ratio_height = lines / DEFAULT_HEIGHT
+      ratio_width < ratio_height ? ratio_width : ratio_height
     end
 
     def draw_score(score)
@@ -112,12 +142,15 @@ module Text2048
       addstr("Score: #{score}")
     end
 
-    def draw_row(tiles, y)
-      tiles.each_with_index do |each, x|
-        @tiles[y][x] =
-          CursesTile.new(each, y, x, COLORS[each.to_i], @scale).show
+    def draw_tiles(tiles)
+      tiles.each_with_index { |row, line| draw_row(row, line) }
+    end
+
+    def draw_row(tiles, line)
+      tiles.each_with_index do |each, col|
+        @tiles[line][col] =
+          CursesTile.new(each, line, col, COLORS[each.to_i], @scale).show
       end
-      refresh
     end
   end
 end

data/lib/text2048/monkey_patch/array/tile.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+# This module smells of :reek:UncommunicativeModuleName
 module Text2048
   module MonkeyPatch
     module Array

data/lib/text2048/text_view.rb

@@ -1,15 +1,26 @@
+# encoding: utf-8
+
+# This module smells of :reek:UncommunicativeModuleName
 module Text2048
   # Simple text view.
   class TextView
-    def initialize(output)
+    # Board row in text.
+    class Row
+      def initialize(row)
+        @row = row
+      end
+
+      def to_s
+        @row.map { |each| each != 0 ? each : '_' }.join(' ')
+      end
+    end
+
+    def initialize(output = STDOUT)
       @output = output
     end
 
-    def update(layout, _score)
-      string = layout.map do |row|
-        row.map { |num| num != 0 ? num : '_' }.join(' ')
-      end.join("\n")
-      @output.puts string
+    def update(game)
+      @output.puts game.tiles.map { |row| Row.new(row).to_s }.join("\n")
     end
 
     def pop_tiles(_list)

data/lib/text2048/tile.rb

@@ -2,6 +2,7 @@
 
 require 'forwardable'
 
+# This module smells of :reek:UncommunicativeModuleName
 module Text2048
   # 2048 tile
   class Tile

data/lib/text2048/tiles.rb

@@ -4,6 +4,7 @@ require 'forwardable'
 require 'text2048/monkey_patch/array'
 require 'text2048/tile'
 
+# This module smells of :reek:UncommunicativeModuleName
 module Text2048
   # Each row or column of a game board.
   class Tiles
@@ -23,10 +24,6 @@ module Text2048
       [list.rshrink.reverse, score]
     end
 
-    def ==(other)
-      rshrink == other.rshrink
-    end
-
     def_delegators :@list, :map, :rshrink
   end
 end

data/lib/text2048/version.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-# Base module.
+# This module smells of :reek:UncommunicativeModuleName
 module Text2048
   # gem version.
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/text2048.rb

@@ -1,4 +1,5 @@
+# encoding: utf-8
+
 require 'text2048/board'
 require 'text2048/curses_view'
-require 'text2048/game'
 require 'text2048/text_view'

data/spec/spec_helper.rb

@@ -2,5 +2,8 @@
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
+require 'coveralls'
+Coveralls.wear_merged!
+
 require 'rspec'
 require 'rspec/given'

data/spec/text2048/board_spec.rb

@@ -1,7 +1,9 @@
+# encoding: utf-8
+
 require 'text2048'
 
 describe Text2048::Board, '.new' do
-  context 'with no numbers' do
+  context 'with all zeroes' do
     Given(:board) do
       Text2048::Board.new([[0, 0, 0, 0],
                            [0, 0, 0, 0],
@@ -10,13 +12,13 @@ describe Text2048::Board, '.new' do
     end
 
     describe '#right' do
-      When { board.right! }
+      When(:result) { board.right }
 
       Then do
-        board.layout == [[0, 0, 0, 0],
-                         [0, 0, 0, 0],
-                         [0, 0, 0, 0],
-                         [0, 0, 0, 0]]
+        result.layout == [[0, 0, 0, 0],
+                          [0, 0, 0, 0],
+                          [0, 0, 0, 0],
+                          [0, 0, 0, 0]]
       end
     end
   end
@@ -30,26 +32,15 @@ describe Text2048::Board, '.new' do
     end
 
     describe '#right' do
-      When { board.right! }
+      When(:result) { board.right }
 
       Then do
-        board.layout == [[0, 0, 0, 2],
-                         [0, 0, 0, 2],
-                         [0, 0, 0, 2],
-                         [0, 0, 0, 2]]
+        result.layout == [[0, 0, 0, 2],
+                          [0, 0, 0, 2],
+                          [0, 0, 0, 2],
+                          [0, 0, 0, 2]]
       end
     end
-
-    describe '#==' do
-      When(:result) do
-        board == Text2048::Board.new([[0, 0, 0, 2],
-                                      [0, 0, 2, 0],
-                                      [0, 2, 0, 0],
-                                      [2, 0, 0, 0]])
-      end
-
-      Then { result == true }
-    end
   end
 
   context 'with six 2s that can be merged' do
@@ -61,13 +52,13 @@ describe Text2048::Board, '.new' do
     end
 
     describe '#right' do
-      When { board.right! }
+      When(:result) { board.right }
 
       Then do
-        board.layout == [[0, 0, 0, 4],
-                         [0, 0, 0, 2],
-                         [0, 0, 0, 4],
-                         [0, 0, 0, 2]]
+        result.layout == [[0, 0, 0, 4],
+                          [0, 0, 0, 2],
+                          [0, 0, 0, 4],
+                          [0, 0, 0, 2]]
       end
     end
   end

data/text2048.gemspec

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'text2048/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text2048
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,6 +40,7 @@ files:
 - README.md
 - Rakefile
 - bin/2048
+- features/game_over.feature
 - features/move_down.feature
 - features/move_left.feature
 - features/move_right.feature
@@ -47,10 +48,10 @@ files:
 - features/step_definitions/2048_steps.rb
 - features/support/env.rb
 - lib/text2048.rb
+- lib/text2048/app.rb
 - lib/text2048/board.rb
 - lib/text2048/curses_tile.rb
 - lib/text2048/curses_view.rb
-- lib/text2048/game.rb
 - lib/text2048/monkey_patch/array.rb
 - lib/text2048/monkey_patch/array/tile.rb
 - lib/text2048/text_view.rb
@@ -89,10 +90,10 @@ test_files:
 - spec/spec_helper.rb
 - spec/text2048/board_spec.rb
 - spec/text2048/tiles_spec.rb
+- features/game_over.feature
 - features/move_down.feature
 - features/move_left.feature
 - features/move_right.feature
 - features/move_up.feature
 - features/step_definitions/2048_steps.rb
 - features/support/env.rb
-has_rdoc: 

data/lib/text2048/game.rb

@@ -1,81 +0,0 @@
-# encoding: utf-8
-
-require 'forwardable'
-require 'text2048/board'
-
-module Text2048
-  # A class responsible of handling all the command line interface
-  # logic.
-  class Game
-    attr_reader :score
-
-    extend Forwardable
-
-    def initialize(view, tiles = nil)
-      @score = 0
-      @board = Board.new(tiles)
-      @view = view
-    end
-
-    def start
-      @view.start
-    end
-
-    def draw
-      @view.update(@board.tiles, @score)
-      @view.pop_tiles(@board.merged_tiles)
-      @view.zoom_tiles(@board.generated_tiles)
-    end
-
-    def lose?
-      b = @board.dup
-      b.right!
-      b.left!
-      b.up!
-      b.down!
-      b.numbers.size == 4 * 4
-    end
-
-    def input(command)
-      @last = @board.tiles.dup
-      __send__ command
-    end
-
-    def left!
-      @score += @board.left!
-    end
-
-    def right!
-      @score += @board.right!
-    end
-
-    def up!
-      @score += @board.up!
-    end
-
-    def down!
-      @score += @board.down!
-    end
-
-    def generate
-      return if @last == @board.tiles
-      @board.generate
-    end
-
-    def larger!
-      @view.larger!(@board.tiles, @score)
-    end
-
-    def smaller!
-      @view.smaller!(@board.tiles, @score)
-    end
-
-    def game_over
-      @view.game_over
-    end
-
-    def quit
-      exit 0
-    end
-  end
-end