TwentyFortyEight 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 169c96337916c0265c9bcf9f76ed322a221728be
-  data.tar.gz: 7712f1815cc6a4e4abe44c1da513354c2b6c6be7
+  metadata.gz: f437369fa63361bbb433fd5498ef7107eca3072b
+  data.tar.gz: 5f1eda15fb4412d3e070a092cae332a0f22e8b60
 SHA512:
-  metadata.gz: 49c55706b034d1a427dd69939bdf202eec5b97476b365fc0e95b6e3cdacc405dd6fa990939443f145603e4f365a4c93d129857106bade1cba5ff7145dd2aee23
-  data.tar.gz: e0c82620996f5656a79057d50425d1ab9b104d001f0cefceb22ffb17795fb114abab60e4ac3a7b2d69da2f86e947559e1b7a697aa5932e8dff8c441271bf10e7
+  metadata.gz: dae1eb27a154ce03fc9e5c2dbe0d1930745d02556e5bb0535b3455a4ac21e10fe4afc5e680f9b4b2c7045c675531c0b27bf691b2ca040e74fb13e9e57a7bd1dd
+  data.tar.gz: 1164df02da194b7dea1d22e6cd0ac27994b3a6fd98fa5fa2c69f7f7fff0546cf90a100fa6b5b829aa656216f54622b020cd58988730e782c6927c738e7b1af6b

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -1,5 +1,8 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.1.0
+  - 2.2.0
+  - 2.3.0
   - 2.4.0
 before_install: gem install bundler -v 1.14.1

data/TwentyFortyEight.gemspec

@@ -4,6 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'TwentyFortyEight/version'
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = '>= 2.1'
   spec.name          = 'TwentyFortyEight'
   spec.version       = TwentyFortyEight::VERSION
   spec.authors       = ['Sidney Liebrand']
@@ -18,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "bin"
+  spec.bindir        = 'bin'
   spec.executables   = ['2048']
   spec.require_paths = ['lib']
 
@@ -26,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'coveralls'
 
   spec.add_runtime_dependency 'curses'
   spec.add_runtime_dependency 'json'

data/bin/2048

@@ -2,6 +2,7 @@
 require_relative '../lib/TwentyFortyEight'
 
 options = TwentyFortyEight::Cli.parse!
+
 TwentyFortyEight.send options.mode, options do
   down || left || right || up
 end

data/lib/TwentyFortyEight.rb

@@ -103,7 +103,7 @@ module TwentyFortyEight
   def self.load_highscore(path = '~/.2048')
     path = File.expand_path path
 
-    if File.exists?(path)
+    if File.exist? path
       contents = File.read path
       hsh      = JSON.parse contents.start_with?('{') && contents || '{}'
     else

data/lib/TwentyFortyEight/board.rb

@@ -4,7 +4,10 @@ module TwentyFortyEight
   class Board
     attr_reader :board, :settings
 
+    DEFAULTS = { size: 4, fill: 0, empty: 0 }
+
     def initialize(opts = {})
+      opts             = Options.new DEFAULTS.merge(opts)
       @settings        = opts
       @settings[:size] = settings.board.size if settings.board?
       @board           = settings.board || Board.generate(settings)
@@ -39,15 +42,14 @@ module TwentyFortyEight
     end
 
     def dup
-      Board.new settings.merge(board: board.dup)
+      new settings.merge(board: board.dup)
     end
 
     private
 
-    def self.generate(**opts)
-      Array.new(opts[:size]) do
-        Array.new(opts[:size]) { opts[:fill] }
-      end
+    def self.generate(opts_hsh, **opts)
+      opts = opts_hsh.merge opts
+      Array.new(opts.size) { Array.new(opts.size) { opts.fill } }
     end
   end
 end

data/lib/TwentyFortyEight/cli.rb

@@ -74,7 +74,7 @@ module TwentyFortyEight
     def self.defaults_for(mode)
       case mode.to_sym
       when :endless
-        { verbose: true, delay: 100 }
+        { verbose: true, delay: 100, history: true }
       when :play
         { verbose: true, delay: 100 }
       else

data/lib/TwentyFortyEight/dsl.rb

@@ -6,6 +6,7 @@ module TwentyFortyEight
 
     def initialize(game, settings = {}, &block)
       @callable = block
