Skip to content

Commit

Permalink
RC5
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver Stark committed Mar 29, 2019
1 parent 46b5605 commit 2c5fd59
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 1.0.0-RC5 - 2019-02-01
- Fixed: use the correct environment name for config files
- The non-existing `/storage` folder is created on the remote

## 1.0.0-RC4 - 2019-02-01
- `copy/setup` is more resilient
- `copy/db/up --force` does not require the plugin to be enabled on the remote
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Craft Copy Plugin (RC4)
# Craft Copy Plugin (RC5)

This little command line tool helps to speed up common tasks around Craft CMS deployment on [fortrabbit](https://www.fortrabbit.com/):

Expand Down Expand Up @@ -29,7 +29,7 @@ cd your/craft-project

composer config platform --unset

composer require fortrabbit/craft-copy:^1.0.0-RC4
composer require fortrabbit/craft-copy:^1.0.0-RC5

php craft install/plugin copy
php craft copy/setup
Expand Down Expand Up @@ -186,17 +186,17 @@ echo 'export PATH=/Applications/MAMP/bin/php/php7.2.1/bin:$PATH' >>~/.bash_profi

When installing the plugin via composer you may see an error like this:
```
$ composer require fortrabbit/craft-copy:^1.0.0-RC4
$ composer require fortrabbit/craft-copy:^1.0.0-RC5
./composer.json has been updated
Loading composer repositories with package information
Updating dependencies (including require-dev)
Your requirements could not be resolved to an installable set of packages.
Problem 1
- Installation request for fortrabbit/craft-copy ^1.0.0-RC4 -> satisfiable by fortrabbit/craft-copy[1.0.0-RC4].
- Installation request for fortrabbit/craft-copy ^1.0.0-RC5 -> satisfiable by fortrabbit/craft-copy[1.0.0-RC5].
- Conclusion: remove symfony/console v3.3.6
- Conclusion: don't install symfony/console v3.3.6
- fortrabbit/craft-copy 1.0.0-RC4 requires symfony/yaml ^4.1
- fortrabbit/craft-copy 1.0.0-RC5 requires symfony/yaml ^4.1
[...]
Problem 99
```
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "fortrabbit/craft-copy",
"description": "Tooling for Craft on fortrabbit",
"type": "craft-plugin",
"version": "1.0.0-RC4",
"version": "1.0.0-RC5",
"keywords": [
"craft",
"cms",
Expand Down
4 changes: 4 additions & 0 deletions src/commands/DbUpAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ public function run(string $config = null)

// Import on remote (does not require craft or copy on remote)
$bar->setMessage($messages[] = "Importing dump on remote (raw)");

// Try to create storage path first
$plugin->ssh->exec("mkdir -p $path");

if ($plugin->ssh->exec("php vendor/bin/craft-copy-import-db.php {$transferFile} --force")) {
$bar->advance();
$bar->setMessage("Dump imported");
Expand Down
1 change: 1 addition & 0 deletions src/commands/SetupAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ protected function writeDeployConfig(string $app, string $region, string $config
$config->sshUrl = "{$app}@deploy.{$region}.frbit.com";
$config->gitRemote = "$app/master";
$config->setName($configName);
Plugin::getInstance()->config->setName($configName);

// Check if file already exist
if (file_exists(Plugin::getInstance()->config->getFullPathToConfig())) {
Expand Down

0 comments on commit 2c5fd59

Please sign in to comment.