shipit-engine 0.20.1 → 0.21.0

data/app/models/shipit/stack.rb

@@ -44,6 +44,7 @@ module Shipit
 
     before_validation :update_defaults
     before_destroy :clear_local_files
+    before_save :set_locked_since
     after_commit :emit_lock_hooks
     after_commit :emit_added_hooks, on: :create
     after_commit :emit_updated_hooks, on: :update
@@ -255,11 +256,7 @@ module Shipit
     end
 
     def last_deployed_commit
-      if deploy = last_successful_deploy
-        deploy.until_commit
-      else
-        NoDeployedCommit
-      end
+      last_successful_deploy.try!(:until_commit) || NoDeployedCommit
     end
 
     def deployable?
@@ -287,7 +284,7 @@ module Shipit
     end
 
     def base_path
-      Rails.root.join('data/stacks', repo_owner, repo_name, environment)
+      Rails.root.join('data', 'stacks', repo_owner, repo_name, environment)
     end
 
     def deploys_path
@@ -362,7 +359,6 @@ module Shipit
 
     def lock(reason, user)
       params = {lock_reason: reason, lock_author: user}
-      params[:locked_since] = Time.current if locked_since.nil?
       update!(params)
     end
 
@@ -384,8 +380,8 @@ module Shipit
     end
 
     delegate :plugins, :task_definitions, :hidden_statuses, :required_statuses, :soft_failing_statuses,
-             :deploy_variables, :filter_task_envs, :filter_deploy_envs, :maximum_commits_per_deploy,
-             :pause_between_deploys, to: :cached_deploy_spec
+             :blocking_statuses, :deploy_variables, :filter_task_envs, :filter_deploy_envs,
+             :maximum_commits_per_deploy, :pause_between_deploys, to: :cached_deploy_spec
 
     def monitoring?
       monitoring.present?
@@ -486,6 +482,16 @@ module Shipit
       self.branch = 'master' if branch.blank?
     end
 
+    def set_locked_since
+      return unless lock_reason_changed?
+
+      if lock_reason.blank?
+        self.locked_since = nil
+      else
+        self.locked_since ||= Time.now
+      end
+    end
+
     def schedule_merges_if_necessary
       if previous_changes.include?('lock_reason') && previous_changes['lock_reason'].last.blank?
         schedule_merges

data/app/models/shipit/status/common.rb

@@ -37,6 +37,10 @@ module Shipit
         commit.hidden_statuses.include?(context)
       end
 
+      def blocking?
+        !success? && commit.blocking_statuses.include?(context)
+      end
+
       def required?
         commit.required_statuses.include?(context)
       end

data/app/models/shipit/status/group.rb

@@ -52,6 +52,10 @@ module Shipit
         true
       end
 
+      def blocking?
+        statuses.any?(&:blocking?)
+      end
+
       private
 
       def reject_hidden(statuses)

data/app/models/shipit/task.rb

@@ -7,13 +7,14 @@ module Shipit
     PRESENCE_CHECK_TIMEOUT = 15
     ACTIVE_STATUSES = %w(pending running aborting).freeze
     COMPLETED_STATUSES = %w(success error failed flapping aborted).freeze
-    UNSUCCESSFUL_STATUSES = %w(error failed aborted flapping).freeze
+    UNSUCCESSFUL_STATUSES = %w(error failed aborted flapping timedout).freeze
 
     attr_accessor :pid
 
     belongs_to :deploy, foreign_key: :parent_id, required: false # required for fixtures
 
     belongs_to :user, optional: true
+    belongs_to :aborted_by, class_name: 'User', optional: true
     belongs_to :stack, counter_cache: true
     belongs_to :until_commit, class_name: 'Commit'
     belongs_to :since_commit, class_name: 'Commit'
@@ -56,11 +57,11 @@ module Shipit
         task.started_at ||= Time.now.utc
       end
 
-      before_transition any => %i(success failed error) do |task|
+      before_transition any => %i(success failed error timedout) do |task|
         task.ended_at ||= Time.now.utc
       end
 
-      after_transition any => %i(success failed error) do |task|
+      after_transition any => %i(success failed error timedout) do |task|
         task.async_refresh_deployed_revision
       end
 
@@ -88,6 +89,10 @@ module Shipit
         transition all => :error
       end
 
+      event :giveup do # :timeout would cause a name clash
+        transition all => :timedout
+      end
+
       event :aborting do
         transition all - %i(aborted) => :aborting
       end
@@ -97,7 +102,7 @@ module Shipit
       end
 
       event :flap do
