TwentyFortyEight 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd1e0f1d57806e35b302242178e84246f788f6e2
-  data.tar.gz: 559e666fa0cfd84c1986a7fb0618324570706975
+  metadata.gz: fe83920a037beecde5b1bfb7abe7c81f6722a90a
+  data.tar.gz: 6506f6288be1a550cb4fee734797f7d933a7eab1
 SHA512:
-  metadata.gz: 818a1636527209ef35db2ae0d3629209181ce4c26508ba43a2fe1737b3836d62c85f5c579366dde9953e8296cc7af643f39af6fe2856c13728c45f867deaacfd
-  data.tar.gz: '069c5d9fd01bda5d83db715ca50c6cf8ccecc78177c3d6e3e6554d4ece02596979a5fa5952b7ef0bcad86f012860199719c6116d2d740918727b30f8d08dc4d2'
+  metadata.gz: '039c7e5d4462a0191bd0c21de97b129ba74dad41a8224161f878f93b4a45b02faa4c3fece018b242d2f7d100cf17acfe49787c6caef414294771e51268cce82d'
+  data.tar.gz: 656d2266224a829cd6c2ba195670d0b943607827e9f1955f65f29f1e2e72194efc8d538795ee238f58c4c3b1036287a3f7c71740821e7a0259b1c2ebeaf442cc

data/README.md

@@ -1,42 +1 @@
-# TwentyFortyEight
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/TwentyFortyEight`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-TODO: Write docs
-TODO: Write tests
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'TwentyFortyEight'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install TwentyFortyEight
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/Sidney Liebrand/TwentyFortyEight. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+Docs can be found on: https://sidofc.github.io/projects/2048/

data/bin/2048

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require_relative '../lib/TwentyFortyEight'
 
-opts = TwentyFortyEight::Cli.parse!
-TwentyFortyEight.send opts.mode, opts do
+options = TwentyFortyEight::Cli.parse!
+TwentyFortyEight.send options.mode, options do
   down || left || right || up
 end

data/lib/TwentyFortyEight.rb

@@ -15,10 +15,11 @@ module TwentyFortyEight
   @@best  = nil
 
   def self.play(settings = {}, &block)
-    game = Game.new @@games.count, settings
-    dirs = game.directions - (settings.except || [])
-    dirs = dirs - (settings.only || [])
-    dsl  = Dsl.new settings, &block if block_given?
+    settings = Options.new settings if settings.is_a? Hash
+    game     = Game.new @@games.count, settings
+    dirs     = game.directions - (settings.except || [])
+    dirs     = dirs - (settings.only || [])
+    dsl      = Dsl.new settings, &block if block_given?
 
     @@best ||= game
 
@@ -32,14 +33,15 @@ module TwentyFortyEight
     restart      = false
     non_blocking = dirs
 
-    render_game game, settings
+    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
-
+        break if settings.mode?(:endless) ||
+                 !settings.verbose? ||
+                 !settings.interactive?
         render_game game, settings, true
 
         action = :default
@@ -54,8 +56,8 @@ module TwentyFortyEight
         if settings.interactive?
           action = Screen.handle_keypress until Game::ACTIONS.include?(action)
         else
-          action = dsl && dsl.apply(game.dup) || non_blocking.sample
           non_blocking = game.changed? ? dirs : non_blocking - [action]
+          action       = dsl && dsl.apply(game.dup) || non_blocking.sample
 
           if non_blocking.empty?
             non_blocking.concat settings.except if settings.except?
@@ -63,8 +65,8 @@ module TwentyFortyEight
           end
         end
 
-        render_game game.action(action), settings if settings.verbose? ||
-                                                     settings.interactive?
+        game.action action
+        render_game game, settings if settings.verbose? || settings.interactive?
         sleep(settings.delay.to_f / 1000) if settings.delay?
       end
     end

data/lib/TwentyFortyEight/cli.rb

@@ -9,8 +9,7 @@ module TwentyFortyEight
       settings[:mode] = :play unless TwentyFortyEight.modes.include? mode
 
       OptionParser.new do |cli|
-        cli.banner = "2048 [mode] [options]"
-
+        cli.banner = ''
         cli.separator "options:"
 
         cli.on('-i', '--interactive', 'Can you reach the 2048 tile?') do
@@ -32,11 +31,6 @@ module TwentyFortyEight
           settings[:delay] = ms
         end
 
-        cli.on('-aSOLVER', '--a=SOLVER', String,
-               'Specify a solver to play the game') do |solver|
-          settings[:solver] = solver.to_sym
-        end
-
         cli.on('-sSIZE', '--size=SIZE', Integer,
                'Set grid size of the board') do |size|
           settings[:size] = size
@@ -55,6 +49,12 @@ module TwentyFortyEight
         end
 
         cli.on('--help', 'Display this help') do
+          puts 'usage: 2048 [mode] [options]'
+          puts 'modes:'
+          puts '     play'    + (' ' * 28) + 'Plays the game automatically in order :down, :left, :right, :up'
+          puts '     endless' + (' ' * 25) + 'Loops play until ctrl+C'
+          puts ''
+          puts '     When no mode is supplied, it will default to: 2048 play -i -s 4'
           puts cli
           exit 0
         end

data/lib/TwentyFortyEight/game.rb

@@ -68,7 +68,7 @@ module TwentyFortyEight
     end
 
     def move(dir, **opts)
-      return self unless directions.include? dir
+      return self unless directions.include? dir.to_sym
 
       @prev_score     = score
       @prev_available = available

data/lib/TwentyFortyEight/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: TwentyFortyEight
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sidney Liebrand