shipit-engine 0.24.0 → 0.25.0

data/app/serializers/shipit/stack_serializer.rb

@@ -5,7 +5,7 @@ module Shipit
     has_one :lock_author
     attributes :id, :repo_owner, :repo_name, :environment, :html_url, :url, :tasks_url, :deploy_url, :pull_requests_url,
                :deploy_spec, :undeployed_commits_count, :is_locked, :lock_reason, :continuous_deployment, :created_at,
-               :updated_at, :locked_since, :last_deployed_at, :branch
+               :updated_at, :locked_since, :last_deployed_at, :branch, :merge_queue_enabled
 
     def url
       api_stack_url(object)

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

@@ -1,6 +1,6 @@
 <%- read_only ||= false -%>
 
-<li class="task deploy" id="task-<%= deploy.id %>" data-status="<%= deploy.status %>">
+<li class="task deploy" id="task-<%= deploy.id %>" data-status="<%= deploy.status %>" data-release-status="<%= deploy.last_release_status.state %>">
   <% cache deploy do %>
     <% cache deploy.author do %>
       <%= render 'shipit/shared/author', author: deploy.author %>
@@ -16,6 +16,11 @@
         </a>
       </span>
       <p class="commit-meta">
+        <% if @stack.release_status? %>
+          <%= link_to '#', data: {tooltip: deploy.last_release_status.description.presence} do %>
+            <i class="deploy-status__icon"></i>
+          <% end %>
+        <% end %>
         <%= deploy.rollback? ? 'rolled back' : 'deployed' %>
         <span class="sha"><%= link_to_github_deploy(deploy) %></span>
         <span class="code-additions">+<%= deploy.additions %></span>
@@ -34,10 +39,21 @@
         <% end %>
       </p>
     </div>
+
+    <% if @stack.release_status? %>
+      <div class="release-validation" >
+        <%= link_to stack_deploy_release_statuses_path(@stack, deploy), class: 'action-set-release-status action-reject-release', data: {tooltip: t('release.reject'), status: 'failure'} do %>
+          <i class="icon icon--reject"></i>
+        <% end %>
+        <%= link_to stack_deploy_release_statuses_path(@stack, deploy), class: 'action-set-release-status action-validate-release', data: {tooltip: t('release.validate'), status: 'success'} do %>
+          <i class="icon icon--validate"></i>
+        <% end %>
+      </div>
+    <% end %>
   <% end %>
 
   <% unless read_only %>
-    <div class="commit-actions">
+    <div class="deploy-actions">
       <% if deploy.rollbackable? %>
         <% if deploy.stack.active_task? %>
           <%= link_to 'Deploy in progress...', '#', class: 'btn disabled deploy-action' %>

data/config/locales/en.yml

@@ -24,6 +24,9 @@ en:
     lock: This commit is safe to deploy. Click to mark it as unsafe.
     unlock: This commit is unsafe to deploy. Click to mark it as safe.
     confirm_unlock: Mark this commit as safe to deploy?
+  release:
+    validate: Mark the release as healthy
+    reject: Mark the release as faulty
   deploy_button:
     hint:
       max_commits: It is recommended not to deploy more than %{maximum} commits at once.

data/config/routes.rb

@@ -88,6 +88,8 @@ Shipit::Engine.routes.draw do
         get :rollback
         get :revert
       end
+
+      resources :release_statuses, only: %i(create)
     end
 
     resources :pull_requests, only: %i(index destroy create)

data/db/migrate/20180802172632_allow_commit_without_author.rb

@@ -0,0 +1,6 @@
+class AllowCommitWithoutAuthor < ActiveRecord::Migration[5.1]
+  def change
+    change_column_null(:commits, :author_id, true)
+    change_column_null(:commits, :committer_id, true)
+  end
+end

data/db/migrate/20180906083930_create_release_statuses.rb

@@ -0,0 +1,21 @@
+class CreateReleaseStatuses < ActiveRecord::Migration[5.1]
+  def change
+    create_table :release_statuses do |t|
+      t.references :stack, foreign_key: false, null: false, index: false
+      t.references :commit, foreign_key: false, null: false, index: false
+      t.references :user, foreign_key: false, null: true
+
+      t.string :state, limit: 10, null: false
+      t.string :description, limit: 1024, null: true
+      t.string :target_url, limit: 1024, null: true
+
+      t.bigint :github_id, null: true
+
+      t.timestamps
+
+      t.index %i(commit_id github_id)
+      t.index %i(stack_id commit_id)
+    end
+  end
+end
+

data/lib/shipit.rb

@@ -30,6 +30,7 @@ require 'faraday-http-cache'
 
 require 'shipit/version'
 
+require 'shipit/flock'
 require 'shipit/github_app'
 require 'shipit/paginator'
 require 'shipit/null_serializer'
@@ -59,6 +60,10 @@ module Shipit
 
   self.timeout_exit_codes = [].freeze
 
+  def authentication_disabled?
+    ENV['SHIPIT_DISABLE_AUTH'].present?
+  end
+
   def app_name
     @app_name ||= secrets.app_name || Rails.application.class.name.split(':').first || 'Shipit'
   end

data/lib/shipit/command.rb

@@ -12,6 +12,8 @@ module Shipit
     Denied = Class.new(Error)
     TimedOut = Class.new(Error)
 
+    BASE_ENV = Bundler.clean_env.merge((ENV.keys - Bundler.clean_env.keys).map { |k| [k, nil] }.to_h)
+
     class Failed < Error
       attr_reader :exit_code
 
@@ -75,14 +77,6 @@ module Shipit
       output.join
     end
 
-    def with_full_path
-      old_path = ENV['PATH']
-      ENV['PATH'] = "#{ENV['PATH']}:#{Shipit.shell_paths.join(':')}"
-      yield
-    ensure
-      ENV['PATH'] = old_path
-    end
-
     def interpolated_arguments
       interpolate_environment_variables(@args)
     end
@@ -90,22 +84,24 @@ module Shipit
     def start(&block)
       return if @started
       @control_block = block
-      child_in = @out = @pid = nil
+      @out = @pid = nil
       FileUtils.mkdir_p(@chdir)
-      with_full_path do
-        begin
-          @out, child_in, @pid = PTY.spawn(@env.stringify_keys, *interpolated_arguments, chdir: @chdir)
-          child_in.close
-        rescue Errno::ENOENT
-          raise NotFound, "#{Shellwords.split(interpolated_arguments.first).first}: command not found"
-        rescue Errno::EACCES
-          raise Denied, "#{Shellwords.split(interpolated_arguments.first).first}: Permission denied"
-        end
+      begin
+        @out, child_in, @pid = PTY.spawn(clean_env, *interpolated_arguments, chdir: @chdir)
+        child_in.close
+      rescue Errno::ENOENT
+        raise NotFound, "#{Shellwords.split(interpolated_arguments.first).first}: command not found"
+      rescue Errno::EACCES
+        raise Denied, "#{Shellwords.split(interpolated_arguments.first).first}: Permission denied"
       end
       @started = true
       self
     end
 
+    def clean_env
+      BASE_ENV.merge('PATH' => "#{ENV['PATH']}:#{Shipit.shell_paths.join(':')}").merge(@env.stringify_keys)
+    end
+
     def stream(&block)
       start
       begin

data/lib/shipit/deploy_commands.rb

@@ -18,9 +18,5 @@ module Shipit
     def diff_url
       Shipit::GithubUrlHelper.github_commit_range_url(@stack, *@task.commit_range)
     end
-
-    def permalink
-      Shipit::Engine.routes.url_helpers.stack_deploy_url(@stack, @task)
-    end
   end
 end

data/lib/shipit/engine.rb

@@ -22,7 +22,7 @@ module Shipit
         path =~ %r{\Aplugins/[\-\w]+\.(js|css)\Z}
       end
       app.config.assets.precompile << proc do |path|
-        path.start_with?('emoji/') && path.end_with?('.png')
+        path.end_with?('.svg') || (path.start_with?('emoji/') && path.end_with?('.png'))
       end
 
       ActionDispatch::ExceptionWrapper.rescue_responses[Shipit::TaskDefinition::NotFound.name] = :not_found

data/lib/shipit/first_parent_commits_iterator.rb

@@ -8,7 +8,7 @@ module Shipit
           next
         end
 
-        if last_ancestor.parents.first.sha == commit.sha
+        if last_ancestor.parents.empty? || last_ancestor.parents.first.sha == commit.sha
           yield last_ancestor = commit
         end
       end

data/lib/shipit/flock.rb

@@ -0,0 +1,43 @@
+require 'English'
+require 'timeout'
+require 'pathname'
+
+module Shipit
+  class Flock
+    TimeoutError = Class.new(::Timeout::Error)
+
+    attr_reader :path
+
+    def initialize(path)
+      @path = Pathname.new(path)
+    end
+
+    def lock(timeout:)
+      path.parent.mkpath
+      path.open('w') do |file|
+        if retrying(timeout: timeout) { file.flock(File::LOCK_EX | File::LOCK_NB) }
+          file.write($PROCESS_ID.to_s)
+          return yield
+        else
+          raise TimeoutError, "Couldn't acquire lock for #{path} in #{timeout} seconds"
+        end
+      end
+    end
+
+    private
+
+    def retrying(timeout:, breathing_time: 0.01)
+      started_at = Time.now.to_f
+
+      loop do
+        if yield
+          return true
+        elsif Time.now.to_f - started_at < timeout
+          sleep(breathing_time)
+        else
+          return false
+        end
+      end
+    end
+  end
+end

data/lib/shipit/github_app.rb

@@ -22,8 +22,11 @@ module Shipit
     end
 
     def api
-      @client = new_client(access_token: token) if !defined?(@client) || @client.access_token != token
-      @client
+      client = Thread.current[:github_client]
+      if !client || client.access_token != token
+        client = Thread.current[:github_client] = new_client(access_token: token)
+      end
+      client
     end
 
     def verify_webhook_signature(signature, message)
@@ -66,7 +69,6 @@ module Shipit
       [
         oauth_id,
         oauth_secret,
-        scope: 'email,repo_deployment',
         client_options: options,
       ]
     end

data/lib/shipit/rollback_commands.rb

@@ -3,5 +3,11 @@ module Shipit
     def steps
       deploy_spec.rollback_steps!
     end
+
+    def env
+      super.merge(
+        'ROLLBACK' => '1',
+      )
+    end
   end
 end

data/lib/shipit/task_commands.rb

@@ -35,7 +35,7 @@ module Shipit
         'SHIPIT_USER' => "#{@task.author.login} (#{normalized_name}) via Shipit",
         'EMAIL' => @task.author.email,
         'BUNDLE_PATH' => Rails.root.join('data', 'bundler').to_s,
-        'SHIPIT_LINK' => permalink,
+        'SHIPIT_LINK' => @task.permalink,
         'LAST_DEPLOYED_SHA' => @stack.last_deployed_commit.sha,
         'TASK_ID' => @task.id.to_s,
         'IGNORED_SAFETIES' => @task.ignored_safeties? ? '1' : '0',
@@ -80,9 +80,5 @@ module Shipit
         @task.working_directory
       end
     end
-
-    def permalink
-      Shipit::Engine.routes.url_helpers.stack_task_url(@stack, @task)
-    end
   end
 end

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.24.0'.freeze
+  VERSION = '0.25.0'.freeze
 end

