From aa75f7b36e44fcb91550b0717321f73253ae638e Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 21:46:22 +0100 Subject: [PATCH 01/66] Adding a template attribute to projects --- app/Group.php | 1 + app/Project.php | 14 ++++++++- .../EloquentProjectRepository.php | 1 + ...15_06_16_213224_add_is_template_column.php | 31 +++++++++++++++++++ 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 database/migrations/2015_06_16_213224_add_is_template_column.php diff --git a/app/Group.php b/app/Group.php index c54b09055..89c4a3a34 100644 --- a/app/Group.php +++ b/app/Group.php @@ -42,6 +42,7 @@ class Group extends Model public function projects() { return $this->hasMany('App\Project') + ->notTemplates() ->orderBy('name'); } diff --git a/app/Project.php b/app/Project.php index 4124af899..9f70d74f7 100644 --- a/app/Project.php +++ b/app/Project.php @@ -30,7 +30,8 @@ class Project extends ProjectRelation implements PresentableInterface protected $hidden = ['private_key', 'created_at', 'deleted_at', 'updated_at', 'hash', 'updated_at', 'servers', 'commands', 'hash', 'notifyEmails', 'group', 'servers', 'commands', 'heartbeats', 'checkUrls', - 'notifications', 'deployments', 'shareFiles', 'projectFiles']; + 'notifications', 'deployments', 'shareFiles', 'projectFiles', + 'is_template']; /** * The attributes that are mass assignable. @@ -61,6 +62,7 @@ class Project extends ProjectRelation implements PresentableInterface protected $casts = [ 'status' => 'integer', 'builds_to_keep' => 'integer', + 'is_template' => 'boolean' ]; /** @@ -262,6 +264,16 @@ public function getWebhookUrlAttribute() return route('webhook', $this->hash); } + public function scopeTemplates($query) + { + return $query->where('is_template', '=', true); + } + + public function scopeNotTemplates($query) + { + return $query->where('is_template', '=', false); + } + /** * Generates an SSH key and sets the private/public key properties. * diff --git a/app/Repositories/EloquentProjectRepository.php b/app/Repositories/EloquentProjectRepository.php index 03ec7e5a5..39ab7bb09 100644 --- a/app/Repositories/EloquentProjectRepository.php +++ b/app/Repositories/EloquentProjectRepository.php @@ -29,6 +29,7 @@ public function __construct(Project $model) public function getAll() { return $this->model + ->notTemplates() ->orderBy('name') ->get(); } diff --git a/database/migrations/2015_06_16_213224_add_is_template_column.php b/database/migrations/2015_06_16_213224_add_is_template_column.php new file mode 100644 index 000000000..46a62dfcf --- /dev/null +++ b/database/migrations/2015_06_16_213224_add_is_template_column.php @@ -0,0 +1,31 @@ +boolean('is_template')->default(false); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('projects', function (Blueprint $table) { + $table->dropColumn('is_template'); + }); + } +} From 00c44049c0fbd7eb6c28fac058ff73dbda785de1 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 22:11:59 +0100 Subject: [PATCH 02/66] Add the ability to include newly created servers in all existing commands --- .../Controllers/Resources/ServerController.php | 11 ++++++++++- app/Http/Requests/StoreServerRequest.php | 11 ++++++----- app/Jobs/DeployProject.php | 2 +- resources/assets/js/servers.js | 17 ++++++++++------- resources/lang/en/servers.php | 5 +++-- resources/views/dialogs/server.blade.php | 12 ++++++++++-- 6 files changed, 40 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/Resources/ServerController.php b/app/Http/Controllers/Resources/ServerController.php index 740564df8..23a31ef12 100644 --- a/app/Http/Controllers/Resources/ServerController.php +++ b/app/Http/Controllers/Resources/ServerController.php @@ -21,7 +21,7 @@ class ServerController extends ResourceController */ public function store(StoreServerRequest $request) { - return Server::create($request->only( + $server = Server::create($request->only( 'name', 'user', 'ip_address', @@ -30,6 +30,15 @@ public function store(StoreServerRequest $request) 'project_id', 'deploy_code' )); + + // Add the server to the existing commands + if ($request->has('add_commands') && $request->add_commands === true) { + foreach ($server->project->commands as $command) { + $command->servers()->attach($server->id); + } + } + + return $server; } /** diff --git a/app/Http/Requests/StoreServerRequest.php b/app/Http/Requests/StoreServerRequest.php index fd505ee03..7527e37ab 100644 --- a/app/Http/Requests/StoreServerRequest.php +++ b/app/Http/Requests/StoreServerRequest.php @@ -43,11 +43,12 @@ function ($attribute, $value, $parameters) { public function rules() { return [ - 'name' => 'required|max:255', - 'user' => 'required|max:255', - 'ip_address' => 'required|host', - 'path' => 'required', - 'project_id' => 'required|integer|exists:projects,id' + 'name' => 'required|max:255', + 'user' => 'required|max:255', + 'ip_address' => 'required|host', + 'path' => 'required', + 'add_commands' => 'boolean', + 'project_id' => 'required|integer|exists:projects,id' ]; } } diff --git a/app/Jobs/DeployProject.php b/app/Jobs/DeployProject.php index abe25c9d4..157a8e096 100644 --- a/app/Jobs/DeployProject.php +++ b/app/Jobs/DeployProject.php @@ -19,7 +19,7 @@ use Symfony\Component\Process\Process; /** - * Deploys an actual project + * Deploys an actual project. * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * TODO: rewrite this as it is doing way too much and is very messy now. */ diff --git a/resources/assets/js/servers.js b/resources/assets/js/servers.js index 6b3b7f04d..52d4fd60e 100644 --- a/resources/assets/js/servers.js +++ b/resources/assets/js/servers.js @@ -16,6 +16,7 @@ var app = app || {}; $('.callout-danger', modal).hide(); $('.has-error', modal).removeClass('has-error'); $('.label-danger', modal).remove(); + $('#add-server-command', modal).hide(); if (button.hasClass('btn-edit')) { title = Lang.servers.edit; @@ -28,6 +29,7 @@ var app = app || {}; $('#server_user').val(''); $('#server_path').val(''); $('#server_deploy_code').prop('checked', true); + $('#add-server-command', modal).show(); } modal.find('.modal-title span').text(title); @@ -82,13 +84,14 @@ var app = app || {}; } server.save({ - name: $('#server_name').val(), - ip_address: $('#server_address').val(), - port: $('#server_port').val(), - user: $('#server_user').val(), - path: $('#server_path').val(), - deploy_code: $('#server_deploy_code').is(':checked'), - project_id: $('input[name="project_id"]').val() + name: $('#server_name').val(), + ip_address: $('#server_address').val(), + port: $('#server_port').val(), + user: $('#server_user').val(), + path: $('#server_path').val(), + deploy_code: $('#server_deploy_code').is(':checked'), + project_id: $('input[name="project_id"]').val(), + add_commands: $('#server_commands').is(':checked') }, { wait: true, success: function(model, response, options) { diff --git a/resources/lang/en/servers.php b/resources/lang/en/servers.php index 0837778e0..d2ca69f46 100644 --- a/resources/lang/en/servers.php +++ b/resources/lang/en/servers.php @@ -19,7 +19,8 @@ 'testing' => 'Testing', 'failed' => 'Failed', 'untested' => 'Untested', - 'deploy_code' => 'Deploy code', - 'deploy_description' => 'Whether or not the code should be deployed to this server' + 'options' => 'Options', + 'deploy_code' => 'Code should be deployed to this server', + 'add_command' => 'Add the new server to all existing commands' ]; diff --git a/resources/views/dialogs/server.blade.php b/resources/views/dialogs/server.blade.php index 14a1b66dd..84a9b288c 100644 --- a/resources/views/dialogs/server.blade.php +++ b/resources/views/dialogs/server.blade.php @@ -35,13 +35,21 @@
- +
+ @if ($project->commands->count() > 0) +
+ +
+ @endif
From 491112e87aefb0944f0cecc9ea113a2acea340d3 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 22:12:31 +0100 Subject: [PATCH 03/66] Adding templates to project creation --- .../Controllers/Admin/ProjectController.php | 21 ++++++++--- app/Http/Requests/StoreProjectRequest.php | 1 + app/Providers/RepositoryServiceProvider.php | 5 +++ .../Contracts/TemplateRepositoryInterface.php | 8 +++++ .../EloquentTemplateRepository.php | 36 +++++++++++++++++++ resources/assets/js/projects.js | 5 ++- resources/lang/en/app.php | 1 + resources/lang/en/templates.php | 13 +++++++ resources/views/dialogs/project.blade.php | 11 ++++++ 9 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 app/Repositories/Contracts/TemplateRepositoryInterface.php create mode 100644 app/Repositories/EloquentTemplateRepository.php create mode 100644 resources/lang/en/templates.php diff --git a/app/Http/Controllers/Admin/ProjectController.php b/app/Http/Controllers/Admin/ProjectController.php index 7d5258125..cfa1f6522 100644 --- a/app/Http/Controllers/Admin/ProjectController.php +++ b/app/Http/Controllers/Admin/ProjectController.php @@ -5,8 +5,10 @@ use App\Http\Controllers\Controller; use App\Http\Requests; use App\Http\Requests\StoreProjectRequest; +use App\Jobs\SetupProject; use App\Project; use App\Repositories\Contracts\ProjectRepositoryInterface; +use App\Repositories\Contracts\TemplateRepositoryInterface; use Lang; /** @@ -20,13 +22,16 @@ class ProjectController extends Controller * @param ProjectRepositoryInterface $projectRepository * @return Response */ - public function index(ProjectRepositoryInterface $projectRepository) - { + public function index( + ProjectRepositoryInterface $projectRepository, + TemplateRepositoryInterface $templateRepository + ) { $projects = $projectRepository->getAll(); return view('projects.listing', [ - 'title' => Lang::get('projects.manage'), - 'projects' => $projects->toJson() // Because PresentableInterface toJson() is not working in the view + 'title' => Lang::get('projects.manage'), + 'templates' => $templateRepository->getAll(), + 'projects' => $projects->toJson() // Because PresentableInterface toJson() is not working in the view ]); } @@ -48,6 +53,14 @@ public function store(StoreProjectRequest $request) 'build_url' )); + // FIXME: Should this be an event rather than a command? + if ($request->has('template_id')) { + $this->dispatch(new SetupProject( + $project, + Template::find($request->template_id) + )); + } + return $project; } diff --git a/app/Http/Requests/StoreProjectRequest.php b/app/Http/Requests/StoreProjectRequest.php index 4e4dd5f6d..755830f49 100644 --- a/app/Http/Requests/StoreProjectRequest.php +++ b/app/Http/Requests/StoreProjectRequest.php @@ -56,6 +56,7 @@ public function rules() 'branch' => 'required|max:255', 'group_id' => 'required|integer|exists:groups,id', 'builds_to_keep' => 'required|integer|min:1|max:20', + 'template_id' => 'integer|exists:templates,id', 'url' => 'url', 'build_url' => 'url' ]; diff --git a/app/Providers/RepositoryServiceProvider.php b/app/Providers/RepositoryServiceProvider.php index ab8b1c970..42eb6d47d 100644 --- a/app/Providers/RepositoryServiceProvider.php +++ b/app/Providers/RepositoryServiceProvider.php @@ -37,6 +37,11 @@ public function register() 'App\Repositories\EloquentProjectRepository' ); + $this->app->bind( + 'App\Repositories\Contracts\TemplateRepositoryInterface', + 'App\Repositories\EloquentTemplateRepository' + ); + $this->app->bind( 'App\Repositories\Contracts\GroupRepositoryInterface', 'App\Repositories\EloquentGroupRepository' diff --git a/app/Repositories/Contracts/TemplateRepositoryInterface.php b/app/Repositories/Contracts/TemplateRepositoryInterface.php new file mode 100644 index 000000000..c7bf0f443 --- /dev/null +++ b/app/Repositories/Contracts/TemplateRepositoryInterface.php @@ -0,0 +1,8 @@ +model = $model; + } + + /** + * Gets all templates. + * + * @return array + */ + public function getAll() + { + return $this->model + ->templates() + ->orderBy('name') + ->get(); + } +} diff --git a/resources/assets/js/projects.js b/resources/assets/js/projects.js index a81f79378..5c373321e 100644 --- a/resources/assets/js/projects.js +++ b/resources/assets/js/projects.js @@ -49,11 +49,13 @@ var app = app || {}; $('.callout-danger', modal).hide(); $('.has-error', modal).removeClass('has-error'); $('.label-danger', modal).remove(); + $('#template-list', modal).hide(); if (button.hasClass('btn-edit')) { title = Lang.edit; $('.btn-danger', modal).show(); } else { + $('#template-list', modal).show(); $('#project_id').val(''); $('#project_name').val(''); $('#project_repository').val(''); @@ -122,7 +124,8 @@ var app = app || {}; group_id: $('#project_group_id').val(), builds_to_keep: $('#project_builds_to_keep').val(), url: $('#project_url').val(), - build_url: $('#project_build_url').val() + build_url: $('#project_build_url').val(), + template_id: $('#project_template_id') ? $('#project_template_id').val() : null }, { wait: true, success: function(model, response, options) { diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php index 3b1444a6a..d9a111bbf 100644 --- a/resources/lang/en/app.php +++ b/resources/lang/en/app.php @@ -8,6 +8,7 @@ 'dashboard' => 'Dashboard', 'admin' => 'Administration', 'projects' => 'Projects', + 'templates' => 'Templates', 'groups' => 'Groups', 'users' => 'Users', 'created' => 'Created', diff --git a/resources/lang/en/templates.php b/resources/lang/en/templates.php new file mode 100644 index 000000000..c5b304cbc --- /dev/null +++ b/resources/lang/en/templates.php @@ -0,0 +1,13 @@ + 'Manage deployment templates', + 'none' => 'There are currently no deployment templates setup', + 'commands' => 'Number of Commands', + 'type' => 'Deployment type', + 'custom' => 'Custom', + 'name' => 'Name', + 'create' => 'Add a new template', + 'edit' => 'Edit the template', + 'warning' => 'The deployment template could not be saved, please check the form below.' +]; diff --git a/resources/views/dialogs/project.blade.php b/resources/views/dialogs/project.blade.php index 5ed19208c..d8ceb2736 100644 --- a/resources/views/dialogs/project.blade.php +++ b/resources/views/dialogs/project.blade.php @@ -25,6 +25,17 @@ @endforeach
+ @if (count($templates) > 0) +
+ + +
+ @endif
From 08729c3fdbd6e621771479b65d2e14c3969b013c Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 22:12:48 +0100 Subject: [PATCH 04/66] Creating project actually from a template --- app/Jobs/SetupProject.php | 47 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 app/Jobs/SetupProject.php diff --git a/app/Jobs/SetupProject.php b/app/Jobs/SetupProject.php new file mode 100644 index 000000000..1e34baa34 --- /dev/null +++ b/app/Jobs/SetupProject.php @@ -0,0 +1,47 @@ +project = $project; + $this->template = $template; + } + + /** + * Execute the command. + * + * @return void + */ + public function handle() + { + // FIXME: Also copy persistent files + foreach ($this->template->commands as $command) { + + $data = $command->toArray(); + $data['project_id'] = $this->project->id; + + Command::create($data); + } + } +} From ec746ee2e5576ac6ef6a21f19a39e4d06b82260c Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 22:13:02 +0100 Subject: [PATCH 05/66] Adding templates to sidebar --- resources/views/_partials/sidebar.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/_partials/sidebar.blade.php b/resources/views/_partials/sidebar.blade.php index e7e50ad3e..810b44055 100644 --- a/resources/views/_partials/sidebar.blade.php +++ b/resources/views/_partials/sidebar.blade.php @@ -31,6 +31,7 @@ From 417e42e9193592c9ab40c677551a4fe6e18f1c93 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 22:28:24 +0100 Subject: [PATCH 06/66] Seeding some example templates --- database/seeds/DatabaseSeeder.php | 1 + database/seeds/TemplateSeeder.php | 48 +++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 database/seeds/TemplateSeeder.php diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index efd927bb4..dcec25d74 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -21,5 +21,6 @@ public function run() $this->call('CommandTableSeeder'); $this->call('NotificationTableSeeder'); $this->call('HeartbeatTableSeeder'); + $this->call('TemplateSeeder'); } } diff --git a/database/seeds/TemplateSeeder.php b/database/seeds/TemplateSeeder.php new file mode 100644 index 000000000..fb05d79c0 --- /dev/null +++ b/database/seeds/TemplateSeeder.php @@ -0,0 +1,48 @@ + 'Laravel', + 'is_template' => true, + 'group_id' => 1 // FIXME: Horrible hack + ]); + + Project::create([ + 'name' => 'Wordpress', + 'is_template' => true, + 'group_id' => 1 + ]); + + Command::create([ + 'name' => 'Down', + 'script' => "php artisan down", + 'project_id' => $laravel->id, + 'user' => 'vagrant', + 'step' => Command::BEFORE_ACTIVATE + ]); + + Command::create([ + 'name' => 'Run Migrations', + 'script' => "php artisan migrate --force", + 'project_id' => $laravel->id, + 'user' => 'vagrant', + 'step' => Command::BEFORE_ACTIVATE + ]); + + Command::create([ + 'name' => 'Up', + 'script' => "php artisan up", + 'project_id' => $laravel->id, + 'user' => 'vagrant', + 'step' => Command::BEFORE_ACTIVATE + ]); + } +} \ No newline at end of file From 8a0a5d0e920dfb5a53a90c5c13464add9a812c29 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 22:28:53 +0100 Subject: [PATCH 07/66] Fixing use statements --- app/Jobs/SetupProject.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/SetupProject.php b/app/Jobs/SetupProject.php index 1e34baa34..f51a67db3 100644 --- a/app/Jobs/SetupProject.php +++ b/app/Jobs/SetupProject.php @@ -2,15 +2,15 @@ namespace App\Jobs; -use App\Commands\Command; use App\Command; +use App\Jobs\Job; use App\Project; use Illuminate\Contracts\Bus\SelfHandling; /** * A class to handle cloning the command templates for the project. */ -class SetupProject extends Command implements SelfHandling +class SetupProject extends Job implements SelfHandling { private $project; private $template; From 458855efab2df3930a711763bd94dbc703acf7fd Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 22:29:03 +0100 Subject: [PATCH 08/66] Fixing validation rule --- app/Http/Requests/StoreProjectRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Requests/StoreProjectRequest.php b/app/Http/Requests/StoreProjectRequest.php index 755830f49..3e2b7c562 100644 --- a/app/Http/Requests/StoreProjectRequest.php +++ b/app/Http/Requests/StoreProjectRequest.php @@ -56,7 +56,7 @@ public function rules() 'branch' => 'required|max:255', 'group_id' => 'required|integer|exists:groups,id', 'builds_to_keep' => 'required|integer|min:1|max:20', - 'template_id' => 'integer|exists:templates,id', + 'template_id' => 'integer|exists:projects,id,is_template,1', 'url' => 'url', 'build_url' => 'url' ]; From 040ed343a470aaf84ebd6f18261e547197ca99d2 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 22:32:45 +0100 Subject: [PATCH 09/66] Missing docblock --- app/Project.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/Project.php b/app/Project.php index 9f70d74f7..ed3afd029 100644 --- a/app/Project.php +++ b/app/Project.php @@ -38,7 +38,7 @@ class Project extends ProjectRelation implements PresentableInterface * * @var array */ - protected $fillable = ['name', 'repository', 'branch', 'group_id', 'builds_to_keep', 'url', 'build_url']; + protected $fillable = ['name', 'repository', 'branch', 'group_id', 'builds_to_keep', 'url', 'build_url', 'is_template']; /** * The fields which should be treated as Carbon instances. @@ -264,11 +264,23 @@ public function getWebhookUrlAttribute() return route('webhook', $this->hash); } + /** + * Query scope to only show templates + * + * @param object $query + * @return object + */ public function scopeTemplates($query) { return $query->where('is_template', '=', true); } + /** + * Query scope to not show templates + * + * @param object $query + * @return object + */ public function scopeNotTemplates($query) { return $query->where('is_template', '=', false); From eb8b8d89b2d238a26895157f2099f7cd108db83f Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 22:33:04 +0100 Subject: [PATCH 10/66] Pass in the template ID rather than the project to SetupProject --- app/Http/Controllers/Admin/ProjectController.php | 3 +-- app/Jobs/SetupProject.php | 15 ++++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Admin/ProjectController.php b/app/Http/Controllers/Admin/ProjectController.php index cfa1f6522..840aac326 100644 --- a/app/Http/Controllers/Admin/ProjectController.php +++ b/app/Http/Controllers/Admin/ProjectController.php @@ -53,11 +53,10 @@ public function store(StoreProjectRequest $request) 'build_url' )); - // FIXME: Should this be an event rather than a command? if ($request->has('template_id')) { $this->dispatch(new SetupProject( $project, - Template::find($request->template_id) + $request->template_id )); } diff --git a/app/Jobs/SetupProject.php b/app/Jobs/SetupProject.php index f51a67db3..1b9ee12ca 100644 --- a/app/Jobs/SetupProject.php +++ b/app/Jobs/SetupProject.php @@ -13,19 +13,19 @@ class SetupProject extends Job implements SelfHandling { private $project; - private $template; + private $template_id; /** * Create a new command instance. * * @param Project $project - * @param Project $template + * @param int $template_id * @return SetupProject */ - public function __construct(Project $project, Project $template) + public function __construct(Project $project, $template_id) { - $this->project = $project; - $this->template = $template; + $this->project = $project; + $this->template_id = $template_id; } /** @@ -35,8 +35,9 @@ public function __construct(Project $project, Project $template) */ public function handle() { - // FIXME: Also copy persistent files - foreach ($this->template->commands as $command) { + $template = Project::findOrFail($this->template_id); + + foreach ($template->commands as $command) { $data = $command->toArray(); $data['project_id'] = $this->project->id; From 22cbda15a12efa5e2559d687e0ff53659a0d1495 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 22:39:15 +0100 Subject: [PATCH 11/66] Starting to add admin screens --- .../Controllers/Admin/TemplateController.php | 27 +++++++++ app/Http/routes.php | 4 ++ resources/views/templates/listing.blade.php | 55 +++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 app/Http/Controllers/Admin/TemplateController.php create mode 100644 resources/views/templates/listing.blade.php diff --git a/app/Http/Controllers/Admin/TemplateController.php b/app/Http/Controllers/Admin/TemplateController.php new file mode 100644 index 000000000..fb50d0808 --- /dev/null +++ b/app/Http/Controllers/Admin/TemplateController.php @@ -0,0 +1,27 @@ +getAll(); + + return view('templates.listing', [ + 'title' => Lang::get('templates.manage'), + 'templates' => $templates->toJson() // Because PresentableInterface toJson() is not working in the view + ]); + } +} \ No newline at end of file diff --git a/app/Http/routes.php b/app/Http/routes.php index 54bffab56..a831efb49 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -60,6 +60,10 @@ Route::group(['prefix' => 'admin', 'namespace' => 'Admin'], function () { + Route::resource('templates', 'TemplateController', [ + 'only' => ['index', 'store', 'update', 'destroy'] + ]); + Route::resource('projects', 'ProjectController', [ 'only' => ['index', 'store', 'update', 'destroy'] ]); diff --git a/resources/views/templates/listing.blade.php b/resources/views/templates/listing.blade.php new file mode 100644 index 000000000..9a898281b --- /dev/null +++ b/resources/views/templates/listing.blade.php @@ -0,0 +1,55 @@ +@extends('layout') + +@section('content') +
+ +
+

{{ Lang::get('templates.none') }}

+
+ +
+ + + + + + + + + + + +
{{ Lang::get('templates.name') }}{{ Lang::get('templates.commands') }} 
+
+
+ + + + + + +@stop + +@section('javascript') + +@stop + +@section('right-buttons') +
+ +
+@stop \ No newline at end of file From 8e8f87e5082187c3c12cac16f2a4e9da90b7c7f4 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Tue, 16 Jun 2015 23:19:49 +0100 Subject: [PATCH 12/66] Start on managing templates --- app/Project.php | 11 -- .../EloquentTemplateRepository.php | 6 +- app/Template.php | 59 ++++++++++ gulpfile.js | 1 + resources/assets/js/projects.js | 2 - resources/assets/js/templates.js | 104 ++++++++++++++++++ resources/views/templates/listing.blade.php | 8 +- 7 files changed, 171 insertions(+), 20 deletions(-) create mode 100644 app/Template.php create mode 100644 resources/assets/js/templates.js diff --git a/app/Project.php b/app/Project.php index ed3afd029..ae1c2e10c 100644 --- a/app/Project.php +++ b/app/Project.php @@ -264,17 +264,6 @@ public function getWebhookUrlAttribute() return route('webhook', $this->hash); } - /** - * Query scope to only show templates - * - * @param object $query - * @return object - */ - public function scopeTemplates($query) - { - return $query->where('is_template', '=', true); - } - /** * Query scope to not show templates * diff --git a/app/Repositories/EloquentTemplateRepository.php b/app/Repositories/EloquentTemplateRepository.php index 93345974d..dbbaf38fb 100644 --- a/app/Repositories/EloquentTemplateRepository.php +++ b/app/Repositories/EloquentTemplateRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Project; +use App\Template; use App\Repositories\Contracts\TemplateRepositoryInterface; /** @@ -13,10 +13,10 @@ class EloquentTemplateRepository extends EloquentRepository implements TemplateR /** * Class constructor. * - * @param Project $model + * @param Template $model * @return EloquentProjectRepository */ - public function __construct(Project $model) + public function __construct(Template $model) { $this->model = $model; } diff --git a/app/Template.php b/app/Template.php new file mode 100644 index 000000000..9f60efb58 --- /dev/null +++ b/app/Template.php @@ -0,0 +1,59 @@ +where('is_template', '=', true); + } + + /** + * Define a accessor for the count of projects. + * + * @return int + */ + public function getCommandCountAttribute() + { + return $this->commands() + ->count(); + } + + /** + * Has many relationship. + * + * @return Command + */ + public function commands() + { + return $this->hasMany('App\Command', 'project_id'); + } +} \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 68b70416a..d8b2209c3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -62,6 +62,7 @@ elixir(function(mix) { .scripts([ 'app.js', 'projects.js', + 'templates.js', 'servers.js', 'heartbeats.js', 'notifications.js', diff --git a/resources/assets/js/projects.js b/resources/assets/js/projects.js index 5c373321e..8d4f2396b 100644 --- a/resources/assets/js/projects.js +++ b/resources/assets/js/projects.js @@ -214,8 +214,6 @@ var app = app || {}; app.Projects.remove(project); } - console.log(data); - $('#project_' + data.model.id).parent('li').remove(); if (parseInt(data.model.id) === parseInt(app.project_id)) { diff --git a/resources/assets/js/templates.js b/resources/assets/js/templates.js new file mode 100644 index 000000000..081fe2322 --- /dev/null +++ b/resources/assets/js/templates.js @@ -0,0 +1,104 @@ +var app = app || {}; + +(function ($) { + + app.Template = Backbone.Model.extend({ + urlRoot: '/admin/templates' + }); + + var Templates = Backbone.Collection.extend({ + model: app.Template + }); + + app.Templates = new Templates(); + + app.TemplatesTab = Backbone.View.extend({ + el: '#app', + events: { + + }, + initialize: function() { + this.$list = $('#template_list tbody'); + + $('#template_list').hide(); + $('#no_templates').show(); + + this.listenTo(app.Templates, 'add', this.addOne); + this.listenTo(app.Templates, 'reset', this.addAll); + this.listenTo(app.Templates, 'remove', this.addAll); + this.listenTo(app.Templates, 'all', this.render); + + app.listener.on('template:App\\Events\\ModelChanged', function (data) { + var template = app.Templates.get(parseInt(data.model.id)); + + if (template) { + template.set(data.model); + } + }); + + app.listener.on('template:App\\Events\\ModelCreated', function (data) { + app.Templates.add(data.model); + }); + + app.listener.on('template:App\\Events\\ModelTrashed', function (data) { + var template = app.Templates.get(parseInt(data.model.id)); + + if (template) { + app.Templates.remove(template); + } + }); + }, + render: function () { + if (app.Templates.length) { + $('#no_templates').hide(); + $('#template_list').show(); + } else { + $('#no_templates').show(); + $('#template_list').hide(); + } + }, + addOne: function (template) { + var view = new app.TemplateView({ + model: template + }); + + this.$list.append(view.render().el); + }, + addAll: function () { + this.$list.html(''); + app.Templates.each(this.addOne, this); + } + }); + + app.TemplateView = Backbone.View.extend({ + tagName: 'tr', + events: { + 'click .btn-edit': 'editTemplate' + }, + initialize: function () { + this.listenTo(this.model, 'change', this.render); + this.listenTo(this.model, 'destroy', this.remove); + + this.template = _.template($('#template-template').html()); + }, + render: function () { + var data = this.model.toJSON(); + + this.$el.html(this.template(data)); + + return this; + }, + editTemplate: function() { + /* + $('#project_id').val(this.model.id); + $('#project_name').val(this.model.get('name')); + $('#project_repository').val(this.model.get('repository')); + $('#project_branch').val(this.model.get('branch')); + $('#project_group_id').val(this.model.get('group_id')); + $('#project_builds_to_keep').val(this.model.get('builds_to_keep')); + $('#project_url').val(this.model.get('url')); + $('#project_build_url').val(this.model.get('build_url')); + */ + } + }); +})(jQuery); \ No newline at end of file diff --git a/resources/views/templates/listing.blade.php b/resources/views/templates/listing.blade.php index 9a898281b..426995923 100644 --- a/resources/views/templates/listing.blade.php +++ b/resources/views/templates/listing.blade.php @@ -25,9 +25,9 @@ - @stop From f4c30213a39e1d5d1e7971e03da1c8d5b9f124f9 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 10:04:46 +0100 Subject: [PATCH 13/66] Fixing PHPCI issues --- app/Http/Controllers/Admin/TemplateController.php | 5 ++++- app/Jobs/SetupProject.php | 4 ++-- app/Project.php | 5 +++-- app/Template.php | 9 ++++++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Admin/TemplateController.php b/app/Http/Controllers/Admin/TemplateController.php index fb50d0808..b2eae7a0c 100644 --- a/app/Http/Controllers/Admin/TemplateController.php +++ b/app/Http/Controllers/Admin/TemplateController.php @@ -7,6 +7,9 @@ use App\Repositories\Contracts\TemplateRepositoryInterface; use Lang; +/** + * Controller for managing deployment template + */ class TemplateController extends Controller { /** @@ -24,4 +27,4 @@ public function index(TemplateRepositoryInterface $templateRepository) 'templates' => $templates->toJson() // Because PresentableInterface toJson() is not working in the view ]); } -} \ No newline at end of file +} diff --git a/app/Jobs/SetupProject.php b/app/Jobs/SetupProject.php index 1b9ee12ca..cf3052fbc 100644 --- a/app/Jobs/SetupProject.php +++ b/app/Jobs/SetupProject.php @@ -37,8 +37,8 @@ public function handle() { $template = Project::findOrFail($this->template_id); - foreach ($template->commands as $command) { - + foreach ($template->commands as $command) + { $data = $command->toArray(); $data['project_id'] = $this->project->id; diff --git a/app/Project.php b/app/Project.php index ae1c2e10c..daf3d5ac3 100644 --- a/app/Project.php +++ b/app/Project.php @@ -38,7 +38,8 @@ class Project extends ProjectRelation implements PresentableInterface * * @var array */ - protected $fillable = ['name', 'repository', 'branch', 'group_id', 'builds_to_keep', 'url', 'build_url', 'is_template']; + protected $fillable = ['name', 'repository', 'branch', 'group_id', + 'builds_to_keep', 'url', 'build_url', 'is_template']; /** * The fields which should be treated as Carbon instances. @@ -266,7 +267,7 @@ public function getWebhookUrlAttribute() /** * Query scope to not show templates - * + * * @param object $query * @return object */ diff --git a/app/Template.php b/app/Template.php index 9f60efb58..1ee61e18c 100644 --- a/app/Template.php +++ b/app/Template.php @@ -2,11 +2,14 @@ namespace App; +/** + * Model for templates + */ class Template extends Project { /** * Fields to show in the JSON presentation - * + * * @var array */ protected $visible = ['name', 'command_count']; @@ -27,7 +30,7 @@ class Template extends Project /** * Query scope to only show templates - * + * * @param object $query * @return object */ @@ -56,4 +59,4 @@ public function commands() { return $this->hasMany('App\Command', 'project_id'); } -} \ No newline at end of file +} From f8a59be7b65d886dc5ab98ec620b522041de18d0 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 10:10:07 +0100 Subject: [PATCH 14/66] Fixing a PHPCS issue --- app/Jobs/SetupProject.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Jobs/SetupProject.php b/app/Jobs/SetupProject.php index cf3052fbc..6ab3da7b0 100644 --- a/app/Jobs/SetupProject.php +++ b/app/Jobs/SetupProject.php @@ -37,8 +37,7 @@ public function handle() { $template = Project::findOrFail($this->template_id); - foreach ($template->commands as $command) - { + foreach ($template->commands as $command) { $data = $command->toArray(); $data['project_id'] = $this->project->id; From d07fa39a57eadd159624aec90645c3d37c4158c4 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 14:05:01 +0100 Subject: [PATCH 15/66] Cleaning up unneeded use statements --- app/Http/Controllers/Admin/TemplateController.php | 1 - database/seeds/TemplateSeeder.php | 1 - 2 files changed, 2 deletions(-) diff --git a/app/Http/Controllers/Admin/TemplateController.php b/app/Http/Controllers/Admin/TemplateController.php index b2eae7a0c..5007a85b1 100644 --- a/app/Http/Controllers/Admin/TemplateController.php +++ b/app/Http/Controllers/Admin/TemplateController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; -use App\Http\Requests; use App\Repositories\Contracts\TemplateRepositoryInterface; use Lang; diff --git a/database/seeds/TemplateSeeder.php b/database/seeds/TemplateSeeder.php index fb05d79c0..1d46368d5 100644 --- a/database/seeds/TemplateSeeder.php +++ b/database/seeds/TemplateSeeder.php @@ -3,7 +3,6 @@ use App\Command; use App\Project; use Illuminate\Database\Seeder; -use Illuminate\Database\Eloquent\Model; class TemplateSeeder extends Seeder { From 2e3f7a66a642ca34335198932e9de1c11a07d6cf Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 17:23:56 +0100 Subject: [PATCH 16/66] Create LICENSING.md --- LICENSING.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSING.md diff --git a/LICENSING.md b/LICENSING.md new file mode 100644 index 000000000..b8bebdf6c --- /dev/null +++ b/LICENSING.md @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Stephen Ball + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. From 1c525c09e2e6d9479989bab669426691a0417057 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 17:24:38 +0100 Subject: [PATCH 17/66] Update LICENSING.md --- LICENSING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSING.md b/LICENSING.md index b8bebdf6c..6326f1de9 100644 --- a/LICENSING.md +++ b/LICENSING.md @@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 8fd1744238845b691935f1971114a08c973fcdec Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 17:26:04 +0100 Subject: [PATCH 18/66] Rename LICENSING.md to LICENSE.md --- LICENSING.md => LICENSE.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSING.md => LICENSE.md (100%) diff --git a/LICENSING.md b/LICENSE.md similarity index 100% rename from LICENSING.md rename to LICENSE.md From 8696a6d2561574fffd2516fcbfeda6ade50a200d Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 17:26:26 +0100 Subject: [PATCH 19/66] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 678341b1f..289ad5dbd 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ [![PHP Dependency Status](https://www.versioneye.com/user/projects/5531329410e7141211000f29/badge.svg)](https://www.versioneye.com/user/projects/5531329410e7141211000f29) [![Nodge Dependency Status](https://www.versioneye.com/user/projects/5531329610e714f9e500109c/badge.svg)](https://www.versioneye.com/user/projects/5531329610e714f9e500109c) [![Latest Version](https://img.shields.io/github/release/REBELinBLUE/deployer.svg)](https://github.com/REBELinBLUE/deployer/releases) +[![License](https://img.shields.io/github/license/rebelinblue/deployer.svg)](https://github.com/REBELinBLUE/deployer/blob/master/LICENSE.md) **Development** From b77774ffb5d36fc55ad818fefff944e331d2b130 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 20:10:55 +0100 Subject: [PATCH 20/66] Create .travis.yml --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..20d574b37 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: php + +php: + - 5.5.9 + - 5.5 + - 5.6 + - 7.0 + - hhvm + +install: + - composer install --no-interaction --prefer-source + - npm install + - bower install From a3c898f65dea7f12f9b69d16745f9e4f8445282f Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 20:22:51 +0100 Subject: [PATCH 21/66] Update .travis.yml --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 20d574b37..e26ec7f3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,12 @@ php: - 7.0 - hhvm +before_script: + - npm install -g grunt-cli + - npm install -g bower + - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config + - bower install -f + install: - composer install --no-interaction --prefer-source - npm install From b868533fd23711dc48b380ed8c16cc55fdf76ef1 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 20:26:35 +0100 Subject: [PATCH 22/66] Update .travis.yml --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index e26ec7f3c..ba9ebe526 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,3 +17,14 @@ install: - composer install --no-interaction --prefer-source - npm install - bower install + +matrix: + allow_failures: + - php: 7.0 + - php: hhvm + fast_finish: true + +# Customize when the notification emails are sent. +notifications: + on_success: never + on_failure: always From 32da48bbf2bd4f3a34c50e628662ace2e03d7f7c Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 20:26:49 +0100 Subject: [PATCH 23/66] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ba9ebe526..0683be864 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ php: - hhvm before_script: + - composer self-update - npm install -g grunt-cli - npm install -g bower - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config From 595b98730a4d3d7c0a0da7507ae1846657460fd2 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 20:27:40 +0100 Subject: [PATCH 24/66] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0683be864..d81402985 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ php: - 7.0 - hhvm -before_script: +before_install: - composer self-update - npm install -g grunt-cli - npm install -g bower From d7be0b11c4d8577c6197ccdf077c20ff4528b058 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 20:39:34 +0100 Subject: [PATCH 25/66] Update .travis.yml --- .travis.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index d81402985..063a95755 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,17 +8,28 @@ php: - hhvm before_install: - - composer self-update - - npm install -g grunt-cli - - npm install -g bower + - travis_retry composer self-update + - travis_retry npm install -g grunt-cli + - travis_retry npm install -g bower - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config - - bower install -f + - travis_retry bower install -f install: - - composer install --no-interaction --prefer-source - - npm install - - bower install + - travis_retry composer install --no-interaction --prefer-source + - travis_retry npm install + - travis_retry bower install +before_script: + - chmod -R 777 storage + - touch storage/database.sqlite + +script: + - php artisan migrate:refresh --no-interaction -vvv --seed + +after_script: + - ls -laR storage + - cat storage/logs/* + matrix: allow_failures: - php: 7.0 From 320e07e21a01cecb5c2953c8739284473d12ce0e Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 20:47:02 +0100 Subject: [PATCH 26/66] Update .travis.yml --- .travis.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 063a95755..e57a7b83d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,17 @@ php: - 5.6 - 7.0 - hhvm - + +env: + global: + - APP_ENV=testing + - APP_DEBUG=true + - APP_TIMEZONE=Europe/London + - APP_KEY=cHKwVTJCF75DKo9bta72ZNrkS6Q0tqYy + - CACHE_DRIVER=array + - SESSION_DRIVER=array + - QUEUE_DRIVER=sync + before_install: - travis_retry composer self-update - travis_retry npm install -g grunt-cli @@ -15,7 +25,7 @@ before_install: - travis_retry bower install -f install: - - travis_retry composer install --no-interaction --prefer-source + - travis_retry composer install --no-interaction --prefer-dist - travis_retry npm install - travis_retry bower install From 30bb10b00a472c9b2bbad69a14730287fb04adcd Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 20:54:05 +0100 Subject: [PATCH 27/66] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e57a7b83d..ea8048007 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ env: - CACHE_DRIVER=array - SESSION_DRIVER=array - QUEUE_DRIVER=sync + - BROADCAST_DRIVER=log before_install: - travis_retry composer self-update From 2b98b7d836561224d59f9f63ba0084cbc395c980 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 21:30:36 +0100 Subject: [PATCH 28/66] Tweaking migrations so they continue to work --- .../migrations/2015_03_15_155553_create_groups_table.php | 6 ------ .../migrations/2015_03_16_212800_create_projects_table.php | 6 ++++++ .../migrations/2015_05_07_145127_change_output_column.php | 4 ++-- phpunit.xml | 1 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/database/migrations/2015_03_15_155553_create_groups_table.php b/database/migrations/2015_03_15_155553_create_groups_table.php index 165336fc6..df8965c8b 100644 --- a/database/migrations/2015_03_15_155553_create_groups_table.php +++ b/database/migrations/2015_03_15_155553_create_groups_table.php @@ -3,8 +3,6 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -use App\Group; - class CreateGroupsTable extends Migration { /** @@ -20,10 +18,6 @@ public function up() $table->timestamps(); $table->softDeletes(); }); - - Group::create([ - 'name' => 'Projects' - ]); } /** diff --git a/database/migrations/2015_03_16_212800_create_projects_table.php b/database/migrations/2015_03_16_212800_create_projects_table.php index 6ac2b8904..09dbdba19 100644 --- a/database/migrations/2015_03_16_212800_create_projects_table.php +++ b/database/migrations/2015_03_16_212800_create_projects_table.php @@ -1,5 +1,6 @@ softDeletes(); $table->foreign('group_id')->references('id')->on('groups'); }); + + // Had to move this from the previous migration due to group having an attribute for project count + Group::create([ + 'name' => 'Projects' + ]); } /** diff --git a/database/migrations/2015_05_07_145127_change_output_column.php b/database/migrations/2015_05_07_145127_change_output_column.php index 5012d712d..1ae1866c0 100644 --- a/database/migrations/2015_05_07_145127_change_output_column.php +++ b/database/migrations/2015_05_07_145127_change_output_column.php @@ -11,7 +11,7 @@ class ChangeOutputColumn extends Migration */ public function up() { - if ($_ENV['DB_TYPE'] != 'sqlite') { + if (isset($_ENV['DB_TYPE']) && $_ENV['DB_TYPE'] != 'sqlite') { DB::statement('ALTER TABLE server_logs CHANGE output output longtext'); } } @@ -23,7 +23,7 @@ public function up() */ public function down() { - if ($_ENV['DB_TYPE'] != 'sqlite') { + if (isset($_ENV['DB_TYPE']) && $_ENV['DB_TYPE'] != 'sqlite') { DB::statement('ALTER TABLE server_logs CHANGE output output text'); } } diff --git a/phpunit.xml b/phpunit.xml index dd197d071..ca4a41514 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -25,5 +25,6 @@ + \ No newline at end of file From 1244daca3d29da93dd085a35c90eff263e4456f8 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 21:37:54 +0100 Subject: [PATCH 29/66] Delete .travis.yml --- .travis.yml | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ea8048007..000000000 --- a/.travis.yml +++ /dev/null @@ -1,53 +0,0 @@ -language: php - -php: - - 5.5.9 - - 5.5 - - 5.6 - - 7.0 - - hhvm - -env: - global: - - APP_ENV=testing - - APP_DEBUG=true - - APP_TIMEZONE=Europe/London - - APP_KEY=cHKwVTJCF75DKo9bta72ZNrkS6Q0tqYy - - CACHE_DRIVER=array - - SESSION_DRIVER=array - - QUEUE_DRIVER=sync - - BROADCAST_DRIVER=log - -before_install: - - travis_retry composer self-update - - travis_retry npm install -g grunt-cli - - travis_retry npm install -g bower - - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config - - travis_retry bower install -f - -install: - - travis_retry composer install --no-interaction --prefer-dist - - travis_retry npm install - - travis_retry bower install - -before_script: - - chmod -R 777 storage - - touch storage/database.sqlite - -script: - - php artisan migrate:refresh --no-interaction -vvv --seed - -after_script: - - ls -laR storage - - cat storage/logs/* - -matrix: - allow_failures: - - php: 7.0 - - php: hhvm - fast_finish: true - -# Customize when the notification emails are sent. -notifications: - on_success: never - on_failure: always From 621ddd128ee152e26f1fef98aadf4be30e35856d Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 23:05:42 +0100 Subject: [PATCH 30/66] Changing icon for logs --- resources/views/dialogs/log.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/dialogs/log.blade.php b/resources/views/dialogs/log.blade.php index 5c31f28e3..553b5ea63 100644 --- a/resources/views/dialogs/log.blade.php +++ b/resources/views/dialogs/log.blade.php @@ -3,7 +3,7 @@
-

{{ Lang::get('deployments.process') }} ( )

+

{{ Lang::get('deployments.process') }} ( )

From e4c2188d30aa3f9cbcf6395671ed6f0f0c7c393d Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 23:05:57 +0100 Subject: [PATCH 31/66] Clean up --- app/Http/Controllers/Admin/GroupController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Admin/GroupController.php b/app/Http/Controllers/Admin/GroupController.php index 168b8f87d..ae55a0125 100644 --- a/app/Http/Controllers/Admin/GroupController.php +++ b/app/Http/Controllers/Admin/GroupController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; -use App\Http\Requests; use App\Http\Requests\StoreGroupRequest; use App\Repositories\Contracts\GroupRepositoryInterface; use Lang; From 9643bc54e9aa0636339042ca63dbe81a1d4e460c Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 23:06:18 +0100 Subject: [PATCH 32/66] Clean up --- app/Project.php | 3 +-- app/Repositories/EloquentGroupRepository.php | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Project.php b/app/Project.php index daf3d5ac3..841a7a31a 100644 --- a/app/Project.php +++ b/app/Project.php @@ -280,9 +280,8 @@ public function scopeNotTemplates($query) * Generates an SSH key and sets the private/public key properties. * * @return void - * @SuppressWarnings(PHPMD.UnusedPrivateMethod) */ - private function generateSSHKey() + protected function generateSSHKey() { $key = tempnam(storage_path() . '/app/', 'sshkey'); unlink($key); diff --git a/app/Repositories/EloquentGroupRepository.php b/app/Repositories/EloquentGroupRepository.php index 6b2094edf..6be5a2d1b 100644 --- a/app/Repositories/EloquentGroupRepository.php +++ b/app/Repositories/EloquentGroupRepository.php @@ -29,6 +29,8 @@ public function __construct(Group $model) */ public function getAll() { - return $this->model->orderBy('name')->get(); + return $this->model + ->orderBy('name') + ->get(); } } From 4bea9d70e847fe4655c050764547a515050ef2bb Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 23:06:34 +0100 Subject: [PATCH 33/66] Allow templates to be created --- .../Controllers/Admin/TemplateController.php | 52 ++++++++++- app/Http/Requests/StoreTemplateRequest.php | 25 +++++ .../EloquentTemplateRepository.php | 14 +++ app/Template.php | 21 ++++- resources/assets/js/templates.js | 91 +++++++++++++++++-- resources/lang/en/templates.php | 1 + resources/views/dialogs/templates.blade.php | 27 ++++++ resources/views/templates/commands.blade.php | 58 ------------ resources/views/templates/listing.blade.php | 6 +- 9 files changed, 220 insertions(+), 75 deletions(-) create mode 100644 app/Http/Requests/StoreTemplateRequest.php create mode 100644 resources/views/dialogs/templates.blade.php delete mode 100644 resources/views/templates/commands.blade.php diff --git a/app/Http/Controllers/Admin/TemplateController.php b/app/Http/Controllers/Admin/TemplateController.php index 5007a85b1..b48003ff9 100644 --- a/app/Http/Controllers/Admin/TemplateController.php +++ b/app/Http/Controllers/Admin/TemplateController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; +use App\Http\Requests\StoreTemplateRequest; use App\Repositories\Contracts\TemplateRepositoryInterface; use Lang; @@ -11,19 +12,64 @@ */ class TemplateController extends Controller { + /** + * The template repository. + * + * @var TemplateRepositoryInterface + */ + private $templateRepository; + + /** + * Class constructor. + * + * @param TemplateRepositoryInterface $templateRepository + * @return void + */ + public function __construct(TemplateRepositoryInterface $templateRepository) + { + $this->templateRepository = $templateRepository; + } + /** * Shows all templates. * - * @param TemplateRepositoryInterface $projectRepository * @return Response */ - public function index(TemplateRepositoryInterface $templateRepository) + public function index() { - $templates = $templateRepository->getAll(); + $templates = $this->templateRepository->getAll(); return view('templates.listing', [ 'title' => Lang::get('templates.manage'), 'templates' => $templates->toJson() // Because PresentableInterface toJson() is not working in the view ]); } + + + /** + * Store a newly created template in storage. + * + * @param StoreTemplateRequest $request + * @return Response + */ + public function store(StoreTemplateRequest $request) + { + return $this->templateRepository->create($request->only( + 'name' + )); + } + + /** + * Update the specified template in storage. + * + * @param int $template_id + * @param StoreTemplateRequest $request + * @return Response + */ + public function update($template_id, StoreTemplateRequest $request) + { + return $this->templateRepository->updateById($request->only( + 'name' + ), $template_id); + } } diff --git a/app/Http/Requests/StoreTemplateRequest.php b/app/Http/Requests/StoreTemplateRequest.php new file mode 100644 index 000000000..5e52f3fe2 --- /dev/null +++ b/app/Http/Requests/StoreTemplateRequest.php @@ -0,0 +1,25 @@ + 'required|max:255' + ]; + + return $rules; + } +} diff --git a/app/Repositories/EloquentTemplateRepository.php b/app/Repositories/EloquentTemplateRepository.php index dbbaf38fb..a6e1a7a4c 100644 --- a/app/Repositories/EloquentTemplateRepository.php +++ b/app/Repositories/EloquentTemplateRepository.php @@ -33,4 +33,18 @@ public function getAll() ->orderBy('name') ->get(); } + + /** + * Overwrite the parent method to add the requires fields + * + * @param array $fields + * @return Template + */ + public function create(array $fields) + { + $fields['group_id'] = 1; + $fields['is_template'] = true; + + return parent::create($fields); + } } diff --git a/app/Template.php b/app/Template.php index 1ee61e18c..d5607a832 100644 --- a/app/Template.php +++ b/app/Template.php @@ -12,7 +12,7 @@ class Template extends Project * * @var array */ - protected $visible = ['name', 'command_count']; + protected $visible = ['id', 'name', 'command_count']; /** * The table associated with the model. @@ -28,6 +28,25 @@ class Template extends Project */ protected $appends = ['command_count']; + /** + * Override the boot method to bind model event listeners. + * + * @return void + */ + public static function boot() + { + parent::boot(); + + // FIXME: Horrible hack + // Clear data not needed in templates + static::created(function (Template $model) { + $model->private_key = ''; + $model->public_key = ''; + $model->hash = ''; + $model->save(); + }); + } + /** * Query scope to only show templates * diff --git a/resources/assets/js/templates.js b/resources/assets/js/templates.js index 081fe2322..2dffbeb90 100644 --- a/resources/assets/js/templates.js +++ b/resources/assets/js/templates.js @@ -1,6 +1,85 @@ var app = app || {}; (function ($) { + // FIXME: This seems very wrong + $('#template').on('show.bs.modal', function (event) { + var button = $(event.relatedTarget); + var modal = $(this); + var title = Lang.create; + + $('.btn-danger', modal).hide(); + $('.callout-danger', modal).hide(); + $('.has-error', modal).removeClass('has-error'); + $('.label-danger', modal).remove(); + + if (button.hasClass('btn-edit')) { + title = Lang.edit; + $('.btn-danger', modal).show(); + } else { + $('#template_id').val(''); + $('#template_name').val(''); + } + + modal.find('.modal-title span').text(title); + }); + + // FIXME: This seems very wrong + $('#template button.btn-save').on('click', function (event) { + var target = $(event.currentTarget); + var icon = target.find('i'); + var dialog = target.parents('.modal'); + + icon.addClass('fa-refresh fa-spin').removeClass('fa-save'); + dialog.find('input').attr('disabled', 'disabled'); + $('button.close', dialog).hide(); + + var template_id = $('#template_id').val(); + + if (template_id) { + var template = app.Templates.get(template_id); + } else { + var template = new app.Template(); + } + + template.save({ + name: $('#template_name').val() + }, { + wait: true, + success: function(model, response, options) { + dialog.modal('hide'); + $('.callout-danger', dialog).hide(); + + icon.removeClass('fa-refresh fa-spin').addClass('fa-save'); + $('button.close', dialog).show(); + dialog.find('input').removeAttr('disabled'); + + if (!template_id) { + app.Templates.add(response); + } + }, + error: function(model, response, options) { + $('.callout-danger', dialog).show(); + + var errors = response.responseJSON; + + $('form input', dialog).each(function (index, element) { + element = $(element); + + var name = element.attr('name'); + + if (typeof errors[name] !== 'undefined') { + var parent = element.parent('div'); + parent.addClass('has-error'); + parent.append($('').attr('class', 'label label-danger').text(errors[name])); + } + }); + + icon.removeClass('fa-refresh fa-spin').addClass('fa-save'); + $('button.close', dialog).show(); + dialog.find('input').removeAttr('disabled'); + } + }); + }); app.Template = Backbone.Model.extend({ urlRoot: '/admin/templates' @@ -89,16 +168,8 @@ var app = app || {}; return this; }, editTemplate: function() { - /* - $('#project_id').val(this.model.id); - $('#project_name').val(this.model.get('name')); - $('#project_repository').val(this.model.get('repository')); - $('#project_branch').val(this.model.get('branch')); - $('#project_group_id').val(this.model.get('group_id')); - $('#project_builds_to_keep').val(this.model.get('builds_to_keep')); - $('#project_url').val(this.model.get('url')); - $('#project_build_url').val(this.model.get('build_url')); - */ + $('#template_id').val(this.model.id); + $('#template_name').val(this.model.get('name')); } }); })(jQuery); \ No newline at end of file diff --git a/resources/lang/en/templates.php b/resources/lang/en/templates.php index c5b304cbc..c459bcd9a 100644 --- a/resources/lang/en/templates.php +++ b/resources/lang/en/templates.php @@ -6,6 +6,7 @@ 'commands' => 'Number of Commands', 'type' => 'Deployment type', 'custom' => 'Custom', + 'example' => 'Laravel 5 Application', 'name' => 'Name', 'create' => 'Add a new template', 'edit' => 'Edit the template', diff --git a/resources/views/dialogs/templates.blade.php b/resources/views/dialogs/templates.blade.php new file mode 100644 index 000000000..b5ce9eb04 --- /dev/null +++ b/resources/views/dialogs/templates.blade.php @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/resources/views/templates/commands.blade.php b/resources/views/templates/commands.blade.php deleted file mode 100644 index a464123c7..000000000 --- a/resources/views/templates/commands.blade.php +++ /dev/null @@ -1,58 +0,0 @@ -@extends('layout') - -@section('content') -
-
-

Clone

-
- @include('commands._partials.list', [ 'step' => 'Before', 'action' => 1 ]) - @include('commands._partials.list', [ 'step' => 'After', 'action' => 3 ]) -
- -
-
-

Install

-
- @include('commands._partials.list', [ 'step' => 'Before', 'action' => 4 ]) - @include('commands._partials.list', [ 'step' => 'After', 'action' => 6 ]) -
- -
-
-

Activate

-
- @include('commands._partials.list', [ 'step' => 'Before', 'action' => 7 ]) - @include('commands._partials.list', [ 'step' => 'After', 'action' => 9 ]) -
- -
-
-

Purge

-
- @include('commands._partials.list', [ 'step' => 'Before', 'action' => 10 ]) - @include('commands._partials.list', [ 'step' => 'After', 'action' => 12 ]) -
- - - - - -@stop - -@section('javascript') - -@stop diff --git a/resources/views/templates/listing.blade.php b/resources/views/templates/listing.blade.php index 426995923..22a0291fc 100644 --- a/resources/views/templates/listing.blade.php +++ b/resources/views/templates/listing.blade.php @@ -23,14 +23,14 @@
- + @include('dialogs.templates') @@ -50,6 +50,6 @@ @section('right-buttons')
- +
@stop \ No newline at end of file From 276d6e58fbe8addf7625fccc06732edc4d3a2301 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 23:06:44 +0100 Subject: [PATCH 34/66] Update dependencies --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 385c4fadd..11594007a 100644 --- a/composer.lock +++ b/composer.lock @@ -2368,16 +2368,16 @@ "packages-dev": [ { "name": "doctrine/annotations", - "version": "v1.2.4", + "version": "v1.2.6", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e" + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/b5202eb9e83f8db52e0e58867e0a46e63be8332e", - "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4", + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4", "shasum": "" }, "require": { @@ -2432,7 +2432,7 @@ "docblock", "parser" ], - "time": "2014-12-23 22:40:37" + "time": "2015-06-17 12:21:22" }, { "name": "doctrine/cache", From 0b453c375a25e6685c7c79b1b026bffc40e5797a Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 23:19:33 +0100 Subject: [PATCH 35/66] Added a method to the repository to get a specific instance --- .../Contracts/TemplateRepositoryInterface.php | 1 + app/Repositories/EloquentRepository.php | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/Repositories/Contracts/TemplateRepositoryInterface.php b/app/Repositories/Contracts/TemplateRepositoryInterface.php index c7bf0f443..a8aa4bffa 100644 --- a/app/Repositories/Contracts/TemplateRepositoryInterface.php +++ b/app/Repositories/Contracts/TemplateRepositoryInterface.php @@ -5,4 +5,5 @@ interface TemplateRepositoryInterface { public function getAll(); + public function getById($model_id); } diff --git a/app/Repositories/EloquentRepository.php b/app/Repositories/EloquentRepository.php index 702fef767..a1446d146 100644 --- a/app/Repositories/EloquentRepository.php +++ b/app/Repositories/EloquentRepository.php @@ -24,6 +24,17 @@ public function getAll() return $this->model->all(); } + /** + * Get's an item from the repository + * + * @param int $model_id + * @return model + */ + public function getById($model_id) + { + return $this->model->findOrFail($model_id); + } + /** * Creates a new instance of the model. * @@ -44,7 +55,7 @@ public function create(array $fields) */ public function updateById(array $fields, $model_id) { - $model = $this->model->findOrFail($model_id); + $model = $this->getById($model_id); $model->update($fields); From 5434b5ecc3db2c47445b05414344c3bda3ab3cf5 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 23:19:41 +0100 Subject: [PATCH 36/66] Cleanup comments --- app/ProjectRelation.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/ProjectRelation.php b/app/ProjectRelation.php index d54b642aa..94c794e4f 100644 --- a/app/ProjectRelation.php +++ b/app/ProjectRelation.php @@ -72,6 +72,7 @@ public function commands() /** * Has many relationship. + * * @return SharedFile */ public function shareFiles() @@ -81,6 +82,7 @@ public function shareFiles() /** * Has many relationship to project file. + * * @return ProjectFile */ public function projectFiles() @@ -90,6 +92,7 @@ public function projectFiles() /** * Has many relationship. + * * @return SharedFile */ public function notifyEmails() @@ -99,6 +102,7 @@ public function notifyEmails() /** * Has many urls to check. + * * @return CheckUrl */ public function checkUrls() From 2a1e278f5fae80f3e4556dbdbeea6618aa17fee1 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 23:21:58 +0100 Subject: [PATCH 37/66] Stop template extending project as there is no need --- app/Template.php | 51 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/app/Template.php b/app/Template.php index d5607a832..99ef7a1b0 100644 --- a/app/Template.php +++ b/app/Template.php @@ -2,10 +2,12 @@ namespace App; +use Illuminate\Database\Eloquent\Model; + /** * Model for templates */ -class Template extends Project +class Template extends Model { /** * Fields to show in the JSON presentation @@ -14,6 +16,13 @@ class Template extends Project */ protected $visible = ['id', 'name', 'command_count']; + /** + * The attributes that are mass assignable. + * + * @var array + */ + protected $fillable = ['name', 'is_template', 'group_id']; + /** * The table associated with the model. * @@ -29,23 +38,13 @@ class Template extends Project protected $appends = ['command_count']; /** - * Override the boot method to bind model event listeners. + * The attributes that should be casted to native types. * - * @return void + * @var array */ - public static function boot() - { - parent::boot(); - - // FIXME: Horrible hack - // Clear data not needed in templates - static::created(function (Template $model) { - $model->private_key = ''; - $model->public_key = ''; - $model->hash = ''; - $model->save(); - }); - } + protected $casts = [ + 'is_template' => 'boolean' + ]; /** * Query scope to only show templates @@ -78,4 +77,24 @@ public function commands() { return $this->hasMany('App\Command', 'project_id'); } + + /** + * Has many relationship. + * + * @return SharedFile + */ + public function shareFiles() + { + return $this->hasMany('App\SharedFile', 'project_id'); + } + + /** + * Has many relationship to project file. + * + * @return ProjectFile + */ + public function projectFiles() + { + return $this->hasMany('App\ProjectFile', 'project_id'); + } } From 134e3fdc2abbb4850eef2e1674e2438069651677 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Wed, 17 Jun 2015 23:22:11 +0100 Subject: [PATCH 38/66] Starting on a method to configure the template --- .../Controllers/Admin/TemplateController.php | 17 ++++++++ app/Http/routes.php | 2 +- resources/views/templates/details.blade.php | 42 +++++++++++++++++++ resources/views/templates/listing.blade.php | 1 + 4 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 resources/views/templates/details.blade.php diff --git a/app/Http/Controllers/Admin/TemplateController.php b/app/Http/Controllers/Admin/TemplateController.php index b48003ff9..c9eb20b97 100644 --- a/app/Http/Controllers/Admin/TemplateController.php +++ b/app/Http/Controllers/Admin/TemplateController.php @@ -45,6 +45,23 @@ public function index() ]); } + /** + * Show the template configuration + * + * @param int $template_id + * @return Response + */ + public function show($template_id) + { + $template = $this->templateRepository->getById($template_id); + + return view('templates.details', [ + 'title' => $template->name, + 'sharedFiles' => $template->shareFiles, + 'projectFiles' => $template->projectFiles, + 'project' => $template + ]); + } /** * Store a newly created template in storage. diff --git a/app/Http/routes.php b/app/Http/routes.php index ecb671dd6..597b5e7f4 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -62,7 +62,7 @@ Route::group(['prefix' => 'admin', 'namespace' => 'Admin'], function () { Route::resource('templates', 'TemplateController', [ - 'only' => ['index', 'store', 'update', 'destroy'] + 'only' => ['index', 'store', 'update', 'destroy', 'show'] ]); Route::resource('projects', 'ProjectController', [ diff --git a/resources/views/templates/details.blade.php b/resources/views/templates/details.blade.php new file mode 100644 index 000000000..f7a612a5b --- /dev/null +++ b/resources/views/templates/details.blade.php @@ -0,0 +1,42 @@ +@extends('layout') + +@section('content') +
+
+
+ +
+
+ @include('projects._partials.commands') +
+
+ @include('projects._partials.shared_files') +
+
+ @include('projects._partials.project_files') +
+
+
+
+
+ + @include('dialogs.server') + @include('dialogs.shared_files') + @include('dialogs.project_files') +@stop + +@section('javascript') + +@stop \ No newline at end of file diff --git a/resources/views/templates/listing.blade.php b/resources/views/templates/listing.blade.php index 22a0291fc..56b1ad304 100644 --- a/resources/views/templates/listing.blade.php +++ b/resources/views/templates/listing.blade.php @@ -30,6 +30,7 @@ <%- command_count %>
+
From 8aef062664268885041a8a577745f048e9448d52 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Thu, 18 Jun 2015 17:21:26 +0100 Subject: [PATCH 39/66] Cleaning up PHPCS issues --- app/Repositories/EloquentRepository.php | 2 +- app/Repositories/EloquentTemplateRepository.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Repositories/EloquentRepository.php b/app/Repositories/EloquentRepository.php index a1446d146..4b54a6bc1 100644 --- a/app/Repositories/EloquentRepository.php +++ b/app/Repositories/EloquentRepository.php @@ -26,7 +26,7 @@ public function getAll() /** * Get's an item from the repository - * + * * @param int $model_id * @return model */ diff --git a/app/Repositories/EloquentTemplateRepository.php b/app/Repositories/EloquentTemplateRepository.php index a6e1a7a4c..cdd97823e 100644 --- a/app/Repositories/EloquentTemplateRepository.php +++ b/app/Repositories/EloquentTemplateRepository.php @@ -36,7 +36,7 @@ public function getAll() /** * Overwrite the parent method to add the requires fields - * + * * @param array $fields * @return Template */ From 1c391da85f468eb7b6822330e841f6eba2ecfb43 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Thu, 18 Jun 2015 17:25:13 +0100 Subject: [PATCH 40/66] Update phpci.yml --- phpci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/phpci.yml b/phpci.yml index e08832469..d8f763589 100644 --- a/phpci.yml +++ b/phpci.yml @@ -24,6 +24,7 @@ setup: CACHE_DRIVER: "array" SESSION_DRIVER: "array" QUEUE_DRIVER: "sync" + BROADCAST_DRIVER: "log" test: lint: From d3aaf75f9f94ff40d51c5a0af2f806c43a33e537 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Thu, 18 Jun 2015 17:38:33 +0100 Subject: [PATCH 41/66] Adding more rules --- phpci.yml | 2 ++ phpcs.xml | 17 +++++++++++++++++ phpmd.xml | 17 +++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 phpcs.xml create mode 100644 phpmd.xml diff --git a/phpci.yml b/phpci.yml index d8f763589..0100e0054 100644 --- a/phpci.yml +++ b/phpci.yml @@ -42,6 +42,8 @@ test: - "design" - "naming" - "unusedcode" + - "codesize" + - "cleancode" php_code_sniffer: path: "app/" standard: "PSR2" diff --git a/phpcs.xml b/phpcs.xml new file mode 100644 index 000000000..c0ab1e8e1 --- /dev/null +++ b/phpcs.xml @@ -0,0 +1,17 @@ + + + Codestyle ruleset for Deployer + + + app + + + + + database/* + bootstrap/* + config/* + tests/* + vendor/* + + \ No newline at end of file diff --git a/phpmd.xml b/phpmd.xml new file mode 100644 index 000000000..6d1320521 --- /dev/null +++ b/phpmd.xml @@ -0,0 +1,17 @@ + + + + Deployer rule set + + + + + + + + + \ No newline at end of file From 6ef801f8b41719ff0d9d7936e5f01392467c7974 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Thu, 18 Jun 2015 17:41:46 +0100 Subject: [PATCH 42/66] Tweaking rules due to complains about the way laravel works --- README.md | 2 +- phpci.yml | 1 - phpmd.xml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 289ad5dbd..0b56748e5 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The code is written to follow PSR-2 standards, this can be tested using PHP_Code Code mess can be checked with - $ phpmd app text design,unusedcode,naming + $ phpmd app text design,unusedcode,naming,codesize PHP Docblocks can be checked with diff --git a/phpci.yml b/phpci.yml index 0100e0054..7cb8ea9bc 100644 --- a/phpci.yml +++ b/phpci.yml @@ -43,7 +43,6 @@ test: - "naming" - "unusedcode" - "codesize" - - "cleancode" php_code_sniffer: path: "app/" standard: "PSR2" diff --git a/phpmd.xml b/phpmd.xml index 6d1320521..82afba63a 100644 --- a/phpmd.xml +++ b/phpmd.xml @@ -8,7 +8,7 @@ Deployer rule set - + From fb01e05fb6f6cdd7aa0305d97b773d8ccb9858d6 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Thu, 18 Jun 2015 20:33:46 +0100 Subject: [PATCH 43/66] Update phpci.yml --- phpci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/phpci.yml b/phpci.yml index 7cb8ea9bc..d8f763589 100644 --- a/phpci.yml +++ b/phpci.yml @@ -42,7 +42,6 @@ test: - "design" - "naming" - "unusedcode" - - "codesize" php_code_sniffer: path: "app/" standard: "PSR2" From 509b6af6e120154ce5453667b471795f413c55cc Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Fri, 19 Jun 2015 13:56:52 +0100 Subject: [PATCH 44/66] Added the ability to notify a channel only on failure --- app/Deployment.php | 10 +++++ .../Resources/NotificationController.php | 6 ++- .../Requests/StoreNotificationRequest.php | 1 + app/Listeners/Events/Notify.php | 4 ++ app/Notification.php | 11 ++++- .../2015_06_17_150003_add_server_ordering.php | 2 +- ...19_134430_add_notify_failure_only_flag.php | 31 ++++++++++++++ resources/assets/js/notifications.js | 13 +++--- resources/lang/en/notifications.php | 42 ++++++++++--------- resources/views/dialogs/channel.blade.php | 9 ++++ 10 files changed, 100 insertions(+), 29 deletions(-) create mode 100644 database/migrations/2015_06_19_134430_add_notify_failure_only_flag.php diff --git a/app/Deployment.php b/app/Deployment.php index ca78c002c..979613fa5 100644 --- a/app/Deployment.php +++ b/app/Deployment.php @@ -119,6 +119,16 @@ public function isSuccessful() return ($this->status === self::COMPLETED); } + /** + * Determines whether the deployment failed. + * + * @return bool + */ + public function isFailed() + { + return ($this->status === self::FAILED); + } + /** * Determines if the deployment is the latest deployment. * diff --git a/app/Http/Controllers/Resources/NotificationController.php b/app/Http/Controllers/Resources/NotificationController.php index 2d1b0eb4b..c03321c61 100644 --- a/app/Http/Controllers/Resources/NotificationController.php +++ b/app/Http/Controllers/Resources/NotificationController.php @@ -23,7 +23,8 @@ public function store(StoreNotificationRequest $request) 'channel', 'webhook', 'project_id', - 'icon' + 'icon', + 'failure_only' )); } @@ -40,7 +41,8 @@ public function update(Notification $notification, StoreNotificationRequest $req 'name', 'channel', 'webhook', - 'icon' + 'icon', + 'failure_only' )); return $notification; diff --git a/app/Http/Requests/StoreNotificationRequest.php b/app/Http/Requests/StoreNotificationRequest.php index 7a0a32721..c06813ee8 100644 --- a/app/Http/Requests/StoreNotificationRequest.php +++ b/app/Http/Requests/StoreNotificationRequest.php @@ -6,6 +6,7 @@ /** * Request for validating notifications. + * @fixme Check channel and webhook are valid */ class StoreNotificationRequest extends Request { diff --git a/app/Listeners/Events/Notify.php b/app/Listeners/Events/Notify.php index 4c4b2edb9..1f7896c78 100644 --- a/app/Listeners/Events/Notify.php +++ b/app/Listeners/Events/Notify.php @@ -40,6 +40,10 @@ public function handle(DeployFinished $event) // Send slack notifications foreach ($project->notifications as $notification) { + if ($notification->failure_only === true && $deployment->isSuccessful()) { + continue; + } + $this->dispatch(new SlackNotify($notification, $deployment->notificationPayload())); } diff --git a/app/Notification.php b/app/Notification.php index a3d4ea992..a832e646c 100644 --- a/app/Notification.php +++ b/app/Notification.php @@ -21,7 +21,7 @@ class Notification extends Model * * @var array */ - protected $fillable = ['name', 'channel', 'webhook', 'project_id', 'icon']; + protected $fillable = ['name', 'channel', 'webhook', 'project_id', 'icon', 'failure_only']; /** * The attributes excluded from the model's JSON form. @@ -30,6 +30,15 @@ class Notification extends Model */ protected $hidden = ['created_at', 'updated_at', 'deleted_at']; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts = [ + 'failure_only' => 'boolean' + ]; + /** * Belongs to relationship. * diff --git a/database/migrations/2015_06_17_150003_add_server_ordering.php b/database/migrations/2015_06_17_150003_add_server_ordering.php index feb1c2b8f..ab65550f5 100644 --- a/database/migrations/2015_06_17_150003_add_server_ordering.php +++ b/database/migrations/2015_06_17_150003_add_server_ordering.php @@ -13,7 +13,7 @@ class AddServerOrdering extends Migration public function up() { Schema::table('servers', function (Blueprint $table) { - $table->unsignedInteger('order')->default('0'); + $table->unsignedInteger('order')->default(0); }); } diff --git a/database/migrations/2015_06_19_134430_add_notify_failure_only_flag.php b/database/migrations/2015_06_19_134430_add_notify_failure_only_flag.php new file mode 100644 index 000000000..c2dead21a --- /dev/null +++ b/database/migrations/2015_06_19_134430_add_notify_failure_only_flag.php @@ -0,0 +1,31 @@ +boolean('failure_only')->default(false); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('notifications', function (Blueprint $table) { + $table->dropColumn('failure_only'); + }); + } +} diff --git a/resources/assets/js/notifications.js b/resources/assets/js/notifications.js index 73f87df45..018f21d48 100644 --- a/resources/assets/js/notifications.js +++ b/resources/assets/js/notifications.js @@ -21,6 +21,7 @@ var app = app || {}; $('#notification_webhook').val(''); $('#notification_channel').val(''); $('#notification_icon').val(''); + $('#notification_failure_only').prop('checked', true); } modal.find('.modal-title span').text(title); @@ -75,11 +76,12 @@ var app = app || {}; } notification.save({ - name: $('#notification_name').val(), - webhook: $('#notification_webhook').val(), - channel: $('#notification_channel').val(), - icon: $('#notification_icon').val(), - project_id: $('input[name="project_id"]').val() + name: $('#notification_name').val(), + webhook: $('#notification_webhook').val(), + channel: $('#notification_channel').val(), + icon: $('#notification_icon').val(), + project_id: $('input[name="project_id"]').val(), + failure_only: $('#notification_failure_only').is(':checked') }, { wait: true, success: function(model, response, options) { @@ -217,6 +219,7 @@ var app = app || {}; $('#notification_webhook').val(this.model.get('webhook')); $('#notification_channel').val(this.model.get('channel')); $('#notification_icon').val(this.model.get('icon')); + $('#notification_failure_only').prop('checked', (this.model.get('failure_only') === true)); } }); })(jQuery); \ No newline at end of file diff --git a/resources/lang/en/notifications.php b/resources/lang/en/notifications.php index 367bd5d79..167eb4b77 100644 --- a/resources/lang/en/notifications.php +++ b/resources/lang/en/notifications.php @@ -2,25 +2,27 @@ return [ - 'label' => 'Notifications', - 'slack' => 'Slack notifications', - 'create' => 'Add a new slack notification', - 'edit' => 'Edit the slack notification', - 'none' => 'The project does not currently have any slack notifications setup', - 'name' => 'Name', - 'channel' => 'Channel', - 'warning' => 'The notification could not be saved, please check the form below.', - 'icon' => 'Icon', - 'bot' => 'Bot', - 'icon_info' => 'Either an emoji, for example :ghost: or the URL to an image', - 'webhook' => 'Webhook URL', - 'test_message' => 'This is a test to ensure the notification is setup correctly, if you ' . - 'can see this it means it is! :+1:', - 'success_message' => 'Deployment %s successful! :smile:', - 'failed_message' => 'Deployment %s failed! :cry:', - 'branch' => 'Branch', - 'project' => 'Project', - 'commit' => 'Commit', - 'committer' => 'Committer' + 'label' => 'Notifications', + 'slack' => 'Slack notifications', + 'create' => 'Add a new slack notification', + 'edit' => 'Edit the slack notification', + 'none' => 'The project does not currently have any slack notifications setup', + 'name' => 'Name', + 'channel' => 'Channel', + 'warning' => 'The notification could not be saved, please check the form below.', + 'icon' => 'Icon', + 'bot' => 'Bot', + 'icon_info' => 'Either an emoji, for example :ghost: or the URL to an image', + 'webhook' => 'Webhook URL', + 'test_message' => 'This is a test to ensure the notification is setup correctly, if you ' . + 'can see this it means it is! :+1:', + 'success_message' => 'Deployment %s successful! :smile:', + 'failed_message' => 'Deployment %s failed! :cry:', + 'branch' => 'Branch', + 'project' => 'Project', + 'commit' => 'Commit', + 'committer' => 'Committer', + 'failure_only' => 'Failure Only', + 'failure_description' => 'Only notify this channel on failure' ]; diff --git a/resources/views/dialogs/channel.blade.php b/resources/views/dialogs/channel.blade.php index 7750c66e8..19015661b 100644 --- a/resources/views/dialogs/channel.blade.php +++ b/resources/views/dialogs/channel.blade.php @@ -31,6 +31,15 @@
+
+ +
+ +
+
From f55020c728608cce331072ba7429fb97da913042 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Fri, 19 Jun 2015 16:08:01 +0100 Subject: [PATCH 45/66] Ran php-ca-fixer and changed return null to simply return nothing --- .php_cs | 2 +- app/Deployment.php | 2 +- app/Events/ServerLogChanged.php | 2 +- app/Http/Controllers/DeploymentController.php | 4 ++-- app/Jobs/DeployProject.php | 2 +- app/ServerLog.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.php_cs b/.php_cs index 29ecc552f..b4336dd2e 100644 --- a/.php_cs +++ b/.php_cs @@ -17,7 +17,7 @@ $fixers = [ 'concat_with_spaces', 'double_arrow_multiline_whitespaces', 'duplicate_semicolon', - '-empty_return', // FIXME: There are a couple of places where return null is used + 'empty_return', 'extra_empty_lines', 'include', 'join_function', diff --git a/app/Deployment.php b/app/Deployment.php index 979613fa5..84f22a7bd 100644 --- a/app/Deployment.php +++ b/app/Deployment.php @@ -154,7 +154,7 @@ public function isCurrent() public function runtime() { if (!$this->finished_at) { - return null; + return; } return $this->started_at->diffInSeconds($this->finished_at); diff --git a/app/Events/ServerLogChanged.php b/app/Events/ServerLogChanged.php index ff0890d80..1a66aedd1 100644 --- a/app/Events/ServerLogChanged.php +++ b/app/Events/ServerLogChanged.php @@ -33,7 +33,7 @@ public function __construct(ServerLog $log) $this->finished_at = $log->finished_at ? $log->finished_at->toDateTimeString() : null; $this->log_id = $log->id; $this->output = ((is_null($log->output) || !strlen($log->output)) ? null : ''); - $this->runtime = (is_null($log->runtime()) ? null : $log->getPresenter()->readable_runtime); + $this->runtime = (!$log->runtime() ? null : $log->getPresenter()->readable_runtime); } /** diff --git a/app/Http/Controllers/DeploymentController.php b/app/Http/Controllers/DeploymentController.php index fa03f2e68..fd9e2f1fb 100644 --- a/app/Http/Controllers/DeploymentController.php +++ b/app/Http/Controllers/DeploymentController.php @@ -60,7 +60,7 @@ public function show(Deployment $deployment) foreach ($step->servers as $server) { $server->server; - $server->runtime = (is_null($server->runtime()) ? null : $server->getPresenter()->readable_runtime); + $server->runtime = (!$server->runtime() ? null : $server->getPresenter()->readable_runtime); $server->output = ((is_null($server->output) || !strlen($server->output)) ? null : ''); $output[] = $server; @@ -128,7 +128,7 @@ public function deploy(Project $project) */ public function log(ServerLog $log) { - $log->runtime = (is_null($log->runtime()) ? null : $log->getPresenter()->readable_runtime); + $log->runtime = (!$log->runtime() ? null : $log->getPresenter()->readable_runtime); return $log; } diff --git a/app/Jobs/DeployProject.php b/app/Jobs/DeployProject.php index 86acbb4f6..68302b12a 100644 --- a/app/Jobs/DeployProject.php +++ b/app/Jobs/DeployProject.php @@ -19,7 +19,7 @@ use Symfony\Component\Process\Process; /** - * Deploys an actual project + * Deploys an actual project. * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * TODO: rewrite this as it is doing way too much and is very messy now. */ diff --git a/app/ServerLog.php b/app/ServerLog.php index 7dcd5063a..9a82a2417 100644 --- a/app/ServerLog.php +++ b/app/ServerLog.php @@ -74,7 +74,7 @@ public function server() public function runtime() { if (!$this->finished_at) { - return null; + return; } return $this->started_at->diffInSeconds($this->finished_at); From 0fb81001b0872ff0ae0b88b6a14e031c4721589a Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Fri, 19 Jun 2015 16:28:13 +0100 Subject: [PATCH 46/66] Run php-cs-fixer to add trailing comma to multiline arrays --- .php_cs | 2 +- app/CheckUrl.php | 12 +++++------ app/Command.php | 2 +- app/Console/Kernel.php | 2 +- app/DeployStep.php | 2 +- app/Events/ModelTrashed.php | 2 +- app/Heartbeat.php | 14 ++++++------- .../Controllers/Admin/GroupController.php | 2 +- .../Controllers/Admin/ProjectController.php | 4 ++-- app/Http/Controllers/Admin/UserController.php | 4 ++-- app/Http/Controllers/DashboardController.php | 6 +++--- app/Http/Controllers/DeploymentController.php | 8 ++++---- .../Resources/CheckUrlController.php | 2 +- .../Resources/CommandController.php | 10 +++++----- .../Resources/HeartbeatController.php | 2 +- .../Resources/NotificationController.php | 2 +- .../Resources/NotifyEmailController.php | 2 +- .../Resources/ProjectFileController.php | 2 +- .../Resources/ServerController.php | 6 +++--- .../Resources/SharedFilesController.php | 2 +- app/Http/Controllers/WebhookController.php | 4 ++-- app/Http/Middleware/VerifyCsrfToken.php | 2 +- app/Http/Requests/StoreCommandRequest.php | 2 +- app/Http/Requests/StoreGroupRequest.php | 2 +- app/Http/Requests/StoreHeartbeatRequest.php | 2 +- .../Requests/StoreNotificationRequest.php | 2 +- app/Http/Requests/StoreNotifyEmailRequest.php | 2 +- app/Http/Requests/StoreProjectFileRequest.php | 2 +- app/Http/Requests/StoreProjectRequest.php | 2 +- app/Http/Requests/StoreServerRequest.php | 2 +- app/Http/Requests/StoreSharedFileRequest.php | 2 +- app/Http/Requests/StoreUserRequest.php | 2 +- app/Http/routes.php | 20 +++++++++---------- app/Jobs/MailDeployNotification.php | 2 +- app/Jobs/Notify.php | 2 +- app/Listeners/Events/SendSignupEmail.php | 2 +- app/Notification.php | 2 +- app/Presenters/RuntimePresenter.php | 2 +- app/Project.php | 2 +- app/Providers/EventServiceProvider.php | 2 +- app/Server.php | 4 ++-- app/ServerLog.php | 2 +- 42 files changed, 77 insertions(+), 77 deletions(-) diff --git a/.php_cs b/.php_cs index b4336dd2e..09fbf4507 100644 --- a/.php_cs +++ b/.php_cs @@ -23,7 +23,7 @@ $fixers = [ 'join_function', 'list_commas', 'indentation', - '-multiline_array_trailing_comma', + 'multiline_array_trailing_comma', 'namespace_no_leading_whitespace', 'no_blank_lines_after_class_opening', 'no_empty_lines_after_phpdocs', diff --git a/app/CheckUrl.php b/app/CheckUrl.php index 2217d762f..6267ad287 100644 --- a/app/CheckUrl.php +++ b/app/CheckUrl.php @@ -34,7 +34,7 @@ class CheckUrl extends Model * @var array */ protected $casts = [ - 'is_report' => 'boolean' + 'is_report' => 'boolean', ]; /** @@ -66,11 +66,11 @@ public function notificationPayload() [ 'title' => Lang::get('notifications.project'), 'value' => sprintf('<%s|%s>', url('project', $this->project_id), $this->project->name), - 'short' => true - ] - ] - ] - ] + 'short' => true, + ], + ], + ], + ], ]; return $payload; diff --git a/app/Command.php b/app/Command.php index 2d9b61155..e45725cfd 100644 --- a/app/Command.php +++ b/app/Command.php @@ -47,7 +47,7 @@ class Command extends Model */ protected $casts = [ 'step' => 'integer', - 'optional' => 'boolean' + 'optional' => 'boolean', ]; /** diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index d2c4930ce..cb0720d16 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -33,7 +33,7 @@ class Kernel extends ConsoleKernel */ protected $commands = [ \App\Console\Commands\CheckHeartbeats::class, - \App\Console\Commands\CheckUrl::class + \App\Console\Commands\CheckUrl::class, ]; /** diff --git a/app/DeployStep.php b/app/DeployStep.php index 7da83cb86..424e3e1fc 100644 --- a/app/DeployStep.php +++ b/app/DeployStep.php @@ -18,7 +18,7 @@ class DeployStep extends Model implements PresentableInterface */ protected $casts = [ 'stage' => 'integer', - 'optional' => 'boolean' + 'optional' => 'boolean', ]; /** diff --git a/app/Events/ModelTrashed.php b/app/Events/ModelTrashed.php index 2841cf560..5aa48cb6a 100644 --- a/app/Events/ModelTrashed.php +++ b/app/Events/ModelTrashed.php @@ -25,7 +25,7 @@ public function __construct($model, $channel) { $this->model = [ 'id' => $model->id, - 'project_id' => $model->project_id + 'project_id' => $model->project_id, ]; $this->channel = $channel; diff --git a/app/Heartbeat.php b/app/Heartbeat.php index cbe55d50d..2ce8180d6 100644 --- a/app/Heartbeat.php +++ b/app/Heartbeat.php @@ -55,7 +55,7 @@ class Heartbeat extends Model */ protected $casts = [ 'status' => 'integer', - 'deploy_code' => 'boolean' + 'deploy_code' => 'boolean', ]; /** @@ -154,15 +154,15 @@ public function notificationPayload() [ 'title' => Lang::get('notifications.project'), 'value' => sprintf('<%s|%s>', url('project', $this->project_id), $this->project->name), - 'short' => true + 'short' => true, ], [ 'title' => Lang::get('heartbeats.last_check_in'), 'value' => $heard_from, - 'short' => true - ] - ] - ] - ] + 'short' => true, + ], + ], + ], + ], ]; return $payload; diff --git a/app/Http/Controllers/Admin/GroupController.php b/app/Http/Controllers/Admin/GroupController.php index 168b8f87d..af2d635aa 100644 --- a/app/Http/Controllers/Admin/GroupController.php +++ b/app/Http/Controllers/Admin/GroupController.php @@ -41,7 +41,7 @@ public function index() { return view('groups.listing', [ 'title' => Lang::get('groups.manage'), - 'groups' => $this->groupRepository->getAll() + 'groups' => $this->groupRepository->getAll(), ]); } diff --git a/app/Http/Controllers/Admin/ProjectController.php b/app/Http/Controllers/Admin/ProjectController.php index 7d5258125..1720a4826 100644 --- a/app/Http/Controllers/Admin/ProjectController.php +++ b/app/Http/Controllers/Admin/ProjectController.php @@ -26,7 +26,7 @@ public function index(ProjectRepositoryInterface $projectRepository) return view('projects.listing', [ 'title' => Lang::get('projects.manage'), - 'projects' => $projects->toJson() // Because PresentableInterface toJson() is not working in the view + 'projects' => $projects->toJson(), // Because PresentableInterface toJson() is not working in the view ]); } @@ -84,7 +84,7 @@ public function destroy(Project $project) $project->delete(); return [ - 'success' => true + 'success' => true, ]; } } diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index fb189337b..ae7e1538d 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -23,7 +23,7 @@ public function index() { return view('users.listing', [ 'title' => Lang::get('users.manage'), - 'users' => User::all() + 'users' => User::all(), ]); } @@ -90,7 +90,7 @@ public function destroy(User $user) $user->delete(); return [ - 'success' => true + 'success' => true, ]; } } diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 30aca0750..9e4b51b5d 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -38,7 +38,7 @@ public function index( return view('dashboard.index', [ 'title' => Lang::get('dashboard.title'), 'latest' => $this->buildTimelineData($deploymentRepository), - 'projects' => $projects_by_group + 'projects' => $projects_by_group, ]); } @@ -51,7 +51,7 @@ public function index( public function timeline(DeploymentRepositoryInterface $deploymentRepository) { return view('dashboard.timeline', [ - 'latest' => $this->buildTimelineData($deploymentRepository) + 'latest' => $this->buildTimelineData($deploymentRepository), ]); } @@ -94,7 +94,7 @@ public function cctray(ProjectRepositoryInterface $projectRepository) } return Response::view('cctray', [ - 'projects' => $projects + 'projects' => $projects, ])->header('Content-Type', 'application/xml'); } } diff --git a/app/Http/Controllers/DeploymentController.php b/app/Http/Controllers/DeploymentController.php index fd9e2f1fb..a6f273190 100644 --- a/app/Http/Controllers/DeploymentController.php +++ b/app/Http/Controllers/DeploymentController.php @@ -43,7 +43,7 @@ public function project(Project $project, DeploymentRepositoryInterface $deploym 'sharedFiles' => $project->shareFiles, 'projectFiles' => $project->projectFiles, 'checkUrls' => $project->checkUrls, - 'optional' => $optional + 'optional' => $optional, ]); } @@ -71,12 +71,12 @@ public function show(Deployment $deployment) return view('deployment.details', [ 'breadcrumb' => [ - ['url' => url('projects', $project->id), 'label' => $project->name] + ['url' => url('projects', $project->id), 'label' => $project->name], ], 'title' => Lang::get('deployments.details'), 'project' => $project, 'deployment' => $deployment, - 'output' => json_encode($output) // PresentableInterface does not correctly json encode the models + 'output' => json_encode($output), // PresentableInterface does not correctly json encode the models ]); } @@ -116,7 +116,7 @@ public function deploy(Project $project) )); return redirect()->route('deployment', [ - 'id' => $deployment->id + 'id' => $deployment->id, ]); } diff --git a/app/Http/Controllers/Resources/CheckUrlController.php b/app/Http/Controllers/Resources/CheckUrlController.php index e7e9bf9a8..ddf28aa18 100644 --- a/app/Http/Controllers/Resources/CheckUrlController.php +++ b/app/Http/Controllers/Resources/CheckUrlController.php @@ -71,7 +71,7 @@ public function destroy(CheckUrl $url) $url->delete(); return [ - 'success' => true + 'success' => true, ]; } } diff --git a/app/Http/Controllers/Resources/CommandController.php b/app/Http/Controllers/Resources/CommandController.php index 14ec7e5c6..f7670ffff 100644 --- a/app/Http/Controllers/Resources/CommandController.php +++ b/app/Http/Controllers/Resources/CommandController.php @@ -26,7 +26,7 @@ public function listing(Project $project, $action) 'clone' => Command::DO_CLONE, 'install' => Command::DO_INSTALL, 'activate' => Command::DO_ACTIVATE, - 'purge' => Command::DO_PURGE + 'purge' => Command::DO_PURGE, ]; // fixme: use a repository @@ -38,12 +38,12 @@ public function listing(Project $project, $action) return view('commands.listing', [ 'breadcrumb' => [ - ['url' => url('projects', $project->id), 'label' => $project->name] + ['url' => url('projects', $project->id), 'label' => $project->name], ], 'title' => Lang::get('commands.' . strtolower($action)), 'project' => $project, 'action' => $types[$action], - 'commands' => $commands + 'commands' => $commands, ]); } @@ -122,7 +122,7 @@ public function destroy(Command $command) $command->delete(); return [ - 'success' => true + 'success' => true, ]; } @@ -146,7 +146,7 @@ public function reorder() } return [ - 'success' => true + 'success' => true, ]; } } diff --git a/app/Http/Controllers/Resources/HeartbeatController.php b/app/Http/Controllers/Resources/HeartbeatController.php index f672cab89..3a34da5a1 100644 --- a/app/Http/Controllers/Resources/HeartbeatController.php +++ b/app/Http/Controllers/Resources/HeartbeatController.php @@ -69,7 +69,7 @@ public function destroy(Heartbeat $heartbeat) $heartbeat->delete(); return [ - 'success' => true + 'success' => true, ]; } } diff --git a/app/Http/Controllers/Resources/NotificationController.php b/app/Http/Controllers/Resources/NotificationController.php index c03321c61..752992765 100644 --- a/app/Http/Controllers/Resources/NotificationController.php +++ b/app/Http/Controllers/Resources/NotificationController.php @@ -59,7 +59,7 @@ public function destroy(Notification $notification) $notification->delete(); return [ - 'success' => true + 'success' => true, ]; } } diff --git a/app/Http/Controllers/Resources/NotifyEmailController.php b/app/Http/Controllers/Resources/NotifyEmailController.php index f38de41f8..6bbb5251e 100644 --- a/app/Http/Controllers/Resources/NotifyEmailController.php +++ b/app/Http/Controllers/Resources/NotifyEmailController.php @@ -53,7 +53,7 @@ public function destroy(NotifyEmail $notify_email) $notify_email->delete(); return [ - 'success' => true + 'success' => true, ]; } } diff --git a/app/Http/Controllers/Resources/ProjectFileController.php b/app/Http/Controllers/Resources/ProjectFileController.php index fae69b225..e3f74b31d 100644 --- a/app/Http/Controllers/Resources/ProjectFileController.php +++ b/app/Http/Controllers/Resources/ProjectFileController.php @@ -53,7 +53,7 @@ public function destroy(ProjectFile $file) $file->delete(); return [ - 'success' => true + 'success' => true, ]; } } diff --git a/app/Http/Controllers/Resources/ServerController.php b/app/Http/Controllers/Resources/ServerController.php index d2ddd96bb..2c72383dc 100644 --- a/app/Http/Controllers/Resources/ServerController.php +++ b/app/Http/Controllers/Resources/ServerController.php @@ -82,7 +82,7 @@ public function destroy(Server $server) $server->delete(); return [ - 'success' => true + 'success' => true, ]; } @@ -102,7 +102,7 @@ public function test(Server $server) } return [ - 'success' => true + 'success' => true, ]; } @@ -126,7 +126,7 @@ public function reorder() } return [ - 'success' => true + 'success' => true, ]; } } diff --git a/app/Http/Controllers/Resources/SharedFilesController.php b/app/Http/Controllers/Resources/SharedFilesController.php index 7169de386..a7e27408f 100644 --- a/app/Http/Controllers/Resources/SharedFilesController.php +++ b/app/Http/Controllers/Resources/SharedFilesController.php @@ -53,7 +53,7 @@ public function destroy(SharedFile $file) $file->delete(); return [ - 'success' => true + 'success' => true, ]; } } diff --git a/app/Http/Controllers/WebhookController.php b/app/Http/Controllers/WebhookController.php index 73ba1ce8b..07c149cc9 100644 --- a/app/Http/Controllers/WebhookController.php +++ b/app/Http/Controllers/WebhookController.php @@ -45,7 +45,7 @@ public function webhook($hash) } return [ - 'success' => $success + 'success' => $success, ]; } @@ -61,7 +61,7 @@ public function refresh(Project $project) $project->save(); return [ - 'url' => route('webhook', $project->hash) + 'url' => route('webhook', $project->hash), ]; } } diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 1b7b417a0..6b81a9213 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -15,6 +15,6 @@ class VerifyCsrfToken extends BaseVerifier * @var array */ protected $except = [ - 'deploy/*' + 'deploy/*', ]; } diff --git a/app/Http/Requests/StoreCommandRequest.php b/app/Http/Requests/StoreCommandRequest.php index 7f0639432..aac462182 100644 --- a/app/Http/Requests/StoreCommandRequest.php +++ b/app/Http/Requests/StoreCommandRequest.php @@ -22,7 +22,7 @@ public function rules() 'user' => 'required|max:255', 'script' => 'required', 'step' => 'required|integer|min:' . Command::BEFORE_CLONE . '|max:' . Command::AFTER_PURGE, - 'project_id' => 'required|integer|exists:projects,id' + 'project_id' => 'required|integer|exists:projects,id', ]; // On edit we don't require the step or the project_id diff --git a/app/Http/Requests/StoreGroupRequest.php b/app/Http/Requests/StoreGroupRequest.php index 2d5dc7f08..2e0b7f0f5 100644 --- a/app/Http/Requests/StoreGroupRequest.php +++ b/app/Http/Requests/StoreGroupRequest.php @@ -17,7 +17,7 @@ class StoreGroupRequest extends Request public function rules() { $rules = [ - 'name' => 'required|max:255|unique:groups,name' + 'name' => 'required|max:255|unique:groups,name', ]; // On edit add the group ID to the rules diff --git a/app/Http/Requests/StoreHeartbeatRequest.php b/app/Http/Requests/StoreHeartbeatRequest.php index 9a1e6f760..2e6f6287a 100644 --- a/app/Http/Requests/StoreHeartbeatRequest.php +++ b/app/Http/Requests/StoreHeartbeatRequest.php @@ -19,7 +19,7 @@ public function rules() return [ 'name' => 'required|max:255', 'interval' => 'required|integer', - 'project_id' => 'required|integer|exists:projects,id' + 'project_id' => 'required|integer|exists:projects,id', ]; } } diff --git a/app/Http/Requests/StoreNotificationRequest.php b/app/Http/Requests/StoreNotificationRequest.php index c06813ee8..57f79a548 100644 --- a/app/Http/Requests/StoreNotificationRequest.php +++ b/app/Http/Requests/StoreNotificationRequest.php @@ -21,7 +21,7 @@ public function rules() 'name' => 'required|max:255', 'channel' => 'required|max:255', 'webhook' => 'required|url', - 'project_id' => 'required|integer|exists:projects,id' + 'project_id' => 'required|integer|exists:projects,id', ]; } } diff --git a/app/Http/Requests/StoreNotifyEmailRequest.php b/app/Http/Requests/StoreNotifyEmailRequest.php index 843b38775..61fc3f8cf 100644 --- a/app/Http/Requests/StoreNotifyEmailRequest.php +++ b/app/Http/Requests/StoreNotifyEmailRequest.php @@ -19,7 +19,7 @@ public function rules() return [ 'name' => 'required|max:255', 'email' => 'required|email', - 'project_id' => 'required|integer|exists:projects,id' + 'project_id' => 'required|integer|exists:projects,id', ]; } } diff --git a/app/Http/Requests/StoreProjectFileRequest.php b/app/Http/Requests/StoreProjectFileRequest.php index d8702451d..14b8e0709 100644 --- a/app/Http/Requests/StoreProjectFileRequest.php +++ b/app/Http/Requests/StoreProjectFileRequest.php @@ -20,7 +20,7 @@ public function rules() 'name' => 'required|max:255', 'path' => 'required', 'content' => 'required', - 'project_id' => 'required|integer|exists:projects,id' + 'project_id' => 'required|integer|exists:projects,id', ]; } } diff --git a/app/Http/Requests/StoreProjectRequest.php b/app/Http/Requests/StoreProjectRequest.php index 4e4dd5f6d..a728b3788 100644 --- a/app/Http/Requests/StoreProjectRequest.php +++ b/app/Http/Requests/StoreProjectRequest.php @@ -57,7 +57,7 @@ public function rules() 'group_id' => 'required|integer|exists:groups,id', 'builds_to_keep' => 'required|integer|min:1|max:20', 'url' => 'url', - 'build_url' => 'url' + 'build_url' => 'url', ]; } } diff --git a/app/Http/Requests/StoreServerRequest.php b/app/Http/Requests/StoreServerRequest.php index fd505ee03..2bbbae847 100644 --- a/app/Http/Requests/StoreServerRequest.php +++ b/app/Http/Requests/StoreServerRequest.php @@ -47,7 +47,7 @@ public function rules() 'user' => 'required|max:255', 'ip_address' => 'required|host', 'path' => 'required', - 'project_id' => 'required|integer|exists:projects,id' + 'project_id' => 'required|integer|exists:projects,id', ]; } } diff --git a/app/Http/Requests/StoreSharedFileRequest.php b/app/Http/Requests/StoreSharedFileRequest.php index 6ec83c5b0..3d18fac5a 100644 --- a/app/Http/Requests/StoreSharedFileRequest.php +++ b/app/Http/Requests/StoreSharedFileRequest.php @@ -19,7 +19,7 @@ public function rules() return [ 'name' => 'required|max:255', 'file' => 'required', - 'project_id' => 'required|integer|exists:projects,id' + 'project_id' => 'required|integer|exists:projects,id', ]; } } diff --git a/app/Http/Requests/StoreUserRequest.php b/app/Http/Requests/StoreUserRequest.php index 09f2b75e8..b87e34f23 100644 --- a/app/Http/Requests/StoreUserRequest.php +++ b/app/Http/Requests/StoreUserRequest.php @@ -20,7 +20,7 @@ public function rules() $rules = [ 'name' => 'required|max:255', 'email' => 'required|email|max:255|unique:users,email', - 'password' => 'required|confirmed|min:6' + 'password' => 'required|confirmed|min:6', ]; // On edit change the password validator diff --git a/app/Http/routes.php b/app/Http/routes.php index 2d6e44a9a..3347a4ed1 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -22,13 +22,13 @@ Route::post('projects/{projects}/deploy', [ 'as' => 'deploy', - 'uses' => 'DeploymentController@deploy' + 'uses' => 'DeploymentController@deploy', ]); // Deployment details Route::get('deployment/{deployments}', [ 'as' => 'deployment', - 'uses' => 'DeploymentController@show' + 'uses' => 'DeploymentController@show', ]); Route::get('log/{log}', 'DeploymentController@log'); @@ -39,14 +39,14 @@ Route::get('projects/{projects}/commands/{step}', [ 'as' => 'commands', - 'uses' => 'CommandController@listing' + 'uses' => 'CommandController@listing', ]); Route::post('servers/reorder', 'ServerController@reorder'); Route::get('servers/{servers}/test', 'ServerController@test'); $actions = [ - 'only' => ['store', 'update', 'destroy'] + 'only' => ['store', 'update', 'destroy'], ]; Route::resource('servers', 'ServerController', $actions); @@ -62,15 +62,15 @@ Route::group(['prefix' => 'admin', 'namespace' => 'Admin'], function () { Route::resource('projects', 'ProjectController', [ - 'only' => ['index', 'store', 'update', 'destroy'] + 'only' => ['index', 'store', 'update', 'destroy'], ]); Route::resource('users', 'UserController', [ - 'only' => ['index', 'store', 'update', 'destroy'] + 'only' => ['index', 'store', 'update', 'destroy'], ]); Route::resource('groups', 'GroupController', [ - 'only' => ['index', 'store', 'update'] + 'only' => ['index', 'store', 'update'], ]); }); @@ -80,7 +80,7 @@ // Webhooks Route::post('deploy/{hash}', [ 'as' => 'webhook', - 'uses' => 'WebhookController@webhook' + 'uses' => 'WebhookController@webhook', ]); Route::get('cctray.xml', 'DashboardController@cctray'); @@ -88,11 +88,11 @@ Route::group(['namespace' => 'Resources'], function () { Route::get('heartbeat/{hash}', [ 'as' => 'heartbeat', - 'uses' => 'HeartbeatController@ping' + 'uses' => 'HeartbeatController@ping', ]); }); Route::controllers([ 'auth' => 'Auth\AuthController', - 'password' => 'Auth\PasswordController' + 'password' => 'Auth\PasswordController', ]); diff --git a/app/Jobs/MailDeployNotification.php b/app/Jobs/MailDeployNotification.php index 01b587589..70f41cc03 100644 --- a/app/Jobs/MailDeployNotification.php +++ b/app/Jobs/MailDeployNotification.php @@ -52,7 +52,7 @@ public function handle() $data = [ 'project' => $this->project->toArray(), - 'deployment' => $deploymentArr + 'deployment' => $deploymentArr, ]; Mail::queueOn( diff --git a/app/Jobs/Notify.php b/app/Jobs/Notify.php index e7b99356f..9d751aaa7 100644 --- a/app/Jobs/Notify.php +++ b/app/Jobs/Notify.php @@ -41,7 +41,7 @@ public function __construct(Notification $notification, array $payload) public function handle() { $payload = [ - 'channel' => $this->notification->channel + 'channel' => $this->notification->channel, ]; if (!empty($this->notification->icon)) { diff --git a/app/Listeners/Events/SendSignupEmail.php b/app/Listeners/Events/SendSignupEmail.php index 0b4c5c1b2..a9786210d 100644 --- a/app/Listeners/Events/SendSignupEmail.php +++ b/app/Listeners/Events/SendSignupEmail.php @@ -38,7 +38,7 @@ public function handle(UserWasCreated $event) $data = [ 'password' => $event->password, - 'email' => $user->email + 'email' => $user->email, ]; Mail::queueOn( diff --git a/app/Notification.php b/app/Notification.php index a832e646c..db2aaa013 100644 --- a/app/Notification.php +++ b/app/Notification.php @@ -36,7 +36,7 @@ class Notification extends Model * @var array */ protected $casts = [ - 'failure_only' => 'boolean' + 'failure_only' => 'boolean', ]; /** diff --git a/app/Presenters/RuntimePresenter.php b/app/Presenters/RuntimePresenter.php index faaac3745..d8c3e0dea 100644 --- a/app/Presenters/RuntimePresenter.php +++ b/app/Presenters/RuntimePresenter.php @@ -29,7 +29,7 @@ public function presentReadableRuntime() 'day' => 24 * 3600, 'hour' => 3600, 'minute' => 60, - 'second' => 1 + 'second' => 1, ]; if ($seconds === 0) { diff --git a/app/Project.php b/app/Project.php index 4124af899..fdc84b680 100644 --- a/app/Project.php +++ b/app/Project.php @@ -30,7 +30,7 @@ class Project extends ProjectRelation implements PresentableInterface protected $hidden = ['private_key', 'created_at', 'deleted_at', 'updated_at', 'hash', 'updated_at', 'servers', 'commands', 'hash', 'notifyEmails', 'group', 'servers', 'commands', 'heartbeats', 'checkUrls', - 'notifications', 'deployments', 'shareFiles', 'projectFiles']; + 'notifications', 'deployments', 'shareFiles', 'projectFiles', ]; /** * The attributes that are mass assignable. diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index adc5756e6..70dca6558 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -20,7 +20,7 @@ class EventServiceProvider extends ServiceProvider 'App\Listeners\Events\SendSignupEmail', ], 'App\Events\DeployFinished' => [ - 'App\Listeners\Events\Notify' + 'App\Listeners\Events\Notify', ], ]; diff --git a/app/Server.php b/app/Server.php index 66997d3a6..44aa66b5a 100644 --- a/app/Server.php +++ b/app/Server.php @@ -31,7 +31,7 @@ class Server extends Model * @var array */ protected $fillable = ['name', 'user', 'ip_address', 'project_id', 'path', - 'status', 'deploy_code', 'port', 'order']; + 'status', 'deploy_code', 'port', 'order', ]; /** * The attributes that should be casted to native types. @@ -40,7 +40,7 @@ class Server extends Model */ protected $casts = [ 'status' => 'integer', - 'deploy_code' => 'boolean' + 'deploy_code' => 'boolean', ]; /** diff --git a/app/ServerLog.php b/app/ServerLog.php index 9a82a2417..e7f779b36 100644 --- a/app/ServerLog.php +++ b/app/ServerLog.php @@ -39,7 +39,7 @@ class ServerLog extends Model implements PresentableInterface, RuntimeInterface * @var array */ protected $casts = [ - 'status' => 'integer' + 'status' => 'integer', ]; /** From c705ede2b6a197ee5a6aac0d606eab4a47fb3e26 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Fri, 19 Jun 2015 16:35:23 +0100 Subject: [PATCH 47/66] Show on the server list whether code is deployed to the server --- resources/lang/en/servers.php | 2 +- resources/views/projects/_partials/servers.blade.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/lang/en/servers.php b/resources/lang/en/servers.php index 0837778e0..10d884945 100644 --- a/resources/lang/en/servers.php +++ b/resources/lang/en/servers.php @@ -19,7 +19,7 @@ 'testing' => 'Testing', 'failed' => 'Failed', 'untested' => 'Untested', - 'deploy_code' => 'Deploy code', + 'deploy_code' => 'Deploy Code', 'deploy_description' => 'Whether or not the code should be deployed to this server' ]; diff --git a/resources/views/projects/_partials/servers.blade.php b/resources/views/projects/_partials/servers.blade.php index 2e74998f0..5d55bd46d 100644 --- a/resources/views/projects/_partials/servers.blade.php +++ b/resources/views/projects/_partials/servers.blade.php @@ -18,6 +18,7 @@ {{ Lang::get('servers.connect_as') }} {{ Lang::get('servers.ip_address') }} {{ Lang::get('servers.port') }} + {{ Lang::get('servers.deploy_code') }} {{ Lang::get('servers.status') }}   @@ -34,6 +35,13 @@ <%- user %> <%- ip_address %> <%- port %> + + <% if (deploy_code) { %> + {{ Lang::get('app.yes') }} + <% } else { %> + {{ Lang::get('app.no') }} + <% } %> + <%- status %> From a46b3c775feab10df6516779a8334be42d88af79 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Fri, 19 Jun 2015 16:35:36 +0100 Subject: [PATCH 48/66] Shows whether the command is optional --- resources/views/commands/_partials/list.blade.php | 1 + resources/views/commands/listing.blade.php | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/resources/views/commands/_partials/list.blade.php b/resources/views/commands/_partials/list.blade.php index 71b53161b..8a84d5a80 100644 --- a/resources/views/commands/_partials/list.blade.php +++ b/resources/views/commands/_partials/list.blade.php @@ -17,6 +17,7 @@ {{ Lang::get('commands.name') }} {{ Lang::get('commands.run_as') }} + {{ Lang::get('commands.optional') }}   diff --git a/resources/views/commands/listing.blade.php b/resources/views/commands/listing.blade.php index e4bef4384..217f510a6 100644 --- a/resources/views/commands/listing.blade.php +++ b/resources/views/commands/listing.blade.php @@ -11,6 +11,13 @@