Merge pull request #19 from netdevops/subcommand

refactor subcommand parser

Author: jtdub

docs/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: c298f96343980084363d65dfca8fb8dc
+config: a809f93c93cd5ff1b68c423b135ac86e
 tags: d77d1c0d9ca2f4c8421862c7c5a0d620

docs/_mkdocs/_build/dirhtml/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: c298f96343980084363d65dfca8fb8dc
+config: a809f93c93cd5ff1b68c423b135ac86e
 tags: d77d1c0d9ca2f4c8421862c7c5a0d620

docs/_mkdocs/_build/dirhtml/_modules/index.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Overview: module code &mdash; netnir 0.0.15 0.0.15 documentation</title>
+  <title>Overview: module code &mdash; netnir 0.0.16 0.0.16 documentation</title>
 
 
 
@@ -49,7 +49,7 @@
 
 
 
-            <a href="../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.15
+            <a href="../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.16
 
 
 
@@ -99,7 +99,7 @@
       <nav class="wy-nav-top" aria-label="top navigation">
 
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="../">netnir 0.0.15</a>
+          <a href="../">netnir 0.0.16</a>
 
       </nav>
 

docs/_mkdocs/_build/dirhtml/_modules/netnir/cli/index.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>netnir.cli &mdash; netnir 0.0.15 0.0.15 documentation</title>
+  <title>netnir.cli &mdash; netnir 0.0.16 0.0.16 documentation</title>
 
 
 
@@ -49,7 +49,7 @@
 
 
 
-            <a href="../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.15
+            <a href="../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.16
 
 
 
@@ -99,7 +99,7 @@
       <nav class="wy-nav-top" aria-label="top navigation">
 
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="../../../">netnir 0.0.15</a>
+          <a href="../../../">netnir 0.0.16</a>
 
       </nav>
 
@@ -169,29 +169,15 @@ <h1>Source code for netnir.cli</h1><div class="highlight"><pre>
 <span class="sd">        A class object used to setup the netnir cli, consume the available commands from plugins,</span>
 <span class="sd">        display the available commands, and execute the available commands based on user input.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
+        <span class="kn">from</span> <span class="nn">netnir.helpers</span> <span class="kn">import</span> <span class="n">plugins_import</span>
+
         <span class="bp">self</span><span class="o">.</span><span class="n">plugins</span> <span class="o">=</span> <span class="n">NETNIR_CONFIG</span><span class="p">[</span><span class="s2">&quot;plugins&quot;</span><span class="p">]</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">loaded_plugins</span> <span class="o">=</span> <span class="nb">dict</span><span class="p">()</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">parser</span> <span class="o">=</span> <span class="n">MyParser</span><span class="p">(</span><span class="n">prog</span><span class="o">=</span><span class="s2">&quot;netnir&quot;</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">parser</span><span class="o">.</span><span class="n">add_argument</span><span class="p">(</span>
             <span class="s2">&quot;--version&quot;</span><span class="p">,</span> <span class="n">default</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">action</span><span class="o">=</span><span class="s2">&quot;store_true&quot;</span><span class="p">,</span> <span class="n">help</span><span class="o">=</span><span class="s2">&quot;display version&quot;</span>
         <span class="p">)</span>
-
         <span class="n">subparsers</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">parser</span><span class="o">.</span><span class="n">add_subparsers</span><span class="p">(</span><span class="n">title</span><span class="o">=</span><span class="s2">&quot;netnir commands&quot;</span><span class="p">,</span> <span class="n">dest</span><span class="o">=</span><span class="s2">&quot;command&quot;</span><span class="p">)</span>
