Merge pull request #179 from singularityhub/allow-options-set-for-instance-on-init

Ensuring options and args are used if set from instance init

Author: vsoch

CHANGELOG.md

@@ -17,6 +17,7 @@ The client here will eventually be released as "spython" (and eventually to
 singularity on pypi), and the versions here will coincide with these releases.
 
 ## [master](https://github.com/singularityhub/singularity-cli/tree/master)
+ - ensure options and args from instance init are honored (0.0.15)
  - choose output for stream_command (0.0.14)
  - adding support to pull from a url (0.1.13)
  - add more verbosity to instance start/stop (0.1.12)

spython/instance/__init__.py

@@ -28,7 +28,8 @@ def __init__(self, image, start=True, name=None, quiet=True, **kwargs):
 
         # Update metadats from arguments
         self._update_metadata(kwargs)
-        self.options = []
+        self.options = kwargs.get("options", [])
+        self.args = kwargs.get("args", [])
         self.cmd = []
         self.quiet = quiet
 

spython/instance/cmd/start.py

@@ -63,6 +63,10 @@ def start(
 
     cmd = self._init_command(subgroup, singularity_options)
 
+    # Set options and args
+    args = args or self.args
+    options = options or self.options
+
     # Add options, if they are provided
     if not isinstance(options, list):
         options = [] if options is None else options.split(" ")

spython/version.py

@@ -5,7 +5,7 @@
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-__version__ = "0.1.14"
+__version__ = "0.1.15"
 AUTHOR = "Vanessa Sochat"
 AUTHOR_EMAIL = "[email protected]"
 NAME = "spython"