shipit-engine 0.20.1 → 0.21.0

data/lib/shipit/command.rb

@@ -8,11 +8,19 @@ module Shipit
     MAX_READ = 64.kilobytes
 
     Error = Class.new(StandardError)
-    Failed = Class.new(Error)
     NotFound = Class.new(Error)
     Denied = Class.new(Error)
     TimedOut = Class.new(Error)
 
+    class Failed < Error
+      attr_reader :exit_code
+
+      def initialize(message, exit_code)
+        super(message)
+        @exit_code = exit_code
+      end
+    end
+
     attr_reader :out, :code, :chdir, :env, :args, :pid, :timeout
 
     def initialize(*args, default_timeout: Shipit.default_inactivity_timeout, env: {}, chdir:)
@@ -44,7 +52,7 @@ module Shipit
     end
 
     def success?
-      code == 0
+      !code.nil? && code.zero?
     end
 
     def exit_message
@@ -121,7 +129,7 @@ module Shipit
 
     def stream!(&block)
       stream(&block)
-      raise Failed.new(exit_message) unless success?
+      raise Failed.new(exit_message, code) unless success?
       self
     end
 

data/lib/shipit/engine.rb

@@ -1,5 +1,3 @@
-require 'bootstrap'
-
 module Shipit
   class Engine < ::Rails::Engine
     isolate_namespace Shipit
@@ -17,8 +15,6 @@ module Shipit
         task.js
         shipit.js
         shipit.css
-        shipit_bs.js
-        shipit_bs.css
       )
       app.config.assets.precompile << proc do |path|
         path =~ %r{\Aplugins/[\-\w]+\.(js|css)\Z}

data/lib/shipit/stack_commands.rb

@@ -26,7 +26,7 @@ module Shipit
     end
 
     def fetch_deployed_revision
-      with_temporary_working_directory do |dir|
+      with_temporary_working_directory(commit: @stack.commits.last) do |dir|
         spec = DeploySpec::FileSystem.new(dir, @stack.environment)
         outputs = spec.fetch_deployed_revision_steps!.map do |command_line|
           Command.new(command_line, env: env, chdir: dir).run
@@ -42,6 +42,8 @@ module Shipit
     end
 
     def with_temporary_working_directory(commit: nil)
+      commit ||= @stack.last_deployed_commit.presence || @stack.commits.last
+
       @stack.acquire_git_cache_lock do
         if !commit || !fetched?(commit).tap(&:run).success?
           fetch.run!

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.20.1'.freeze
+  VERSION = '0.21.0'.freeze
 end

data/lib/snippets/assert-lerna-fixed-version-tag

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+VERSION=$(node --eval "console.log(require('./lerna.json').version);")
+echo -e "\033[0;32mTrying to publish version $VERSION\033[0m"
+
+git tag | grep "^v$VERSION$" > /dev/null
+if [ $? != '0' ]; then
+  echo -e "\033[1;31mYou need to create the \033[0;33mv$VERSION\033[1;31m tag first.\033[0m"
+  exit 1
+fi
+
+TAG_REV=$(git rev-list -n1 "v$VERSION")
+HEAD_REV=$(git rev-parse HEAD)
+
+if [ "$TAG_REV" != "$HEAD_REV" ]; then
+  echo -e "\033[1;31mYou're attempting to publish \033[0;33m$HEAD_REV\033[1;31m as \033[0;33mv$VERSION\033[1;31m but it already points to \033[0;33m$TAG_REV\033[1;31m.\033[0m"
+  exit 1
+fi
+
+echo -e "\033[0;32mAll clear!\033[0m"
+exit 0

data/lib/snippets/assert-lerna-independent-version-tags

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+TAGS=$(git tag --points-at HEAD)
+
+if [ -z "$TAGS" ]; then
+  HEAD_REV=$(git rev-parse HEAD)
+  echo -e "\033[1;31mNo tags associated with $HEAD_REV.  Did you push your commits and tags?\033[0m"
+  exit 1
+fi
+
+for TAG in $TAGS
+do
+  if [[ "${TAG}" == @* ]]; then
+    TAG=$(echo "$TAG" | cut -d \/ -f 2)
+  fi
+
+  PACKAGE_NAME=$(echo "$TAG" | cut -d \@ -f 1)
+  TAG_PACKAGE_VERSION=$(echo "$TAG" | cut -d \@ -f 2)
+  ACTUAL_PACKAGE_VERSION=$(node -e "console.log(require('./packages/$PACKAGE_NAME/package.json').version)")
+
+  if [ "$TAG_PACKAGE_VERSION" != "$ACTUAL_PACKAGE_VERSION" ]; then
+    echo -e "\033[1;31m$PACKAGE_NAME is tagged as $TAG_PACKAGE_VERSION, but its package.json version is $ACTUAL_PACKAGE_VERSION.\033[0m"
+    exit 1
+  fi
+done
+
+echo -e "\033[0;32mAll clear!\033[0m"
+exit 0

