shipit-engine 0.32.0 → 0.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98113cef0ad013fa29cb11fea22f09547c191310a601eb788a53fdc5fb3c7e40
-  data.tar.gz: 39c68de0e6356e1daab40942a817af86258ea8219726c1e4276a42bba5d79315
+  metadata.gz: 7ab32590ea528100fc22999f40a17d9ffcefb72313672eb4858befdb9a6932e1
+  data.tar.gz: fe6fe3d4b026e0e2d0ecb067639d97027649d26fd785c90b9e198ce0e478c2a9
 SHA512:
-  metadata.gz: 29504e17c71d378485e8610edea95e25e215f5c391478244e609a95a847e3022b508bda95713db97e1f1de22f67c8eed310a562f82cf737e1425803e958341ce
-  data.tar.gz: a7ea41b8ddcf21803a1279cd74d53231c9e030165c06b2ff835f31db55b0cf2240ca802626fba50abaec6b0e5c09e1439900de22c9d3b7719f53b6e2fe524da8
+  metadata.gz: a51d622ab862751d118d2d0995361366d8035481f090ddfcaa09f01b672c326ed1708c4085831a195899500762cd29b6247c01710e08260b5baf263d2363cc33
+  data.tar.gz: 327aac9271b84975c388c0dbb42c380f99c00d15b1ce6930bba6877066d0333b3c60efcaf8ab56e925d17e90ac1462c48cbccb9ec5da1537c04f45fe6149c49b

data/README.md

