stroop 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6aab77ba17a5345e1eb6a60f6a5a5db7306df7eb
-  data.tar.gz: ee2a0f808ec2fc3febb13259bbaf0aded5630fd9
+SHA256:
+  metadata.gz: 964e287156e79b56d6b6210bf1b7a5934e38e6178352904e23c7d8d84206a193
+  data.tar.gz: 3d6648046d0ecb62ec85da53f102910a07c7ddd855bc0174ee2507baca328fba
 SHA512:
-  metadata.gz: 88ef238dc777b031cd082a570484c2be65b1b47f35dcf689bf0093fe2e6895f4404adbbe327541eb2e45fb0d09707bbf4cfa21ef0a343ee1b415139dfda65e9b
-  data.tar.gz: da92237c03e285e2c516aff46fb94a54c5019f123924ac16389b2bc567ebdcf57f04f2fc49f3af72dcb0c70c1da4317efeb9c30c2ad7a0a4a0a0e58442b89e62
+  metadata.gz: a45e2802db6fe67fe7adb3e3d7690142b994c0548fecf2fdbf21b04c1bf95a54d69db4272d60c0926578070b961f82c3faf71e828db8dfc8b857b11b992744ed
+  data.tar.gz: d49000f0bcc7ccb7677a953d8a3788fcacbd9b9f6e94c5863d55111c2eb244af26b88c112c01f3504835dca011fabe9d6a365e3e91bd1b4d94c0fce14554baf2

data/.travis.yml

@@ -2,9 +2,10 @@ sudo: false
 language: ruby
 
 rvm:
-- 2.2
-- 2.1
-- rbx-2
+- ruby-head
+- 2.7
+- 2.6
+- 2.5
 - jruby-head
 - jruby-9000
 

data/CHANGELOG.md

@@ -1,6 +1,27 @@
-## CHANGELOG
+# Changelog
 