-        transition %i(failed error success) => :flapping
+        transition %i(failed error timedout success) => :flapping
       end
 
       state :pending
@@ -105,6 +110,7 @@ module Shipit
       state :failed
       state :success
       state :error
+      state :timedout
       state :aborting
       state :aborted
       state :flapping
@@ -114,15 +120,21 @@ module Shipit
       status.in?(ACTIVE_STATUSES)
     end
 
-    def report_failure!(_error)
+    def report_failure!(error)
       reload
       if aborting?
         aborted!
+      elsif error.respond_to?(:exit_code) && Shipit.timeout_exit_codes.include?(error.exit_code)
+        giveup!
       else
         failure!
       end
     end
 
+    def report_timeout!(_error)
+      giveup!
+    end
+
     def report_error!(error)
       write("#{error.class}: #{error.message}\n\t#{error.backtrace.join("\n\t")}\n")
       error!
@@ -177,7 +189,7 @@ module Shipit
     def output
       gzip = self[:gzip_output]
 
-      if gzip.nil? || gzip.empty?
+      if gzip.blank?
         ''
       else
         ActiveSupport::Gzip.decompress(gzip)
@@ -236,8 +248,8 @@ module Shipit
       end
     end
 
-    def abort!(rollback_once_aborted: false)
-      update!(rollback_once_aborted: rollback_once_aborted)
+    def abort!(rollback_once_aborted: false, aborted_by:)
+      update!(rollback_once_aborted: rollback_once_aborted, aborted_by_id: aborted_by.id)
 
       if alive?
         aborting

data/app/models/shipit/task_definition.rb

@@ -4,13 +4,13 @@ module Shipit
 
     class << self
       def load(payload)
-        return unless payload.present?
+        return if payload.blank?
         json = JSON.parse(payload)
         new(json.delete('id'), json)
       end
 
       def dump(definition)
-        return unless definition.present?
+        return if definition.blank?
         JSON.dump(definition.as_json)
       end
     end

data/app/models/shipit/undeployed_commit.rb

@@ -9,9 +9,15 @@ module Shipit
 
     def deploy_state(bypass_safeties = false)
       state = deployable? ? 'allowed' : status.state
+
       unless bypass_safeties
-        state = 'deploying' if stack.active_task?
-        state = 'locked' if locked?
+        if blocked?
+          state = 'blocked'
+        elsif locked?
+          state = 'locked'
+        elsif stack.active_task?
+          state = 'deploying'
+        end
       end
       state
     end
@@ -31,5 +37,10 @@ module Shipit
     def deploy_discouraged?
       stack.maximum_commits_per_deploy && index >= stack.maximum_commits_per_deploy
     end
+
+    def blocked?
+      return @blocked if defined?(@blocked)
+      @blocked = super
+    end
   end
 end

data/app/models/shipit/user.rb

@@ -71,7 +71,7 @@ module Shipit
     end
 
     def refresh_from_github!
-      update!(github_user: Shipit.github_api.user(login))
+      update!(github_user: Shipit.github_api.user(github_id))
     rescue Octokit::NotFound
       identify_renamed_user!
     end

data/app/serializers/shipit/pull_request_serializer.rb

@@ -7,7 +7,7 @@ module Shipit
     has_one :head, serializer: ShortCommitSerializer
 
     attributes :id, :number, :title, :github_id, :additions, :deletions, :state, :merge_status, :mergeable,
-               :merge_requested_at, :rejection_reason, :html_url
+               :merge_requested_at, :rejection_reason, :html_url, :branch, :base_ref
 
     def html_url
       github_pull_request_url(object)

data/app/serializers/shipit/tail_task_serializer.rb

@@ -11,7 +11,7 @@ module Shipit
     end
 
     def include_url?
-      !url.blank?
+      url.present?
     end
 
     def output

data/app/views/shipit/ccmenu/project.xml.builder

@@ -2,12 +2,13 @@
 status_map = {'backlogged' => 'failure', 'locked' => 'failure'}
 xml.instruct!
 xml.Projects do
-  xml.Project '', {
-    :name => stack.to_param,
-    :lastBuildStatus => status_map.fetch(stack.merge_status, stack.merge_status).capitalize,
-    :activity => deploy.running? ? 'Building' : 'Sleeping',
-    :lastBuildTime => deploy.ended_at || deploy.started_at || deploy.created_at,
-    :lastBuildLabel => deploy.id,
-    :webUrl => stack_url(stack),
-  }
+  xml.Project(
+    '',
+    name: stack.to_param,
+    lastBuildStatus: status_map.fetch(stack.merge_status, stack.merge_status).capitalize,
+    activity: deploy.running? ? 'Building' : 'Sleeping',
+    lastBuildTime: deploy.ended_at || deploy.started_at || deploy.created_at,
+    lastBuildLabel: deploy.id,
+    webUrl: stack_url(stack),
+  )
 end

