From 57beee3fdf0fbf9b1284ff69d384976803ca5262 Mon Sep 17 00:00:00 2001
From: Evan Huus <eapache@gmail.com>
Date: Thu, 20 Oct 2022 20:23:35 -0400
Subject: [PATCH] Split --export flag

---
 CHANGELOG.md  |  6 ++++++
 bin/starscope | 22 +++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f99b2c..08c674e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+main (unreleased)
+-------------------
+
+* Split --export flag into --export and --export-path to avoid confusion and
+  subtle command-line syntax errors.
+
 v1.6.1 (2022-08-07)
 -------------------
 
diff --git a/bin/starscope b/bin/starscope
index 5fd7464..471ac50 100755
--- a/bin/starscope
+++ b/bin/starscope
@@ -51,8 +51,16 @@ OptionParser.new do |opts|
   end
 
   opts.separator "\nDatabase Management"
-  opts.on('-e', '--export FORMAT[,PATH]', 'Export in FORMAT to PATH, (see EXPORTING)') do |export|
-    options[:export] << export
+  opts.on('-e', '--export FORMAT', 'Exports database in FORMAT (see EXPORTING)') do |export|
+    options[:export] ||= []
+    options[:export] << export.split(',', 2)
+  end
+  opts.on('--export-path PATH', 'Sets custom export PATH for exported file') do |path|
+    if options[:export].nil? || options[:export].last.size == 2
+      warn '--export-path must follow an --export flag which does not itself specify a PATH'
+      exit(1)
+    end
+    options[:export].last << path
   end
   opts.on('-f', '--file FILE', "Use FILE instead of `#{DEFAULT_DB}`") do |path|
     options[:db] = path
@@ -97,8 +105,9 @@ OptionParser.new do |opts|
   opts.separator <<~TAIL
     \nEXPORTING
         At the moment two export formats are supported: 'ctags' and 'cscope'. If
-        you don't specify a path, the output is written to the file '#{Starscope::Exportable::CTAGS_DEFAULT_PATH}' (for
-        ctags) or '#{Starscope::Exportable::CSCOPE_DEFAULT_PATH}' (for cscope) in the current directory.
+        you don't specify a path with --export-path, the output is written to the
+        file '#{Starscope::Exportable::CTAGS_DEFAULT_PATH}' (for ctags) or '#{Starscope::Exportable::CSCOPE_DEFAULT_PATH}' (for cscope) in the current
+        directory.
   TAIL
 end.parse!
 
@@ -185,8 +194,7 @@ rescue Starscope::DB::NoTableError
   false
 end
 
-def export(db, param)
-  format, path = param.split(',', 2)
+def export(db, format, path)
   db.export(format.to_sym, path)
 rescue Starscope::Exportable::UnknownExportFormatError
   warn "Unrecognized export format \"#{format}\""
@@ -231,7 +239,7 @@ new_data ||= updated
 
 db.save(options[:db]) if options[:write] && (new_data || !db_exists)
 
-options[:export].each { |target| export(db, target) }
+options[:export].each { |target| export(db, target[0], target[1]) }
 
 run_query(db, options[:query], ',') if options[:query]