shipit-engine 0.8.9 → 0.9.0

data/app/assets/stylesheets/shipit.scss

@@ -1,4 +1,6 @@
 //= require 'ansi_stream'
+//= require 'clusterize'
+
 @import "_base/_media-queries";
 @import "_base/_utility";
 @import "_base/_colors";

data/app/assets/stylesheets/shipit_bs.scss

@@ -0,0 +1,22 @@
+// Custom bootstrap variables must be set or import before bootstrap itself.
+@import "bootstrap";
+
+body {
+  padding-top: 5rem;
+}
+
+.navbar-brand {
+  background: asset-data-url('anchor.svg') center center no-repeat;
+  display: block;
+  width: 40px;
+  height: 40px;
+  transition: transform .3s ease-in-out;
+  text-indent: -9999px;
+  top: 50%;
+  right: 100%;
+  margin-right: 1em;
+
+  &:hover {
+    transform: rotate(-25deg);
+  }
+}

data/app/controllers/shipit/deploys_controller.rb

@@ -9,10 +9,14 @@ module Shipit
     def new
       @commit = @stack.commits.by_sha!(params[:sha])
       @commit.checks.schedule if @stack.checks?
-      @deploy = @stack.deploys.new(until_commit: @commit, since_commit: @stack.last_deployed_commit)
+      @deploy = @stack.build_deploy(@commit, current_user)
     end
 
     def show
+      respond_to do |format|
+        format.html
+        format.text { render plain: @deploy.chunk_output }
+      end
     end
 
     def create

data/app/controllers/shipit/shipit_controller.rb

@@ -11,9 +11,12 @@ module Shipit
     helper Shipit::Engine.routes.url_helpers
     include Shipit::Engine.routes.url_helpers
 
-    before_action :ensure_required_settings,
-                  :force_github_authentication,
-                  :set_variant
+    before_action(
+      :toogle_bootstrap_feature,
+      :ensure_required_settings,
+      :force_github_authentication,
+      :set_variant,
+    )
 
     # Respond to HTML by default
     respond_to :html
@@ -24,6 +27,10 @@ module Shipit
 
     private
 
+    def toogle_bootstrap_feature
+      prepend_view_path(Shipit.bootstrap_view_path) if Shipit.feature_bootstrap?
+    end
+
     def ensure_required_settings
       return if Shipit.all_settings_present?
 

data/app/controllers/shipit/stacks_controller.rb

@@ -24,8 +24,16 @@ module Shipit
       @commits = @commits.to_a
     end
 
+    def lookup
+      @stack = Stack.find(params[:id])
+      redirect_to stack_url(@stack)
+    end
+
     def create
-      @stack = Stack.create(create_params)
+      @stack = Stack.new(create_params)
+      unless @stack.save
+        flash[:warning] = @stack.errors.full_messages.to_sentence
+      end
       respond_with(@stack)
     end
 
@@ -41,7 +49,7 @@ module Shipit
       RefreshStatusesJob.perform_later(stack_id: @stack.id)
       GithubSyncJob.perform_later(stack_id: @stack.id)
       flash[:success] = 'Refresh scheduled'
-      redirect_to :back
+      redirect_to request.referer ? :back : stack_path(@stack)
     end
 
     def update
@@ -73,7 +81,8 @@ module Shipit
     end
 
     def update_params
-      params.require(:stack).permit(:deploy_url, :lock_reason, :continuous_deployment, :ignore_ci).tap do |params|
+      params.require(:stack).permit(:deploy_url, :lock_reason, :environment,
+                                    :continuous_deployment, :ignore_ci).tap do |params|
         params[:lock_author_id] = params[:lock_reason].present? ? current_user.id : nil
       end
     end

data/app/controllers/shipit/tasks_controller.rb

@@ -19,6 +19,10 @@ module Shipit
 
     def show
       task
+      respond_to do |format|
+        format.html
+        format.text { render plain: @task.chunk_output }
+      end
     end
 
     def create

data/app/helpers/shipit/shipit_helper.rb

@@ -1,5 +1,23 @@
 module Shipit
   module ShipitHelper
+    def emojify(content)
+      h(content).to_str.gsub(/:([\w+-]+):/) do |match|
+        if emoji = Emoji.find_by_alias($1)
+          %(
+            <img
+              alt="##{$1}"
+              src="#{image_path("emoji/#{emoji.image_filename}")}"
+              style="vertical-align:middle"
+              width="20"
+              height="20"
+            />
+          )
+        else
+          match
+        end
+      end.html_safe if content.present?
+    end
+
     def include_plugins(stack)
       stack.plugins.flat_map do |plugin, config|
         plugin_tags(plugin, config)

data/app/helpers/shipit/stacks_helper.rb

@@ -37,7 +37,7 @@ module Shipit
 
     def render_commit_message(commit)
       message = commit.pull_request_title || commit.message