data/test/controllers/release_statuses_controller_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+module Shipit
+  class ReleaseStatusesControllerTest < ActionController::TestCase
+    setup do
+      @stack = shipit_stacks(:shipit)
+      @deploy = shipit_deploys(:shipit)
+      session[:user_id] = shipit_users(:walrus).id
+    end
+
+    test ":create allow users to append release statuses" do
+      assert_difference -> { ReleaseStatus.count }, +1 do
+        post :create, params: {stack_id: @stack, deploy_id: @deploy.id, status: 'success'}
+        assert_response :created
+      end
+
+      status = ReleaseStatus.last
+      assert_equal 'success', status.state
+      assert_equal '@walrus signaled this release as healthy.', status.description
+      assert_equal @deploy.permalink, status.target_url
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180417130436) do
+ActiveRecord::Schema.define(version: 20180906083930) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535
@@ -45,8 +45,8 @@ ActiveRecord::Schema.define(version: 20180417130436) do
 
   create_table "commits", force: :cascade do |t|
     t.integer "stack_id", limit: 4, null: false
-    t.integer "author_id", limit: 4, null: false
-    t.integer "committer_id", limit: 4, null: false
+    t.integer "author_id", limit: 4
+    t.integer "committer_id", limit: 4
     t.string "sha", limit: 40, null: false
     t.text "message", limit: 65535, null: false
     t.datetime "created_at"
@@ -158,6 +158,21 @@ ActiveRecord::Schema.define(version: 20180417130436) do
     t.index ["stack_id"], name: "index_pull_requests_on_stack_id"
   end
 
+  create_table "release_statuses", force: :cascade do |t|
+    t.integer "stack_id", null: false
+    t.integer "commit_id", null: false
+    t.integer "user_id"
+    t.string "state", limit: 10, null: false
+    t.string "description", limit: 1024
+    t.string "target_url", limit: 1024
+    t.bigint "github_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["commit_id", "github_id"], name: "index_deploy_statuses_on_commit_id_and_github_id"
+    t.index ["stack_id", "commit_id"], name: "index_deploy_statuses_on_stack_id_and_commit_id"
+    t.index ["user_id"], name: "index_deploy_statuses_on_user_id"
+  end
+
   create_table "stacks", force: :cascade do |t|
     t.string "repo_name", limit: 100, null: false
     t.string "repo_owner", limit: 39, null: false

data/test/dummy/db/seeds.rb

@@ -75,6 +75,10 @@ module Shipit
               "Eat some chips"
             ]
           },
+          "status": {
+            "context": "shipit/pre-production",
+            "delay": 60
+          },
           "deploy": {
             "max_commits": 3,
             "override": [

data/test/fixtures/shipit/commits.yml

@@ -117,6 +117,19 @@ cyclimse_merged:
   updated_at: <%= 8.days.ago.to_s(:db) %>
   pull_request_id: 99
 
+anonymous:
+  id: 10
+  sha: 216100bc78431fd73cac00592cd016d0d508458e
+  message: "whoami"
+  stack: shipit
+  author:
+  committer:
+  authored_at: <%= 10.days.ago.to_s(:db) %>
+  committed_at: <%= 9.days.ago.to_s(:db) %>
+  additions: 42
+  deletions: 24
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
 soc_first:
   id: 101
   sha: 5e9278037b872fd9a6690523e411ecb3aa181355

data/test/fixtures/shipit/release_statuses.yml

@@ -0,0 +1,16 @@
+to_be_created:
+  stack: shipit
+  commit_id: 4
+  user: walrus
+  state: pending
+  description: Deploy started
+  target_url: https://example.com/deploys/42
+
+created:
+  stack: shipit
+  commit_id: 1
+  user: walrus
+  state: pending
+  description: Deploy started
+  target_url: https://example.com/deploys/24
+  github_id: 234234234

data/test/fixtures/shipit/stacks.yml

@@ -20,6 +20,10 @@ shipit:
       "deploy": {"override": null, "interval": 60, "max_commits": 3, "variables": [{"name": "SAFETY_DISABLED", "title": "Set to 1 to do dangerous things", "default": 0}]},
       "rollback": {"override": ["echo 'Rollback!'"]},
       "fetch": ["echo '42'"],
+      "status": {
+        "context": "shipit/production",
+        "delay": 60
+      },
       "tasks": {
         "restart": {
           "action": "Restart application",