one44-cli 0.0.4 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e811b1c11362294deaf5030115ca69e848467b1025b17b207c31829d18ed7842
-  data.tar.gz: b141b078d3932311c52775e8c5e182e8f2685c820952b12b02270e6c1b7b0441
+  metadata.gz: be80efae9e104478942b455965752f6f062dd49c84a94a11fff7c5e062039258
+  data.tar.gz: ad0eb206e009b087c73545345b3df53cb653e1358d3df50f01ec6e35a85d64cf
 SHA512:
-  metadata.gz: b55744031caf87ca56d44754e7620a1e87b2b61d7e4c57ac4a0d2c4f178e98fdb6929e4e6ff107605ba3dc96f5d7d62d0be6c5f12d0b318b1fe30fe9933b4ccd
-  data.tar.gz: 692ce413ae5a70aa61ccbeb81588b8d7dac04b4bde79ecba2ccd9ac0593d89afc85b0b6e6341f2342eefa76258c0cb4d8e55ec1f77f57958419255f204af5d04
+  metadata.gz: 5dc34c9522743cebdb04e4a0cfca23dffe85d7cf82ed70eb029c8c0a98ff0ae76894b3bdb0c586f48a2f06e9d95bbbf2d01f4e0ac00db214a20e9def427b539a
+  data.tar.gz: fd166a7d2141cb87322270ac7a99560986e10e6cb4318da1e3362a00aed406edc78e29b303301f937217638e1de83d62af529e4d9ae120c046dbfa9b37b6debc

data/README.md

@@ -8,4 +8,20 @@ Install the gem:
 `gem install one44-cli`
 
 ## How to use
-$`one44-cli`
+
+### Randomly order test questions (default)
+Test questions are randomly ordered. Make the behaviour explicit by specifying one of the options below:
+
+$`one44-cli`
+
+$`one44-cli -r`
+
+$`one44-cli --random-sort-questions`
+
+$`one44-cli --sort-questions random`
+
+
+### Do not randomly order test questions
+Test questions will be ordered as listed if the `--not-random-sort-questions` is specified:
+
+$`one44-cli --not-random-sort-questions`

data/bin/one44-cli

@@ -6,16 +6,19 @@ require 'one44'
 require 'one44/adaptors/io/cli'
 require 'one44-cli'
 
-
 include One44::Adaptors::IO::CLI
+include One44::CLI::Helpers
+include One44::CLI::Optparse
+
+test = One44::Test.new($stdout)
 
-test = One44::Test.new(STDOUT)
-test.start('indigo', randomise(questions))
+ordered_questions = $one44_cli_options[:question_order] == :random ? randomise(questions) : questions
+test.start('indigo', ordered_questions)
 test.questions.each_with_index do |_question, index|
   test.provide clean(answer), index
-  STDOUT.puts
-  STDOUT.print "#{test.questions[index + 1]}: " unless test.questions[index] == test.questions.last
+  $stdout.puts
+  $stdout.print "#{test.questions[index + 1]}: " unless test.questions[index] == test.questions.last
 end
-STDOUT.print 'Result: '
-STDOUT.print test.result.to_s
-STDOUT.puts
+$stdout.print 'Result: '
+$stdout.print test.result.to_s
+$stdout.puts

data/lib/one44-cli.rb

@@ -1,19 +1,5 @@
 # frozen_string_literal: true
 
-def answer
-  gets.chomp
-end
-
-def clean(answer)
-  Integer(answer).to_i
-rescue StandardError
-  nil
-end
-
-def randomise(questions)
-  questions.shuffle
-end
-
-def questions
-  load_tests_from_csv_file('bin/tests/Advanced Indigo.txt', "\t\t")
-end
+require_relative 'one44-cli/helpers'
+require_relative 'one44-cli/optparse'
+require_relative 'one44-cli/version'

data/lib/one44-cli/helpers.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module One44
+  module CLI
+    module Helpers
+      def answer
+        gets.chomp
+      end
+
+      def clean(answer)
+        Integer(answer).to_i
+      rescue StandardError
+        nil
+      end
+
+      def randomise(questions)
+        questions.shuffle
+      end
+
+      def questions
+        load_tests_from_csv_file('bin/tests/Advanced Indigo.txt', "\t\t")
+      end
+    end
+  end
+end

data/lib/one44-cli/optparse.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module One44
+  module CLI
+    module Optparse
+      require 'optparse'
+
+      $one44_cli_options = {}
+      option_parser = OptionParser.new do |opts|
+        opts.on('-r', '--random-sort-questions') do
+          $one44_cli_options[:random_sort_questions] = true
+        end
+
+        opts.on('--not-random-sort-questions') do
+          $one44_cli_options[:random_sort_questions] = false
+        end
+
+        opts.on('-s ORDER', '--sort-questions=ORDER', /^random$/i) do |order|
+          $one44_cli_options[:question_order] = order.downcase.to_sym
+        end
+      end
+      option_parser.parse!
+
+      unless $one44_cli_options&.dig(:question_order)
+        $one44_cli_options[:question_order] = :random unless $one44_cli_options&.dig(:random_sort_questions) == false
+      end
+    end
+  end
+end

data/lib/one44-cli/version.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 module One44
-  VERSION = '0.0.4'
+  module CLI
+    VERSION = '0.1.1'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: one44-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.1
 platform: ruby
 authors:
 - Adam Bonsu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2021-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: one44
@@ -24,7 +24,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.2
-description: Marks math problems'
+description: Marks math problems
 email: adam@bonsu.io
 executables:
 - one44-cli
@@ -37,6 +37,8 @@ files:
 - README.md
 - bin/one44-cli
 - lib/one44-cli.rb
+- lib/one44-cli/helpers.rb
+- lib/one44-cli/optparse.rb
 - lib/one44-cli/version.rb
 homepage: https://github.com/adambonsu/one44-cli
 licenses: