More bug fixes to handle building Spark at a commit (#197)

* more bug fixes to handle building Spark at a commit
* update change log

CHANGES.md

@@ -25,11 +25,12 @@
 
 * [#195]: After launching a new cluster, Flintrock now shows the
   master address and login command.
-* [#196]: Fixed a bug that was preventing Flintrock from launching
-  Spark clusters at a specific commit.
+* [#196], [#197]: Fixed some bugs that were preventing Flintrock from
+  launching Spark clusters at a specific commit.
 
 [#195]: https://github.com/nchammas/flintrock/pull/195
 [#196]: https://github.com/nchammas/flintrock/pull/196
+[#197]: https://github.com/nchammas/flintrock/pull/197
 
 ## [0.8.0] - 2017-02-11
 

flintrock/core.py

@@ -461,7 +461,7 @@ def generate_template_mapping(
         'hadoop_version': hadoop_version,
         'hadoop_short_version': '.'.join(hadoop_version.split('.')[:2]),
         'spark_version': spark_version,
-        'spark_short_version': '.'.join(spark_version.split('.')[:2]),
+        'spark_short_version': '.'.join(spark_version.split('.')[:2]) if '.' in spark_version else spark_version,
 
         'hadoop_root_dir': hadoop_root_dir,
         'hadoop_ephemeral_dirs': hadoop_ephemeral_dirs,

flintrock/services.py

@@ -321,7 +321,7 @@ def configure(
                             mapping=generate_template_mapping(
                                 cluster=cluster,
                                 hadoop_version=self.hadoop_version,
-                                spark_version=self.version,
+                                spark_version=self.version or self.git_commit,
                             ))),
                     p=shlex.quote(template_path)))
 

tests/test_core.py

@@ -1,4 +1,5 @@
 import os
+import pytest
 
 # Flintrock
 from flintrock.core import (
@@ -12,7 +13,13 @@
             os.path.realpath(__file__))))
 
 
-def test_templates(dummy_cluster):
+@pytest.mark.parametrize(
+    'spark_version', [
+        (''),
+        ('2.1.1'),
+        ('0626b11147133b67b26a04b4819f61a33dd958d3'),
+    ])
+def test_templates(dummy_cluster, spark_version):
     template_dir = os.path.join(FLINTROCK_ROOT_DIR, 'flintrock', 'templates')
     for (dirpath, dirnames, filenames) in os.walk(template_dir):
         if filenames:
@@ -21,7 +28,7 @@ def test_templates(dummy_cluster):
                 mapping = generate_template_mapping(
                     cluster=dummy_cluster,
                     hadoop_version='',
-                    spark_version='',
+                    spark_version=spark_version,
                 )
                 get_formatted_template(
                     path=template_path,