Merge pull request #40 from vsoch/fix/recipe-bug

Fix/recipe bug

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 bug with recipe Dockerfile conversion (0.0.37)
  - typo in pypi PACKAGE_URL (0.0.36)
  - respecting Client "quiet" attribute in run_command  (0.0.34/0.0.35)
  - adding missing import of tempfile in image.export (0.0.33)

spython/main/parse/docker.py

@@ -98,7 +98,23 @@ def _test(self, line):
 
         '''
         self.test  = self._setup('HEALTHCHECK', line)
-        
+
+
+# Arg Parser
+
+    def _arg(self, line):
+        '''singularity doesn't have support for ARG, so instead will issue
+           a warning to the console for the user to export the variable
+           with SINGULARITY prefixed at build.
+ 
+           Parameters
+           ==========
+           line: the line from the recipe file to parse for ARG
+   
+        '''
+        line = self._setup('ARG', line)
+        bot.warning("ARG is not supported for Singularity! To get %s" %line[0])
+        bot.warning("in the container, on host export SINGULARITY_%s" %line[0])
 
 # Env Parser
 
@@ -398,6 +414,7 @@ def _get_mapping(self, line, parser=None, previous=None):
         cmd = line[0].upper()
 
         mapping = {"ADD": self._add,
+                   "ARG": self._arg,
                    "COPY": self._copy,
                    "CMD": self._cmd,
                    "ENTRYPOINT": self._entry,
@@ -411,7 +428,7 @@ def _get_mapping(self, line, parser=None, previous=None):
                    "VOLUME": self._volume,
                    "LABEL": self._label}
 
-        # If it's a command line, return correct functoin
+        # If it's a command line, return correct function
         if cmd in mapping:
             return mapping[cmd]
 
@@ -448,7 +465,6 @@ def _parse(self):
 
             parser = self._get_mapping(line, parser, previous)
 
-
             # Parse it, if appropriate
             if parser:
                 parser(line)

spython/main/parse/environment.py

@@ -55,7 +55,12 @@ def parse_env(envlist):
             elif '=' in current:
                 exports.append(current)
 
-            # Case 1: ['A', 'B']  --> A=B
+            # Case 3: ENV \\
+
+            elif current.endswith('\\'):
+                continue
+
+            # Case 4: ['A', 'B']  --> A=B
 
             else:
 

spython/version.py

@@ -18,7 +18,7 @@
 
 
 
-__version__ = "0.0.36"
+__version__ = "0.0.37"
 AUTHOR = 'Vanessa Sochat'
 AUTHOR_EMAIL = 'vsochat@stanford.edu'
 NAME = 'spython'