From 639140677410f11955947980aa47356e1136c32e Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Wed, 9 Aug 2017 12:16:43 +0200 Subject: Add two more project templates Related to !13108. Mostly this is just running the rake task and changing the task a bit to catch cases like the project already existing or so. The rake task moves archives to the vendor/project_template directory, which are checked in too. --- app/views/shared/icons/_express.svg | 6 ++++++ app/views/shared/icons/_java_spring.svg | 6 ------ app/views/shared/icons/_node_express.svg | 6 ------ app/views/shared/icons/_spring.svg | 6 ++++++ lib/gitlab/project_template.rb | 4 +++- lib/tasks/gitlab/update_templates.rake | 9 +++++++-- spec/lib/gitlab/project_template_spec.rb | 4 +++- vendor/project_templates/express.tar.gz | Bin 0 -> 4572 bytes vendor/project_templates/spring.tar.gz | Bin 0 -> 49882 bytes 9 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 app/views/shared/icons/_express.svg delete mode 100644 app/views/shared/icons/_java_spring.svg delete mode 100644 app/views/shared/icons/_node_express.svg create mode 100644 app/views/shared/icons/_spring.svg create mode 100644 vendor/project_templates/express.tar.gz create mode 100644 vendor/project_templates/spring.tar.gz diff --git a/app/views/shared/icons/_express.svg b/app/views/shared/icons/_express.svg new file mode 100644 index 00000000000..f2c94319f19 --- /dev/null +++ b/app/views/shared/icons/_express.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/views/shared/icons/_java_spring.svg b/app/views/shared/icons/_java_spring.svg deleted file mode 100644 index 508349aa456..00000000000 --- a/app/views/shared/icons/_java_spring.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/views/shared/icons/_node_express.svg b/app/views/shared/icons/_node_express.svg deleted file mode 100644 index f2c94319f19..00000000000 --- a/app/views/shared/icons/_node_express.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/views/shared/icons/_spring.svg b/app/views/shared/icons/_spring.svg new file mode 100644 index 00000000000..508349aa456 --- /dev/null +++ b/app/views/shared/icons/_spring.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index cf461adf697..732fbf68dad 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -25,7 +25,9 @@ module Gitlab end TEMPLATES_TABLE = [ - ProjectTemplate.new('rails', 'Ruby on Rails') + ProjectTemplate.new('rails', 'Ruby on Rails'), + ProjectTemplate.new('spring', 'Spring'), + ProjectTemplate.new('express', 'NodeJS Express') ].freeze class << self diff --git a/lib/tasks/gitlab/update_templates.rake b/lib/tasks/gitlab/update_templates.rake index a7e30423c7a..f44abc2b81b 100644 --- a/lib/tasks/gitlab/update_templates.rake +++ b/lib/tasks/gitlab/update_templates.rake @@ -21,13 +21,18 @@ namespace :gitlab do params = { import_url: template.clone_url, namespace_id: admin.namespace.id, - path: template.title, + path: template.name, skip_wiki: true } - puts "Creating project for #{template.name}" + puts "Creating project for #{template.title}" project = Projects::CreateService.new(admin, params).execute + unless project.persisted? + puts project.errors.messages + exit(1) + end + loop do if project.finished? puts "Import finished for #{template.name}" diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 12e75cdd5d0..d19bd611919 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -4,7 +4,9 @@ describe Gitlab::ProjectTemplate do describe '.all' do it 'returns a all templates' do expected = [ - described_class.new('rails', 'Ruby on Rails') + described_class.new('rails', 'Ruby on Rails'), + described_class.new('spring', 'Spring'), + described_class.new('express', 'NodeJS Express') ] expect(described_class.all).to be_an(Array) diff --git a/vendor/project_templates/express.tar.gz b/vendor/project_templates/express.tar.gz new file mode 100644 index 00000000000..6353f6605d5 Binary files /dev/null and b/vendor/project_templates/express.tar.gz differ diff --git a/vendor/project_templates/spring.tar.gz b/vendor/project_templates/spring.tar.gz new file mode 100644 index 00000000000..d7c0ab74d01 Binary files /dev/null and b/vendor/project_templates/spring.tar.gz differ -- cgit v1.2.1