data/lib/snippets/generate-local-npmrc

@@ -0,0 +1,19 @@
+#!/usr/bin/env node
+const {resolve} = require('path');
+const {existsSync, writeFileSync, readFileSync} = require('fs');
+const npmrc = resolve('.', '.npmrc');
+const npmrcContents = process.argv[2];
+
+if (!npmrcContents) {
+  console.error('npmrc contents not specified.');
+  process.exit(1);
+}
+
+if (existsSync(npmrc)) {
+  console.log('.npmrc already exists.')
+} else {
+  writeFileSync(npmrc, npmrcContents)
+
+  console.log('\nGenerated .npmrc:');
+  console.log(readFileSync(npmrc, {encoding: 'utf8'}))
+}

data/lib/snippets/misconfigured-npm-publish-config

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+echo -e "\033[1;31m Misconfigured package.json, please ensure the following has been met:\n \033[0m"
+
+echo -e "\033[1;31m * Please add a publishConfig with an access setting in your package.json.  e.g.,\033[0m"
+echo -e "\n\033[1;31m\t\"publishConfig:\" {\n\t   \"access\": \"<public|restricted>\" \n\t} \033[0m"
+echo -e "\n\033[1;31m * If your package is private, ensure your the package name is scoped (@organization/package) \033[0m"
+exit 1

data/lib/snippets/publish-lerna-independent-packages

@@ -0,0 +1,39 @@
+#!/usr/bin/env node
+const {resolve} = require('path');
+const {execSync} = require('child_process')
+const Repository = require(resolve('.', 'node_modules', 'lerna', 'lib', 'Repository'));
+const PackageUtilities = require(resolve('.', 'node_modules', 'lerna', 'lib', 'PackageUtilities'));
+
+function npmTag(version) {
+  const isNext = ['-beta', '-alpha', '-rc', '-next'].some(distributionType =>
+    version.includes(distributionType),
+  );
+  return isNext ? 'next' : 'latest';
+}
+
+const taggedPackages = execSync('git tag --points-at HEAD')
+  .toString()
+  .trim()
+  .split('\n')
+  .map(tag => {
+    if (tag.startsWith('@')) {
+      return `@${tag.split('@')[1]}`;
+    }
+    return tag.split('@')[0];
+  });
+
+const repository = new Repository('.');
+const unsortedPackages = PackageUtilities.getPackages({rootPath: '.', packageConfigs: repository.packageConfigs});
+const packages = PackageUtilities.topologicallyBatchPackages(unsortedPackages, true)
+  .reduce((acc, packageGroup) => [...acc, ...packageGroup], [])
+  .filter(({name}) => taggedPackages.includes(name));
+
+packages.forEach(({name, version}) => {
+  const command = `node_modules/.bin/lerna publish --yes --npm-client=npm --skip-npm=false --skip-git --force-publish=${name} --repo-version=${version} --scope=${name} --npm-tag=${npmTag(
+    version,
+  )}`;
+
+  // eslint-disable-next-line no-console
+  console.log(command);
+  require('child_process').execSync(command);
+});

data/lib/snippets/push-to-heroku

@@ -23,17 +23,17 @@ if [[ -z "${HEROKU_APP}" ]]; then
   exit 1;
 fi
 
-echo "$HEROKU_RELEASES" | head -n2 | tail -n1 | grep '^\(v[0-9]\+\)' >/dev/null
+echo "$HEROKU_RELEASES" | grep 'Current: \(v[0-9]\+\)' >/dev/null
 
 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}:"
-  heroku sharing --app $HEROKU_APP
+  heroku access --app $HEROKU_APP
   exit 1;
 fi
 
-HEROKU_LAST_GOOD_RELEASE=`echo "$HEROKU_RELEASES" | head -n2 | tail -n1 | sed -e 's/^\(v[0-9]\+\).*/\1/'`
+HEROKU_LAST_GOOD_RELEASE=`echo "$HEROKU_RELEASES" | grep 'Current: \(v[0-9]\+\)' | sed -e 's/.*\(v[0-9]\+\).*/\1/'`
 green "Current heroku release: ${HEROKU_LAST_GOOD_RELEASE}"
 
 green "Pushing to heroku."
@@ -41,7 +41,7 @@ $GIT_COMMAND
 if [[ $? -ne 0 ]]; then
   red "Heroku push rejected. See message above."
   red "Please contact a heroku collaborator for ${HEROKU_APP}:"
