Fixes issue deployphp#1671, Range expansion in FileLoader when host.y…

…ml is loaded.

CHANGELOG.md

@@ -1,7 +1,13 @@
 # Changelog
 
+
+
 ## master
 [v6.3.0...master](https://github.com/deployphp/deployer/compare/v6.3.0...master)
+- Added a function to Deployer\Host\FileLoader, expandOnLoad, which rebuilds the parsed yaml array with expanded hostnames. 
+- Updated deployer/test/fixtures/inventory.xml by combining db1.deployer.org and db2.deployer.org into db[1:2].deployer.org in order to test file loading with range.
+- Added tests for db1.deployer.org and db2.deployer.org in FileLoaderTest testLoad(). 
+- Added tests in FunctionTest testInventory() function to test for db1.deployer.org and db2.deployer.org because the bug report referenced inventory().
 
 ### Changed
 - Laravel recipe should not run `artisan:cache:clear` in `deploy` task

src/Host/FileLoader.php

@@ -16,7 +16,25 @@ class FileLoader
      * @var Host[]
      */
     private $hosts = [];
+   /**
+    * @param array $datain
+    * @return array $dataexp
+    */
+    public function expandOnLoad($datain) {
+        $dataout = array();
+        foreach ($datain as $hostname => $config) {
+                if (preg_match('/\[(.+?)\]/', $hostname)) {
+                        foreach(Range::expand([$hostname]) as $splithost) {
+                        	$dataout["$splithost"] = $config;
+                        }
+                } else {
+			$dataout["$hostname"] = $config;
+                }
+
+        }
 
+        return $dataout;
+   }
     /**
      * @param string $file
      * @return $this
@@ -29,7 +47,8 @@ public function load($file)
         }
 
         $data = Yaml::parse(file_get_contents($file));
-
+	$data = $this->expandOnLoad($data);
+
         if (!is_array($data)) {
             throw new Exception("Hosts file `$file` should contains array of hosts.");
         }

test/fixture/inventory.yml

@@ -35,11 +35,7 @@ app.deployer.org:
   roles: app
   deploy_path: ~/app
 
-db1.deployer.org:
-  stage: production
-  roles: db
-
-db2.deployer.org:
+db[1:2].deployer.org:
   stage: production
   roles: db
 

test/src/FunctionsTest.php

@@ -98,7 +98,7 @@ public function testInventory()
     {
         inventory(__DIR__ . '/../fixture/inventory.yml');
 
-        foreach (['app.deployer.org', 'beta.deployer.org'] as $hostname) {
+        foreach (['app.deployer.org', 'beta.deployer.org', 'db1.deployer.org', 'db2.deployer.org'] as $hostname) {
             self::assertInstanceOf(Host::class, $this->deployer->hosts->get($hostname));
         }
     }

test/src/Host/FileLoaderTest.php

@@ -51,6 +51,11 @@ public function testLoad()
             '-f -A -someFlag value -p 22 -F configFile -i identityFile -o Option=Value',
             $bar->getSshArguments()->getCliArguments()
         );
+
+	$db1 = $this->getHost('db1.deployer.org');
+	self::assertEquals('db1.deployer.org', $db1->getHostname());
+	$db2 = $this->getHost('db2.deployer.org');
+	self::assertEquals('db2.deployer.org', $db2->getHostname());
     }
 
     /**