python-jack-knife 0.6.9__tar.gz → 0.6.11__tar.gz

{python_jack_knife-0.6.9 → python_jack_knife-0.6.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jack-knife
-Version: 0.6.9
+Version: 0.6.11
 Summary: Python Jack Knife – a command line data processor
 Author-email: Mike Schultz <mike.schultz@gmail.com>
 License: 

{python_jack_knife-0.6.9 → python_jack_knife-0.6.11}/src/pjk/pipes/join.py

@@ -14,13 +14,13 @@ class JoinPipe(Pipe):
     def usage(cls):
         usage = Usage(
             name='join',
-            desc="Join records against a keyed source on shared fields",
+            desc="Join records against a keyed source or concatentate sources",
             component_class=cls
         )
         usage.def_arg(
             name='mode',
-            usage="'left', 'inner', or 'outer' join behavior",
-            valid_values={'left', 'inner', 'outer'}
+            usage="'left', 'inner', 'outer' or 'concat' behavior.",
+            valid_values={'left', 'inner', 'outer', 'concat'}
         )
         usage.def_syntax("pjk <left_source> <map_source> [mapby|groupby]:<key> join:<mode> <sink>")
 
@@ -49,6 +49,14 @@ class JoinPipe(Pipe):
             "join:outer"
         ],
         expect="[{color:'blue', price:50}, {color:'green'}, {color:'red', price: 20}]")
+
+        usage.def_example(expr_tokens=
+        [
+            "[{color:'blue'},{color:'green'}]",
+            "[{color:'blue', price:50}, {color:'red', price:20}]",
+            "join:concat"
+        ],
+        expect="[{color:'blue'}, {color:'green'}, {color: 'blue', price:50}, {color:'red', price: 20}]")
         return usage
 
     def __init__(self, ptok: ParsedToken, usage: Usage):
@@ -68,7 +76,19 @@ class JoinPipe(Pipe):
         self._pending_right = None
         self._check_right = False
 
+    def concat_iter(self):
+        for rec in self.left:
+            self.recs_out.increment()
+            yield rec
+        for rec in self.right:
+            self.recs_out.increment()
+            yield rec
+
     def __iter__(self):
+        if self.mode == 'concat':
+            yield from self.concat_iter()
+            return
+
         if not isinstance(self.right, KeyedSource):
             raise UsageError("right source must be a KeyedSource")
 

{python_jack_knife-0.6.9 → python_jack_knife-0.6.11}/src/pjk/sinks/stdout.py

@@ -29,16 +29,7 @@ class StdoutSink(Sink):
             with pager_stdout(self.use_pager):
                 for record in self.input:
                     try:
-                        # if it's a simple single-key map whose value is a string, print raw
-                        # kind of hack to make 'pjk macros -' cut-n-pastable
-                        if isinstance(record, dict) and len(record) == 1:
-                            (k, v), = record.items()
-                            if isinstance(v, str):
-                                sys.stdout.write(f"{k}: {v}\n---\n")
-                                continue
-
                         # everything else -> normal YAML
-                        print('foo')
                         yaml.dump(
                             record,
                             sys.stdout,

{python_jack_knife-0.6.9 → python_jack_knife-0.6.11}/src/pjk/sources/json_source.py

@@ -33,11 +33,9 @@ class JsonSource(FormatSource):
                 try:
                     yield json.loads(line)
                 except json.JSONDecodeError as e:
-                    break
-
-        # attempt to decode the file as a whole
-        try:
-            yield from self.as_whole_file()
-
-        except:
-            logger.error(f'cannot decode {self.lazy_file.path}')
+                    try:
+                        yield from self.as_whole_file()
+                        return
+                    except:
+                        logger.error(f'cannot decode {self.lazy_file.path}')
+                        break

{python_jack_knife-0.6.9 → python_jack_knife-0.6.11}/src/pjk/version.py

@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2024 Mike Schultz
 
-__version__ = "0.6.9"
+__version__ = "0.6.11"

{python_jack_knife-0.6.9 → python_jack_knife-0.6.11}/src/python_jack_knife.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jack-knife
-Version: 0.6.9
+Version: 0.6.11
 Summary: Python Jack Knife – a command line data processor
 Author-email: Mike Schultz <mike.schultz@gmail.com>
 License: