#58: handle executable flag properly

pongasoft · Jun 30, 2013 · cc361fc · cc361fc
1 parent 3388304
commit cc361fc
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 1 deletion.
diff --git a/....packaging-setup/src/cmdline/resources/configs/agent-server/conf/pre_master_conf.sh.gtmpl b/....packaging-setup/src/cmdline/resources/configs/agent-server/conf/pre_master_conf.sh.gtmpl
diff --git a/...ackaging-setup/src/cmdline/resources/configs/console-server/conf/pre_master_conf.sh.gtmpl b/...ackaging-setup/src/cmdline/resources/configs/console-server/conf/pre_master_conf.sh.gtmpl
diff --git a/...org.pongasoft.glu.packaging-setup-impl/src/test/groovy/test/setup/BasePackagerTest.groovy b/...org.pongasoft.glu.packaging-setup-impl/src/test/groovy/test/setup/BasePackagerTest.groovy
@@ -25,6 +25,8 @@ import org.pongasoft.glu.packaging.setup.PackagerContext
 import org.pongasoft.glu.provisioner.core.metamodel.GluMetaModel
 import org.pongasoft.glu.provisioner.core.metamodel.impl.builder.GluMetaModelBuilder
 
+import java.nio.file.Files
+
 /**
  * @author yan@pongasoft.com  */
 public abstract class BasePackagerTest extends GroovyTestCase
@@ -107,7 +109,7 @@ public abstract class BasePackagerTest extends GroovyTestCase
 
   protected File getTestModelFile()
   {
-    new File('../org.linkedin.glu.packaging-all/src/cmdline/resources/conf/tutorial/glu-meta-model.json.groovy').canonicalFile
+    new File('../org.linkedin.glu.packaging-all/src/cmdline/resources/models/tutorial/glu-meta-model.json.groovy').canonicalFile
   }
 
   protected File getConfigsRoot()
@@ -181,6 +183,9 @@ public abstract class BasePackagerTest extends GroovyTestCase
                          rootShell.sha1(expectedValue.resource), rootShell.sha1(r))
           else
             assertEquals("mismatch content for ${r}", expectedValue, r.file.text)
+
+          if(r.path.endsWith('.sh'))
+            assertTrue("${r} is executable", Files.isExecutable(r.file.toPath()))
         }
       }
       catch(AssertionFailedError ex)

diff --git a/...gasoft.glu.packaging-setup-impl/src/test/groovy/test/setup/TestAgentServerPackager.groovy b/...gasoft.glu.packaging-setup-impl/src/test/groovy/test/setup/TestAgentServerPackager.groovy
@@ -34,6 +34,8 @@ public class TestAgentServerPackager extends BasePackagerTest
 
       shell.saveContent(inputPackage.createRelative('version.txt'), GLU_VERSION)
       shell.saveContent(inputPackage.createRelative("${GLU_VERSION}/lib/acme.jar"), "this is the jar")
+      def shellScript = shell.saveContent(inputPackage.createRelative("${GLU_VERSION}/bin/acme.sh"), "this is the shell script")
+      shell.chmodPlusX(shellScript) // make executable
 
       def packager = new AgentServerPackager(packagerContext: createPackagerContext(shell),
                                              outputFolder: shell.mkdirs('/out'),
@@ -51,6 +53,8 @@ public class TestAgentServerPackager extends BasePackagerTest
         [
           '/version.txt': GLU_VERSION,
           "/${GLU_VERSION}": DIRECTORY,
+          "/${GLU_VERSION}/bin": DIRECTORY,
+          "/${GLU_VERSION}/bin/acme.sh": "this is the shell script",
           "/${GLU_VERSION}/lib": DIRECTORY,
           "/${GLU_VERSION}/lib/acme.jar": 'this is the jar',
           "/${GLU_VERSION}/conf": DIRECTORY,

diff --git a/...g.linkedin.glu.utils/src/main/groovy/org/linkedin/glu/groovy/utils/shell/ShellImpl.groovy b/...g.linkedin.glu.utils/src/main/groovy/org/linkedin/glu/groovy/utils/shell/ShellImpl.groovy
@@ -1095,6 +1095,9 @@ def class ShellImpl implements Shell
           break
       }
 
+      if(Files.isExecutable(templateResource.file.toPath()))
+        chmodPlusX(toResource)
+
       return toResource
     }
     catch(Throwable th)

diff --git a/utils/org.linkedin.glu.utils/src/test/groovy/test/utils/shell/TestShell.groovy b/utils/org.linkedin.glu.utils/src/test/groovy/test/utils/shell/TestShell.groovy
@@ -620,12 +620,22 @@ line 3 abcdef
       def p1 = shell.processTemplate(t1, '/out1/foo', [token1: 'foo', token2: 'bar'])
       assertEquals('/out1/foo', p1.path)
       assertEquals('abc foo efg bar hij foo', shell.cat(p1))
+      assertFalse(Files.isExecutable(p1.file.toPath()))
 
       shell.mkdirs('/out')
       // in an existing dir
       def p2 = shell.processTemplate(t1, '/out', [token1: 'foo', token2: 'bar'])
       assertEquals('/out/foo', p2.path)
       assertEquals('abc foo efg bar hij foo', shell.cat(p2))
+      assertFalse(Files.isExecutable(p2.file.toPath()))
+
+      // make it executable
+      shell.chmodPlusX(t1)
+
+      def p1x = shell.processTemplate(t1, '/out1x/foo', [token1: 'foo', token2: 'bar'])
+      assertEquals('/out1x/foo', p1x.path)
+      assertEquals('abc foo efg bar hij foo', shell.cat(p1x))
+      assertTrue(Files.isExecutable(p1x.file.toPath()))
 
       // .gtmpl
       def t2 = shell.saveContent(templates.createRelative('/foo.gtmpl'),