shipit-engine 0.7.0 → 0.8.0

data/app/models/shipit/deploy.rb

@@ -8,12 +8,32 @@ module Shipit
       after_transition to: :success, do: :schedule_continuous_delivery
       after_transition to: :success, do: :update_undeployed_commits_count
       after_transition to: :aborted, do: :trigger_revert_if_required
+      after_transition any => any, do: :update_commit_deployments
+    end
+
+    has_many :commit_deployments, inverse_of: :task, foreign_key: :task_id do
+      GITHUB_STATUSES = {
+        'pending' => 'pending',
+        'failed' => 'failed',
+        'success' => 'success',
+        'error' => 'error',
+        'aborted' => 'error',
+      }
+
+      def append_status(task_status)
+        if github_status = GITHUB_STATUSES[task_status]
+          each do |deployment|
+            deployment.statuses.create!(status: github_status)
+          end
+        end
+      end
     end
 
     before_create :denormalize_commit_stats
+    after_create :create_commit_deployments
     after_commit :broadcast_update
 
-    delegate :broadcast_update, to: :stack
+    delegate :broadcast_update, :filter_deploy_envs, to: :stack
 
     def build_rollback(user = nil, env: nil)
       Rollback.new(
@@ -117,6 +137,16 @@ module Shipit
 
     private
 
+    def create_commit_deployments
+      commits.each do |commit|
+        commit_deployments.create!(commit: commit)
+      end
+    end
+
+    def update_commit_deployments
+      commit_deployments.append_status(status)
+    end
+
     def trigger_revert_if_required
       return unless rollback_once_aborted?
       return unless supports_rollback?
@@ -135,11 +165,7 @@ module Shipit
 
     def schedule_continuous_delivery
       return unless stack.continuous_deployment?
-
-      to_deploy = stack.commits.order(:id).newer_than(until_commit).successful.last
-      return unless to_deploy
-
-      stack.trigger_deploy(to_deploy, to_deploy.committer)
+      ContinuousDeliveryJob.perform_later(stack)
     end
 
     def last_successful_deploy

data/app/models/shipit/deploy_spec.rb

@@ -90,6 +90,14 @@ module Shipit
       TaskDefinition.new(id, coerce_task_definition(config('tasks', id)) || task_not_found!(id))
     end
 
+    def filter_deploy_envs(env)
+      EnvironmentVariables.with(env).permit(deploy_variables)
+    end
+
+    def filter_task_envs(id, env)
+      find_task_definition(id).filter_envs(env)
+    end
+
     def review_checklist
       (config('review', 'checklist') || discover_review_checklist || []).map(&:strip).select(&:present?)
     end

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

@@ -15,7 +15,7 @@ module Shipit
 
       def discover_gem_checklist
         [%(<strong>Don't forget to add a tag before deploying!</strong> You can do this with:
-          git tag -a -m "Version <strong>x.y.z</strong>" v<strong>x.y.z</strong> && git push --tags)] if gem?
+          git tag v<strong>x.y.z</strong> && git push --tags)] if gem?
       end
 
       def gem?

data/app/models/shipit/rollback.rb

@@ -27,5 +27,15 @@ module Shipit
     def to_partial_path
       'deploys/deploy'
     end
+
+    private
+
+    def create_commit_deployments
+      # Rollback events are confusing in GitHub
+    end
+
+    def update_commit_deployments
+      # Rollback events are confusing in GitHub
+    end
   end
 end

data/app/models/shipit/stack.rb

@@ -55,13 +55,14 @@ module Shipit
       undeployed_commits_count > 0
     end
 
-    def trigger_task(definition_id, user)
+    def trigger_task(definition_id, user, env: nil)
       commit = last_deployed_commit
       task = tasks.create(
         user_id: user.id,
         definition: find_task_definition(definition_id),
         until_commit_id: commit.id,
         since_commit_id: commit.id,
+        env: filter_task_envs(definition_id, (env || {})),
       )
       task.enqueue
       task
@@ -74,18 +75,26 @@ module Shipit
         user_id: user.id,
         until_commit: until_commit,
         since_commit: since_commit,
-        env: env || {},
+        env: filter_deploy_envs(env || {}),
       )
       deploy.enqueue
       deploy
     end
 
+    def trigger_continuous_deploy
+      return unless deployable?
+      if commit = last_deployable_commit
+        return if commit.deployed?
+        trigger_deploy(commit, commit.committer)
+      end
+    end
+
     def async_refresh_deployed_revision
       FetchDeployedRevisionJob.perform_later(self)
     end
 
     def update_deployed_revision(sha)
-      return if deploying?
+      return if active_task?
 
       last_deploy = deploys_and_rollbacks.last
       actual_deployed_commit = commits.reachable.by_sha!(sha)
@@ -108,7 +117,7 @@ module Shipit
     end
 
     def status
-      return :deploying if deploying?
+      return :deploying if active_task?
       :default
     end
 
@@ -124,6 +133,10 @@ module Shipit
       end
     end
 
+    def last_deployable_commit
+      commits.order(id: :desc).newer_than(last_deployed_commit).reachable.preload(:statuses).to_a.find(&:deployable?)
+    end
+
     def filter_visible_statuses(statuses)
       statuses.reject { |s| hidden_statuses.include?(s.context) }
     end
@@ -133,7 +146,7 @@ module Shipit
     end
 
     def deployable?
-      !locked? && !deploying?
+      !locked? && !active_task?
     end
 
     def repo_name=(name)
@@ -190,13 +203,13 @@ module Shipit
       Shipit.github_api.commits(github_repo_name, sha: branch)
     end
 
-    def deploying?
-      !!active_deploy
+    def active_task?
+      !!active_task
     end
 
-    def active_deploy
-      return @active_deploy if defined?(@active_deploy)
-      @active_deploy ||= deploys_and_rollbacks.active.last
+    def active_task
+      return @active_task if defined?(@active_task)
+      @active_task ||= tasks.active.exclusive.last
     end
 
     def locked?
@@ -217,7 +230,7 @@ module Shipit
     end
 
     delegate :plugins, :task_definitions, :hidden_statuses, :required_statuses, :soft_failing_statuses,
-             :deploy_variables, to: :cached_deploy_spec
+             :deploy_variables, :filter_task_envs, :filter_deploy_envs, to: :cached_deploy_spec
 
     def monitoring?
       monitoring.present?
@@ -280,10 +293,15 @@ module Shipit
       inaccessible_since?
     end
 
+    def reload(*)
+      clear_cache
+      super
+    end
+
     private
 
     def clear_cache
-      remove_instance_variable(:@active_deploy) if defined?(@active_deploy)
+      remove_instance_variable(:@active_task) if defined?(@active_task)
     end
 
     def sync_github

data/app/models/shipit/status_group.rb

@@ -9,7 +9,7 @@ module Shipit
       @statuses = visible_statuses
     end
 
-    delegate :success?, :state, to: :significant_status
+    delegate :pending?, :success?, :error?, :failure?, :state, to: :significant_status
 
     def description
       "#{success_count} / #{statuses.count} checks OK"

data/app/models/shipit/task.rb

@@ -15,6 +15,7 @@ module Shipit
     scope :success, -> { where(status: 'success') }
     scope :completed, -> { where(status: %w(success error failed flapping aborted)) }
     scope :active, -> { where(status: %w(pending running aborting)) }
+    scope :exclusive, -> { where(allow_concurrency: false) }
 
     scope :due_for_rollup, -> { completed.where(rolled_up: false).where('created_at <= ?', 1.hour.ago) }
 

data/app/models/shipit/task_definition.rb

@@ -15,14 +15,21 @@ module Shipit
       end
     end
 
-    attr_reader :id, :action, :description, :steps, :checklist
+    attr_reader :id, :action, :description, :steps, :checklist, :variables
+    alias_method :to_param, :id
 
     def initialize(id, config)
       @id = id
       @action = config['action']
       @description = config['description'] || ''
       @steps = config['steps'] || []
+      @variables = task_variables(config['variables'] || [])
       @checklist = config['checklist'] || []
+      @allow_concurrency = config['allow_concurrency'] || false
+    end
+
+    def allow_concurrency?
+      @allow_concurrency
     end
 
     def as_json
@@ -31,8 +38,20 @@ module Shipit
         action: action,
         description: description,
         steps: steps,
+        variables: variables.map(&:to_h),
         checklist: checklist,
+        allow_concurrency: allow_concurrency?,
       }
     end
+
+    def filter_envs(env)
+      EnvironmentVariables.with(env).permit(variables)
+    end
+
+    private
+
+    def task_variables(config_variables)
+      config_variables.map(&VariableDefinition.method(:new))
+    end
   end
 end

data/app/models/shipit/user.rb

@@ -8,6 +8,8 @@ module Shipit
     has_many :commits, foreign_key: :committer_id, inverse_of: :committer
     has_many :tasks
 