-  heroku sharing --app $HEROKU_APP
+  heroku access --app $HEROKU_APP
   exit 1;
 fi
 
@@ -58,7 +58,7 @@ if [[ "${MIGRATION_STATUS}" != "" ]]; then
   if [[ "${POST_MIGRATION_STATUS}" != "" ]]; then
     red "Migration failed! This is bad."
     red "Please contact a heroku collaborator for ${HEROKU_APP}:"
-    heroku sharing --app $HEROKU_APP
+    heroku access --app $HEROKU_APP
     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."

data/lib/tasks/cron.rake

@@ -7,7 +7,7 @@ namespace :cron do
     Shipit::PullRequest.schedule_merges
   end
 
-  task hourly: [:rollup, :refresh_users]
+  task hourly: %i(rollup refresh_users)
 
   desc "Rolls-up output chunks for completed deploys older than an hour"
   task rollup: :environment do

data/lib/tasks/dev.rake

@@ -15,7 +15,7 @@ namespace :dev do
 
     loop do
       sentence = Faker::Lorem.sentence.split.map do |word|
-        if rand(4) == 0
+        if rand(4).zero?
           "\e[#{rand(30..37)}m#{word}\e[0m"
         else
           word

data/test/controllers/api/deploys_controller_test.rb

@@ -40,6 +40,13 @@ module Shipit
         deploy.user == @user
       end
 
+      test "#create normalises the claimed user" do
+        request.headers['X-Shipit-User'] = @user.login.swapcase
+        post :create, params: {stack_id: @stack.to_param, sha: @commit.sha}
+        deploy = Deploy.last
+        assert_equal deploy.user, @user
+      end
+
       test "#create renders a 422 if the sha isn't found" do
         post :create, params: {stack_id: @stack.to_param, sha: '123443543545'}
         assert_response :unprocessable_entity
@@ -52,6 +59,18 @@ module Shipit
         assert_json 'errors', 'sha' => ['is too short (minimum is 6 characters)']
       end
 
+      test "#create renders a 409 if a concurrent task is already running" do
+        assert_difference -> { @stack.deploys.count }, 1 do
+          post :create, params: {stack_id: @stack.to_param, sha: @commit.sha}
+        end
+
+        assert_no_difference -> { @stack.deploys.count } do
+          post :create, params: {stack_id: @stack.to_param, sha: @commit.sha}
+        end
+
+        assert_response :conflict
+      end
+
       test "#create refuses to deploy locked stacks" do
         @stack.update!(lock_reason: 'Something broken')
 

data/test/controllers/api/stacks_controller_test.rb

@@ -60,7 +60,7 @@ module Shipit
         assert_response :ok
         assert_json '0.id', stack.id
         assert_json do |stacks|
-          assert_equal 3, stacks.size
+          assert_equal Stack.count, stacks.size
         end
       end
 

data/test/controllers/github_authentication_controller_test.rb

@@ -24,7 +24,7 @@ module Shipit
         get :callback
       end
 
-      user = User.find_by_login('shipit-user')
+      user = User.find_by(login: 'shipit-user')
       assert_equal 's3cr3t', user.github_access_token
       assert_equal 44, user.github_id
     end

data/test/controllers/stacks_controller_test.rb

@@ -149,6 +149,11 @@ module Shipit
       assert_redirected_to stack_settings_path(@stack)
     end
 
+    test "#sync_webhooks displays a flash message" do
+      post :sync_webhooks, params: {id: @stack.to_param}
+      assert_equal 'Webhooks syncing scheduled', flash[:success]
+    end
+
     test "#clear_git_cache queues a ClearGitCacheJob" do
       assert_enqueued_with(job: ClearGitCacheJob, args: [@stack]) do
         post :clear_git_cache, params: {id: @stack.to_param}
@@ -156,6 +161,11 @@ module Shipit
       assert_redirected_to stack_settings_path(@stack)
     end
 
+    test "#clear_git_cache displays a flash message" do
+      post :clear_git_cache, params: {id: @stack.to_param}
+      assert_equal 'Git Cache clearing scheduled', flash[:success]
+    end
+
     test "#update redirects to return_to parameter" do
       patch :update, params: {id: @stack.to_param, stack: {ignore_ci: false}, return_to: stack_path(@stack)}
       assert_redirected_to stack_path(@stack)

data/test/controllers/tasks_controller_test.rb

@@ -70,6 +70,7 @@ module Shipit
       @task.reload
       assert_response :success
       assert_equal 'aborting', @task.reload.status