data/app/views/shipit/deploys/_deploy.html.erb

@@ -5,9 +5,9 @@
     <% cache deploy.author do %>
       <%= render 'shipit/shared/author', author: deploy.author %>
     <% end %>
-    <a href="<%= stack_deploy_path(@stack, deploy) %>" class="status status--<%= deploy.status %>" data-tooltip="<%= deploy.status.capitalize %>">
+    <a href="<%= stack_deploy_path(@stack, deploy) %>" class="status status--<%= deploy.status %>" data-tooltip="<%= deploy_status_in_words(deploy.status) %>">
       <i class="status__icon"></i>
-      <span class="visually-hidden"><%= deploy.status %></span>
+      <span class="visually-hidden"><%= deploy_status_in_words(deploy.status) %></span>
     </a>
     <div class="commit-details">
       <span class="commit-title">
@@ -21,6 +21,7 @@
         <span class="code-additions">+<%= deploy.additions %></span>
         <span class="code-deletions">-<%= deploy.deletions %></span>
         <% if deploy.ignored_safeties? %><span class="ignored-safeties">ignoring safeties</span><% end %>
+        <% if deploy.aborted_by %><span class="aborted-by">aborted by <%= deploy.aborted_by.login %></span><% end %>
       </p>
       <p class="commit-meta">
         <% if read_only %>

data/app/views/shipit/stacks/_banners.html.erb

@@ -36,7 +36,10 @@
       <div class="banner__content">
         <h2 class="banner__title">
           <i class="icon icon--lock"></i>
-          Deploys are locked by <%= stack.lock_author.name %>
+          Deploys were locked by <%= stack.lock_author.name %>
+          <% unless stack.locked_since.nil? %>
+            <%= timeago_tag(stack.locked_since, force: true) %>
+          <% end %>
         </h2>
         <p class="banner__text">
           <%= auto_link emojify(stack.lock_reason) %>

data/app/views/shipit/stacks/settings.html.erb

@@ -13,6 +13,10 @@
           <%= f.text_field :environment, placeholder: 'production' %>
         </div>
 
+        <div class="field-wrapper">
+          <span>Branch: <%= @stack.branch %></span>
+        </div>
+
         <div class="field-wrapper">
           <%= f.label :deploy_url, 'Deploy URL (Where is this stack deployed to?)' %>
           <%= f.text_field :deploy_url, placeholder: 'https://' %>

data/app/views/shipit/statuses/_group.html.erb

@@ -9,7 +9,7 @@
     <% group.statuses.each do |status| %>
       <div class="status-item status-item--<%= status.state %> <%= :ignored if status.allowed_to_fail? %>">
         <i class="status-item__icon"></i>
-        <a href="<%= status.target_url %>" target="_blank">
+        <a href="<%= status.target_url %>" <% unless status.target_url.present? %> disabled class="disabled" <% end %> target="_blank">
           <strong class="status-item__service"><%= status.context %></strong>
         </a>
         <span class="status-item__description">&mdash; <%= status.description %></span>

data/app/views/shipit/statuses/_status.html.erb

@@ -1,4 +1,4 @@
-<a class="status status--<%= status.state %> <%= :disabled unless status.target_url.present? %>" <% unless status.group? %>data-tooltip="<%= status.description.presence || status.state.capitalize %>"<% end %> href="<%= status.target_url%>" target="_blank">
+<a class="status status--<%= status.state %> <%= 'disabled' unless status.target_url.present? %>" <%= 'disabled' unless status.target_url.present? %> <% unless status.group? %>data-tooltip="<%= status.description.presence || status.state.capitalize %>"<% end %> href="<%= status.target_url%>" target="_blank">
   <i class="status__icon"></i>
   <span class="visually-hidden"><%= status.state %></span>
 </a>

data/app/views/shipit/tasks/_task.html.erb

@@ -26,8 +26,7 @@
         <% else %>
           <%= timeago_tag(task.created_at, force: true) %>
         <% end %>
-        
       </p>
     </div>
   </li>
-<% end %>
+<% end %>

data/config/locales/en.yml

@@ -27,6 +27,7 @@ en:
   deploy_button:
     hint:
       max_commits: It is recommended not to deploy more than %{maximum} commits at once.
