TwentyFortyEight 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe83920a037beecde5b1bfb7abe7c81f6722a90a
-  data.tar.gz: 6506f6288be1a550cb4fee734797f7d933a7eab1
+  metadata.gz: 169c96337916c0265c9bcf9f76ed322a221728be
+  data.tar.gz: 7712f1815cc6a4e4abe44c1da513354c2b6c6be7
 SHA512:
-  metadata.gz: '039c7e5d4462a0191bd0c21de97b129ba74dad41a8224161f878f93b4a45b02faa4c3fece018b242d2f7d100cf17acfe49787c6caef414294771e51268cce82d'
-  data.tar.gz: 656d2266224a829cd6c2ba195670d0b943607827e9f1955f65f29f1e2e72194efc8d538795ee238f58c4c3b1036287a3f7c71740821e7a0259b1c2ebeaf442cc
+  metadata.gz: 49c55706b034d1a427dd69939bdf202eec5b97476b365fc0e95b6e3cdacc405dd6fa990939443f145603e4f365a4c93d129857106bade1cba5ff7145dd2aee23
+  data.tar.gz: e0c82620996f5656a79057d50425d1ab9b104d001f0cefceb22ffb17795fb114abab60e4ac3a7b2d69da2f86e947559e1b7a697aa5932e8dff8c441271bf10e7

data/TwentyFortyEight.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %(A 2048 game for terminals)
   spec.description   = 'Play a game of 2048 in the terminal, colorized using ' \
-                       'Ruby curses. See --help for more options)'
+                       'Ruby curses. (See --help for options / controls)'
   spec.homepage      = 'https://sidofc.github.io/projects/2048'
   spec.license       = 'MIT'
 

data/bin/console

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "TwentyFortyEight"
+require 'bundler/setup'
+require 'TwentyFortyEight'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+@game = TwentyFortyEight.endless verbose: true do
+  down || left || right || up
+end
 
-require "irb"
-IRB.start(__FILE__)
+require 'pry'
+Pry.start

data/lib/TwentyFortyEight.rb

@@ -11,17 +11,20 @@ require_relative 'TwentyFortyEight/screen'
 require_relative 'TwentyFortyEight/dsl'
 
 module TwentyFortyEight
-  @@games = []
-  @@best  = nil
+  MODES    = [:play, :endless].freeze
+  SETTINGS = { size: 4, fill: 0, empty: 0 }.freeze
+
+  @@games     = []
+  @@highscore = nil
 
   def self.play(settings = {}, &block)
-    settings = Options.new settings if settings.is_a? Hash
+    settings = Options.new SETTINGS.merge(settings)
     game     = Game.new @@games.count, settings
     dirs     = game.directions - (settings.except || [])
-    dirs     = dirs - (settings.only || [])
-    dsl      = Dsl.new settings, &block if block_given?
+    dirs    -= (settings.only || [])
+    dsl      = Dsl.new game, settings, &block if block_given?
 
-    @@best ||= game
+    load_or_set_highscore!(game.score, settings) unless @@highscore
 
     Screen.init! settings if settings.verbose? && @@games.empty?
 
@@ -36,8 +39,6 @@ module TwentyFortyEight
     render_game game, settings if settings.verbose?
 
     loop do
-      @@best = game if @@best != game && game.score > @@best.score
-      # binding.pry
       if game.end?
         break if settings.mode?(:endless) ||
                  !settings.verbose? ||
@@ -66,6 +67,7 @@ module TwentyFortyEight
         end
 
         game.action action
+        load_or_set_highscore! game.score, settings
         render_game game, settings if settings.verbose? || settings.interactive?
         sleep(settings.delay.to_f / 1000) if settings.delay?
       end
@@ -79,31 +81,52 @@ module TwentyFortyEight
     end
 
     return play(settings, &block) if restart
-
     game
   ensure
     Screen.restore! if settings.verbose? && settings.mode?(:play)
   end
 
+  def self.load_or_set_highscore!(current_score, settings, path = '~/.2048')
+    @@highscore                     ||= load_highscore
+    @@highscore[settings.size.to_s] ||= 0
+
+    return unless current_score > @@highscore[settings.size.to_s]
+
+    @@highscore[settings.size.to_s] = current_score
+    write_highscore
+  end
+
+  def self.write_highscore(path = '~/.2048')
+    File.write File.expand_path(path), @@highscore.to_json
+  end
+
+  def self.load_highscore(path = '~/.2048')
+    path = File.expand_path path
+
+    if File.exists?(path)
+      contents = File.read path
+      hsh      = JSON.parse contents.start_with?('{') && contents || '{}'
+    else
+      File.new path, File::CREAT
+      {}
+    end
+  end
+
   def self.endless(settings = {}, &block)
     loop { TwentyFortyEight.play settings, &block }
   ensure
     Screen.restore! if settings.verbose?
   end
 
-  def self.modes
-    (TwentyFortyEight.methods - [:modes, :render_game]) - Object.methods
-  end
-
   def self.render_game(game, settings, final = false)
-    print_extra = { interactive: settings.interactive?,
-                    info: [{ highscore: @@best&.score},
-                           { score: game.score, dir: game.current_dir},
-                           { id: @@games.count, move: game.move_count }]}
+    h = { interactive: settings.interactive?, info: [] }
 
