Merge pull request #158 from ByteInternet/add-php56-to-hypernode-vagrant-runner

add php56 to hypernode-vagrant-runner

Author: vdloo

tools/hypernode-vagrant-runner/hypernode_vagrant_runner/commands.py

@@ -78,14 +78,20 @@ def parse_start_runner_arguments():
     parser.add_argument(
         '--xenial',
         action='store_true',
-        help='Start a Xenial Hypernode (PRE-ALPHA)'
+        help='Start a Xenial Hypernode'
     )
     parser.add_argument(
         '--no-provision',
         action='store_true',
         help='Run "vagrant up" with the --no-provision flag'
     )
-    return parse_arguments(parser)
+    args = parse_arguments(parser)
+    if not args.xenial and args.php == '5.6':
+        parser.error(
+            "Can't use the Precise Hypernode with PHP5.6. "
+            "Add the --xenial flag to use the Xenial version"
+        )
+    return args
 
 
 def start_runner():

tools/hypernode-vagrant-runner/hypernode_vagrant_runner/runner/__init__.py

@@ -94,7 +94,7 @@ def launch_runner(project_path=None, command_to_run=None,
     :param str ssh_user: The SSH user to use to run the hook as
     :param bool xdebug_enabled: Install xdebug in the vagrant
     :param bool skip_try_sudo: Skip try to sudo beforehand to fail early
-    ;param bool xenial: Start a Xenial image
+    :param bool xenial: Start a Xenial image
     :param bool no_provision: Pass --no-provision to vagrant up
     :return None:
     """

tools/hypernode-vagrant-runner/hypernode_vagrant_runner/settings.py

@@ -5,6 +5,7 @@
 ]
 HYPERNODE_VAGRANT_PHP_VERSIONS = [
     '5.5',
+    '5.6',
     '7.0'
 ]
 HYPERNODE_VAGRANT_BOX_NAMES = {

tools/hypernode-vagrant-runner/hypernode_vagrant_runner/vagrant/__init__.py

@@ -47,7 +47,7 @@ def hypernode_vagrant(directory=None,
     :param str php_version: The PHP version to use
     :param bool xdebug_enabled: Install xdebug in the vagrant
     :param bool skip_try_sudo: Skip try to sudo beforehand to fail early
-    ;param bool xenial: Start a Xenial image
+    :param bool xenial: Start a Xenial image
     :param bool no_provision: Pass --no-provision to vagrant up
     :yield dict vagrant_ssh_config: Parsed vagrant ssh-config
     """

tools/hypernode-vagrant-runner/hypernode_vagrant_runner/vagrant/set_up.py

@@ -107,7 +107,7 @@ def write_hypernode_vagrant_configuration(
     :param str directory: The hypernode-vagrant checkout directory
     :param str php_version: The PHP version to use
     :param bool xdebug_enabled: Install xdebug in the vagrant
-    ;param bool xenial: Configure a Xenial image
+    :param bool xenial: Start a Xenial image
     :return None:
     """
     log.info("Writing configuration file to the hypernode-vagrant directory")
@@ -137,7 +137,7 @@ def start_hypernode_vagrant(directory,
     :param str directory: The directory in which to start the hypernode-vagrant
     :param str php_version: The PHP version to use
     :param bool xdebug_enabled: Install xdebug in the vagrant
-    ;param bool xenial: Start a Xenial image
+    :param bool xenial: Start a Xenial image
     :param bool no_provision: Pass --no-provision to vagrant up
     :return None:
     """
@@ -159,7 +159,7 @@ def create_hypernode_vagrant(directory=None,
     :param str php_version: The PHP version to use
     :param bool xdebug_enabled: Install xdebug in the vagrant
     :param bool skip_try_sudo: Skip try to sudo beforehand to fail early
-    ;param bool xenial: Start a Xenial image
+    :param bool xenial: Start a Xenial image
     :param bool no_provision: Pass --no-provision to vagrant up
     :return str directory: Path to the hypernode-vagrant checkout
     None for a temp dir that will automatically be created

tools/hypernode-vagrant-runner/tests/unit/hypernode_vagrant_runner/commands/test_parse_start_runner_arguments.py

@@ -147,3 +147,26 @@ def test_parse_start_runner_arguments_returns_parsed_arguments(self):
         ret = parse_start_runner_arguments()
 
         self.assertEqual(ret, self.parse_arguments.return_value)
+
+    def test_parse_start_runner_arguments_errors_when_php56_and_precise(self):
+        self.parse_arguments.return_value.php = '5.6'
+        self.parse_arguments.return_value.xenial = False
+
+        parse_start_runner_arguments()
+
+        self.argument_parser.return_value.error.assert_called_once_with(ANY)
+
+    def test_parse_start_runner_arguments_does_not_error_when_php55_and_precise(self):
+        self.parse_arguments.return_value.php = '5.5'
+        self.parse_arguments.return_value.xenial = False
+
+        parse_start_runner_arguments()
+
+        self.assertFalse(self.argument_parser.return_value.error.called)
+
+    def test_parse_start_runner_arguments_does_not_error_if_php56_and_xenial(self):
+        self.parse_arguments.return_value.php = '5.6'
+
+        parse_start_runner_arguments()
+
+        self.assertFalse(self.argument_parser.return_value.error.called)

tools/hypernode-vagrant-runner/tests/unit/hypernode_vagrant_runner/utils/test_run_local_command.py

@@ -87,7 +87,7 @@ def test_run_local_command_does_not_write_to_stdout_in_case_of_nonzero_exit_in_p
             with self.assertRaises(CalledProcessError):
                 run_local_command(['echo', '1'])
 
-	    self.assertFalse(self.write_output_to_stdout.called)
+        self.assertFalse(self.write_output_to_stdout.called)
 
     def test_run_local_command_also_writes_stdout_to_stdout_in_case_of_nonzero_exit_in_python2(self):
         if not is_python_3():