Hello community,
here is the log from the commit of package platformsh-cli for openSUSE:Factory
checked in at 2018-10-08 17:44:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old)
and /work/SRC/openSUSE:Factory/.platformsh-cli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "platformsh-cli"
Mon Oct 8 17:44:49 2018 rev:56 rq:640115 version:3.35.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes
2018-10-01 08:18:05.309942119 +0200
+++ /work/SRC/openSUSE:Factory/.platformsh-cli.new/platformsh-cli.changes
2018-10-08 17:47:09.258351615 +0200
@@ -1,0 +2,11 @@
+Fri Oct 05 16:34:12 UTC 2018 - ji...@boombatower.com
+
+- Update to version 3.35.2:
+ * Release v3.35.2
+ * Do not prompt for checkout in branch command if it won't be possible
+ * Small refactor of commit:list [skip changelog]
+ * Fix infinite loop in commit:list command (when trying to go back before a
root commit)
+ * Get service name from config for Bitbucket hooks
+ * Friendlier commit:get examples
+
+-------------------------------------------------------------------
Old:
----
platformsh-cli-3.35.1.tar.xz
New:
----
platformsh-cli-3.35.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ platformsh-cli.spec ++++++
--- /var/tmp/diff_new_pack.ARb1f3/_old 2018-10-08 17:47:10.206350406 +0200
+++ /var/tmp/diff_new_pack.ARb1f3/_new 2018-10-08 17:47:10.210350401 +0200
@@ -17,7 +17,7 @@
Name: platformsh-cli
-Version: 3.35.1
+Version: 3.35.2
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.ARb1f3/_old 2018-10-08 17:47:10.254350345 +0200
+++ /var/tmp/diff_new_pack.ARb1f3/_new 2018-10-08 17:47:10.254350345 +0200
@@ -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.35.1</param>
+ <param name="revision">refs/tags/v3.35.2</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.ARb1f3/_old 2018-10-08 17:47:10.266350329 +0200
+++ /var/tmp/diff_new_pack.ARb1f3/_new 2018-10-08 17:47:10.266350329 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/platformsh/platformsh-cli.git</param>
- <param
name="changesrevision">8a5f81bee4e2ed3f5dc1898b9479be832dcad466</param>
+ <param
name="changesrevision">f524af6368289fa17c9c8d6c088c260e46b3ec4a</param>
</service>
</servicedata>
++++++ platformsh-cli-3.35.1.tar.xz -> platformsh-cli-3.35.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.35.1/config.yaml
new/platformsh-cli-3.35.2/config.yaml
--- old/platformsh-cli-3.35.1/config.yaml 2018-09-27 19:30:23.000000000
+0200
+++ new/platformsh-cli-3.35.2/config.yaml 2018-10-05 11:21:50.000000000
+0200
@@ -1,7 +1,7 @@
# Metadata about the CLI application itself.
application:
name: 'Platform.sh CLI'
- version: '3.35.1'
+ version: '3.35.2'
executable: 'platform'
package_name: 'platformsh/cli'
installer_url: 'https://platform.sh/cli/installer'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.35.1/dist/manifest.json
new/platformsh-cli-3.35.2/dist/manifest.json
--- old/platformsh-cli-3.35.1/dist/manifest.json 2018-09-27
19:30:23.000000000 +0200
+++ new/platformsh-cli-3.35.2/dist/manifest.json 2018-10-05
11:21:50.000000000 +0200
@@ -1,10 +1,10 @@
[
{
"name": "platform.phar",
- "sha1": "50ce50d095f4fac11d208ad0aea4ab966fe4d0fc",
- "sha256":
"187c81f29c387a78af06930ad4d6ca70a34a14062ba464e6e3b5e27208447029",
- "url":
"https://github.com/platformsh/platformsh-cli/releases/download/v3.35.1/platform.phar";,
- "version": "3.35.1",
+ "sha1": "8479397a644be78557d8ca58a0dbeb0e7b5ffc08",
+ "sha256":
"1f7b9aec2af20ea0a0931b2c6b8d89d45c9de1c51fd3c071eb07f760ea284006",
+ "url":
"https://github.com/platformsh/platformsh-cli/releases/download/v3.35.2/platform.phar";,
+ "version": "3.35.2",
"php": {
"min": "5.5.9"
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.35.1/src/Command/Commit/CommitGetCommand.php
new/platformsh-cli-3.35.2/src/Command/Commit/CommitGetCommand.php
--- old/platformsh-cli-3.35.1/src/Command/Commit/CommitGetCommand.php
2018-09-27 19:30:23.000000000 +0200
+++ new/platformsh-cli-3.35.2/src/Command/Commit/CommitGetCommand.php
2018-10-05 11:21:50.000000000 +0200
@@ -32,8 +32,9 @@
PropertyFormatter::configureInput($definition);
$this->addExample('Display the current commit on the environment');
+ $this->addExample('Display the previous commit', 'HEAD~');
$this->addExample('Display the 3rd commit before the current one',
'HEAD~3');
- $this->addExample('Display the second parent of the current commit
(e.g. for merge commits)', "'HEAD^2'");
+ $this->addExample('Display the email address of the last commit
author', '-P author.email');
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.35.1/src/Command/Commit/CommitListCommand.php
new/platformsh-cli-3.35.2/src/Command/Commit/CommitListCommand.php
--- old/platformsh-cli-3.35.1/src/Command/Commit/CommitListCommand.php
2018-09-27 19:30:23.000000000 +0200
+++ new/platformsh-cli-3.35.2/src/Command/Commit/CommitListCommand.php
2018-10-05 11:21:50.000000000 +0200
@@ -7,6 +7,7 @@
use Platformsh\Cli\Service\GitDataApi;
use Platformsh\Cli\Service\PropertyFormatter;
use Platformsh\Cli\Service\Table;
+use Platformsh\Client\Model\Environment;
use Platformsh\Client\Model\Git\Commit;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Input\InputInterface;
@@ -50,8 +51,8 @@
$startSha = $input->getArgument('commit');
/** @var \Platformsh\Cli\Service\GitDataApi $gitData */
$gitData = $this->getService('git_data_api');
- $parent = $gitData->getCommit($environment, $startSha);
- if (!$parent) {
+ $startCommit = $gitData->getCommit($environment, $startSha);
+ if (!$startCommit) {
if ($startSha) {
$this->stdErr->writeln('Commit not found: <error>' . $startSha
. '</error>');
} else {
@@ -61,10 +62,7 @@
return 1;
}
- /** @var Commit[] $commits */
- $commits = [$parent];
-
- if ($output->isDecorated()) {
+ if ($this->stdErr->isDecorated()) {
$this->stdErr->writeln(sprintf(
'Commits on the project %s, environment %s:',
$this->api()->getProjectLabel($this->getSelectedProject()),
@@ -72,21 +70,7 @@
));
}
- $progress = new ProgressBar($output->isDecorated() ? $this->stdErr :
new NullOutput());
- $progress->setMessage('Loading...');
- $progress->setFormat('%message% %current% (limit: %max%)');
- $progress->start($input->getOption('limit'));
- while (count($commits) < $input->getOption('limit')) {
- foreach (array_reverse($parent->parents) as $parentSha) {
- if (isset($commits[$parentSha])) {
- $parent = $commits[$parentSha];
- } else {
- $commits[$parentSha] = $parent =
$gitData->getCommit($environment, $parentSha);
- $progress->advance();
- }
- }
- }
- $progress->clear();
+ $commits = $this->loadCommitList($environment, $startCommit,
$input->getOption('limit'));
/** @var PropertyFormatter $formatter */
$formatter = $this->getService('property_formatter');
@@ -111,6 +95,45 @@
}
/**
+ * Load parent commits, recursively, up to the limit.
+ *
+ * @param \Platformsh\Client\Model\Environment $environment
+ * @param \Platformsh\Client\Model\Git\Commit $startCommit
+ * @param int $limit
+ *
+ * @return \Platformsh\Client\Model\Git\Commit[]
+ */
+ private function loadCommitList(Environment $environment, Commit
$startCommit, $limit = 10)
+ {
+ /** @var Commit[] $commits */
+ $commits = [$startCommit];
+ if (!count($startCommit->parents) || $limit === 1) {
+ return $commits;
+ }
+
+ /** @var \Platformsh\Cli\Service\GitDataApi $gitData */
+ $gitData = $this->getService('git_data_api');
+
+ $progress = new ProgressBar($this->stdErr->isDecorated() ?
$this->stdErr : new NullOutput());
+ $progress->setMessage('Loading...');
+ $progress->setFormat('%message% %current% (limit: %max%)');
+ $progress->start($limit);
+ for ($currentCommit = $startCommit;
+ count($currentCommit->parents) && count($commits) < $limit;) {
+ foreach (array_reverse($currentCommit->parents) as $parentSha) {
+ if (!isset($commits[$parentSha])) {
+ $commits[$parentSha] = $gitData->getCommit($environment,
$parentSha);
+ }
+ $currentCommit = $commits[$parentSha];
+ $progress->advance();
+ }
+ }
+ $progress->clear();
+
+ return $commits;
+ }
+
+ /**
* Summarize a commit message.
*
* @param string $message
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.35.1/src/Command/Environment/EnvironmentBranchCommand.php
new/platformsh-cli-3.35.2/src/Command/Environment/EnvironmentBranchCommand.php
---
old/platformsh-cli-3.35.1/src/Command/Environment/EnvironmentBranchCommand.php
2018-09-27 19:30:23.000000000 +0200
+++
new/platformsh-cli-3.35.2/src/Command/Environment/EnvironmentBranchCommand.php
2018-10-05 11:21:50.000000000 +0200
@@ -67,6 +67,11 @@
}
if ($environment = $this->api()->getEnvironment($branchName,
$selectedProject)) {
+ if (!$this->getProjectRoot()) {
+ $this->stdErr->writeln("The environment
<comment>$branchName</comment> already exists.");
+
+ return 1;
+ }
/** @var \Platformsh\Cli\Service\QuestionHelper $questionHelper */
$questionHelper = $this->getService('question_helper');
$checkout = $questionHelper->confirm(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.35.1/src/Command/Integration/IntegrationCommandBase.php
new/platformsh-cli-3.35.2/src/Command/Integration/IntegrationCommandBase.php
---
old/platformsh-cli-3.35.1/src/Command/Integration/IntegrationCommandBase.php
2018-09-27 19:30:23.000000000 +0200
+++
new/platformsh-cli-3.35.2/src/Command/Integration/IntegrationCommandBase.php
2018-10-05 11:21:50.000000000 +0200
@@ -335,7 +335,11 @@
],
];
$payload = [
- 'description' => 'Platform.sh: ' .
$this->getSelectedProject()->id,
+ 'description' => sprintf(
+ '%s: %s',
+ $this->config()->get('service.name'),
+ $this->getSelectedProject()->id
+ ),
'url' => $integration->getLink('#hook'),
'active' => true,
'events' => [
++++++ 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-09-27 21:17:57.292667326 +0200
+++ new/vendor/autoload.php 2018-10-05 18:34:22.517671139 +0200
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitfccd2789e3577aba72e110e86488d2d3::getLoader();
+return ComposerAutoloaderInit0dff82c60c70d8471aa3cff70381581f::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-09-27 21:17:57.292667326
+0200
+++ new/vendor/composer/autoload_real.php 2018-10-05 18:34:22.517671139
+0200
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitfccd2789e3577aba72e110e86488d2d3
+class ComposerAutoloaderInit0dff82c60c70d8471aa3cff70381581f
{
private static $loader;
@@ -19,15 +19,15 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInitfccd2789e3577aba72e110e86488d2d3',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit0dff82c60c70d8471aa3cff70381581f',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInitfccd2789e3577aba72e110e86488d2d3',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit0dff82c60c70d8471aa3cff70381581f',
'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\ComposerStaticInitfccd2789e3577aba72e110e86488d2d3::getInitializer($loader));
+
call_user_func(\Composer\Autoload\ComposerStaticInit0dff82c60c70d8471aa3cff70381581f::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\ComposerStaticInitfccd2789e3577aba72e110e86488d2d3::$files;
+ $includeFiles =
Composer\Autoload\ComposerStaticInit0dff82c60c70d8471aa3cff70381581f::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequirefccd2789e3577aba72e110e86488d2d3($fileIdentifier,
$file);
+ composerRequire0dff82c60c70d8471aa3cff70381581f($fileIdentifier,
$file);
}
return $loader;
}
}
-function composerRequirefccd2789e3577aba72e110e86488d2d3($fileIdentifier,
$file)
+function composerRequire0dff82c60c70d8471aa3cff70381581f($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-09-27 21:17:57.292667326
+0200
+++ new/vendor/composer/autoload_static.php 2018-10-05 18:34:22.517671139
+0200
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitfccd2789e3577aba72e110e86488d2d3
+class ComposerStaticInit0dff82c60c70d8471aa3cff70381581f
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' .
'/symfony/polyfill-mbstring/bootstrap.php',
@@ -195,9 +195,9 @@
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 =
ComposerStaticInitfccd2789e3577aba72e110e86488d2d3::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 =
ComposerStaticInitfccd2789e3577aba72e110e86488d2d3::$prefixDirsPsr4;
- $loader->classMap =
ComposerStaticInitfccd2789e3577aba72e110e86488d2d3::$classMap;
+ $loader->prefixLengthsPsr4 =
ComposerStaticInit0dff82c60c70d8471aa3cff70381581f::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 =
ComposerStaticInit0dff82c60c70d8471aa3cff70381581f::$prefixDirsPsr4;
+ $loader->classMap =
ComposerStaticInit0dff82c60c70d8471aa3cff70381581f::$classMap;
}, null, ClassLoader::class);
}
