shipit-engine 0.11.0 → 0.12.0

data/app/models/shipit/status.rb

@@ -13,18 +13,24 @@ module Shipit
 
     delegate :broadcast_update, to: :commit
 
-    def self.replicate_from_github!(github_status)
-      find_or_create_by!(
-        state: github_status.state,
-        description: github_status.description,
-        target_url: github_status.rels.try(:[], :target).try(:href),
-        context: github_status.context,
-        created_at: github_status.created_at,
-      )
+    class << self
+      def replicate_from_github!(github_status)
+        find_or_create_by!(
+          state: github_status.state,
+          description: github_status.description,
+          target_url: github_status.target_url,
+          context: github_status.context,
+          created_at: github_status.created_at,
+        )
+      end
     end
 
     delegate :stack, to: :commit
 
+    def unknown?
+      false
+    end
+
     def ignored?
       stack.soft_failing_statuses.include?(context)
     end

data/app/models/shipit/status_group.rb

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

data/app/models/shipit/task.rb

@@ -3,6 +3,7 @@ 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
 
     attr_accessor :pid
 
@@ -22,6 +23,7 @@ module Shipit
     scope :completed, -> { where(status: COMPLETED_STATUSES) }
     scope :active, -> { where(status: ACTIVE_STATUSES) }
     scope :exclusive, -> { where(allow_concurrency: false) }
+    scope :unsuccessful, -> { where(status: UNSUCCESSFUL_STATUSES) }
 
     scope :due_for_rollup, -> { completed.where(rolled_up: false).where('created_at <= ?', 1.hour.ago) }
 

data/app/models/shipit/unknown_status.rb

@@ -5,6 +5,10 @@ module Shipit
     end
     alias_method :simple_state, :state
 
+    def unknown?
+      true
+    end
+
     def pending?
       false
     end

data/app/models/shipit/user.rb

@@ -35,6 +35,14 @@ module Shipit
       end
     end
 
+    alias_method :original_github_access_token, :github_access_token
+    def github_access_token
+      original_github_access_token
+    rescue OpenSSL::Cipher::CipherError
+      update_columns(encrypted_github_access_token: nil, encrypted_github_access_token_iv: nil)
+      nil
+    end
+
     def github_api
       return Shipit.github_api unless github_access_token
 
@@ -55,7 +63,7 @@ module Shipit
 
     def stacks_contributed_to
       return [] unless id
-      Commit.where('author_id = :id or committer_id = :id', id: id).uniq.pluck(:stack_id)
+      Commit.where('author_id = :id or committer_id = :id', id: id).distinct.pluck(:stack_id)
     end
 
     def refresh_from_github!

data/app/serializers/shipit/stack_serializer.rb

@@ -4,7 +4,8 @@ module Shipit
 
     has_one :lock_author
     attributes :id, :repo_owner, :repo_name, :environment, :html_url, :url, :tasks_url, :deploy_url, :deploy_spec,
-               :undeployed_commits_count, :is_locked, :lock_reason, :continuous_deployment, :created_at, :updated_at
+               :undeployed_commits_count, :is_locked, :lock_reason, :continuous_deployment, :created_at,
+               :updated_at, :locked_since
 
     def url
       api_stack_url(object)
@@ -30,6 +31,10 @@ module Shipit
       object.locked?
     end
 
+    def include_locked_since?
+      object.locked?
+    end
+
     def deploy_spec
       object.cached_deploy_spec.cacheable.config
     end

data/app/views/shipit/commit_checks/_checks.html.erb

@@ -0,0 +1,13 @@
+<%= javascript_include_tag 'task' %>
+
+<section>
+  <header class="section-header">
+    <h2>Checks</h2>
+  </header>
+
+  <%- url = stack_tail_commit_checks_path(commit.stack, sha: commit.sha, since: 0) -%>
+
+  <div class="task-output-container">
+    <pre class="commit-checks" data-status="<%= commit.checks.status %>"><code data-next-chunks-url="<%= url %>"></code></pre>
+  </div>
+</section>

data/app/views/shipit/commit_checks/show.html.erb

@@ -0,0 +1,5 @@
+<%= render partial: 'shipit/stacks/header', locals: { stack: @stack } %>
+
+<div class="wrapper">
+  <%= render_checks @commit %>
+</div>

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

@@ -36,7 +36,7 @@
     </li>
     <% if stack.deploy_url.present? %>
       <li class="nav__list__item">
-        <%= link_to 'View website', stack.deploy_url, :target => '_blank', :class => 'deploy-url' %>
+        <%= sanitize link_to 'View website', stack.deploy_url, :target => '_blank', :class => 'deploy-url' %>
       </li>
     <% end %>
   </ul>

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

@@ -49,6 +49,21 @@
   </div>
 <% end %>
 
+<% if @stack.continuous_delivery_delayed? %>
+  <div class="banner">
+    <div class="banner__inner wrapper">
+      <div class="banner__content">
+        <h2 class="banner__title">Continuous Delivery Delayed!</h2>
+        <p class="banner__text">
+          Continuous Delivery for this stack is currently paused because
+          <%= link_to 'the pre-deploy checks failed', stack_commit_checks_path(@stack, sha: @stack.next_commit_to_deploy.sha) %>.
+          You can either wait for them to pass, or trigger a deploy manually.
+        </p>
+      </div>
+    </div>
+  </div>
+<% end %>
+
 <div class="wrapper" data-event-stream="<%= events_path(channels: ["stack.#{@stack.id}"]) %>">
 
   <section>

data/config/routes.rb

@@ -24,7 +24,7 @@ Shipit::Engine.routes.draw do
   # API
   namespace :api do
     root to: 'base#index'
-    resources :stacks, only: :index
+    resources :stacks, only: %i(index create)
     scope '/stacks/*id', id: stack_id_format, as: :stack do
       get '/' => 'stacks#show'
     end
@@ -62,6 +62,7 @@ Shipit::Engine.routes.draw do
   end
 
   scope '/*stack_id', stack_id: stack_id_format, as: :stack do
+    get '/commit/:sha/checks' => 'commit_checks#show', as: :commit_checks
     get '/commit/:sha/checks/tail' => 'commit_checks#tail', as: :tail_commit_checks, defaults: {format: :json}
 
     resources :rollbacks, only: %i(create)

data/db/migrate/20140226233935_create_baseline.rb

@@ -49,13 +49,13 @@ class CreateBaseline < ActiveRecord::Migration
     create_table "github_hooks", force: :cascade do |t|
       t.integer  "stack_id",     limit: 4
       t.integer  "github_id",    limit: 4
-      t.string   "event",        limit: 255
+      t.string   "event",        limit: 50
       t.datetime "created_at"
       t.datetime "updated_at"
       t.string   "secret",       limit: 255
       t.string   "api_url",      limit: 255
       t.string   "type",         limit: 255
-      t.string   "organization", limit: 255
+      t.string   "organization", limit: 39
     end
 
     add_index "github_hooks", ["organization", "event"], name: "index_github_hooks_on_organization_and_event", unique: true, using: :btree
@@ -94,9 +94,9 @@ class CreateBaseline < ActiveRecord::Migration
     add_index "output_chunks", ["task_id"], name: "index_output_chunks_on_task_id", using: :btree
 
     create_table "stacks", force: :cascade do |t|
-      t.string   "repo_name",                limit: 255,                          null: false
-      t.string   "repo_owner",               limit: 255,                          null: false
-      t.string   "environment",              limit: 255,   default: "production", null: false
+      t.string   "repo_name",                limit: 100,                          null: false
+      t.string   "repo_owner",               limit: 39,                           null: false
+      t.string   "environment",              limit: 50,    default: "production", null: false
       t.datetime "created_at"
       t.datetime "updated_at"
       t.string   "branch",                   limit: 255,   default: "master",     null: false
@@ -127,12 +127,12 @@ class CreateBaseline < ActiveRecord::Migration
       t.integer  "stack_id",        limit: 4,                         null: false
       t.integer  "since_commit_id", limit: 4,                         null: false
       t.integer  "until_commit_id", limit: 4,                         null: false
-      t.string   "status",          limit: 255,   default: "pending", null: false
+      t.string   "status",          limit: 10,    default: "pending", null: false
       t.datetime "created_at"
       t.datetime "updated_at"
       t.integer  "user_id",         limit: 4
       t.boolean  "rolled_up",                     default: false,     null: false
-      t.string   "type",            limit: 255
+      t.string   "type",            limit: 20
       t.integer  "parent_id",       limit: 4
       t.integer  "additions",       limit: 4,     default: 0
       t.integer  "deletions",       limit: 4,     default: 0
@@ -148,9 +148,9 @@ class CreateBaseline < ActiveRecord::Migration
     create_table "teams", force: :cascade do |t|
       t.integer  "github_id",    limit: 4
       t.string   "api_url",      limit: 255
-      t.string   "slug",         limit: 255
+      t.string   "slug",         limit: 50
       t.string   "name",         limit: 255
-      t.string   "organization", limit: 255
+      t.string   "organization", limit: 39
       t.datetime "created_at",               null: false
       t.datetime "updated_at",               null: false
     end
@@ -161,7 +161,7 @@ class CreateBaseline < ActiveRecord::Migration
       t.integer  "github_id",  limit: 4
       t.string   "name",       limit: 255, null: false
       t.string   "email",      limit: 255
-      t.string   "login",      limit: 255
+      t.string   "login",      limit: 39
       t.string   "api_url",    limit: 255
       t.datetime "created_at"
       t.datetime "updated_at"

data/db/migrate/20160802092812_add_continuous_delivery_delayed_since_to_stacks.rb

@@ -0,0 +1,5 @@
+class AddContinuousDeliveryDelayedSinceToStacks < ActiveRecord::Migration
+  def change
+    add_column :stacks, :continuous_delivery_delayed_since, :datetime, null: true
+  end
+end

data/db/migrate/20160822131405_add_locked_since_to_stacks.rb

@@ -0,0 +1,5 @@
+class AddLockedSinceToStacks < ActiveRecord::Migration
+  def change
+    add_column :stacks, :locked_since, :datetime, null: true
+  end
+end

data/lib/shipit.rb

@@ -175,6 +175,10 @@ module Shipit
     {'SHIPIT' => '1'}.merge(secrets.env || {})
   end
 
+  def shell_paths
+    [Shipit::Engine.root.join('lib', 'snippets').to_s]
+  end
+
   def revision
     @revision ||= begin
       if revision_file.exist?

data/lib/shipit/command.rb

@@ -69,7 +69,7 @@ module Shipit
 
     def with_full_path
       old_path = ENV['PATH']
-      ENV['PATH'] = "#{ENV['PATH']}:#{Shipit::Engine.root.join('lib', 'snippets')}"
+      ENV['PATH'] = "#{ENV['PATH']}:#{Shipit.shell_paths.join(':')}"
       yield
     ensure
       ENV['PATH'] = old_path

data/lib/shipit/commands.rb

@@ -1,17 +1,20 @@
 module Shipit
   class Commands
-    def self.for(model)
-      "#{model.class.name}Commands".constantize.new(model)
-    end
+    class << self
+      def for(model)
+        "#{model.class.name}Commands".constantize.new(model)
+      end
 
-    def self.git_version
-      @git_version ||= begin
-        `git --version` =~ /([\d\.]+)/
+      def git_version
+        @git_version ||= parse_git_version(`git --version`)
+      end
+
+      def parse_git_version(raw_git_version)
+        raw_git_version =~ /(\d+\.\d+\.\d+)/
         raise 'git command not found' unless $1
         Gem::Version.new($1)
       end
     end
-
     delegate :git_version, to: :class
 
     def env

data/lib/shipit/csv_serializer.rb

@@ -9,7 +9,7 @@ module Shipit
 
     def dump(array)
       return nil if array.blank?
-      array.join(',')
+      Array.wrap(array).join(',')
     end
   end
 end

data/lib/shipit/stack_commands.rb

@@ -16,6 +16,15 @@ module Shipit
       end
     end
 
+    def fetched?(commit)
+      git_dir = File.join(@stack.git_path, '.git')
+      if Dir.exist?(git_dir)
+        git('rev-parse', '--quiet', '--verify', "#{commit.sha}^{commit}", env: env, chdir: @stack.git_path)
+      else
+        Command.new('test', '-d', git_dir, env: env, chdir: @stack.deploys_path)
+      end
+    end
+
     def fetch_deployed_revision
       with_temporary_working_directory do |dir|
         spec = DeploySpec::FileSystem.new(dir, @stack.environment)
@@ -33,14 +42,17 @@ module Shipit
     end
 
     def with_temporary_working_directory(commit: nil)
-      @stack.acquire_git_cache_lock do
-        fetch.run!
-        git('checkout', '--force', "origin/#{@stack.branch}", env: env, chdir: @stack.git_path).run!
+      if commit
+        @stack.acquire_git_cache_lock do
+          fetch.run! unless fetched?(commit).tap(&:run).success?
+        end
       end
+
       Dir.mktmpdir do |dir|
         git('clone', @stack.git_path, @stack.repo_name, chdir: dir).run!
-        git('checkout', commit.sha, chdir: dir) if commit
-        yield Pathname.new(File.join(dir, @stack.repo_name))
+        git_dir = File.join(dir, @stack.repo_name)
+        git('checkout', commit.sha, chdir: git_dir).run! if commit
+        yield Pathname.new(git_dir)
       end
     end
 

data/lib/shipit/task_commands.rb

@@ -1,6 +1,6 @@
 module Shipit
   class TaskCommands < Commands
-    delegate :fetch, to: :stack_commands
+    delegate :fetch, :fetched?, to: :stack_commands
 
     def initialize(task)
       @task = task
@@ -32,7 +32,7 @@ module Shipit
       super.merge(
         'ENVIRONMENT' => @stack.environment,
         'BRANCH' => @stack.branch,
-        'USER' => "#{@task.author.login} (#{normalized_name}) via 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,

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/lib/snippets/push-to-heroku

@@ -13,8 +13,9 @@ function yellow() {
 HEROKU_APP=$1
 HEROKU_RELEASES=`heroku releases --app $HEROKU_APP 2>&1`
 GIT_COMMAND=${GIT_COMMAND:="git push git@heroku.com:$HEROKU_APP.git $SHA:master $GIT_FLAGS"}
+POST_MIGRATION_DEPLOY=${POST_MIGRATION_DEPLOY:="true"}
 
-if [ -z $HEROKU_APP ]; then
+if [[ -z "${HEROKU_APP}" ]]; then
   red "Usage: $0 <app-name>"
   red "Supported environment variables:"
   red "  - GIT_COMMAND: override the entire 'git push' command."
@@ -24,49 +25,52 @@ fi
 
 echo "$HEROKU_RELEASES" | head -n2 | tail -n1 | grep '^\(v[0-9]\+\)' >/dev/null
 
-if [ $? -ne 0 ]; then
+if [[ $? -ne 0 ]]; then
   red "Error detecting current heroku release. Message from 'heroku releases':"
-  echo "$HEROKU_RELEASES"
-  red "Please contact a heroku collaborator for $HEROKU_APP:"
+  echo "${HEROKU_RELEASES}"
+  red "Please contact a heroku collaborator for ${HEROKU_APP}:"
   heroku sharing --app $HEROKU_APP
   exit 1;
 fi
 
 HEROKU_LAST_GOOD_RELEASE=`echo "$HEROKU_RELEASES" | head -n2 | tail -n1 | sed -e 's/^\(v[0-9]\+\).*/\1/'`
-green "Current heroku release: $HEROKU_LAST_GOOD_RELEASE"
+green "Current heroku release: ${HEROKU_LAST_GOOD_RELEASE}"
 
 green "Pushing to heroku."
 $GIT_COMMAND
-if [ $? -ne 0 ]; then
+if [[ $? -ne 0 ]]; then
   red "Heroku push rejected. See message above."
-  red "Please contact a heroku collaborator for $HEROKU_APP:"
+  red "Please contact a heroku collaborator for ${HEROKU_APP}:"
   heroku sharing --app $HEROKU_APP
   exit 1;
 fi
 
-MIGRATIONS=`heroku run rake db:migrate:status --app $HEROKU_APP | grep -e '^\s*down'`
+MIGRATION_STATUS=`heroku run rake db:migrate:status --app $HEROKU_APP | grep -e '^\s*down'`
 
-if [ "$MIGRATIONS" != "" ]; then
+if [[ "${MIGRATION_STATUS}" != "" ]]; then
   green "There are pending migrations to apply:"
-  echo $MIGRATIONS
+  echo $MIGRATION_STATUS
 
   green "Migrating database."
   heroku run rake db:migrate --app $HEROKU_APP
-  if [ $? -ne 0 ]; then
+
+  POST_MIGRATION_STATUS=`heroku run rake db:migrate:status --app $HEROKU_APP | grep -e '^\s*down'`
+  if [[ "${POST_MIGRATION_STATUS}" != "" ]]; then
     red "Migration failed! This is bad."
-    red "Please contact a heroku collaborator for $HEROKU_APP:"
+    red "Please contact a heroku collaborator for ${HEROKU_APP}:"
     heroku sharing --app $HEROKU_APP
-    red "The app $HEROKU_APP will now be reverted to its last working version $HEROKU_LAST_GOOD_RELEASE."
+    red "The app ${HEROKU_APP} will now be reverted to its last working version ${HEROKU_LAST_GOOD_RELEASE}."
     heroku releases:rollback $HEROKU_LAST_GOOD_RELEASE --app $HEROKU_APP
     red "Abort."
     exit 1
   fi
 
-  green "Post-migration dyno restart."
-  heroku restart --app $HEROKU_APP
+  if [[ "${POST_MIGRATION_DEPLOY}" == "true" ]]; then
+    green "Post-migration dyno restart."
+    heroku restart --app $HEROKU_APP
+  fi
 else
   green "There are no pending migrations."
 fi
 
 green "All done."
-