@@ -12,7 +12,7 @@ Shipit is compatible with just about anything that you can deploy using a script
 
 This guide aims to help you [set up](#installation-and-setup), [use](#using-shipit), and [understand](#reference) Shipit.
 
-*Shipit requires a database (MySQL, PostgreSQL or SQLite3), redis, and Ruby 2.1 or superior.*
+*Shipit requires a database (MySQL, PostgreSQL or SQLite3), redis, and Ruby 2.6 or superior.*
 
 * * *
 <h2 id="toc">Table of contents</h2>
@@ -270,7 +270,9 @@ deploy:
 ```
 <br>
 
-**<code>deploy.max_commits</code>** defines the maximum number of commits that should be shipped per deploys. Defaults to `8`.
+**<code>deploy.max_commits</code>** defines the maximum number of commits that should be shipped per deploy. Defaults to `8` if no value is provided.
+
+To disable this limit, you can use use an explicit null value: `max_commits: null`. Continuous Delivery will then deploy any number of commits.
 
 Human users will be warned that they are not respecting the recommendation, but allowed to continue.
 However continuous delivery will respect this limit. If there is no deployable commits in this range, a human intervention will be required.
@@ -292,6 +294,15 @@ deploy:
   interval: 5m
 ```
 
+**<code>deploy.retries</code>** enables retries for a stack, and defines the maximum amount of times that Shipit will retry a deploy that finished with a `failed`, `error` or `timedout` status.
+
+For example, this will retry a deploy twice if it fails.
+
+```yaml
+deploy:
+  retries: 2
+```
+
 **<code>rollback.override</code>** contains an array of the shell commands required to rollback the application to a previous state. Shipit will try to infer it from the repository structure, but you can change the default inference. This key defaults to `disabled` unless Capistrano is detected.
 
 For example:

data/app/assets/images/magic-solid.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="magic" class="svg-inline--fa fa-magic fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M224 96l16-32 32-16-32-16-16-32-16 32-32 16 32 16 16 32zM80 160l26.66-53.33L160 80l-53.34-26.67L80 0 53.34 53.33 0 80l53.34 26.67L80 160zm352 128l-26.66 53.33L352 368l53.34 26.67L432 448l26.66-53.33L512 368l-53.34-26.67L432 288zm70.62-193.77L417.77 9.38C411.53 3.12 403.34 0 395.15 0c-8.19 0-16.38 3.12-22.63 9.38L9.38 372.52c-12.5 12.5-12.5 32.76 0 45.25l84.85 84.85c6.25 6.25 14.44 9.37 22.62 9.37 8.19 0 16.38-3.12 22.63-9.37l363.14-363.15c12.5-12.48 12.5-32.75 0-45.24zM359.45 203.46l-50.91-50.91 86.6-86.6 50.91 50.91-86.6 86.6z"></path></svg>

data/app/assets/javascripts/shipit/repositories_search.js.coffee

@@ -0,0 +1,60 @@
+KEY =
+  UP: 38
+  DOWN: 40
+  ENTER: 13
+
+class RepositorySearch
+
+  constructor: (root) ->
+    @$root = $(root)
+    @$root.on('keyup', '.repository-search', @onKeyUp)
+    @$root.on('click', '.show-all-repositories', (event) =>
+      @$root.find('.not-matching').removeClass('not-matching')
+      event.preventDefault()
+    )
+
+  onKeyUp: (event) =>
+    @$items = @$root.find('[data-search]')
+    switch event.keyCode
+      when KEY.ENTER
+        event.preventDefault()
+        @goToSelectedRepository()
+      when KEY.UP
+        event.preventDefault()
+        @selectPrevious()
+      when KEY.DOWN
+        event.preventDefault()
+        @selectNext()
+      else
+        @filterResults($.trim($(event.target).val()).toLowerCase())
+
+  filterResults: (query) ->
+    if query
+      for item in @$items
+        $item = $(item)
+        $item.toggleClass('not-matching', query not in $item.attr('data-search').toLowerCase())
+      @selectFirst()
+    else
+      @$items.removeClass('not-matching')
+
+  selectFirst: ->
+    @$items.removeClass('selected').first(':not(.not-matching)').addClass('selected')
+
+  selectNext: ->
+    $next = @$items.filter('.selected').removeClass('selected').nextAll(':not(.not-matching)').first()
+    $next = @$items.filter(':not(.not-matching)').first() unless $next.length
+    $next.addClass('selected')
+
+  selectPrevious: ->
+    $previous = @$items.filter('.selected').removeClass('selected').prevAll(':not(.not-matching)').first()
+    $previous = @$items.filter(':not(.not-matching)').last() unless $previous.length
+    $previous.addClass('selected')
+
+  goToSelectedRepository: ->
+    if repository = @$items.filter('.selected').filter(':not(.not-matching)').find('.commits-path').attr('href')
+      window.location = repository
+
+search = new RepositorySearch(document)
+
+jQuery ->
+  $('.repository-search').focus()

data/app/assets/stylesheets/_pages/_deploy.scss

@@ -67,7 +67,8 @@
 }
 
 .deploy-banner {
-  height: 4rem;
+  min-height: 4rem;
+  height: auto;
   background-color: #f0f4f7;
   display: flex;
   justify-content: center;
@@ -196,8 +197,6 @@
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  padding-right: 20px;
-  padding-left: 15px;
 }
 
 .commit-checks {

data/app/assets/stylesheets/_pages/_repositories.scss

@@ -0,0 +1,148 @@
+.repository-search {
+  -webkit-appearance: none;
+  width: 100%;
+  @extend h1;
+  border: none;
+  font-family: "Helvetica Neue", sans-serif;
+  font-weight: 200;
+  background: asset-data-url('search.svg') no-repeat center right;
+  &::-webkit-input-placeholder {
+    color: #B5C0CA;
+  }
+  &:focus {
+    outline: none;
+    background-image: asset-data-url('search-active.svg');
+  }
+}
+
+.repository-table-header {
+  @include clearfix;
+  margin: 0; padding: 1.25rem 0 1rem;
+  .col {
+    width: 25%;
+    float: left;
+  }
+  li {
+    list-style-type: none;
+    font-size: .875em;
+    color: #BAC5D1;
+  }
+}
+
+.repository-lst {
+  list-style-type: none;
+  margin: 0; padding: 0; margin-bottom: 1.5rem;
+    .col {
+      width: 25%;
+      float: left;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      padding-right: .5rem;
+      box-sizing: border-box;
+    }
+    .undeployed {
+      background-image: asset-data-url('ship.png');
+      background-repeat: no-repeat;
+      background-size: 22px 22px;
+      background-position: 0px center;
+      padding-left: 30px;
+      margin-left: -30px;
+    }
+    .archived {
+      // From FontAwesome, license @ https://fontawesome.com/license/free
+      background-image: asset-data-url('archive-solid.svg');
+      background-repeat: no-repeat;
+      background-size: 22px 22px;
+      background-position: 0px center;
+      padding-left: 30px;
+      margin-left: -30px;
+    }
+    .auto-provisioned {
+      // From FontAwesome, license @ https://fontawesome.com/license/free
+      background-image: asset-data-url('magic-solid.svg');
+      background-repeat: no-repeat;
+      background-size: 22px 22px;
+      background-position: 0px center;
+      padding-left: 30px;
+      margin-left: -30px;
+    }
+}
+
+.repository-lst:empty:before {
+  content: "No environment to deploy to, Shipit Squirrel is displeased";
+}
+
+.repository-lst li {
+  &:nth-child(even) a {
+    background-color: lighten(#EDF1F3, 3.5%);
+  }
+
+  &.selected a {
+    background-color: $blue;
+    outline: none;
+    span { color: #fff; }
+    small { color: rgba(#fff, .8); }
+  }
+
+  a {
+  padding: .35rem;
+  margin-left: -0.35rem; margin-right: -0.35rem;
+  @include clearfix;
+  border-radius: 4px;
+  display: block;
+    &:hover, &:focus {
+      background-color: $blue;
+      outline: none;
+      span { color: #fff; }
+      small { color: rgba(#fff, .8); }
+    }
+  }
+}
+
+.repository-search input {
+  margin-left: 4%;
+  width: 92%;
+  padding: 6px;
+  font-size: larger;
+  -moz-border-radius: 8px;
+  -webkit-border-radius: 8px;
+  border-radius: 8px;
+  outline: 0;
+  border: 1px #a0a0a0 solid;
+}
+
+.repository-search-header {
+  display: none;
+}
+
+.show-all-repositories {
+  display: none;
+}
+
+.filtering-enabled {
+  .show-all-repositories {
+    display: inline-block;
+  }
+
+  .repository-search-header {
+    display: block;
+  }
+  .search-item.not-matching {
+    display: none;
+  }
+}
+
+.new_repository {
+  input.repo {
+    width: 200px;
+    display: inline;
+
+    &:focus {
+      padding-right: 30px !important;
+    }
+  }
+  input:focus {
+    border-color: $blue;
+  }
+}

data/app/assets/stylesheets/_pages/_stacks.scss

@@ -58,6 +58,15 @@
       padding-left: 30px;
       margin-left: -30px;
     }
+    .auto-provisioned {
+      // From FontAwesome, license @ https://fontawesome.com/license/free
+      background-image: asset-data-url('magic-solid.svg');
+      background-repeat: no-repeat;
+      background-size: 22px 22px;
+      background-position: 0px center;
+      padding-left: 30px;
+      margin-left: -30px;
+    }
 }
 
 .stack-lst:empty:before {
@@ -193,6 +202,16 @@
   @include clearfix;
 }
 
+.auto-provisioned {
+  // From FontAwesome, license @ https://fontawesome.com/license/free
+  background-image: asset-data-url('magic-solid.svg');
+  background-repeat: no-repeat;
+  background-size: 22px 22px;
+  background-position: 0px center;
+  padding-left: 30px;
+  margin-left: 5px;
+}
+
 /* STATS */
 
 .stats {

data/app/assets/stylesheets/shipit.scss

@@ -17,4 +17,5 @@
 @import "_pages/_commits";
 @import "_pages/_settings";
 @import "_pages/_stacks";
+@import "_pages/_repositories";
 @import "_pages/_deploy";

data/app/controllers/shipit/api/ccmenu_controller.rb

@@ -20,7 +20,7 @@ module Shipit
 
       def show
         latest_deploy = stack.deploys_and_rollbacks.last || NoDeploy.new
-        render('shipit/ccmenu/project.xml.builder', formats: [:xml], locals: { stack: stack, deploy: latest_deploy })
+        render('shipit/ccmenu/project', formats: [:xml], locals: { stack: stack, deploy: latest_deploy })
       end
 
       private

data/app/controllers/shipit/api/deploys_controller.rb

@@ -11,11 +11,13 @@ module Shipit
       params do
         requires :sha, String, length: { in: 6..40 }
         accepts :force, Boolean, default: false
+        accepts :require_ci, Boolean, default: false
         accepts :env, Hash, default: {}
       end
       def create
         commit = stack.commits.by_sha(params.sha) || param_error!(:sha, 'Unknown revision')
         param_error!(:force, "Can't deploy a locked stack") if !params.force && stack.locked?
+        param_error!(:require_ci, "Commit is not deployable") if params.require_ci && !commit.deployable?
         deploy = stack.trigger_deploy(commit, current_user, env: params.env, force: params.force)
         render_resource(deploy, status: :accepted)
       end

data/app/controllers/shipit/api/{pull_requests_controller.rb → merge_requests_controller.rb}

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 module Shipit
   module Api
-    class PullRequestsController < BaseController
+    class MergeRequestsController < BaseController
       require_permission :read, :stack
       require_permission :deploy, :stack, only: %i(update destroy)
 
       def index
-        render_resources(stack.pull_requests.includes(:head).order(id: :desc))
+        render_resources(stack.merge_requests.includes(:head).order(id: :desc))
       end
 
       def show
-        render_resource(stack.pull_requests.find_by!(number: params[:id]))
+        render_resource(stack.merge_requests.find_by!(number: params[:id]))
       end
 
       def update
-        pull_request = PullRequest.request_merge!(stack, params[:id], current_user)
-        if pull_request.waiting?
+        merge_request = MergeRequest.request_merge!(stack, params[:id], current_user)
+        if merge_request.waiting?
           head(:accepted)
-        elsif pull_request.merged?
+        elsif merge_request.merged?
           render(status: :method_not_allowed, json: {
             message: "This pull request was already merged.",
           })
@@ -27,8 +27,8 @@ module Shipit
       end
 
       def destroy
-        if pull_request = stack.pull_requests.where(number: params[:id]).first
-          pull_request.cancel! if pull_request.waiting?
+        if merge_request = stack.merge_requests.where(number: params[:id]).first
+          merge_request.cancel! if merge_request.waiting?
         end
         head(:no_content)
       end

data/app/controllers/shipit/api/rollbacks_controller.rb

@@ -8,6 +8,7 @@ module Shipit
         requires :sha, String, length: { in: 6..40 }
         accepts :force, Boolean, default: false
         accepts :env, Hash, default: {}
+        accepts :lock, Boolean, default: true
       end
       def create
         commit = stack.commits.by_sha(params.sha) || param_error!(:sha, 'Unknown revision')
@@ -23,7 +24,7 @@ module Shipit
           active_task.abort!(aborted_by: current_user, rollback_once_aborted_to: deploy)
           response = active_task
         else
-          response = deploy.trigger_rollback(current_user, env: deploy_env, force: params.force)
+          response = deploy.trigger_rollback(current_user, env: deploy_env, force: params.force, lock: params.lock)
         end
 
         render_resource(response, status: :accepted)

data/app/controllers/shipit/api/stacks_controller.rb

@@ -5,8 +5,21 @@ module Shipit
       require_permission :read, :stack, only: %i(index show)
       require_permission :write, :stack, only: %i(create update destroy)
 
+      params do
+        accepts :repo_owner, String
+        accepts :repo_name, String
+      end
       def index
-        render_resources(stacks)
+        @stacks = stacks
+        if params[:repo_owner] && params[:repo_name]
+          full_repo_name = [repo_owner, repo_name].join('/')
+          @stacks = if (repository = Repository.from_github_repo_name(full_repo_name))
+            stacks.where(repository: repository)
+          else
+            Stack.none
+          end
+        end
+        render_resources(@stacks)
       end
 
       params do
@@ -27,6 +40,7 @@ module Shipit
       end
 
       params do
+        accepts :branch, String
         accepts :deploy_url, String
         accepts :ignore_ci, Boolean
         accepts :merge_queue_enabled, Boolean

data/app/controllers/shipit/deploys_controller.rb

@@ -17,7 +17,7 @@ module Shipit
     def show
       respond_to do |format|
         format.html
-        format.text { render plain: @deploy.chunk_output }
+        format.text { render(plain: @deploy.chunk_output) }
       end
     end