+      assert_equal shipit_users(:walrus).id, @task.aborted_by_id
       assert_equal false, @task.rollback_once_aborted?
     end
 
@@ -81,6 +82,7 @@ module Shipit
       @task.reload
       assert_response :success
       assert_equal 'aborting', @task.status
+      assert_equal shipit_users(:walrus).id, @task.aborted_by_id
       assert_equal true, @task.rollback_once_aborted?
     end
 

data/test/controllers/webhooks_controller_test.rb

@@ -150,13 +150,6 @@ module Shipit
       end
     end
 
-    test ":membership can append a user membership for an organization with capitals" do
-      assert_difference -> { Membership.count }, 1 do
-        post :membership, params: membership_params.merge(organization: {login: 'Shopify'}, member: {login: 'bob'})
-        assert_response :ok
-      end
-    end
-
     private
 
     def membership_params

data/test/dummy/config/secrets.yml

@@ -15,5 +15,3 @@ test:
     #   -
     #   -
   redis_url: "redis://127.0.0.1:6379/7"
-  # features:
-  #   - bootstrap

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: 20170629141736) do
+ActiveRecord::Schema.define(version: 20180202220850) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535
@@ -80,9 +80,8 @@ ActiveRecord::Schema.define(version: 20170629141736) do
     t.datetime "delivered_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["created_at"], name: "index_deliveries_on_created_at"
     t.index ["hook_id", "event", "status"], name: "index_deliveries_on_hook_id_and_event_and_status"
-    t.index ["status", "event"], name: "index_deliveries_on_status_and_event"
+    t.index ["hook_id", "status"], name: "index_deliveries_on_hook_id_and_status"
   end
 
   create_table "github_hooks", force: :cascade do |t|
@@ -148,6 +147,8 @@ ActiveRecord::Schema.define(version: 20170629141736) do
     t.string "branch"
     t.datetime "revalidated_at"
     t.datetime "merged_at"
+    t.string "base_ref", limit: 1024
+    t.integer "base_commit_id"
     t.index ["head_id"], name: "index_pull_requests_on_head_id"
     t.index ["merge_requested_by_id"], name: "index_pull_requests_on_merge_requested_by_id"
     t.index ["merge_status"], name: "index_pull_requests_on_merge_status"
@@ -215,6 +216,7 @@ ActiveRecord::Schema.define(version: 20170629141736) do
     t.datetime "started_at"
     t.datetime "ended_at"
     t.boolean "ignored_safeties", default: false, null: false
+    t.integer "aborted_by_id"
     t.index ["rolled_up", "created_at", "status"], name: "index_tasks_on_rolled_up_and_created_at_and_status"
     t.index ["since_commit_id"], name: "index_tasks_on_since_commit_id"
     t.index ["stack_id", "allow_concurrency", "status"], name: "index_active_tasks"

data/test/fixtures/shipit/commits.yml

@@ -102,3 +102,56 @@ shipit_pending_pr_head:
   deletions: 24
   updated_at: <%= 8.days.ago.to_s(:db) %>
   detached: true
+
+cyclimse_merged:
+  id: 9
+  sha: 772b4795871e4a45aa17d53f02aa45d0
+  message: "Merge pull request #66 from cyclimse/yoloshipit\n\nyoloshipit!"
+  stack: cyclimse
+  author: walrus
+  committer: walrus
+  authored_at: <%= 4.days.ago.to_s(:db) %>
+  committed_at: <%= 3.days.ago.to_s(:db) %>
+  additions: 420
+  deletions: 342
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+  pull_request_id: 99
+
+soc_first:
+  id: 101
+  sha: 5e9278037b872fd9a6690523e411ecb3aa181355
+  message: "lets go"
+  stack: soc
+  author: walrus
+  committer: walrus
+  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_second:
+  id: 102
+  sha: e790fd8b5f2be05d1fedb763a3605ee461c39074
+  message: "sheep it!"
+  stack: soc
+  author: walrus
+  committer: walrus
+  authored_at: <%= 8.days.ago.to_s(:db) %>
+  committed_at: <%= 7.days.ago.to_s(:db) %>
+  additions: 1
+  deletions: 1
+  updated_at: <%= 8.days.ago.to_s(:db) %>
+
+soc_third:
+  id: 103
+  sha: 477578b362bf2b4df5903e1c7960929361c39074
+  message: "fix it!"
+  stack: soc
+  author: walrus
+  committer: walrus
+  authored_at: <%= 6.days.ago.to_s(:db) %>
+  committed_at: <%= 5.days.ago.to_s(:db) %>
+  additions: 12
+  deletions: 64
+  updated_at: <%= 8.days.ago.to_s(:db) %>