+      @sequence = []
       @settings = settings
       @game     = game
     end
@@ -15,14 +16,45 @@ module TwentyFortyEight
       instance_eval(&@callable)
     end
 
+    def sequence(*directions)
+      @sequence = directions.flatten.map(&:to_sym)
+      run_sequence
+    end
+
+    def run_sequence
+      return @poss.shift if @poss && @poss.any?
+
+      copy   = @sequence.dup
+      sample = game.dup
+      @poss  = []
+
+      while (next_move = copy.shift)
+        unless sample.move(next_move).changed?
+          @poss = nil
+          break
+        end
+
+        @poss << next_move
+      end
+
+      @poss && @poss.shift
+    end
+
+    def info?(sym)
+      [:won?, :lost?, :changed?, :available, :score, :prev_score].include? sym
+    end
+
+    def info(sym)
+      game.send sym
+    end
+
     def quit!
       game.quit! && :quit
     end
 
     def method_missing(sym, *args, &block)
-      return game.send(sym) if [:won?, :lost?, :changed?, :available,
-                                :score, :prev_score].include?(sym)
-      return sym if game.dup.action(sym, insert: false).changed?
+      return info sym     if info? sym
+      return sym          if game.dup.action(sym, insert: false).changed?
     end
 
     def respond_to_missing?(sym, *args, &block)

data/lib/TwentyFortyEight/game.rb

@@ -5,6 +5,7 @@ module TwentyFortyEight
     attr_reader :id, :board, :settings, :score, :prev_score, :prev_available,
                 :moves, :log, :current_dir
 
+    DEFAULTS = { fill: 0, empty: 0 }.freeze
     MOVES    = [:up, :down, :left, :right].freeze
     ACTIONS  = [*MOVES, :quit].freeze
 
@@ -13,7 +14,7 @@ module TwentyFortyEight
       @score          = 0
       @prev_score     = 0
       @moves          = 0
-      @settings       = Options.new opts.merge(rest_opts)
+      @settings       = Options.new DEFAULTS.merge(opts.merge(rest_opts))
       @board          = Board.new(settings)
       @prev_available = available
       @current_dir    = nil
@@ -34,7 +35,7 @@ module TwentyFortyEight
     end
 
     def won?
-      board.flatten.max >= 2048
+      board.board.flatten.max >= 2048
     end
 
     def lost?
@@ -102,7 +103,7 @@ module TwentyFortyEight
     end
 
     def dup
-      TwentyFortyEight::Game.new settings.merge(board: board.to_a)
+      Game.new settings.merge(board: board.to_a)
     end
 
     private

data/lib/TwentyFortyEight/logger.rb

@@ -4,8 +4,8 @@ module TwentyFortyEight
   class Logger
     attr_reader :entries
 
-    def initialize
-      @entries = []
+    def initialize(entries = [])
+      @entries = entries
     end
 
     def <<(info_hsh)
@@ -14,11 +14,30 @@ module TwentyFortyEight
 
     def write!(options = {})
       name = (options[:name] || "2048-#{Time.now.to_i}") + '.log.json'
-      path = File.expand_path(options[:path]) if options[:path]
-      path = File.join(Dir.pwd, name) unless options[:dir]
+      path = File.join File.expand_path(options[:path]), name if options[:path]
+      path = File.join(Dir.pwd, name) unless options[:dir] || options[:path]
       path = (File.join Dir.pwd, options[:dir], name) if options[:dir]
 
       File.open(path, 'w') { |f| f.write @entries.to_json }
     end
+
+    def self.load!(path)
+      full_path = File.expand_path path
+      check_file_existence! full_path
+
+      new JSON.parse(File.read(full_path), symbolize_names: true)
+    end
+
+    def self.destroy!(path)
+      full_path = File.expand_path path
+      check_file_existence! full_path
+      File.delete full_path
+    end
+
+    def self.check_file_existence!(path)
+      raise FileNotFound, 'Log does not exist' unless File.exist? path
+    end
+
+    class FileNotFound < StandardError; end
   end
 end

data/lib/TwentyFortyEight/options.rb

@@ -20,6 +20,7 @@ module TwentyFortyEight
 
     def merge(other)
       @options.merge! other
+      self
     end
 
     def to_hash

data/lib/TwentyFortyEight/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TwentyFortyEight
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: curses
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +117,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -136,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="