Hello community,
here is the log from the commit of package platformsh-cli for openSUSE:Factory
checked in at 2018-01-23 13:53:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old)
and /work/SRC/openSUSE:Factory/.platformsh-cli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "platformsh-cli"
Tue Jan 23 13:53:23 2018 rev:32 rq:568438 version:3.27.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes
2018-01-20 11:28:12.684166580 +0100
+++ /work/SRC/openSUSE:Factory/.platformsh-cli.new/platformsh-cli.changes
2018-01-23 13:53:24.860423093 +0100
@@ -1,0 +2,10 @@
+Tue Jan 23 05:15:25 UTC 2018 - ji...@boombatower.com
+
+- Update to version 3.27.1:
+ * Release v3.27.1
+ * [project:create] increase check timeout and make it configurable
+ * self:build: check for boolean output from git command
+ * Note login_method in README.md
+ * Note login_method can be overriden
+
+-------------------------------------------------------------------
Old:
----
platformsh-cli-3.27.0.tar.xz
New:
----
platformsh-cli-3.27.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ platformsh-cli.spec ++++++
--- /var/tmp/diff_new_pack.u6xGES/_old 2018-01-23 13:53:26.528345174 +0100
+++ /var/tmp/diff_new_pack.u6xGES/_new 2018-01-23 13:53:26.532344987 +0100
@@ -17,7 +17,7 @@
Name: platformsh-cli
-Version: 3.27.0
+Version: 3.27.1
Release: 0
Summary: Tool for managing Platform.sh services from the command line
# See licenses.txt for dependency licenses.
++++++ _service ++++++
--- /var/tmp/diff_new_pack.u6xGES/_old 2018-01-23 13:53:26.568343305 +0100
+++ /var/tmp/diff_new_pack.u6xGES/_new 2018-01-23 13:53:26.568343305 +0100
@@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
- <param name="revision">refs/tags/v3.27.0</param>
+ <param name="revision">refs/tags/v3.27.1</param>
<param name="url">git://github.com/platformsh/platformsh-cli.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.u6xGES/_old 2018-01-23 13:53:26.592342184 +0100
+++ /var/tmp/diff_new_pack.u6xGES/_new 2018-01-23 13:53:26.592342184 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/platformsh/platformsh-cli.git</param>
- <param
name="changesrevision">14f78ca17089deff54abed0e3d3e379788ce8aa6</param>
+ <param
name="changesrevision">90ee4b28bc46cef98160e5223ca58d7e5e90900b</param>
</service>
</servicedata>
++++++ platformsh-cli-3.27.0.tar.xz -> platformsh-cli-3.27.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.27.0/CHANGELOG.md
new/platformsh-cli-3.27.1/CHANGELOG.md
--- old/platformsh-cli-3.27.0/CHANGELOG.md 2018-01-18 18:53:58.000000000
+0100
+++ new/platformsh-cli-3.27.1/CHANGELOG.md 2018-01-22 13:36:58.000000000
+0100
@@ -4,6 +4,11 @@
More readable, curated release notes can be found at:
https://github.com/platformsh/platformsh-cli/releases
+## [v3.27.1](https://github.com/platformsh/platformsh-cli/tree/v3.27.1)
(2018-01-22)
+[Full
Changelog](https://github.com/platformsh/platformsh-cli/compare/v3.27.0...v3.27.1)
+
+* [project:create] increase check timeout and make it configurable
+
## [v3.27.0](https://github.com/platformsh/platformsh-cli/tree/v3.27.0)
(2018-01-18)
[Full
Changelog](https://github.com/platformsh/platformsh-cli/compare/v3.26.1...v3.27.0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.27.0/README.md
new/platformsh-cli-3.27.1/README.md
--- old/platformsh-cli-3.27.0/README.md 2018-01-18 18:53:58.000000000 +0100
+++ new/platformsh-cli-3.27.1/README.md 2018-01-22 13:36:58.000000000 +0100
@@ -195,6 +195,11 @@
# Run 'platform logout --all' if you change this value.
token_file: null
+application:
+ # The method used for interactive login: 'browser' or 'password' (defaults to
+ # 'browser').
+ login_method: browser
+
local:
# Set this to true to avoid some Windows symlink issues.
copy_on_windows: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.27.0/config.yaml
new/platformsh-cli-3.27.1/config.yaml
--- old/platformsh-cli-3.27.0/config.yaml 2018-01-18 18:53:58.000000000
+0100
+++ new/platformsh-cli-3.27.1/config.yaml 2018-01-22 13:36:58.000000000
+0100
@@ -1,7 +1,7 @@
# Metadata about the CLI application itself.
application:
name: 'Platform.sh CLI'
- version: '3.27.0'
+ version: '3.27.1'
executable: 'platform'
package_name: 'platformsh/cli'
installer_url: 'https://platform.sh/cli/installer'
@@ -11,7 +11,8 @@
env_prefix: 'PLATFORMSH_CLI_'
tmp_sub_dir: 'platformsh-cli-tmp'
- # The default login method: either 'browser' or 'password'.
+ # The default interactive login method: either 'browser' or 'password'.
+ # This can be overridden in the user config file.
login_method: browser
# Disabled commands.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.27.0/dist/manifest.json
new/platformsh-cli-3.27.1/dist/manifest.json
--- old/platformsh-cli-3.27.0/dist/manifest.json 2018-01-18
18:53:58.000000000 +0100
+++ new/platformsh-cli-3.27.1/dist/manifest.json 2018-01-22
13:36:58.000000000 +0100
@@ -1,10 +1,10 @@
[
{
"name": "platform.phar",
- "sha1": "152b7c59d9b7594d94a7d772e51a335502ccd5c0",
- "sha256":
"8df70df88de443e3375c42276263c12aeb1f8e6426c21c77f3ddf63e1e867334",
- "url":
"https://github.com/platformsh/platformsh-cli/releases/download/v3.27.0/platform.phar";,
- "version": "3.27.0",
+ "sha1": "3924f27f25298c8956cc3488e8091c484ddc5d8f",
+ "sha256":
"949e0577969c519cc74bc1dac7d1478c111a60fdd5aedf9c99691f541a25043e",
+ "url":
"https://github.com/platformsh/platformsh-cli/releases/download/v3.27.1/platform.phar";,
+ "version": "3.27.1",
"php": {
"min": "5.5.9"
},
@@ -95,7 +95,7 @@
},
{
"notes": "* Use browser login by default (the old login method
is available as `auth:password-login`).\n* Set
`--build-pull-requests-post-merge` to false by default (GitHub
integrations).\n* Respect `--no-wait` in `environment:init`, and clear the
environment cache afterwards.\n* In the `project:delete` command, leave access
control to the API.\n* Support disabling or enabling colorized output via the
CLICOLOR_FORCE environment variable.",
- "show from": "3.26.1",
+ "show from": "3.26.0",
"hide from": "3.27.0"
}
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.27.0/src/Command/Project/ProjectCreateCommand.php
new/platformsh-cli-3.27.1/src/Command/Project/ProjectCreateCommand.php
--- old/platformsh-cli-3.27.0/src/Command/Project/ProjectCreateCommand.php
2018-01-18 18:53:58.000000000 +0100
+++ new/platformsh-cli-3.27.1/src/Command/Project/ProjectCreateCommand.php
2018-01-22 13:36:58.000000000 +0100
@@ -9,6 +9,7 @@
use Platformsh\ConsoleForm\Field\OptionsField;
use Platformsh\ConsoleForm\Form;
use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class ProjectCreateCommand extends CommandBase
@@ -39,6 +40,10 @@
$this->form = Form::fromArray($this->getFields());
$this->form->configureInputDefinition($this->getDefinition());
+
+ $this->addOption('check-timeout', null, InputOption::VALUE_REQUIRED,
'The API timeout while checking the project status', 30)
+ ->addOption('timeout', null, InputOption::VALUE_REQUIRED, 'The
total timeout for all API checks', 900);
+
}
/**
@@ -94,16 +99,19 @@
$bot = new Bot($this->stdErr);
$timedOut = false;
$start = $lastCheck = time();
+ $checkInterval = 3;
+ $checkTimeout = $this->getTimeOption($input, 'check-timeout', 1, 3600);
+ $totalTimeout = $this->getTimeOption($input, 'timeout', 0, 3600);
while ($subscription->isPending() && !$timedOut) {
$bot->render();
- // Attempt to check the subscription every 3 seconds. This also
- // waits 3 seconds before the first check, which allows the server
- // a little more leeway to act on the initial request.
- if (time() - $lastCheck >= 3) {
+ // Attempt to check the subscription every $checkInterval seconds.
+ // This also waits $checkInterval seconds before the first check,
+ // which allows the server a little more leeway to act on the
+ // initial request.
+ if (time() - $lastCheck >= $checkInterval) {
try {
- // Each request can only last up to 3 seconds (otherwise
the
- // animation would be blocked).
- $subscription->refresh(['timeout' => 3, 'exceptions' =>
false]);
+ // The API call will timeout after $checkTimeout seconds.
+ $subscription->refresh(['timeout' => $checkTimeout,
'exceptions' => false]);
$lastCheck = time();
} catch (ConnectException $e) {
if (strpos($e->getMessage(), 'timed out') !== false) {
@@ -113,8 +121,8 @@
}
}
}
- // Time out after 15 minutes.
- $timedOut = time() - $start > 900;
+ // Check the total timeout.
+ $timedOut = $totalTimeout ? time() - $start > $totalTimeout :
false;
}
$this->stdErr->writeln('');
@@ -219,4 +227,26 @@
]),
];
}
+
+ /**
+ * Get a numeric option value while ensuring it's a reasonable number.
+ *
+ * @param \Symfony\Component\Console\Input\InputInterface $input
+ * @param string $optionName
+ * @param int $min
+ * @param int $max
+ *
+ * @return float|int
+ */
+ private function getTimeOption(InputInterface $input, $optionName, $min =
0, $max = 3600)
+ {
+ $value = $input->getOption($optionName);
+ if ($value <= $min) {
+ $value = $min;
+ } elseif ($value > $max) {
+ $value = $max;
+ }
+
+ return $value;
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.27.0/src/Command/Self/SelfBuildCommand.php
new/platformsh-cli-3.27.1/src/Command/Self/SelfBuildCommand.php
--- old/platformsh-cli-3.27.0/src/Command/Self/SelfBuildCommand.php
2018-01-18 18:53:58.000000000 +0100
+++ new/platformsh-cli-3.27.1/src/Command/Self/SelfBuildCommand.php
2018-01-22 13:36:58.000000000 +0100
@@ -197,6 +197,7 @@
'--no-merges',
'v' . $oldVersion . '...master'
]);
+ $changelog = is_string($changelog) ? $changelog : '';
}
$manifestItem['version'] = $version;
$manifestItem['sha1'] = $sha1;
++++++ platformsh-cli-vendor.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/autoload.php new/vendor/autoload.php
--- old/vendor/autoload.php 2018-01-19 16:45:13.779978687 +0100
+++ new/vendor/autoload.php 2018-01-23 06:15:27.715721172 +0100
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitd9a086792cd61d5aa0e965a7c5596da1::getLoader();
+return ComposerAutoloaderInitd6da0633bacdf02d08e7b85a96cc4544::getLoader();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/composer/autoload_real.php
new/vendor/composer/autoload_real.php
--- old/vendor/composer/autoload_real.php 2018-01-19 16:45:13.779978687
+0100
+++ new/vendor/composer/autoload_real.php 2018-01-23 06:15:27.715721172
+0100
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitd9a086792cd61d5aa0e965a7c5596da1
+class ComposerAutoloaderInitd6da0633bacdf02d08e7b85a96cc4544
{
private static $loader;
@@ -19,15 +19,15 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInitd9a086792cd61d5aa0e965a7c5596da1',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInitd6da0633bacdf02d08e7b85a96cc4544',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInitd9a086792cd61d5aa0e965a7c5596da1',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInitd6da0633bacdf02d08e7b85a96cc4544',
'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')
&& (!function_exists('zend_loader_file_encoded') ||
!zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
-
call_user_func(\Composer\Autoload\ComposerStaticInitd9a086792cd61d5aa0e965a7c5596da1::getInitializer($loader));
+
call_user_func(\Composer\Autoload\ComposerStaticInitd6da0633bacdf02d08e7b85a96cc4544::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles =
Composer\Autoload\ComposerStaticInitd9a086792cd61d5aa0e965a7c5596da1::$files;
+ $includeFiles =
Composer\Autoload\ComposerStaticInitd6da0633bacdf02d08e7b85a96cc4544::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequired9a086792cd61d5aa0e965a7c5596da1($fileIdentifier,
$file);
+ composerRequired6da0633bacdf02d08e7b85a96cc4544($fileIdentifier,
$file);
}
return $loader;
}
}
-function composerRequired9a086792cd61d5aa0e965a7c5596da1($fileIdentifier,
$file)
+function composerRequired6da0633bacdf02d08e7b85a96cc4544($fileIdentifier,
$file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/composer/autoload_static.php
new/vendor/composer/autoload_static.php
--- old/vendor/composer/autoload_static.php 2018-01-19 16:45:13.779978687
+0100
+++ new/vendor/composer/autoload_static.php 2018-01-23 06:15:27.715721172
+0100
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitd9a086792cd61d5aa0e965a7c5596da1
+class ComposerStaticInitd6da0633bacdf02d08e7b85a96cc4544
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' .
'/symfony/polyfill-mbstring/bootstrap.php',
@@ -189,9 +189,9 @@
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 =
ComposerStaticInitd9a086792cd61d5aa0e965a7c5596da1::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 =
ComposerStaticInitd9a086792cd61d5aa0e965a7c5596da1::$prefixDirsPsr4;
- $loader->classMap =
ComposerStaticInitd9a086792cd61d5aa0e965a7c5596da1::$classMap;
+ $loader->prefixLengthsPsr4 =
ComposerStaticInitd6da0633bacdf02d08e7b85a96cc4544::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 =
ComposerStaticInitd6da0633bacdf02d08e7b85a96cc4544::$prefixDirsPsr4;
+ $loader->classMap =
ComposerStaticInitd6da0633bacdf02d08e7b85a96cc4544::$classMap;
}, null, ClassLoader::class);
}
