learn-co 3.2.16 → 3.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d99775b553ce5b4a507847bae14b5761cd738a7
-  data.tar.gz: ec68270dc18fbf434cb4f8783da537e0f4caebba
+  metadata.gz: 17dd343cee2a158173899d07c6960b3d68e74e41
+  data.tar.gz: 2a23fa06053b7ed17593bf3cb25cc36cbfb6275f
 SHA512:
-  metadata.gz: 6df376a55f8ca1a0db1cf13933327e14753930250e32846ab686612c35a85ba84659384aa421cbd0b242409012e1cb7e94eeef6b72a1d7c424f27fc308927f0c
-  data.tar.gz: 83e8171428c66a907346b7a793e066fcb986e60ccf475e003ded486bbd2d38ea46b50422839c76659b9b5d6c63083b4e1c7e939c421fdc16d2c80805145da7e2
+  metadata.gz: 00554ee4084a6dc6563793d0bd9a841886756f4ae1ca4a3dda40e9e97de4ed78b087101b781537aba7605ce6a1ca24dbe1df83cc2b953ac3fc9951de246d6864
+  data.tar.gz: 8cc85aaa9f59efdc1fcd93194c08f15776e5cb43dc28a521067f93b2a9e8a353cc7d3035d2de74112e37645fe9d38d7728e1542a0d3c8e5a11e7f3e82748379b

data/learn-co.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry"
 
-  spec.add_runtime_dependency "learn-test", ">= 1.2.24"
+  spec.add_runtime_dependency "learn-test", ">= 1.2.25"
   spec.add_runtime_dependency "learn-config", ">= 1.0.75"
   spec.add_runtime_dependency "learn-open", ">= 1.1.56"
   spec.add_runtime_dependency "learn-submit", ">= 1.1.7"

data/lib/learn/options_sanitizer.rb

@@ -33,7 +33,8 @@ module Learn
       '--browser',
       '-s',
       '--skip',
-      '--keep'
+      '--keep',
+      '--fail-fast'
     ]
 
     def initialize(args)
@@ -68,8 +69,9 @@ module Learn
     def handle_missing_or_unknown_args
       if first_arg_not_a_flag_or_file?
         exit_with_unknown_command
-      elsif has_output_flag?
-        check_for_output_file
+      elsif has_output_flag? || has_format_flag?
+        check_for_output_file if has_output_flag?
+        check_for_format_type if has_format_flag?
       elsif only_has_flag_arguments?
         add_test_command
       else
@@ -80,13 +82,13 @@ module Learn
     def check_for_output_file(add_test_command: true)
       index = args.index('-o') || args.index('--out')
 
-      if output_file_specified?(index)
+      if flag_argument_specified?(index)
         initial_arg_index = add_test_command ? 0 : 1
         out_arg = "#{args[index]} #{args[index+1]}"
-        delete_output_file_args!(index)
+        delete_flag_args!(index)
 
         if only_has_known_test_flags?(initial_arg_index)
-          rebuild_args!(output_file_arg: out_arg, add_test_command: add_test_command)
+          rebuild_args!(flag_arg: out_arg, add_test_command: add_test_command)
         else
           exit_with_unknown_flags
         end
@@ -95,14 +97,32 @@ module Learn
       end
     end
 
-    def delete_output_file_args!(index)
+    def check_for_format_type(add_test_command: true)
+      index = args.index('-f') || args.index('--format')
+
+      if flag_argument_specified?(index)
+        initial_arg_index = add_test_command ? 0 : 1
+        format_arg = "#{args[index]} #{args[index+1]}"
+        delete_flag_args!(index)
+
+        if only_has_known_test_flags?(initial_arg_index)
+          rebuild_args!(flag_arg: format_arg, add_test_command: add_test_command)
+        else
+          exit_with_unknown_flags
+        end
+      else
+        exit_with_missing_format_type
+      end
+    end
+
+    def delete_flag_args!(index)
       args.delete_at(index+1)
       args.delete_at(index)
     end
 
-    def rebuild_args!(output_file_arg:, add_test_command:)
+    def rebuild_args!(flag_arg:, add_test_command:)
       args.unshift('test') if add_test_command
-      args.push(output_file_arg)
+      args.push(flag_arg)
     end
 
     def add_test_command
@@ -130,6 +150,10 @@ module Learn
       args.any? {|arg| ['-o', '--out'].include?(arg)}
     end
 
+    def has_format_flag?
+      args.any? {|arg| ['-f', '--format'].include?(arg)}
+    end
+
     def only_has_known_test_flags?(start_index)
       if arg_is_a_file?(args[start_index])
         start_index += 1
@@ -138,7 +162,7 @@ module Learn
       args[start_index..-1].all? {|arg| KNOWN_TEST_FLAGS.include?(arg)}
     end
 
-    def output_file_specified?(index)
+    def flag_argument_specified?(index)
       args[index+1] && !args[index+1].start_with?('-')
     end
 
@@ -158,6 +182,10 @@ module Learn
       args[0] == 'test' && args.any? {|arg| ['-o', '--out'].include?(arg)}
     end
 
+    def has_test_command_and_format_flag?
+      args[0] == 'test' && args.any? {|arg| ['-f', '--format'].include?(arg)}
+    end
+
     # Exit methods
     def exit_with_invalid_flag
       puts "Invalid flag: #{args[1]}"
@@ -184,5 +212,10 @@ module Learn
       puts "Must specify an output file when using the -o, --out flag."
       exit
     end
+
+    def exit_with_missing_format_type
+      puts "Must specify a format type when using the -f, --format flag."
+      exit
+    end
   end
 end

data/lib/learn/version.rb

@@ -1,3 +1,3 @@
 module Learn
-  VERSION = '3.2.16'
+  VERSION = '3.2.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: learn-co
 version: !ruby/object:Gem::Version
-  version: 3.2.16
+  version: 3.2.17
 platform: ruby
 authors:
 - Flatiron School
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.24
+        version: 1.2.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.24
+        version: 1.2.25
 - !ruby/object:Gem::Dependency
   name: learn-config
   requirement: !ruby/object:Gem::Requirement