wordle 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37a2b0b303c14b7f71edbfd175f86a25614a3fc103ba6d1870c02432d2d6010f
-  data.tar.gz: 336637bbb33eecf7647cc166aa98f0cd3e75e354346a9ac16a3f083a32c24412
+  metadata.gz: 4aa10bd48df4f525022634f4a41a1c4009f25e6da6bd9992470c2c963f08a91c
+  data.tar.gz: 99047acbf6078ca14d65aaaf71d0727fbb489557d58c72ed02c41d67bbb9b22e
 SHA512:
-  metadata.gz: 6f20ad88e68d4fcdbdc5540905690cebb9018aea5dcc8e5f9aa3707aea9321a3579689e8aa0f5b21bd95375906c05135a5e819af33efa1cebfa754cdcbd5d657
-  data.tar.gz: 9eb4620e84138d2d87204fac907834b24cf41d431b5f4c36e546eb2f545465f8c2ebafae95f563cecf08a0b7f6822f1435d8d122dcf695cadba7ee4790a8660f
+  metadata.gz: a807bcfa10a95e25cb272da8d28a8bd65172e3d623ba76f8e0bc98fd8e4f8618e205a18b6ead77c79e3c21171b6801e64c729029cdbbd9615d713cef53767a87
+  data.tar.gz: 3e44a8f3ed4eb337de645d60d50399393206d56df15e29262d6a327ae52c3b2edf6dd8e9daee3eeaffb05d66470916cddf518113d2c4d0fb1a0eca720e976db0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.6.0] - 2022-04-14
+
+- Adds hard mode.
+
 ## [0.5.0] - 2022-02-02
 
 - Prints outs squares for sharing at the end of a game.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordle (0.5.0)
