wordle 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4aa10bd48df4f525022634f4a41a1c4009f25e6da6bd9992470c2c963f08a91c
-  data.tar.gz: 99047acbf6078ca14d65aaaf71d0727fbb489557d58c72ed02c41d67bbb9b22e
+  metadata.gz: 5fa86fa80e845caca00f5128d21a4c569996441d57b9367862a1a634067052d3
+  data.tar.gz: a3965aea2dba04cf9abfd4a8bc1e1760980630200f576d60bf7b14319aace3a3
 SHA512:
-  metadata.gz: a807bcfa10a95e25cb272da8d28a8bd65172e3d623ba76f8e0bc98fd8e4f8618e205a18b6ead77c79e3c21171b6801e64c729029cdbbd9615d713cef53767a87
-  data.tar.gz: 3e44a8f3ed4eb337de645d60d50399393206d56df15e29262d6a327ae52c3b2edf6dd8e9daee3eeaffb05d66470916cddf518113d2c4d0fb1a0eca720e976db0
+  metadata.gz: 9f1772bbf2e003583cf25ee27af46f2911ff584dfa4c4e2533aafeaa411ba877db690d4f4789242a50e9c54a070beea66e3db966ed4aa0a84075b431977be10c
+  data.tar.gz: 87f7b5e53311ee0e15f1cacf56f2eaae014ea1a78ce0363f590ee9a4c273b4717bf13f748864dbe67ab567d0862c881fe69f62b2adec8a1c579921b451d9aa74

data/.tool-versions

@@ -1 +1 @@
-ruby 3.1.0
+ruby 3.1.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.7.0] - 2022-04-15
+
+- Adds high color contrast mode.
+
 ## [0.6.0] - 2022-04-14
 
 - Adds hard mode.

data/Gemfile

@@ -5,8 +5,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in wordle.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem "rake"
 
-gem "rspec", "~> 3.0"
+gem "rspec"
 
-gem "standard", "~> 1.3"
+gem "standard"

data/Gemfile.lock

@@ -1,71 +1,70 @@
 PATH
   remote: .
   specs:
-    wordle (0.6.0)
+    wordle (0.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    debug (1.4.0)
+    debug (1.5.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)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.3.0)
     reline (0.3.1)
       io-console (~> 0.5)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.24.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.27.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.13.1)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.13.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    standard (1.6.0)
-      rubocop (= 1.24.1)
-      rubocop-performance (= 1.13.1)
+    standard (1.10.0)
+      rubocop (= 1.27.0)
+      rubocop-performance (= 1.13.3)
     unicode-display_width (2.1.0)
 
 PLATFORMS
   x86_64-darwin-21
-  x86_64-linux
 
 DEPENDENCIES
   debug (>= 1.0.0)
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  standard (~> 1.3)
+  rake
+  rspec
+  standard
   wordle!
 
 BUNDLED WITH
-   2.3.4
+   2.3.7

data/README.md

@@ -20,6 +20,7 @@ This version will pull a new word at random every time you run it from a very we
 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.
