Fix cli argument processing bug, close #7

Author: jbn

cli_tests.sh

@@ -31,6 +31,44 @@ cmp cli_test.ipynb tests/fixtures/_gold.ipynb
 rm cli_test.ipynb
 
 
+###############################################################################
+# Recursive with a regexp, to stdout.
+###############################################################################
+
+nbmerge \
+	--recursive -i \
+	-p "(1_Intro|2_Middle|3_Conclusion)\.ipynb" \
+	> cli_test.ipynb
+
+cmp cli_test.ipynb tests/fixtures/_gold.ipynb
+
+###############################################################################
+# Recursive with a regexp, explicit output.
+###############################################################################
+
+nbmerge \
+	--recursive -i \
+	-p "(1_Intro|2_Middle|3_Conclusion)\.ipynb" \
+	-o cli_test.ipynb
+
+cmp cli_test.ipynb tests/fixtures/_gold.ipynb
+
+rm cli_test.ipynb
+
+###############################################################################
+# Recursive with a regexp and explict input, explicit output.
+###############################################################################
+
+nbmerge \
+	--recursive -i \
+	-p "(2_Middle|3_Conclusion)\.ipynb" \
+	-o cli_test.ipynb \
+	tests/fixtures/1_Intro.ipynb 
+
+cmp cli_test.ipynb tests/fixtures/_gold.ipynb
+
+rm cli_test.ipynb
+
 ###############################################################################
 # When called without any arguments, nbmerge should emit a usage message.
 ###############################################################################

nbmerge/__init__.py

@@ -136,7 +136,6 @@ def parse_plan(args=None, base_dir=None):
     parser = argparse.ArgumentParser(prog="nbmerge",
                                      description=__description__)
 
-
     parser.add_argument("-o", "--output",
                         help="Write to the specified file")
 
@@ -164,13 +163,6 @@ def parse_plan(args=None, base_dir=None):
     args = parser.parse_args(args)
 
     file_paths = args.files[:]
-    # Didn't notice this until trying a pattern I don't use as much from the
-    # command line. The execution name is being collected as part of the
-    # filepaths. I don't know why. Perhaps something to do with using
-    # it as an entry point?
-    # XXX: TODO: KLUDGE
-    if file_paths and file_paths[0].endswith("nbmerge"):
-        file_paths = file_paths[1:]
 
     if not file_paths and not args.recursive:
         parser.print_help()
@@ -194,7 +186,7 @@ def parse_plan(args=None, base_dir=None):
 
 
 def main(args=None):
-    plan = parse_plan(args or sys.argv)
+    plan = parse_plan(args)
 
     nb = merge_notebooks(plan['base_dir'],
                          plan['notebooks'],

tests/test_merge.py

@@ -1,5 +1,4 @@
 import os
-import subprocess
 import sys
 import unittest
 
@@ -61,7 +60,7 @@ def test_parse_plan(self):
         self.assertTrue(plan["verbose"])
         self.assertEqual(plan["output_file"], "myfile.ipynb")
         with self.assertRaises(IOError):
-            parse_plan(["nbmerge", "this-file-doesn't-exist"])
+            parse_plan(["this-file-doesn't-exist"])
 
     def test_annotate_source_path(self):
         nb_path = os.path.join(FIXTURES_DIR, "1_Intro.ipynb")
@@ -72,7 +71,7 @@ def test_annotate_source_path(self):
                          os.path.join('fixtures', '1_Intro.ipynb'))
 
     def test_main_to_stdout(self):
-        main(['nbmerge'] + TARGET_NBS)
+        main(TARGET_NBS)
         self._validate_merged_three(reads(sys.stdout.getvalue(), as_version=4))
 
     def test_main_to_file(self):