+    wordle (0.6.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -2,7 +2,7 @@
 
 Ruby implementation of [Wordle](https://www.powerlanguage.co.uk/wordle/).
 
-<img width="785" alt="Screen Shot 2022-01-14 at 8 10 22 PM" src="https://user-images.githubusercontent.com/22665228/149608330-f5514be8-c0d9-4860-9ed4-d652fdb35cb3.png">
+<img width="869" alt="Screen Shot 2022-02-02 at 10 32 02 PM" src="https://user-images.githubusercontent.com/22665228/152292863-33743039-d9f4-4afa-a321-684d7b67cdb3.png">
 
 [![Build](https://github.com/JonathanWThom/wordle/actions/workflows/build.yml/badge.svg)](https://github.com/JonathanWThom/wordle/actions/workflows/build.yml)
 
@@ -14,11 +14,14 @@ Ruby implementation of [Wordle](https://www.powerlanguage.co.uk/wordle/).
 
 Just run `wordle` from the command line.
 
-After the game, a hash will be included with your result. A friend can pass this
-hash as the `-i` option to play the same word as you, e.g. `wordle -i ed541a`.
-
 This version will pull a new word at random every time you run it from a very weird and long list. It's much more difficult than the original due to some of the words being a bit uncommon.
 
+```
+Usage: wordle [options]
+    -i, --identifier=IDENTIFIER      Pass word identifer to target a specific word that someone else has played. Identifier gets printed at the end of the game to share with a friend.
+    -d, --difficult                  Hard mode. Any revealed hints must be used in subsequent guesses.
+```
+
 ## 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.
@@ -31,7 +34,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/Jonath
 
 ## Acknowledgements
 
-I cribbed my word list from the Wordle site itself. I have no association with the site or its creator, I'm just a fan!
+I cribbed my word list from the Wordle site itself. I have no association with the site, its creator, or the New York Times - I'm just a fan!
 
 ## License
 

data/lib/integer.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Integer
+  def ordinalize
+    {
+      1 => "1st",
+      2 => "2nd",
+      3 => "3rd",
+      4 => "4th",
+      5 => "5th"
+    }[self]
+  end
+end

data/lib/wordle/game.rb

@@ -2,13 +2,13 @@
 
 module Wordle
   class Game
-    def self.play
-      new.play
+    def self.play(*args)
+      new(*args).play
     end
 
-    def initialize
+    def initialize(options_reader = Options.new)
       @list = List.new
-      @options = read_options
+      @options = options_reader.read
       @target_word = generate_word
     end
 
@@ -18,11 +18,19 @@ module Wordle
       Legend.print
       puts "Guess a 5 letter word: "
       guesses = []
+      must_include = []
+      must_match = Array.new(5)
 
       while guesses.length < 6 && !winner
         guess = gets.chomp
 
-        validator = GuessValidator.new(guess, @list)
+        validator = GuessValidator.new(
+          guess,
+          @list,
+          @options[:difficult],
+          must_include,
+          must_match
+        )
         if validator.invalid?
           puts validator.error
           next
@@ -31,6 +39,10 @@ module Wordle
         analyzer = GuessAnalyzer.new(@target_word, guess)
         puts analyzer.colors
         guesses << analyzer.squares
+        if @options[:difficult]
+          must_include = analyzer.must_include(must_include)
+          must_match = analyzer.must_match(must_match)
+        end
 
         if analyzer.match?
           winner = true
@@ -58,24 +70,5 @@ module Wordle
         @list.random
       end
     end
-
-    def read_options
-      options = {}
-      parser = OptionParser.new do |opts|
-        opts.banner = "Usage: wordle [options]"
-
-        opts.on("-iIDENTIFIER", "--identifier=IDENTIFIER", "Pass word identifer to target a specific word that someone else has played. Identifier gets printed at the end of the game to share.") do |i|
-          options[:identifier] = i
-        end
-      end
-
-      begin
-        parser.parse!
-      rescue OptionParser::InvalidOption
-        puts "Option not recognized"
-      end
-
-      options
-    end
   end
 end

data/lib/wordle/guess_analyzer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../string"
-
 module Wordle
   class GuessAnalyzer
     def initialize(target_word, guess)
@@ -31,10 +29,30 @@ module Wordle
       end.join("")
     end
 
+    def must_include(prev_must_include)
+      raw_colors.each_with_index do |color, i|
+        if color == :yellow && !prev_must_include.include?(guess_letters[i])
+          prev_must_include << guess_letters[i]
+        end
+      end
+
+      prev_must_include
+    end
+
+    def must_match(prev_must_match)
+      raw_colors.each_with_index do |color, i|
+        if color == :green
+          prev_must_match[i] = guess_letters[i]
+        end
+      end
+
+      prev_must_match
+    end
+
     private
 
     def guess_letters
-      @_guess_letters = @guess.chars
+      @_guess_letters ||= @guess.chars
     end
 
     def raw_colors

data/lib/wordle/guess_validator.rb

@@ -2,23 +2,62 @@
 
 module Wordle
   class GuessValidator
-    attr_reader :error
-
-    def initialize(guess, list)
+    def initialize(
+      guess,
+      list,
+      difficult,
+      must_include,
+      must_match
+    )
       @guess = guess
       @list = list
+      @difficult = difficult
+      @must_include = must_include
+      @must_match = must_match
+      @validated = false
     end
 
     def invalid?
+      !error.nil?
+    end
+
+    def error
+      validate if !@validated
+
+      @error
+    end
+
+    private
+
+    def validate
+      validate_normal_mode
+      validate_hard_mode if @difficult
+      @validated = true
+    end
+
+    def validate_normal_mode
       if @guess.length != 5
         @error = "Guess must be 5 letters long"
-        return true
       elsif @list.invalid?(@guess)
-        @error = "Guess must be a real word"
-        return true
+        @error = "Guess not in word list"
+      end
+    end
+
+    def validate_hard_mode
+      @must_include.each do |letter|
+        if !@guess.include?(letter)
+          @error = "Guess must include #{letter}"
+          break
+        end
       end
 
-      false
+      @guess.each_char.with_index do |letter, i|
+        match = @must_match[i]
+        if match && match != letter
+          @error = "#{(i + 1).ordinalize} letter must be #{match}"
+          break
+        end
+      end
     end
   end
 end

data/lib/wordle/options.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Wordle
+  class Options
+    def read
+      options = {}
+
+      parser = OptionParser.new do |opts|
+        opts.banner = "Usage: wordle [options]"
+
+        opts.on("-iIDENTIFIER", "--identifier=IDENTIFIER", "Pass word identifer to target a specific word that someone else has played. Identifier gets printed at the end of the game to share with a friend.") do |i|
+          options[:identifier] = i
+        end
+
+        opts.on("-d", "--difficult", "Hard mode. Any revealed hints must be used in subsequent guesses.") do |d|
+          options[:difficult] = d
+        end
+      end
+
+      begin
+        parser.parse!
+      rescue OptionParser::InvalidOption
+        puts "Option not recognized"
+      end
+
+      options
+    end
+  end
+end

data/lib/wordle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wordle
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/wordle.rb

@@ -2,8 +2,10 @@
 
 require "digest"
 require "optparse"
+require_relative "integer"
 require_relative "string"
 require_relative "wordle/version"
+require_relative "wordle/options"
 require_relative "wordle/source"
 require_relative "wordle/list"
 require_relative "wordle/guess_validator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wordle
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jonathan Thom
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -45,6 +45,7 @@ files:
 - bin/console
 - bin/setup
 - exe/wordle
+- lib/integer.rb
 - lib/string.rb
 - lib/wordle.rb
 - lib/wordle/game.rb
@@ -52,6 +53,7 @@ files:
 - lib/wordle/guess_validator.rb
 - lib/wordle/legend.rb
 - lib/wordle/list.rb
+- lib/wordle/options.rb
 - lib/wordle/source.rb
 - lib/wordle/version.rb
 - wordle.gemspec