shipit-engine 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98113cef0ad013fa29cb11fea22f09547c191310a601eb788a53fdc5fb3c7e40
-  data.tar.gz: 39c68de0e6356e1daab40942a817af86258ea8219726c1e4276a42bba5d79315
+  metadata.gz: 47bb069ae71eaf994a57ee8dbe3a409adf62ede12fbb010b18ffb9056cee9e0e
+  data.tar.gz: 2e8399c7f72ed1308de6b0be4715579bb6732f3759b22eb38e2e750bb84439de
 SHA512:
-  metadata.gz: 29504e17c71d378485e8610edea95e25e215f5c391478244e609a95a847e3022b508bda95713db97e1f1de22f67c8eed310a562f82cf737e1425803e958341ce
-  data.tar.gz: a7ea41b8ddcf21803a1279cd74d53231c9e030165c06b2ff835f31db55b0cf2240ca802626fba50abaec6b0e5c09e1439900de22c9d3b7719f53b6e2fe524da8
+  metadata.gz: a0a8986aae58f932aca14da3213df881dabfa1017aa844bfe3f5a61afcabc2f09032eafe4342d8acdb7d4fc50cfe4ec9ad1f05dba9209757ef95cc6aa8c8a142
+  data.tar.gz: 0722dfd987d98c176b4625e23921c5576b1a40e85ed6e4d18208c4a4eff4b8c45ba314055dee3255feb576748431be638e6eb97fda6935c6953b70bfe6f14048

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/_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/{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/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

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
 
@@ -55,7 +55,7 @@ module Shipit
     end
 
     def load_stack
-      @stack ||= Stack.from_param!(params[:stack_id])
+      @stack ||= Stack.from_param!(params[:stack_id]).becomes(Stack)
     end
 
     def load_until_commit

data/app/controllers/shipit/merge_requests_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Shipit
+  class MergeRequestsController < ShipitController
+    def index
+      @merge_requests = stack.merge_requests.queued
+    end
+
+    def create
+      if pr_number = MergeRequest.extract_number(stack, params[:number_or_url])
+        merge_request = MergeRequest.request_merge!(stack, pr_number, current_user)
+        flash[:success] = "Pull request ##{merge_request.number} added to the queue."
+      else
+        flash[:warning] = "Invalid or missing pull request number."
+      end
+      redirect_to(stack_merge_requests_path)
+    end
+
+    def destroy
+      merge_request = stack.merge_requests.find(params[:id])
+      merge_request.cancel!
+      flash[:success] = 'Merge canceled'
+      redirect_to(stack_merge_requests_path)
+    end
+
+    private
+
+    def stack
+      @stack ||= Stack.from_param!(params[:stack_id])
+    end
+  end
+end

data/app/controllers/shipit/merge_status_controller.rb

@@ -12,7 +12,7 @@ module Shipit
 
       if stack
         return render('logged_out') unless current_user.logged_in?
-        if stale?(last_modified: [stack.updated_at, pull_request.updated_at].max, template: false)
+        if stale?(last_modified: [stack.updated_at, merge_request.updated_at].max, template: false)
           render(stack_status, layout: !request.xhr?)
         end
       else
@@ -23,13 +23,13 @@ module Shipit
     end
 
     def enqueue
-      PullRequest.request_merge!(stack, params[:number], current_user)
+      MergeRequest.request_merge!(stack, params[:number], current_user)
       render(stack_status, layout: !request.xhr?)
     end
 
     def dequeue
-      if pull_request = stack.pull_requests.find_by_number(params[:number])
-        pull_request.cancel! if pull_request.waiting?
+      if merge_request = stack.merge_requests.find_by_number(params[:number])
+        merge_request.cancel! if merge_request.waiting?
       end
       render(stack_status, layout: !request.xhr?)
     end
@@ -38,12 +38,12 @@ module Shipit
       respond_to do |format|
         format.html do
           if stack_status == 'success'
-            render plain: 'ok'
+            render(plain: 'ok')
           else
-            render plain: stack_status, status: 503
+            render(plain: stack_status, status: 503)
           end
         end
-        format.json { render json: { stack_status: stack_status } }
+        format.json { render(json: { stack_status: stack_status }) }
       end
     end
 
@@ -82,10 +82,10 @@ module Shipit
       @referrer_parser ||= ReferrerParser.new(params[:referrer])
     end
 
-    def pull_request
-      return @pull_request if defined?(@pull_request)
-      @pull_request = pull_request_number && stack.pull_requests.find_by_number(pull_request_number)
-      @pull_request ||= UnknownPullRequest.new
+    def merge_request
+      return @merge_request if defined?(@merge_request)
+      @merge_request = pull_request_number && stack.merge_requests.find_by_number(pull_request_number)
+      @merge_request ||= UnknownMergeRequest.new
     end
 
     def pull_request_number
@@ -98,14 +98,14 @@ module Shipit
     end
 
     helper_method :pull_request_number
-    helper_method :pull_request
+    helper_method :merge_request
     helper_method :queue_enabled?
     helper_method :stack
     helper_method :stack_status
 
     # FIXME: for some reason if invoked in the view, those path helpers will link to /events?...
-    helper_method :enqueue_pull_request_path
-    helper_method :dequeue_pull_request_path
+    helper_method :enqueue_merge_request_path
+    helper_method :dequeue_merge_request_path
 
     class ReferrerParser
       URL_PATTERN = %r{\Ahttps://github\.com/([^/]+)/([^/]+)/pull/(\d+)}
@@ -123,7 +123,7 @@ module Shipit
       end
     end
 
-    class UnknownPullRequest
+    class UnknownMergeRequest
       attr_reader :updated_at
 
       def initialize