-### 0.1.0
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [1.0.0] - 2020-05-21
+### Removed 
+- Drop support for Ruby <= v2.4
+
+### Fixed 
+- Color displaying for the word panel
+- Ensure same colors do not appear multiple times in one row 
+
+### Security 
+- Dependency update to fix security issues with [Rake <= v12.3.2](https://github.com/advisories/GHSA-jppv-gw3r-w3q8)
+
+## [0.1.0] - 2015-11-07
 
 * Inital release
 
+[Unreleased]: https://github.com/paulgoetze/stroop/compare/v1.0.0...HEAD
+[1.0.0]: https://github.com/paulgoetze/stroop/compare/v0.1.0...v1.0.0
+[0.1.0]: https://github.com/paulgoetze/stroop/releases/tag/v0.1.0

data/Gemfile.lock

@@ -1,35 +1,38 @@
 PATH
   remote: .
   specs:
-    stroop (0.1.0)
-      colorize (~> 0.7)
-      thor (~> 0.19)
+    stroop (1.0.0)
+      colorize (~> 0.8)
+      thor (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    colorize (0.7.7)
-    diff-lcs (1.2.5)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    colorize (0.8.1)
+    diff-lcs (1.3)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    thor (0.19.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    thor (1.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   stroop!
+
+BUNDLED WITH
+   2.1.4

data/lib/stroop/cli.rb

@@ -3,7 +3,6 @@ require_relative 'set'
 
 module Stroop
   class CLI < Thor
-
     DEFAULT_SIZE = 5.freeze
 
     desc 'neutral COLSxROWS', 'prints neutral color words in COLS columns and ROWS rows'

data/lib/stroop/set.rb

@@ -3,8 +3,7 @@ require_relative 'exceptions'
 
 module Stroop
   class Set
-
-    COLORS = %w{ black white red green blue yellow }
+    COLORS = %w{ black white red green blue yellow }.freeze
 
     NEUTRAL     = :neutral
     CONGRUENT   = :congruent
@@ -12,6 +11,15 @@ module Stroop
 
     MODES  = [NEUTRAL, CONGRUENT, INCONGRUENT].freeze
 
+    BOX = {
+      vertical: "┊",
+      horizontal: "┄",
+      top_left: "┌",
+      top_right: "┐",
+      bottom_left: "└",
+      bottom_right: "┘"
+    }.transform_values(&:light_black).freeze
+
     attr_reader :rows, :columns, :mode
 
     def initialize(rows:, columns:, mode:)
@@ -23,13 +31,17 @@ module Stroop
     end
 
     def to_s
-      [empty_line, *lines, empty_line].join("\n")
+      [empty_line(:top), *lines, empty_line(:bottom)].join("\n")
     end
 
     private
 
-    def empty_line
-      wrap(space * (total_word_width * columns))
+    def empty_line(location)
+      corner_left = BOX[:"#{location}_left"]
+      line = BOX[:horizontal] * (total_word_width * columns)
+      corner_right = BOX[:"#{location}_right"]
+
+      corner_left + line + corner_right
     end
 
     def lines
@@ -42,12 +54,12 @@ module Stroop
     end
 
     def wrap(line)
-      space + line + space
+      BOX[:vertical] + line + BOX[:vertical]
     end
 
     def random_word
       word, color = word_color_pair
-      word.center(total_word_width).send(color).bold.on_light_black
+      word.center(total_word_width).send(color).bold
     end
 
     def word_color_pair
@@ -77,11 +89,9 @@ module Stroop
     end
 
     def random_color
-      COLORS.sample
-    end
-
-    def space
-      " ".on_light_black
+      color = COLORS.sample
+      color = random_color if color == @latest_random_color
+      @latest_random_color = color
     end
 
     def max_word_length

data/lib/stroop/version.rb

@@ -1,5 +1,5 @@
 module Stroop
-  VERSION = "0.1.0".freeze
+  VERSION = "1.0.0".freeze
 end
 
 

data/spec/stroop/set_spec.rb

@@ -3,20 +3,20 @@ require 'spec_helper'
 describe Stroop::Set do
 
   let(:arguments) { {rows: 1, columns: 2, mode: :neutral } }
-  subject { described_class.new(arguments) }
+  subject { described_class.new(**arguments) }
 
   describe 'creating a new instance' do
     it 'should raise an error if the given mode is not available' do
       expect {
-        described_class.new(arguments.merge({ mode: :not_existing }))
+        described_class.new(**arguments.merge({ mode: :not_existing }))
       }.to raise_error Stroop::SetModeNotAvailable
     end
 
     it 'should not raise an error if the given mode is available' do
       expect {
-        described_class.new(arguments.merge({ mode: :neutral }))
-        described_class.new(arguments.merge({ mode: :congruent }))
-        described_class.new(arguments.merge({ mode: :incongruent }))
+        described_class.new(**arguments.merge({ mode: :neutral }))
+        described_class.new(**arguments.merge({ mode: :congruent }))
+        described_class.new(**arguments.merge({ mode: :incongruent }))
       }.not_to raise_error
     end
   end

data/stroop.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.required_ruby_version = '~> 2.1'
+  gem.required_ruby_version = '~> 2.5'
 
-  gem.add_runtime_dependency     'colorize', '~> 0.7'
-  gem.add_runtime_dependency     'thor',     '~> 0.19'
+  gem.add_runtime_dependency     'colorize', '~> 0.8'
+  gem.add_runtime_dependency     'thor',     '~> 1.0'
 
   gem.add_development_dependency 'rspec',    '~> 3.0'
-  gem.add_development_dependency 'rake',     '~> 10.0'
+  gem.add_development_dependency 'rake',     '~> 13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stroop
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Paul Götze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 description: The Stroop effect - demonstrating the interference in the reaction time
   of a task.
 email: paul.christoph.goetze@gmail.com
@@ -105,15 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Stroop effect