Arduino-CI
diff --git a/‎CHANGELOG.md
Copy file name to clipboardExpand all lines: CHANGELOG.md
+1 b/‎CHANGELOG.md
Copy file name to clipboardExpand all lines: CHANGELOG.md
+1
diff --git a/‎exe/arduino_ci.rb
Copy file name to clipboardExpand all lines: exe/arduino_ci.rb
+22-10 b/‎exe/arduino_ci.rb
Copy file name to clipboardExpand all lines: exe/arduino_ci.rb
+22-10
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Fix phrasing of free-space check
+- Handle unrecognized command line errors in a nicer way
 
 ### Security
 
 
@@ -19,6 +19,18 @@
 
 # Use some basic parsing to allow command-line overrides of config
 class Parser
+
+  def self.show_help(opts)
+    puts opts
+    puts
+    puts "Additionally, the following environment variables control the script:"
+    puts " - #{VAR_CUSTOM_INIT_SCRIPT} - if set, this script will be run from the Arduino/libraries directory"
+    puts "       prior to any automated library installation or testing (e.g. to install unofficial libraries)"
+    puts " - #{VAR_USE_SUBDIR} - if set, the script will install the library from this subdirectory of the cwd"
+    puts " - #{VAR_EXPECT_EXAMPLES} - if set, testing will fail if no example sketches are present"
+    puts " - #{VAR_EXPECT_UNITTESTS} - if set, testing will fail if no unit tests are present"
+  end
+
   def self.parse(options)
     unit_config = {}
     output_options = {
@@ -58,19 +70,19 @@ def self.parse(options)
       end
 
       opts.on("-h", "--help", "Prints this help") do
-        puts opts
-        puts
-        puts "Additionally, the following environment variables control the script:"
-        puts " - #{VAR_CUSTOM_INIT_SCRIPT} - if set, this script will be run from the Arduino/libraries directory"
-        puts "       prior to any automated library installation or testing (e.g. to install unofficial libraries)"
-        puts " - #{VAR_USE_SUBDIR} - if set, the script will install the library from this subdirectory of the cwd"
-        puts " - #{VAR_EXPECT_EXAMPLES} - if set, testing will fail if no example sketches are present"
-        puts " - #{VAR_EXPECT_UNITTESTS} - if set, testing will fail if no unit tests are present"
+        show_help(opts)
         exit
       end
     end
 
-    opt_parser.parse!(options)
+    begin
+      opt_parser.parse!(options)
+    rescue OptionParser::InvalidOption => e
+      puts e
+      puts
+      show_help(opt_parser)
+      exit 1
+    end
     output_options
   end
 end
@@ -585,7 +597,7 @@ def perform_example_compilation_tests(cpp_library, config)
 #
 
 # Read in command line options and make them read-only
-@cli_options = (Parser.parse ARGV).freeze
+@cli_options = Parser.parse(ARGV).freeze
 
 @log = ArduinoCI::Logger.auto_width
 @log.banner