wordle 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff0c43c46f9e5e2e25088128a3cd8e2f634bda564b98a0b36473c0d9fb1a25b7
-  data.tar.gz: bbcaf825639fd41c6388b501388cc108048d1c4464e59a3cad7eaa2451586679
+  metadata.gz: 4aa10bd48df4f525022634f4a41a1c4009f25e6da6bd9992470c2c963f08a91c
+  data.tar.gz: 99047acbf6078ca14d65aaaf71d0727fbb489557d58c72ed02c41d67bbb9b22e
 SHA512:
-  metadata.gz: 366f914646b492bd8c00f4a4334db6ebb494b447cd54c34ea0d6c47310be1ab7ed3af5662c05daf5bcf8056dbb0899db2848599525ed17859eb40e6b111d500b
-  data.tar.gz: 1a21fa7349041d534f29588cb45b9ca41e4e0deef0d6812de0e1384a80613a94667b925b3c32cacf9d6d99bc587807b0419f416a9b6ebe16cb43142d1de13cce
+  metadata.gz: a807bcfa10a95e25cb272da8d28a8bd65172e3d623ba76f8e0bc98fd8e4f8618e205a18b6ead77c79e3c21171b6801e64c729029cdbbd9615d713cef53767a87
+  data.tar.gz: 3e44a8f3ed4eb337de645d60d50399393206d56df15e29262d6a327ae52c3b2edf6dd8e9daee3eeaffb05d66470916cddf518113d2c4d0fb1a0eca720e976db0

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.1.0

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [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.
+- Sharing prints out unique hash for word that was played, which can be passed
+to -i option so you can play the same word as a friend.
+
+## [0.4.0] - 2022-01-14
+
+- Fixes bug where too many letters would get marked as yellow. Resolves
+    [https://github.com/JonathanWThom/wordle/issues/3](https://github.com/JonathanWThom/wordle/issues/3).
+
 ## [0.3.0] - 2022-01-10
 
 - Adds a better world list. From the Wordle source itself : )

data/Gemfile.lock

@@ -1,19 +1,27 @@
 PATH
   remote: .
   specs:
-    wordle (0.3.0)
+    wordle (0.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    debug (1.4.0)
+      irb (>= 1.3.6)
+      reline (>= 0.2.7)
     diff-lcs (1.5.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.6)
     regexp_parser (2.2.0)
+    reline (0.3.1)
+      io-console (~> 0.5)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -53,6 +61,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  debug (>= 1.0.0)
   rake (~> 13.0)
   rspec (~> 3.0)
   standard (~> 1.3)

data/README.md

@@ -2,8 +2,9 @@
 
 Ruby implementation of [Wordle](https://www.powerlanguage.co.uk/wordle/).
 
-<img width="794" alt="Screen Shot 2022-01-10 at 9 18 19 PM" src="https://user-images.githubusercontent.com/22665228/148885575-39805830-274e-40e6-be14-4c6bc6db37ec.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)
 
 ## Installation
 
@@ -13,6 +14,14 @@ Ruby implementation of [Wordle](https://www.powerlanguage.co.uk/wordle/).
 
 Just run `wordle` from the command line.
 
+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.
@@ -23,6 +32,10 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/JonathanWThom/wordle. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/JonathanWThom/wordle/blob/main/CODE_OF_CONDUCT.md).
 
+## Acknowledgements
+
+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
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

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,29 +2,35 @@
 
 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 = options_reader.read
       @target_word = generate_word
     end
 
-    # print letters that have already been used?
-    # compare to real words
-
     def play
       winner = false
-      attempts = 0
 
       Legend.print
       puts "Guess a 5 letter word: "
+      guesses = []
+      must_include = []
+      must_match = Array.new(5)
 
-      while attempts < 6 && !winner
+      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
@@ -32,27 +38,37 @@ 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
           break
         end
-
-        attempts += 1
       end
 
+      hash = Digest::SHA2.hexdigest(@target_word)[..5]
       if winner
-        puts "Winner!"
+        puts "\nWordle Gem #{hash} #{guesses.length}/6\n\n"
       else
-        puts "Word was: #{@target_word}"
-        puts "Better luck next time!"
+        puts "\nWord was: #{@target_word}\n"
+        puts "\nWordle Gem #{hash} X/6*\n\n"
       end
+
+      puts guesses
     end
 
     private
 
     def generate_word
-      @list.random
+      if @options[:identifier]
+        @list.by_hash(@options[:identifier])
+      else
+        @list.random
+      end
     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)
@@ -14,21 +12,73 @@ module Wordle
     end
 
     def colors
-      target_letters = @target_word.chars
-      guess_letters = @guess.chars
-      colored_letters = ""
-
-      guess_letters.each_with_index do |letter, i|
-        colored_letters += if letter == target_letters[i]
-          letter.green
-        elsif target_letters.include?(letter)
-          letter.yellow
-        else
-          letter.gray
+      raw_colors.each_with_index.map do |color, i|
+        guess_letters[i].send(color)
+      end.join("")
+    end
+
+    def squares
+      color_map = {
+        green: "🟩",
+        yellow: "🟨",
+        gray: "⬛️"
+      }
+
+      raw_colors.each_with_index.map do |color, i|
+        color_map[color]
+      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
 
-      colored_letters
+      prev_must_match
+    end
+
+    private
+
+    def guess_letters
+      @_guess_letters ||= @guess.chars
+    end
+
+    def raw_colors
+      @_raw_colors ||= begin
+        target_letters = @target_word.chars
+        colors = []
+
+        guess_letters.each_with_index do |letter, i|
+          if letter == target_letters[i]
+            colors[i] = :green
+            target_letters[i] = nil
+          end
+        end
+
+        guess_letters.each_with_index do |letter, i|
+          if colors[i].nil?
+            colors[i] = if target_letters.include?(letter)
+              :yellow
+            else
+              :gray
+            end
+          end
+        end
+
+        colors
+      end
     end
   end
 end

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/legend.rb

@@ -10,6 +10,8 @@ module Wordle
       puts green_example
       puts yellow_example
       puts gray_example
+      puts "\nRestart and add -i flag to target a specific word by hash, for example:"
+      puts "$ wordle -i ed541a\n\n"
     end
 
     private

data/lib/wordle/list.rb

@@ -2,14 +2,20 @@
 
 module Wordle
   class List
-    def initialize(length = 5)
-      @length = length
-    end
-
     def random
       list.sample.downcase.strip
     end
 
+    def by_hash(hash)
+      word = list.detect do |word|
+        Digest::SHA2.hexdigest(word.downcase.strip)[..5] == hash
+      end
+
+      raise Wordle::Error, "Invalid word identifier, are you sure you copied it correctly?" if word.nil?
+
+      word
+    end
+
     def invalid?(word)
       !list.include?(word)
     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.3.0"
+  VERSION = "0.6.0"
 end

data/lib/wordle.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+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"

data/wordle.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
+  spec.add_development_dependency "debug", ">= 1.0.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: wordle
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jonathan Thom
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
-dependencies: []
+date: 2022-04-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description:
 email:
 - jonathanthom@hey.com
@@ -20,6 +34,7 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".standard.yml"
+- ".tool-versions"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -30,6 +45,7 @@ files:
 - bin/console
 - bin/setup
 - exe/wordle
+- lib/integer.rb
 - lib/string.rb
 - lib/wordle.rb
 - lib/wordle/game.rb
@@ -37,9 +53,9 @@ 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
-- sig/wordle.rbs
 - wordle.gemspec
 homepage: https://github.com/jonathanwthom/wordle
 licenses:
@@ -64,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Wordle CLI in Ruby

data/sig/wordle.rbs

@@ -1,4 +0,0 @@
-module Wordle
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end