-      content_tag(:span, message.truncate(COMMIT_TITLE_LENGTH), class: 'event-message')
+      content_tag(:span, emojify(message.truncate(COMMIT_TITLE_LENGTH)), class: 'event-message')
     end
 
     def render_commit_message_with_link(commit)

data/app/jobs/shipit/cache_deploy_spec_job.rb

@@ -3,6 +3,8 @@ module Shipit
     include BackgroundJob::Unique
 
     def perform(stack)
+      return if stack.inaccessible?
+
       commands = Commands.for(stack)
       commands.with_temporary_working_directory(commit: stack.commits.last) do |path|
         stack.update!(cached_deploy_spec: DeploySpec::FileSystem.new(path, stack.environment))

data/app/jobs/shipit/fetch_deployed_revision_job.rb

@@ -4,6 +4,7 @@ module Shipit
 
     def perform(stack)
       return if stack.active_task?
+      return if stack.inaccessible?
 
       commands = StackCommands.new(stack)
 

data/app/jobs/shipit/git_mirror_update_job.rb

@@ -3,6 +3,8 @@ module Shipit
     queue_as :default
 
     def perform(stack)
+      return if stack.inaccessible?
+
       commands = StackCommands.new(stack)
       stack.acquire_git_cache_lock do
         commands.fetch.run

data/app/jobs/shipit/perform_task_job.rb

@@ -20,6 +20,7 @@ module Shipit
       perform_task
       @task.complete!
     rescue Command::Error => error
+      @task.write("\n#{error.message}\n")
       @task.report_failure!(error)
     rescue StandardError => error
       @task.report_error!(error)

data/app/models/shipit/commit.rb

@@ -23,12 +23,12 @@ module Shipit
 
     def self.newer_than(commit)
       return all unless commit
-      where('id > ?', commit.is_a?(Commit) ? commit.id : commit)
+      where('id > ?', commit.try(:id) || commit)
     end
 
     def self.until(commit)
       return all unless commit
-      where('id <= ?', commit.is_a?(Commit) ? commit.id : commit)
+      where('id <= ?', commit.try(:id) || commit)
     end
 
     def self.successful

data/app/models/shipit/deploy.rb

@@ -90,7 +90,7 @@ module Shipit
     end
 
     def currently_deployed?
-      until_commit_id == stack.last_deployed_commit.try!(:id)
+      until_commit_id == stack.last_deployed_commit.id
     end
 
     def commits

data/app/models/shipit/deploy_spec/bundler_discovery.rb

@@ -26,7 +26,7 @@ module Shipit
         # Heroku apps often specify a ruby version.
         if /darwin/ =~ RUBY_PLATFORM
           # OSX is nitpicky about the -i.
-          %q(sed -i '' '/^ruby\s/d' Gemfile)
+          %q(/usr/bin/sed -i '' '/^ruby\s/d' Gemfile)
         else
           %q(sed -i '/^ruby\s/d' Gemfile)
         end

data/app/models/shipit/duration.rb

@@ -0,0 +1,28 @@
+module Shipit
+  class Duration
+    UNITS = {
+      's' => :seconds,
+      'm' => :minutes,
+      'h' => :hours,
+      'd' => :days,
+    }.freeze
+
+    def initialize(seconds)
+      @seconds = seconds
+    end
+
+    def to_i
+      @seconds.to_i
+    end
+
+    def to_s
+      seconds = to_i
+      days, seconds = seconds.divmod(1.day.to_i)
+      if days > 0
+        "#{days}d#{Time.at(seconds).utc.strftime('%Hh%Mm%Ss')}"
+      else
+        Time.at(seconds).utc.strftime('%Hh%Mm%Ss')[/[^0a-z]\w+/] || '0s'
+      end
+    end
+  end
+end

data/app/models/shipit/stack.rb

@@ -2,6 +2,22 @@ require 'fileutils'
 
 module Shipit
   class Stack < ActiveRecord::Base
+    module NoDeployedCommit
+      extend self
+
+      def id
+        -1
+      end
+
+      def sha
+        ''
+      end
+
+      def blank?
+        true
+      end
+    end
+
     REPO_OWNER_MAX_SIZE = 39
     REPO_NAME_MAX_SIZE = 100
     ENVIRONMENT_MAX_SIZE = 50
@@ -36,7 +52,8 @@ module Shipit
     after_commit :setup_hooks, :sync_github, on: :create
     after_touch :clear_cache
 
-    validates :repo_name, uniqueness: {scope: %i(repo_owner environment)}
+    validates :repo_name, uniqueness: {scope: %i(repo_owner environment),
+                                       message: 'cannot be used more than once with this environment'}
     validates :repo_owner, :repo_name, :environment, presence: true, ascii_only: true
     validates :repo_owner, format: {with: /\A[a-z0-9_\-\.]+\z/}, length: {maximum: REPO_OWNER_MAX_SIZE}
     validates :repo_name, format: {with: /\A[a-z0-9_\-\.]+\z/}, length: {maximum: REPO_NAME_MAX_SIZE}