-
-        <span class="k">for</span> <span class="n">task_key</span><span class="p">,</span> <span class="n">task</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">plugins</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
-            <span class="n">plugin</span> <span class="o">=</span> <span class="n">task</span><span class="p">[</span><span class="s2">&quot;class&quot;</span><span class="p">]</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s2">&quot;.&quot;</span><span class="p">)[:</span><span class="o">-</span><span class="mi">1</span><span class="p">]</span>
-            <span class="n">app</span> <span class="o">=</span> <span class="n">task</span><span class="p">[</span><span class="s2">&quot;class&quot;</span><span class="p">]</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s2">&quot;.&quot;</span><span class="p">)[</span><span class="o">-</span><span class="mi">1</span><span class="p">]</span>
-            <span class="n">cmdparser</span> <span class="o">=</span> <span class="n">subparsers</span><span class="o">.</span><span class="n">add_parser</span><span class="p">(</span>
-                <span class="n">task_key</span><span class="p">,</span> <span class="n">help</span><span class="o">=</span><span class="n">task</span><span class="p">[</span><span class="s2">&quot;description&quot;</span><span class="p">],</span> <span class="n">description</span><span class="o">=</span><span class="n">task</span><span class="p">[</span><span class="s2">&quot;description&quot;</span><span class="p">],</span>
-            <span class="p">)</span>
-
-            <span class="k">try</span><span class="p">:</span>
-                <span class="n">plugin</span> <span class="o">=</span> <span class="nb">getattr</span><span class="p">(</span><span class="nb">__import__</span><span class="p">(</span><span class="s2">&quot;.&quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">plugin</span><span class="p">),</span> <span class="n">fromlist</span><span class="o">=</span><span class="p">[</span><span class="n">app</span><span class="p">]),</span> <span class="n">app</span><span class="p">)</span>
-                <span class="bp">self</span><span class="o">.</span><span class="n">loaded_plugins</span><span class="o">.</span><span class="n">update</span><span class="p">({</span><span class="n">task_key</span><span class="p">:</span> <span class="n">plugin</span><span class="p">})</span>
-            <span class="k">except</span> <span class="ne">ModuleNotFoundError</span><span class="p">:</span>
-                <span class="k">raise</span>
-
-            <span class="n">plugin</span><span class="o">.</span><span class="n">parser</span><span class="p">(</span><span class="n">cmdparser</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">loaded_plugins</span> <span class="o">=</span> <span class="n">plugins_import</span><span class="p">(</span><span class="n">tasks</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">plugins</span><span class="p">,</span> <span class="n">subparsers</span><span class="o">=</span><span class="n">subparsers</span><span class="p">)</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">args</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">parser</span><span class="o">.</span><span class="n">parse_args</span><span class="p">()</span>
 

docs/_mkdocs/_build/dirhtml/_modules/netnir/core/credentials/index.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>netnir.core.credentials &mdash; netnir 0.0.15 0.0.15 documentation</title>
+  <title>netnir.core.credentials &mdash; netnir 0.0.16 0.0.16 documentation</title>
 
 
 
@@ -49,7 +49,7 @@
 
 
 
-            <a href="../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.15
+            <a href="../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.16
 
 
 
@@ -99,7 +99,7 @@
       <nav class="wy-nav-top" aria-label="top navigation">
 
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="../../../../">netnir 0.0.15</a>
+          <a href="../../../../">netnir 0.0.16</a>
 
       </nav>
 

docs/_mkdocs/_build/dirhtml/_modules/netnir/core/inventory/index.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>netnir.core.inventory &mdash; netnir 0.0.15 0.0.15 documentation</title>
+  <title>netnir.core.inventory &mdash; netnir 0.0.16 0.0.16 documentation</title>
 
 
 
@@ -49,7 +49,7 @@
 
 
 
-            <a href="../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.15
+            <a href="../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.16
 
 
 
@@ -99,7 +99,7 @@
       <nav class="wy-nav-top" aria-label="top navigation">
 
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="../../../../">netnir 0.0.15</a>
+          <a href="../../../../">netnir 0.0.16</a>
 
       </nav>
 

docs/_mkdocs/_build/dirhtml/_modules/netnir/core/networking/index.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>netnir.core.networking &mdash; netnir 0.0.15 0.0.15 documentation</title>
+  <title>netnir.core.networking &mdash; netnir 0.0.16 0.0.16 documentation</title>
 
 
 
@@ -49,7 +49,7 @@
 
 
 
-            <a href="../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.15
+            <a href="../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.16
 
 
 
@@ -99,7 +99,7 @@
       <nav class="wy-nav-top" aria-label="top navigation">
 
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="../../../../">netnir 0.0.15</a>
+          <a href="../../../../">netnir 0.0.16</a>
 
       </nav>
 

docs/_mkdocs/_build/dirhtml/_modules/netnir/core/output/index.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>netnir.core.output &mdash; netnir 0.0.15 0.0.15 documentation</title>
+  <title>netnir.core.output &mdash; netnir 0.0.16 0.0.16 documentation</title>
 
 
 
@@ -49,7 +49,7 @@
 
 
 
-            <a href="../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.15
+            <a href="../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.16
 
 
 
@@ -99,7 +99,7 @@
       <nav class="wy-nav-top" aria-label="top navigation">
 
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="../../../../">netnir 0.0.15</a>
+          <a href="../../../../">netnir 0.0.16</a>
 
       </nav>
 

docs/_mkdocs/_build/dirhtml/_modules/netnir/core/tasks/config_plan/index.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>netnir.core.tasks.config_plan &mdash; netnir 0.0.15 0.0.15 documentation</title>
+  <title>netnir.core.tasks.config_plan &mdash; netnir 0.0.16 0.0.16 documentation</title>
 
 
 
@@ -49,7 +49,7 @@
 
 
 
-            <a href="../../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.15
+            <a href="../../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.16
 
 
 
@@ -99,7 +99,7 @@
       <nav class="wy-nav-top" aria-label="top navigation">
 
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="../../../../../">netnir 0.0.15</a>
+          <a href="../../../../../">netnir 0.0.16</a>
 
       </nav>
 

docs/_mkdocs/_build/dirhtml/_modules/netnir/core/tasks/fetch/config/index.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>netnir.core.tasks.fetch.config &mdash; netnir 0.0.15 0.0.15 documentation</title>
+  <title>netnir.core.tasks.fetch.config &mdash; netnir 0.0.16 0.0.16 documentation</title>
 
 
 
@@ -49,7 +49,7 @@
 
 
 
-            <a href="../../../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.15
+            <a href="../../../../../../" class="icon icon-home" alt="Documentation Home"> netnir 0.0.16
 
 
 
@@ -99,7 +99,7 @@
       <nav class="wy-nav-top" aria-label="top navigation">
 
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="../../../../../../">netnir 0.0.15</a>
+          <a href="../../../../../../">netnir 0.0.16</a>
 
       </nav>