Merge pull request #15 from mnapoli/auto-add-bref-files

Auto-deploy Bref internal files

serverless.yml

@@ -9,9 +9,7 @@ package:
     - '*'
     - '**'
   include:
-    - handler.js
     - bref.php
-    - '.bref/**'
     - 'src/**'
     - 'vendor/**'
 

src/Console/Deployer.php

@@ -168,8 +168,10 @@ private function generateArchive(SymfonyStyle $io, ProgressBar $progress) : void
         $this->fs->copy(__DIR__ . '/../../template/php.ini', '.bref/output/.bref/php.ini');
         $progress->advance();
 
-        $progress->setMessage('Installing `handler.js`');
+        $progress->setMessage('Installing Bref files for NodeJS');
         $progress->display();
+        $this->copyServerlessYml();
+        // Install `handler.js`
         $this->fs->copy(__DIR__ . '/../../template/handler.js', '.bref/output/handler.js');
         $progress->advance();
 
@@ -178,13 +180,6 @@ private function generateArchive(SymfonyStyle $io, ProgressBar $progress) : void
         $this->runLocally('composer install --no-dev --classmap-authoritative --no-scripts');
         $progress->advance();
 
-        /*
-         * TODO Edit the `serverless.yml` copy (in `.bref/output` to deploy these files:
-         * - bref.php
-         * - handler.js
-         * - .bref/**
-         */
-
         // Run build hooks defined in .bref.yml
         $progress->setMessage('Running build hooks');
         $progress->display();
@@ -204,10 +199,6 @@ private function runLocally(string $command) : void
         $process->mustRun();
     }
 
-    /**
-     * @param SymfonyStyle $io
-     * @return ProgressBar
-     */
     private function createProgressBar(SymfonyStyle $io, int $max) : ProgressBar
     {
         ProgressBar::setFormatDefinition('bref', "<comment>%message%</comment>\n %current%/%max% [%bar%] %elapsed:6s%\n");
@@ -221,4 +212,18 @@ private function createProgressBar(SymfonyStyle $io, int $max) : ProgressBar
 
         return $progressBar;
     }
+
+    /**
+     * Pre-process the `serverless.yml` file and copy it in the lambda directory.
+     */
+    private function copyServerlessYml() : void
+    {
+        $serverlessYml = Yaml::parse(file_get_contents('serverless.yml'));
+
+        // Force deploying the files used by Bref without having the user know about them
+        $serverlessYml['package']['include'][] = 'handler.js';
+        $serverlessYml['package']['include'][] = '.bref/**';
+
+        file_put_contents('.bref/output/serverless.yml', Yaml::dump($serverlessYml, 10));
+    }
 }

template/serverless.yml

@@ -9,9 +9,7 @@ package:
     - '*'
     - '**'
   include:
-    - handler.js
     - bref.php
-    - '.bref/**'
     - 'src/**'
     - 'vendor/**'