+      blocked: This commit range includes a commit that can't be deployed.
     caption:
       pending: Pending CI
       failure: Failing CI
@@ -36,6 +37,7 @@ en:
       deploying: A Deploy is in Progress
       allowed: Deploy
       missing: Missing CI
+      blocked: Blocked
   redeploy_button:
     caption:
       deploying: A Deploy is in Progress

data/config/secrets.development.example.yml

@@ -13,10 +13,6 @@ github_oauth:
   secret:
   # teams: # Optional
 
-# To work on the beta bootstrap re-write
-# features:
-#   - bootstrap
-
 # To work on the kubernetes deploy script
 # env:
 #   KUBECONFIG: # Path of the kubeconfig you want to use.

data/config/secrets.development.shopify.yml

@@ -1,4 +1,4 @@
-host: 'http://shipit-engine.localhost'
+host: 'https://shipit-engine.myshopify.io'
 redis_url: 'redis://shipit-engine.railgun:6379'
 
 github_api:
@@ -13,10 +13,6 @@ github_oauth:
   secret:
   # teams: # Optional
 
-# To work on the beta bootstrap re-write
-# features:
-#   - bootstrap
-
 # To work on the kubernetes deploy script
 # env:
 #   KUBECONFIG: # Path of the kubeconfig you want to use.

data/db/migrate/20170904103242_reindex_deliveries.rb

@@ -0,0 +1,7 @@
+class ReindexDeliveries < ActiveRecord::Migration[5.1]
+  def change
+    add_index :deliveries, [:hook_id, :status]
+    remove_index :deliveries, [:created_at]
+    remove_index :deliveries, [:status, :event]
+  end
+end

data/db/migrate/20171120161420_add_base_info_to_pull_request.rb

@@ -0,0 +1,7 @@
+class AddBaseInfoToPullRequest < ActiveRecord::Migration[5.1]
+  def change
+    add_column :pull_requests, :base_ref, :string, limit: 1024
+    add_column :pull_requests, :base_commit_id, :integer
+    add_foreign_key :pull_requests, :commits, column: :base_commit_id
+  end
+end

data/db/migrate/20180202220850_add_aborted_by_to_tasks.rb

@@ -0,0 +1,5 @@
+class AddAbortedByToTasks < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tasks, :aborted_by_id, :integer
+  end
+end

data/lib/shipit.rb

@@ -30,8 +30,6 @@ require 'faraday-http-cache'
 
 require 'shipit/version'
 
-require 'shipit/template_renderer_extension'
-
 require 'shipit/paginator'
 require 'shipit/null_serializer'
 require 'shipit/csv_serializer'
@@ -56,8 +54,9 @@ module Shipit
 
   delegate :table_name_prefix, to: :secrets
 
-  attr_accessor :disable_api_authentication
-  attr_writer :automatically_prepend_bundle_exec
+  attr_accessor :disable_api_authentication, :timeout_exit_codes
+
+  self.timeout_exit_codes = [].freeze
 
   def app_name
     @app_name ||= secrets.app_name || Rails.application.class.name.split(':').first || 'Shipit'
@@ -138,6 +137,18 @@ module Shipit
     secrets.host.presence
   end
 
+  def enforce_publish_config
+    secrets.enforce_publish_config.presence
+  end
+
+  def npm_org_scope
+    secrets.npm_org_scope.presence
+  end
+
+  def private_npm_registry
+    secrets.private_npm_registry.presence
+  end
+
   def github_teams
     @github_teams ||= github_teams_handles.map { |t| Team.find_or_create_by_handle(t) }
   end
@@ -195,29 +206,10 @@ module Shipit
     end
   end
 
-  def feature_bootstrap?
-    secrets.features.try!(:include?, 'bootstrap')
-  end
-
-  def bootstrap_view_path
-    @bootstrap_view_path ||= Engine.root.join('app/views/bootstrap')
-  end
-
   def default_inactivity_timeout
     secrets.commands_inactivity_timeout || 5.minutes.to_i
   end
 
-  def automatically_prepend_bundle_exec
-    unless defined?(@automatically_prepend_bundle_exec)
-      ActiveSupport::Deprecation.warn(
-        'Automatically prepending `bundle exec` will be removed in a future version of Shipit, '\
-        'set `Shipit.automatically_prepend_bundle_exec = false` to test the new behaviour.',
-      )
-      @automatically_prepend_bundle_exec = true
-    end
-    @automatically_prepend_bundle_exec
-  end
-
   protected
 
   def revision_file