+    attr_encrypted :github_access_token, key: Shipit.user_access_tokens_key
+
     def self.find_or_create_by_login!(login)
       find_or_create_by!(login: login) do |user|
         user.github_user = Shipit.github_api.user(login)
@@ -33,6 +35,12 @@ module Shipit
       end
     end
 
+    def github_api
+      return Shipit.github_api unless github_access_token
+
+      @github_api ||= Octokit::Client.new(access_token: github_access_token)
+    end
+
     def identifiers_for_ping
       {github_id: github_id, name: name, email: email, github_login: login}
     end
@@ -60,8 +68,8 @@ module Shipit
         name: github_user.name || github_user.login, # Name is not mandatory on GitHub
         email: github_user.email,
         login: github_user.login,
-        avatar_url: github_user.rels[:avatar].try(:href),
-        api_url: github_user.rels[:self].try(:href),
+        avatar_url: github_user.avatar_url,
+        api_url: github_user.url,
       )
     end
 

data/app/models/shipit/variable_definition.rb

@@ -1,19 +1,17 @@
 module Shipit
   class VariableDefinition
-    attr_reader :name, :title, :value, :default
+    attr_reader :name, :title, :default
 
     def initialize(attributes)
       @name = attributes.fetch('name')
       @title = attributes['title']
-      @value = attributes['value']
-      @default = attributes['default']
+      @default = attributes['default'].to_s
     end
 
     def to_h
       {
         'name' => @name,
         'title' => @title,
-        'value' => @value,
         'default' => @default,
       }
     end

data/app/serializers/shipit/commit_serializer.rb

@@ -1,8 +1,26 @@
 module Shipit
   class CommitSerializer < ShortCommitSerializer
+    include GithubUrlHelper
+    include ConditionalAttributes
+
     has_one :author
     has_one :committer
 
-    attributes :additions, :deletions, :authored_at, :committed_at
+    attributes :additions, :deletions, :authored_at, :committed_at, :html_url, :pull_request
+
+    def html_url
+      github_commit_url(object)
+    end
+
+    def pull_request
+      {
+        number: object.pull_request_number,
+        html_url: github_pull_request_url(object),
+      }
+    end
+
+    def include_pull_request?
+      object.pull_request?
+    end
   end
 end

data/app/serializers/shipit/deploy_serializer.rb

@@ -1,13 +1,19 @@
 module Shipit
   class DeploySerializer < TaskSerializer
+    include GithubUrlHelper
+
     has_many :commits
 
-    attributes :additions, :deletions
+    attributes :compare_url, :additions, :deletions
 
     def html_url
       stack_deploy_url(object.stack, object)
     end
 
+    def compare_url
+      github_commit_range_url(object.stack, object.since_commit, object.until_commit)
+    end
+
     def type
       :deploy
     end

data/app/serializers/shipit/short_commit_serializer.rb

@@ -3,7 +3,7 @@ module Shipit
     attributes :sha, :message
 
     def message
-      object.pull_request? ? "#{object.pull_request_title} (##{object.pull_request_id})" : object.message
+      object.pull_request? ? object.pull_request_title : object.message
     end
   end
 end

data/app/serializers/shipit/task_serializer.rb

@@ -5,7 +5,7 @@ module Shipit
     has_one :author
     has_one :revision, serializer: ShortCommitSerializer
 
-    attributes :id, :url, :html_url, :output_url, :type, :status, :updated_at, :created_at
+    attributes :id, :url, :html_url, :output_url, :type, :status, :action, :description, :updated_at, :created_at
 
     def revision
       object.until_commit
@@ -26,5 +26,21 @@ module Shipit
     def type
       :task
     end
+
+    def action
+      object.definition.try!(:action)
+    end
+
+    def include_action?
+      type == :task
+    end
+
+    def description
+      object.definition.try!(:action)
+    end
+
+    def include_description?
+      type == :task
+    end
   end
 end

data/app/views/shipit/_variables.html.erb

@@ -0,0 +1,15 @@
+<% unless variables.empty? %>
+  <section>
+    <header class="section-header variables-header">
+      <h2><%= header %></h2>
+    </header>
+    <%= form.fields_for field_name do |field| %>
+      <% variables.each do |variable| %>
+        <p class="variables-fields">
+          <%= field.text_field variable.name, value: variable.default %>
+          <%= field.label variable.name, variable.title || variable.name %>
+        </p>
+      <% end %>
+    <% end %>
+  </section>
+<% end %>