@@ -57,7 +74,7 @@ module Shipit
     end
 
     def trigger_task(definition_id, user, env: nil)
-      commit = last_deployed_commit
+      commit = last_deployed_commit.presence || commits.first
       task = tasks.create(
         user_id: user.id,
         definition: find_task_definition(definition_id),
@@ -69,15 +86,19 @@ module Shipit
       task
     end
 
-    def trigger_deploy(until_commit, user, env: nil)
-      since_commit = last_deployed_commit
-
-      deploy = deploys.create(
+    def build_deploy(until_commit, user, env: nil)
+      since_commit = last_deployed_commit.presence || commits.first
+      deploys.build(
         user_id: user.id,
         until_commit: until_commit,
         since_commit: since_commit,
         env: filter_deploy_envs(env || {}),
       )
+    end
+
+    def trigger_deploy(*args)
+      deploy = build_deploy(*args)
+      deploy.save!
       deploy.enqueue
       deploy
     end
@@ -95,10 +116,11 @@ module Shipit
     end
 
     def update_deployed_revision(sha)
-      return if active_task?
-
       last_deploy = deploys_and_rollbacks.last
-      actual_deployed_commit = commits.reachable.by_sha!(sha)
+      return if last_deploy.try!(:active?)
+
+      actual_deployed_commit = commits.reachable.by_sha(sha)
+      return unless actual_deployed_commit
 
       if last_deploy && actual_deployed_commit == last_deploy.until_commit
         last_deploy.accept!
@@ -107,7 +129,7 @@ module Shipit
       else
         deploys.create!(
           until_commit: actual_deployed_commit,
-          since_commit: last_deployed_commit,
+          since_commit: last_deployed_commit.presence || commits.first,
           status: 'success',
         )
       end
@@ -144,7 +166,7 @@ module Shipit
       if deploy = last_successful_deploy
         deploy.until_commit
       else
-        commits.first
+        NoDeployedCommit
       end
     end
 

data/app/models/shipit/task.rb

@@ -1,5 +1,8 @@
 module Shipit
   class Task < ActiveRecord::Base
+    ACTIVE_STATUSES = %w(pending running aborting).freeze
+    COMPLETED_STATUSES = %w(success error failed flapping aborted).freeze
+
     belongs_to :deploy, foreign_key: :parent_id, required: false # required for fixtures
 
     belongs_to :user
@@ -13,8 +16,8 @@ module Shipit
     serialize :env, Hash
 
     scope :success, -> { where(status: 'success') }
-    scope :completed, -> { where(status: %w(success error failed flapping aborted)) }
-    scope :active, -> { where(status: %w(pending running aborting)) }
+    scope :completed, -> { where(status: COMPLETED_STATUSES) }
+    scope :active, -> { where(status: ACTIVE_STATUSES) }
     scope :exclusive, -> { where(allow_concurrency: false) }
 
     scope :due_for_rollup, -> { completed.where(rolled_up: false).where('created_at <= ?', 1.hour.ago) }
@@ -23,6 +26,14 @@ module Shipit
     after_commit :emit_hooks
 
     state_machine :status, initial: :pending do
+      before_transition any => :running do |task|
+        task.started_at ||= Time.now.utc
+      end
+
+      before_transition any => %i(success failed error) do |task|
+        task.ended_at ||= Time.now.utc
+      end
+
       after_transition any => %i(success failed error) do |task|
         task.async_refresh_deployed_revision
       end
@@ -69,6 +80,10 @@ module Shipit
       state :flapping
     end
 
+    def active?
+      status.in?(ACTIVE_STATUSES)
+    end
+
     def report_failure!(_error)
       reload
       if aborting?
@@ -79,7 +94,7 @@ module Shipit
     end
 
     def report_error!(error)
-      write("#{error.class}: #{error.message}\n\t#{error.backtrace.join("\t")}\n")
+      write("#{error.class}: #{error.message}\n\t#{error.backtrace.join("\n\t")}\n")
       error!
     end
 
@@ -87,6 +102,14 @@ module Shipit
 
     delegate :checklist, to: :definition
 
+    def duration?
+      started_at? && ended_at?
+    end
+
+    def duration
+      Duration.new(ended_at - started_at) if duration?
+    end
+
     def spec
       @spec ||= DeploySpec::FileSystem.new(working_directory, stack.environment)
     end

data/app/serializers/shipit/task_serializer.rb

@@ -5,7 +5,20 @@ module Shipit
     has_one :author
     has_one :revision, serializer: ShortCommitSerializer
 
-    attributes :id, :url, :html_url, :output_url, :type, :status, :action, :description, :updated_at, :created_at
+    attributes(*%i(
+      id
+      url
+      html_url
+      output_url
+      type
+      status
+      action
+      description
+      started_at
+      ended_at
+      updated_at
+      created_at
+    ))
 
     def revision
       object.until_commit