one44-cli 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be80efae9e104478942b455965752f6f062dd49c84a94a11fff7c5e062039258
-  data.tar.gz: ad0eb206e009b087c73545345b3df53cb653e1358d3df50f01ec6e35a85d64cf
+  metadata.gz: 79b8c6389f90c0394b0cb266a7979a3c982b4e1286321979c21edd9ad94140df
+  data.tar.gz: 4f50eb532f3ffea32c336d1a01cdd58b43a26865243fe4039764485b33726cb3
 SHA512:
-  metadata.gz: 5dc34c9522743cebdb04e4a0cfca23dffe85d7cf82ed70eb029c8c0a98ff0ae76894b3bdb0c586f48a2f06e9d95bbbf2d01f4e0ac00db214a20e9def427b539a
-  data.tar.gz: fd166a7d2141cb87322270ac7a99560986e10e6cb4318da1e3362a00aed406edc78e29b303301f937217638e1de83d62af529e4d9ae120c046dbfa9b37b6debc
+  metadata.gz: 7535cdcd2b0bdb35d694cf54c4594179fcbfb2067f6e23aa3e8186a95605e31682d594a51c8b127a7159b4c237c5c51f95dd2584680c07c9fd73ebb8faaedcd8
+  data.tar.gz: dfb7636dadb728156c71194fbab1fd0dc897e8349c8e4c4854a1dc8182c09177c62ef67d59af12e262ae2d8d43cb63eab5ad8f331615e425ea2ef90cfa45a47c

data/README.md

@@ -8,20 +8,28 @@ Install the gem:
 `gem install one44-cli`
 
 ## How to use
+Create a test file containing math problems:
 
-### Randomly order test questions (default)
-Test questions are randomly ordered. Make the behaviour explicit by specifying one of the options below:
+E.g
+```testfileexample
+1x1		2x2		3x3
+4x4		5x5		6x6
+```
 
-$`one44-cli`
+Run `one44-cli` as follows:
 
-$`one44-cli -r`
+$`one44-cli -f path/to/test/file`
 
-$`one44-cli --random-sort-questions`
+### Do not randomly order test questions (default)
+Test questions will be ordered as listed in the test file if the `--not-random-sort-questions` is specified:
 
-$`one44-cli --sort-questions random`
+$`one44-cli --not-random-sort-questions`
 
+### Randomly order test questions
+Test questions are randomly ordered by specifying one of the options below:
 
-### Do not randomly order test questions
-Test questions will be ordered as listed if the `--not-random-sort-questions` is specified:
+$`one44-cli -r`
 
-$`one44-cli --not-random-sort-questions`
+$`one44-cli --random-sort-questions`
+
+$`one44-cli --sort-questions random`

data/bin/one44-cli

@@ -10,10 +10,10 @@ include One44::Adaptors::IO::CLI
 include One44::CLI::Helpers
 include One44::CLI::Optparse
 
+options = One44::CLI::Optparse::Parser.parse(ARGV)
 test = One44::Test.new($stdout)
 
-ordered_questions = $one44_cli_options[:question_order] == :random ? randomise(questions) : questions
-test.start('indigo', ordered_questions)
+test.start(options[:test], ordered_questions(options[:test], options[:question_order]))
 test.questions.each_with_index do |_question, index|
   test.provide clean(answer), index
   $stdout.puts

data/lib/one44-cli/helpers.rb

@@ -13,12 +13,16 @@ module One44
         nil
       end
 
+      def ordered_questions(test, question_order)
+        question_order == :random ? randomise(questions_from(test)) : questions_from(test)
+      end
+
       def randomise(questions)
         questions.shuffle
       end
 
-      def questions
-        load_tests_from_csv_file('bin/tests/Advanced Indigo.txt', "\t\t")
+      def questions_from(test)
+        load_tests_from_csv_file(test, "\t\t")
       end
     end
   end

data/lib/one44-cli/optparse.rb

@@ -5,24 +5,40 @@ module One44
     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
+      class Parser
+        def self.parse(args)
+          options = {}
+          option_parser = OptionParser.new do |opts|
+            opts.on('-r', '--random-sort-questions') do
+              options[:random_sort_questions] = true
+            end
 
-        opts.on('--not-random-sort-questions') do
-          $one44_cli_options[:random_sort_questions] = false
-        end
+            opts.on('--not-random-sort-questions') do
+              options[:random_sort_questions] = false
+            end
+
+            opts.on('-s ORDER', '--sort-questions=ORDER', /^random$/i) do |order|
+              options[:question_order] = order.downcase.to_sym
+            end
 
-        opts.on('-s ORDER', '--sort-questions=ORDER', /^random$/i) do |order|
-          $one44_cli_options[:question_order] = order.downcase.to_sym
+            opts.on('-f TEST', '--path-to-test-file=TEST', '[Mandatory] Specify the path to the test file.') do |test|
+              options[:test] = test
+            end
+          end
+          process_options(option_parser, options, args)
         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
+        def self.process_options(option_parser, options, args)
+          option_parser.parse!(args)
+          unless options[:test]
+            puts option_parser.help
+            exit 1
+          end
+          options
+        rescue Exception => e
+          puts "Exception encountered: #{e}"
+          exit 1
+        end
       end
     end
   end

data/lib/one44-cli/version.rb

@@ -2,6 +2,6 @@
 
 module One44
   module CLI
-    VERSION = '0.1.1'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: one44-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Adam Bonsu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-13 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: one44
@@ -24,6 +24,76 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+- !ruby/object:Gem::Dependency
+  name: rspec-wait
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.91.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.91.0
 description: Marks math problems
 email: adam@bonsu.io
 executables: