shipit-engine 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e03aca5879f298b7d2448ba822f3ca7ff9bf5ce5
-  data.tar.gz: 3c25d091d942b851f423a426e1e8d07a4e34bfd1
+  metadata.gz: 6cd9fd17a4690e6cfbd69728d27b69606ac38b08
+  data.tar.gz: d0e71f015a45d0f9df466f99bef8a813bbc91492
 SHA512:
-  metadata.gz: a1e53791e40271aef251578e6547b5b02c960403d43ba03f6dc60d67ab8ec251b35b2ba9ade73619058431834dfd81775d7c34e17cb9bb0ad6e09293cc01aefd
-  data.tar.gz: cec7cc91bd9d429b069e03fcc5a9b7e109ff7680f8597e5838c52a5474e6f0a78f86eea97edc2d46b94f88ab8508dda14686b0a448560d1e7c7408d0d9404627
+  metadata.gz: fe9ff5e9c364f4586d292f1985c1b369286eb61727c16e15501d35c62b8976fe77c93a0021b227755fcf1706f4b1dcded1fa759f5904a43678acab1a46ea623e
+  data.tar.gz: 7a179ee612da5e37cea519f54325f484779a9d47d0b411409ae6071d7758a95aa11c26a9324fab32c2a672a2e88f8bc103841779c20de52389e0ec172c0f847c

data/app/assets/images/flapping.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.0.2 (7799) - http://www.bohemiancoding.com/sketch -->
+    <title>unknown</title>
+    <description>Created with Sketch.</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="unknown" sketch:type="MSArtboardGroup" fill="#FFAD4C">
+            <path d="M15.0013334,17.28 L16.8713334,17.28 C16.8713334,16.7666641 16.9299994,16.2900022 17.0473334,15.85 C17.1646673,15.4099978 17.3516654,15.0286683 17.6083334,14.706 C17.8650013,14.3833317 18.1839981,14.1266676 18.5653334,13.936 C18.9466686,13.7453324 19.4013307,13.65 19.9293334,13.65 C20.7213373,13.65 21.348331,13.8773311 21.8103334,14.332 C22.2723357,14.7866689 22.5326664,15.4173293 22.5913334,16.224 C22.6206668,16.7666694 22.5546675,17.2286648 22.3933334,17.61 C22.2319992,17.9913352 22.015668,18.3396651 21.7443334,18.655 C21.4729987,18.9703349 21.1796683,19.2709986 20.8643334,19.557 C20.5489984,19.8430014 20.2483348,20.154665 19.9623334,20.492 C19.6763319,20.829335 19.4343343,21.2143312 19.2363334,21.647 C19.0383324,22.0796688 18.9246668,22.6039969 18.8953334,23.22 L18.8953334,24.254 L20.7653334,24.254 L20.7653334,23.396 C20.7653334,23.0146648 20.8203328,22.6736682 20.9303334,22.373 C21.0403339,22.0723318 21.1869991,21.7936679 21.3703334,21.537 C21.5536676,21.280332 21.7589989,21.0383345 21.9863334,20.811 C22.2136678,20.5836655 22.4446655,20.3600011 22.6793334,20.14 C22.9140012,19.9053322 23.1449989,19.6633346 23.3723334,19.414 C23.5996678,19.1646654 23.8013325,18.8933348 23.9773334,18.6 C24.1533342,18.3066652 24.2963328,17.9803351 24.4063334,17.621 C24.5163339,17.2616649 24.5713334,16.8546689 24.5713334,16.4 C24.5713334,15.6959965 24.4576678,15.0726694 24.2303334,14.53 C24.0029989,13.9873306 23.6840021,13.5290019 23.2733334,13.155 C22.8626646,12.7809981 22.3750028,12.495001 21.8103334,12.297 C21.2456639,12.098999 20.6186701,12 19.9293334,12 C19.1666629,12 18.4773364,12.1319987 17.8613334,12.396 C17.2453303,12.6600013 16.7246688,13.030331 16.2993334,13.507 C15.8739979,13.9836691 15.5476678,14.5446634 15.3203334,15.19 C15.0929989,15.8353366 14.9866666,16.5319963 15.0013334,17.28 L15.0013334,17.28 Z" id="?" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-4" stroke="#CCCCCC" sketch:type="MSShapeGroup" cx="20" cy="28" r="1"></circle>
+        </g>
+    </g>
+</svg>

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

@@ -200,6 +200,15 @@
   }
 }
 
+.status--flapping,
+[data-deploy-status='flapping'] {
+  border-color: $orange;
+
+  .status__icon {
+    background-image: asset-data-url("flapping.svg");
+  }
+}
+
 .status--success,
 [data-deploy-status='success'] {
   border-color: $green;

data/app/controllers/webhooks_controller.rb

@@ -18,7 +18,7 @@ class WebhooksController < ActionController::Base
     branches = params[:branches] || []
     if branches.find { |branch| branch[:name] == stack.branch }
       commit = stack.commits.find_by_sha!(params[:sha])
-      commit.statuses.create!(params.permit(:state, :description, :target_url, :context, :created_at))
+      commit.add_status(params.permit(:state, :description, :target_url, :context, :created_at))
     end
     head :ok
   end

data/app/models/commit.rb

@@ -83,6 +83,20 @@ class Commit < ActiveRecord::Base
     end
   end
 
+  def add_status(status_attributes)
+    previous_status = significant_status
+    statuses.create!(status_attributes)
+    reload # to get the statuses into the right order (since sorted :desc)
+    new_status = significant_status
+
+    payload = {commit: self, stack: stack, status: new_status.state}
+    Hook.emit(:commit_status, stack, payload.merge(commit_status: new_status)) if previous_status != new_status
+    if simple_state(previous_status) != simple_state(new_status) && !new_status.pending?
+      Hook.emit(:deployable_status, stack, payload.merge(deployable_status: new_status))
+    end
+    new_status
+  end
+
   def checks
     @checks ||= CommitChecks.new(self)
   end
@@ -176,4 +190,8 @@ class Commit < ActiveRecord::Base
   def already_deployed?
     stack.last_deployed_commit.id >= id
   end
+
+  def simple_state(status)
+    status.state == 'error' ? 'failure' : status.state
+  end
 end

data/app/models/deploy.rb

@@ -1,6 +1,8 @@
 require 'fileutils'
 
 class Deploy < Task
+  CONFIRMATIONS_REQUIRED = 5
+
   state_machine :status do
     after_transition to: :success, do: :schedule_continuous_delivery
     after_transition to: :success, do: :update_undeployed_commits_count
@@ -90,6 +92,28 @@ class Deploy < Task
     stack.deploy_variables
   end
 
+  def reject!
+    return if failed?
+    transaction do
+      flap! unless flapping?
+      update!(confirmations: [confirmations - 1, -1].min)
+      failure! if confirmed?
+    end
+  end
+
+  def accept!
+    return if success?
+    transaction do
+      flap! unless flapping?
+      update!(confirmations: [confirmations + 1, 1].max)
+      complete! if confirmed?
+    end
+  end
+
+  def confirmed?
+    confirmations.abs >= CONFIRMATIONS_REQUIRED
+  end
+
   private
 
   def trigger_revert_if_required

data/app/models/hook.rb

@@ -11,6 +11,8 @@ class Hook < ActiveRecord::Base
     deploy
     rollback
     lock
+    commit_status
+    deployable_status
   ).freeze
 
   belongs_to :stack, required: false

data/app/models/stack.rb

@@ -13,6 +13,10 @@ class Stack < ActiveRecord::Base
   has_many :api_clients, dependent: :destroy
   belongs_to :lock_author, class_name: :User
 
+  def lock_author(*)
+    super || AnonymousUser.new
+  end
+
   before_validation :update_defaults
   before_destroy :clear_local_files
   after_commit :emit_hooks
@@ -68,16 +72,20 @@ class Stack < ActiveRecord::Base
   def update_deployed_revision(sha)
     return if deploying?
 
+    last_deploy = deploys_and_rollbacks.last
     actual_deployed_commit = commits.reachable.by_sha!(sha)
 
-    recorded_last_deployed_commit = last_deployed_commit
-    return if recorded_last_deployed_commit.id == actual_deployed_commit.id
-
-    deploys.create!(
-      until_commit: actual_deployed_commit,
-      since_commit: recorded_last_deployed_commit,
-      status: 'success',
-    )
+    if actual_deployed_commit == last_deploy.until_commit
+      last_deploy.accept!
+    elsif actual_deployed_commit == last_deploy.since_commit
+      last_deploy.reject!
+    else
+      deploys.create!(
+        until_commit: actual_deployed_commit,
+        since_commit: last_deployed_commit,
+        status: 'success',
+      )
+    end
   end
 
   def head

data/app/models/task.rb

@@ -10,11 +10,12 @@ class Task < ActiveRecord::Base
   serialize :env, Hash
 
   scope :success, -> { where(status: 'success') }
-  scope :completed, -> { where(status: %w(success error failed)) }
-  scope :active, -> { where(status: %w(pending running)) }
+  scope :completed, -> { where(status: %w(success error failed flapping aborted)) }
+  scope :active, -> { where(status: %w(pending running aborting)) }
 
   scope :due_for_rollup, -> { completed.where(rolled_up: false).where('created_at <= ?', 1.hour.ago) }
 
+  after_save :record_status_change
   after_commit :emit_hooks
 
   state_machine :status, initial: :pending do
@@ -22,16 +23,20 @@ class Task < ActiveRecord::Base
       task.async_refresh_deployed_revision
     end
 
+    after_transition any => :flapping do |task|
+      task.update!(confirmations: 0)
+    end
+
     event :run do
       transition pending: :running
     end
 
     event :failure do
-      transition running: :failed
+      transition %i(running flapping) => :failed
     end
 
     event :complete do
-      transition running: :success
+      transition %i(running flapping) => :success
     end
 
     event :error do
@@ -46,6 +51,10 @@ class Task < ActiveRecord::Base
       transition aborting: :aborted
     end
 
+    event :flap do
+      transition %i(failed error success) => :flapping
+    end
+
     state :pending
     state :running
     state :failed
@@ -53,6 +62,7 @@ class Task < ActiveRecord::Base
     state :error
     state :aborting
     state :aborted
+    state :flapping
   end
 
   def report_failure!(_error)
@@ -170,8 +180,13 @@ class Task < ActiveRecord::Base
     FileUtils.rm_rf(working_directory)
   end
 
+  def record_status_change
+    @status_changed ||= status_changed?
+  end
+
   def emit_hooks
-    return unless previous_changes.include?('status')
+    return unless @status_changed
+    @status_changed = nil
     Hook.emit(hook_event, stack, hook_event => self, status: status, stack: stack)
   end
 

data/app/views/stacks/show.html.erb

@@ -39,10 +39,10 @@
       <div class="banner__content">
         <h2 class="banner__title">
           <i class="icon icon--lock"></i>
-          Deploys are locked by <%= @stack.lock_author.name || AnonymousUser.new.name %>
+          Deploys are locked by <%= @stack.lock_author.name %>
         </h2>
         <p class="banner__text">
-          <%= @stack.lock_reason %>
+          <%= auto_link @stack.lock_reason %>
         </p>
       </div>
     </div>

data/db/migrate/20150918190012_add_confirmations_to_tasks.rb

@@ -0,0 +1,5 @@
+class AddConfirmationsToTasks < ActiveRecord::Migration
+  def change
+    add_column :tasks, :confirmations, :integer, default: 0, null: false
+  end
+end

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/lib/shipit.rb

@@ -11,6 +11,7 @@ require 'jquery-rails'
 require 'rails-timeago'
 require 'ansi_stream'
 require 'autoprefixer-rails'
+require 'rails_autolink'
 
 require 'omniauth-github'
 

data/test/controllers/stacks_controller_test.rb

@@ -64,6 +64,18 @@ class StacksControllerTest < ActionController::TestCase
     assert_response :ok
   end
 
+  test "#show handles locked stacks without a lock_author" do
+    @stack.update!(lock_reason: "I am a lock with no author")
+    get :show, id: @stack.to_param
+  end
+
+  test "#show auto-links URLs in lock reason" do
+    @stack.update!(lock_reason: 'http://google.com')
+    get :show, id: @stack.to_param
+    assert_response :ok
+    assert_select 'a[href="http://google.com"]'
+  end
+
   test "#create creates a Stack, queues a job to setup webhooks and redirects to it" do
     params = {}
     params[:stack] = {
@@ -116,7 +128,7 @@ class StacksControllerTest < ActionController::TestCase
     patch :update, id: @stack.to_param, stack: {lock_reason: ''}
     @stack.reload
     refute @stack.locked?
-    assert_nil @stack.lock_author
+    assert_instance_of AnonymousUser, @stack.lock_author
   end
 
   test "#refresh queues a RefreshStatusesJob and a GithubSyncJob" do

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150814204960) do
+ActiveRecord::Schema.define(version: 20150918190012) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text     "permissions", limit: 65535
@@ -155,6 +155,7 @@ ActiveRecord::Schema.define(version: 20150814204960) do
     t.binary   "gzip_output"
     t.boolean  "rollback_once_aborted",               default: false,     null: false
     t.text     "env"
+    t.integer  "confirmations",                       default: 0,         null: false
   end
 
   add_index "tasks", ["rolled_up", "created_at", "status"], name: "index_tasks_on_rolled_up_and_created_at_and_status"

data/test/dummy/db/seeds.rb

@@ -1,4 +1,8 @@
 require 'faker'
+require 'fakeweb'
+
+# Sometimes on Travis the background job runs immediately so provide a response to fake hooks
+FakeWeb.register_uri(:post, %r{https://example\.com/}, status: %w(200 OK))
 
 # Cheap hack to allow rake db:seed to work
 Stack.send(:define_method, :setup_hooks) {}