-    print_extra[:history] = (@@games + [game]) if settings.history?
+    h[:info] << { game: (1 + game.id) } if settings.mode? :endless
+    h[:info] << { highscore: @@highscore[settings.size.to_s], move: game.moves }
+    h[:info] << { score: game.score, dir: game.current_dir}
+    h[:history] = (@@games + [game]) if settings.history?
 
-    return Screen.game_over game, print_extra if final
-    Screen.render game.board.to_a, print_extra
+    return Screen.game_over game, h if final
+    Screen.render game.board.to_a, h
   end
 end

data/lib/TwentyFortyEight/cli.rb

@@ -6,7 +6,7 @@ module TwentyFortyEight
       mode     = ARGV[0].to_s.downcase.to_sym
       settings = defaults_for(mode).merge user_defaults
       settings[:mode] = mode
-      settings[:mode] = :play unless TwentyFortyEight.modes.include? mode
+      settings[:mode] = :play unless TwentyFortyEight::MODES.include? mode
 
       OptionParser.new do |cli|
         cli.banner = ''
@@ -50,6 +50,11 @@ module TwentyFortyEight
 
         cli.on('--help', 'Display this help') do
           puts 'usage: 2048 [mode] [options]'
+          puts 'controls:'
+          puts '     W A S D'
+          puts '     K J H L'
+          puts '     ARROW KEYS'
+          puts ''
           puts 'modes:'
           puts '     play'    + (' ' * 28) + 'Plays the game automatically in order :down, :left, :right, :up'
           puts '     endless' + (' ' * 25) + 'Loops play until ctrl+C'

data/lib/TwentyFortyEight/dsl.rb

@@ -4,20 +4,25 @@ module TwentyFortyEight
   class Dsl
     attr_reader :settings, :game
 
-    def initialize(settings = {}, &block)
+    def initialize(game, settings = {}, &block)
       @callable = block
       @settings = settings
+      @game     = game
     end
 
     def apply(game)
       @queue = []
-      @game  = game.dup
-
       instance_eval(&@callable)
     end
 
+    def quit!
+      game.quit! && :quit
+    end
+
     def method_missing(sym, *args, &block)
-      return sym if game.action(sym, insert: false).changed?
+      return game.send(sym) if [:won?, :lost?, :changed?, :available,
+                                :score, :prev_score].include?(sym)
+      return sym if game.dup.action(sym, insert: false).changed?
     end
 
     def respond_to_missing?(sym, *args, &block)

data/lib/TwentyFortyEight/game.rb

@@ -3,9 +3,8 @@ module TwentyFortyEight
   # Game
   class Game
     attr_reader :id, :board, :settings, :score, :prev_score, :prev_available,
-                :move_count, :log, :current_dir
+                :moves, :log, :current_dir
 
-    SETTINGS = { size: 4, fill: 0, empty: 0 }.freeze
     MOVES    = [:up, :down, :left, :right].freeze
     ACTIONS  = [*MOVES, :quit].freeze
 
@@ -13,8 +12,8 @@ module TwentyFortyEight
       @id             = id
       @score          = 0
       @prev_score     = 0
-      @move_count     = 0
-      @settings       = Options.new SETTINGS.merge(opts).merge(rest_opts)
+      @moves          = 0
+      @settings       = Options.new opts.merge(rest_opts)
       @board          = Board.new(settings)
       @prev_available = available
       @current_dir    = nil
@@ -77,9 +76,9 @@ module TwentyFortyEight
       send dir
 
       if changed?
-        @move_count += 1
+        @moves += 1
 
-        log << { move: move_count, score: score, direction: dir } if log
+        log << { move: moves, score: score, direction: dir } if log
         insert! unless opts[:insert] == false
       end
 

data/lib/TwentyFortyEight/screen.rb

@@ -84,12 +84,12 @@ module TwentyFortyEight
     def self.handle_keypress(allow_moves = true)
       case Curses.getch
       when ' ' then sleep 0.2 until Curses.getch == ' '
-      when Curses::KEY_DOWN,  's' then :down  if allow_moves
-      when Curses::KEY_UP,    'w' then :up    if allow_moves
-      when Curses::KEY_LEFT,  'a' then :left  if allow_moves
-      when Curses::KEY_RIGHT, 'd' then :right if allow_moves
-      when Curses::KEY_CLOSE, 'q' then :quit
-      when 'r' then :restart
+      when Curses::KEY_DOWN,  's', 'j' then :down  if allow_moves
+      when Curses::KEY_UP,    'w', 'k' then :up    if allow_moves
+      when Curses::KEY_LEFT,  'a', 'h' then :left  if allow_moves
+      when Curses::KEY_RIGHT, 'd', 'l' then :right if allow_moves
+      when Curses::KEY_CLOSE, 'q'      then :quit
+      when 'r'                         then :restart
       end
     end
 

data/lib/TwentyFortyEight/version.rb

@@ -1,3 +1,3 @@
 module TwentyFortyEight
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TwentyFortyEight
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,8 +94,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Play a game of 2048 in the terminal, colorized using Ruby curses. See
-  --help for more options)
+description: Play a game of 2048 in the terminal, colorized using Ruby curses. (See
+  --help for options / controls)
 email:
 - sidneyliebrand@gmail.com
 executables: