fixing bugs with commands

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)
+ - fixing bugs with import, export, image commands (0.0.31)
  - adding tests for client (0.0.30)
  - bug in Dockerfile fromHeader variable fix (0.0.29)
  - Dockerfile from "as level" removed (0.0.28)

spython/main/base/logger.py

@@ -36,7 +36,7 @@ def init_level(self, quiet=False):
 
 
 
-def println(self,output,quiet=False):
+def println(self, output, quiet=False):
     '''print will print the output, given that quiet is not True. This
        function also serves to convert output in bytes to utf-8
 

spython/main/image/__init__.py

@@ -31,6 +31,9 @@ def generate_image_commands():
     class ImageClient:
         group = "image"
 
+    from spython.main.base.logger import println
+    from spython.main.base.command import ( init_command, run_command )
+
     from .utils import ( compress, decompress )
     from .create import create
     from .importcmd import importcmd
@@ -41,6 +44,10 @@ class ImageClient:
     ImageClient.export = export
     ImageClient.decompress = decompress
     ImageClient.compress = compress
+
+    ImageClient.println = println
+    ImageClient.init_command = init_command
+    ImageClient.run_command = run_command
 
     cli = ImageClient()
     return cli

spython/main/image/create.py

@@ -29,7 +29,10 @@ def create(self,image_path, size=1024, sudo=False):
         filesystem: supported file systems ext3/ext4 (ext[2/3]: default ext3
 
     '''        
-    self.check_install()
+    from spython.utils import check_install
+    check_install()
+
+
     cmd = self.init_command('image.create')
     cmd = cmd + ['--size', str(size), image_path ]
 
@@ -40,5 +43,3 @@ def create(self,image_path, size=1024, sudo=False):
         bot.exit("Could not create image %s" %image_path)
 
     return image_path
-
-

spython/main/image/export.py

@@ -19,7 +19,7 @@
 
 from spython.logger import bot
 
-def export(self,image_path, tmptar=None):
+def export(self, image_path, tmptar=None):
     '''export will export an image, sudo must be used.
 
        Parameters
@@ -29,10 +29,12 @@ def export(self,image_path, tmptar=None):
        tmptar: if defined, use custom temporary path for tar export
 
     '''
-    self.check_install()
+    from spython.utils import check_install
+    check_install()
 
     if tmptar is None:
         tmptar = "/%s/tmptar.tar" %(tempfile.mkdtemp())
-    cmd = ['singularity', 'image.export', '-f',tmptar, image_path]
-    output = self.run_command(cmd,sudo=False)
+    cmd = ['singularity', 'image.export', '-f', tmptar, image_path]
+
+    output = self.run_command(cmd, sudo=False)
     return tmptar

spython/main/image/importcmd.py

@@ -29,10 +29,11 @@ def importcmd(self, image_path, input_source):
        import_type: if not specified, imports whatever function is given
        
     '''
-    self.check_install()
+    from spython.utils import check_install
+    check_install()
 
-    cmd = ['singularity','image.import',image_path,input_source]
-    output = self.run_command(cmd,sudo=False)
+    cmd = ['singularity', 'image.import', image_path, input_source]
+    output = self.run_command(cmd, sudo=False)
     self.println(output)        
     return image_path
 

spython/main/image/utils.py

@@ -19,9 +19,7 @@
 
 from spython.logger import bot
 
-
-
-def compress(self,image_path):
+def compress(self, image_path):
     '''compress will (properly) compress an image'''
     if os.path.exists(image_path):
         compressed_image = "%s.gz" %image_path
@@ -31,7 +29,7 @@ def compress(self,image_path):
     bot.exit("Cannot find image %s" %image_path)
 
 
-def decompress(self,image_path,quiet=True):
+def decompress(self, image_path, quiet=True):
     '''decompress will (properly) decompress an image'''
 
     if not os.path.exists(image_path):

spython/version.py

@@ -18,7 +18,7 @@
 
 
 
-__version__ = "0.0.30"
+__version__ = "0.0.31"
 AUTHOR = 'Vanessa Sochat'
 AUTHOR_EMAIL = '[email protected]'
 NAME = 'spython'