+    -c, --contrast                   High contrast mode. Matched letters will be orange. Included letters will be blue.
 ```
 
 ## Development

data/lib/string.rb

@@ -14,4 +14,12 @@ class String
   def gray
     colorize(47)
   end
+
+  def blue
+    colorize(46)
+  end
+
+  def orange
+    "\033[48:2:255:165:0m#{self}\033[m"
+  end
 end

data/lib/wordle/game.rb

@@ -10,12 +10,13 @@ module Wordle
       @list = List.new
       @options = options_reader.read
       @target_word = generate_word
+      @result_builder = ResultBuilder.new(@options[:contrast])
     end
 
     def play
       winner = false
 
-      Legend.print
+      Legend.print(@result_builder)
       puts "Guess a 5 letter word: "
       guesses = []
       must_include = []
@@ -36,7 +37,11 @@ module Wordle
           next
         end
 
-        analyzer = GuessAnalyzer.new(@target_word, guess)
+        analyzer = GuessAnalyzer.new(
+          @target_word,
+          guess,
+          @result_builder
+        )
         puts analyzer.colors
         guesses << analyzer.squares
         if @options[:difficult]

data/lib/wordle/guess_analyzer.rb

@@ -2,9 +2,10 @@
 
 module Wordle
   class GuessAnalyzer
-    def initialize(target_word, guess)
+    def initialize(target_word, guess, result_builder = ResultBuilder.new)
       @target_word = target_word
       @guess = guess
+      @result_builder = result_builder
     end
 
     def match?
@@ -12,26 +13,20 @@ module Wordle
     end
 
     def colors
-      raw_colors.each_with_index.map do |color, i|
-        guess_letters[i].send(color)
+      raw_results.each_with_index.map do |result, i|
+        guess_letters[i].send(@result_builder.text_color(result))
       end.join("")
     end
 
     def squares
-      color_map = {
-        green: "🟩",
-        yellow: "🟨",
-        gray: "⬛️"
-      }
-
-      raw_colors.each_with_index.map do |color, i|
-        color_map[color]
+      raw_results.each_with_index.map do |result, i|
+        @result_builder.square(result)
       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])
+      raw_results.each_with_index do |result, i|
+        if @result_builder.included?(result) && !prev_must_include.include?(guess_letters[i])
           prev_must_include << guess_letters[i]
         end
       end
@@ -40,8 +35,8 @@ module Wordle
     end
 
     def must_match(prev_must_match)
-      raw_colors.each_with_index do |color, i|
-        if color == :green
+      raw_results.each_with_index do |result, i|
+        if @result_builder.match?(result)
           prev_must_match[i] = guess_letters[i]
         end
       end
@@ -55,29 +50,29 @@ module Wordle
       @_guess_letters ||= @guess.chars
     end
 
-    def raw_colors
-      @_raw_colors ||= begin
+    def raw_results
+      @_raw_results ||= begin
         target_letters = @target_word.chars
-        colors = []
+        results = []
 
         guess_letters.each_with_index do |letter, i|
           if letter == target_letters[i]
-            colors[i] = :green
+            results[i] = @result_builder.match
             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
+          if results[i].nil?
+            results[i] = if target_letters.include?(letter)
+              @result_builder.included
             else
-              :gray
+              @result_builder.miss
             end
           end
         end
 
-        colors
+        results
       end
     end
   end

data/lib/wordle/legend.rb

@@ -2,29 +2,41 @@
 
 module Wordle
   class Legend
-    def self.print
-      new.print
+    def self.print(*args)
+      new(*args).print
+    end
+
+    def initialize(result_builder = ResultBuilder.new)
+      @result_builder = result_builder
     end
 
     def print
-      puts green_example
-      puts yellow_example
-      puts gray_example
+      puts match_example
+      puts included_example
+      puts miss_example
       puts "\nRestart and add -i flag to target a specific word by hash, for example:"
       puts "$ wordle -i ed541a\n\n"
     end
 
     private
 
-    def green_example
-      "#{"w".green}eary - The letter w is in the word and in the correct spot."
+    def match_color
+      @result_builder.match_text_color
+    end
+
+    def included_color
+      @result_builder.included_text_color
+    end
+
+    def match_example
+      "#{"w".send(match_color)}eary - The letter w is in the word and in the correct spot."
     end
 
-    def yellow_example
-      "p#{"i".yellow}lls - The letter i is in the word but in the wrong spot."
+    def included_example
+      "p#{"i".send(included_color)}lls - The letter i is in the word but in the wrong spot."
     end
 
-    def gray_example
+    def miss_example
       "vag#{"u".gray}e - The letter u is not in the word in any spot."
     end
   end

data/lib/wordle/options.rb

@@ -15,6 +15,10 @@ module Wordle
         opts.on("-d", "--difficult", "Hard mode. Any revealed hints must be used in subsequent guesses.") do |d|
           options[:difficult] = d
         end
+
+        opts.on("-c", "--contrast", "High contrast mode. Matched letters will be orange. Included letters will be blue.") do |c|
+          options[:contrast] = c
+        end
       end
 
       begin

data/lib/wordle/result_builder.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Wordle
+  class ResultBuilder
+    MATCH = :match
+    INCLUDED = :included
+    MISS = :miss
+
+    DEFAULT_OPTIONS = {
+      MATCH => {text: :green, square: "🟩"},
+      INCLUDED => {text: :yellow, square: "🟨"},
+      MISS => {text: :gray, square: "⬛️"}
+    }.freeze
+
+    CONTRAST_OPTIONS = {
+      MATCH => {text: :orange, square: "🟧"},
+      INCLUDED => {text: :blue, square: "🟦"},
+      MISS => {text: :gray, square: "⬛️"}
+    }.freeze
+
+    def initialize(contrast = false)
+      @contrast = contrast
+    end
+
+    def match?(result)
+      result == MATCH
+    end
+
+    def included?(result)
+      result == INCLUDED
+    end
+
+    def match
+      MATCH
+    end
+
+    def included
+      INCLUDED
+    end
+
+    def miss
+      MISS
+    end
+
+    def match_text_color
+      options[match][:text]
+    end
+
+    def included_text_color
+      options[included][:text]
+    end
+
+    def text_color(result)
+      options[result][:text]
+    end
+
+    def square(result)
+      options[result][:square]
+    end
+
+    private
+
+    def options
+      return DEFAULT_OPTIONS if !@contrast
+      @_options ||= CONTRAST_OPTIONS
+    end
+  end
+end

data/lib/wordle/version.rb

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

data/lib/wordle.rb

@@ -4,14 +4,15 @@ 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"
+require_relative "wordle/game"
 require_relative "wordle/guess_analyzer"
+require_relative "wordle/guess_validator"
 require_relative "wordle/legend"
-require_relative "wordle/game"
+require_relative "wordle/list"
+require_relative "wordle/options"
+require_relative "wordle/result_builder"
+require_relative "wordle/source"
+require_relative "wordle/version"
 
 module Wordle
   class Error < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordle
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jonathan Thom
@@ -54,6 +54,7 @@ files:
 - lib/wordle/legend.rb
 - lib/wordle/list.rb
 - lib/wordle/options.rb
+- lib/wordle/result_builder.rb
 - lib/wordle/source.rb
 - lib/wordle/version.rb
 - wordle.gemspec
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Wordle CLI in Ruby