shipit-engine 0.28.0 → 0.32.0

data/lib/shipit/simple_message_verifier.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class SimpleMessageVerifier < ActiveSupport::MessageVerifier
     def initialize(secret, options = {})

data/lib/shipit/stack_commands.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'fileutils'
 
@@ -26,7 +27,7 @@ module Shipit
     end
 
     def fetch_deployed_revision
-      with_temporary_working_directory(commit: @stack.commits.last) do |dir|
+      with_temporary_working_directory(commit: @stack.commits.reachable.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,11 +43,13 @@ module Shipit
     end
 
     def with_temporary_working_directory(commit: nil)
-      commit ||= @stack.last_deployed_commit.presence || @stack.commits.last
+      commit ||= @stack.last_deployed_commit.presence || @stack.commits.reachable.last
 
       if !commit || !fetched?(commit).tap(&:run).success?
         @stack.acquire_git_cache_lock do
-          fetch.run!
+          unless fetched?(commit).tap(&:run).success?
+            fetch.run!
+          end
         end
       end
 

data/lib/shipit/stat.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Stat
     extend self

data/lib/shipit/task_commands.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class TaskCommands < Commands
     delegate :fetch, :fetched?, to: :stack_commands
@@ -28,20 +29,20 @@ module Shipit
     end
 
     def env
-      normalized_name = ActiveSupport::Inflector.transliterate(@task.author.name)
-      super.merge(
-        'ENVIRONMENT' => @stack.environment,
-        'BRANCH' => @stack.branch,
-        'SHIPIT_USER' => "#{@task.author.login} (#{normalized_name}) via Shipit",
-        'EMAIL' => @task.author.email,
-        'BUNDLE_PATH' => Rails.root.join('data', 'bundler').to_s,
-        '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',
-        'GIT_COMMITTER_NAME' => @task.user&.name || Shipit.committer_name,
-        'GIT_COMMITTER_EMAIL' => @task.user&.email || Shipit.committer_email,
-      ).merge(deploy_spec.machine_env).merge(@task.env)
+      super
+        .merge(@stack.env)
+        .merge(
+          'SHIPIT_USER' => "#{@task.author.login} (#{normalized_author_name}) via Shipit",
+          'EMAIL' => @task.author.email,
+          'BUNDLE_PATH' => Rails.root.join('data', 'bundler').to_s,
+          'SHIPIT_LINK' => @task.permalink,
+          'TASK_ID' => @task.id.to_s,
+          'IGNORED_SAFETIES' => @task.ignored_safeties? ? '1' : '0',
+          'GIT_COMMITTER_NAME' => @task.user&.name || Shipit.committer_name,
+          'GIT_COMMITTER_EMAIL' => @task.user&.email || Shipit.committer_email,
+        )
+        .merge(deploy_spec.machine_env)
+        .merge(@task.env)
     end
 
     def checkout(commit)
@@ -52,6 +53,7 @@ module Shipit
       [
         git(
           'clone',
+          '--quiet',
           '--local',
           '--origin', 'cache',
           @stack.git_path,
@@ -70,6 +72,12 @@ module Shipit
       FileUtils.rm_rf(@task.working_directory) if deploy_spec.clear_working_directory?
     end
 
+    private
+
+    def normalized_author_name
+      ActiveSupport::Inflector.transliterate(@task.author.name)
+    end
+
     protected
 
     def steps_directory

data/lib/shipit/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
-  VERSION = '0.28.0'.freeze
+  VERSION = '0.32.0'
 end

data/lib/snippets/release-gem

@@ -50,8 +50,12 @@ spec = Gem::Specification.load(spec_path)
 if RubygemsAPI.published?(spec.name, spec.version)
   puts "#{spec.name} version #{spec.version} is already published."
   exit 0
+elsif !spec.metadata['allowed_push_host']
+  puts "Can't release the gem: spec.metadata['allowed_push_host'] must be defined."
+  exit 1
 else
-  Git.tag_and_push(spec.version) do
+  is_successful = Git.tag_and_push(spec.version) do
     system(*release_command)
   end
+  is_successful ? exit(0) : exit(1)
 end

data/lib/tasks/cron.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 namespace :cron do
   desc "Updates deployed revisions"
   task minutely: :environment do
@@ -5,6 +6,7 @@ namespace :cron do
     Shipit::Stack.schedule_continuous_delivery
     Shipit::GithubStatus.refresh_status
     Shipit::PullRequest.schedule_merges
+    Shipit::ReapDeadTasksJob.perform_later
   end
 
   task hourly: %i(rollup refresh_users)

data/lib/tasks/dev.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 namespace :dev do
   desc "Appends chunks to the last deploy, or specify with DEPLOY=id"
   task stream: :environment do
@@ -11,7 +12,7 @@ namespace :dev do
 
     deploy.update_attribute(:output, nil)
 
-    logger.info "Starting to stream data to deploy ##{deploy.id}"
+    logger.info("Starting to stream data to deploy ##{deploy.id}")
 
     loop do
       sentence = Faker::Lorem.sentence.split.map do |word|
@@ -22,7 +23,7 @@ namespace :dev do
         end
       end.join(' ')
 
-      logger.error sentence
+      logger.error(sentence)
 
       deploy.chunks.create(text: sentence + "\n")
       sleep 1

data/lib/tasks/shipit.rake

@@ -1,27 +1,26 @@
+# frozen_string_literal: true
 namespace :shipit do
   desc "Deploy from a running instance. "
   task deploy: :environment do
-    begin
-      stack = ENV['stack']
-      revision = ENV['revision']
+    stack = ENV['stack']
+    revision = ENV['revision']
 
-      raise ArgumentError.new('The first argument has to be a stack, e.g. shopify/shipit/production') if stack.nil?
-      raise ArgumentError.new('The second argument has to be a revision') if revision.nil?
+    raise ArgumentError, 'The first argument has to be a stack, e.g. shopify/shipit/production' if stack.nil?
+    raise ArgumentError, 'The second argument has to be a revision' if revision.nil?
 
-      module Shipit
-        class Task
-          def write(text)
-            p text
-            chunks.create!(text: text)
-          end
+    module Shipit
+      class Task
+        def write(text)
+          p(text)
+          chunks.create!(text: text)
         end
       end
-
-      Shipit::Stack.run_deploy_in_foreground(stack: stack, revision: revision)
-    rescue ArgumentError
-      p "Use this command as follows:"
-      p "bundle exec rake shipit:deploy stack='shopify/shipit/production' revision='$SHA'"
-      raise
     end
+
+    Shipit::Stack.run_deploy_in_foreground(stack: stack, revision: revision)
+  rescue ArgumentError
+    p("Use this command as follows:")
+    p("bundle exec rake shipit:deploy stack='shopify/shipit/production' revision='$SHA'")
+    raise
   end
 end

data/lib/tasks/teams.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 namespace :teams do
   desc "Import the members of each team configured through the github.oauth.teams config"
   task fetch: :environment do

data/test/controllers/api/base_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -6,7 +7,7 @@ module Shipit
       test "authentication is required" do
         get :index
         assert_response :unauthorized
-        assert_equal({message: 'Bad credentials'}.to_json, response.body)
+        assert_equal({ message: 'Bad credentials' }.to_json, response.body)
       end
 
       test "with proper credentials the request is processed" do
@@ -17,7 +18,7 @@ module Shipit
       test "#index respond with a list of endpoints" do
         authenticate!
         get :index, format: :json
-        assert_equal({stacks_url: api_stacks_url}.to_json, response.body)
+        assert_equal({ stacks_url: api_stacks_url }.to_json, response.body)
       end
     end
   end

data/test/controllers/api/ccmenu_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -10,26 +11,26 @@ module Shipit
 
       test "a request with insufficient permissions will render a 403" do
         @client.update!(permissions: [])
-        get :show, params: {stack_id: @stack.to_param}
+        get :show, params: { stack_id: @stack.to_param }
         assert_response :forbidden
         assert_json 'message', 'This operation requires the `read:stack` permission'
       end
 
       test "#show renders the xml" do
-        get :show, params: {stack_id: @stack.to_param}
+        get :show, params: { stack_id: @stack.to_param }
         assert_response :ok
         assert_payload 'name', @stack.to_param
       end
 
       test "can authenticate with query string token" do
         request.headers['Authorization'] = 'bleh'
-        get :show, params: {stack_id: @stack.to_param, token: @client.authentication_token}
+        get :show, params: { stack_id: @stack.to_param, token: @client.authentication_token }
         assert_response :ok
         assert_payload 'name', @stack.to_param
       end
 
       test "xml contains required attributes" do
-        get :show, params: {stack_id: @stack.to_param}
+        get :show, params: { stack_id: @stack.to_param }
         project = get_project_from_xml(response.body)
         %w(name activity lastBuildStatus lastBuildLabel lastBuildTime webUrl).each do |attribute|
           assert_includes project, attribute, "Response missing required attribute: #{attribute}"
@@ -38,13 +39,13 @@ module Shipit
 
       test "locked stacks show as failed" do
         @stack.lock('test', @user)
-        get :show, params: {stack_id: @stack.to_param}
+        get :show, params: { stack_id: @stack.to_param }
         assert_payload 'lastBuildStatus', 'Failure'
       end
 
       test "stacks with no deploys render correctly" do
-        stack = Stack.create!(repo_owner: 'foo', repo_name: 'bar')
-        get :show, params: {stack_id: stack.to_param}
+        stack = Stack.create!(repository: Repository.new(owner: "foo", name: "bar"))
+        get :show, params: { stack_id: stack.to_param }
         assert_payload 'lastBuildStatus', 'Success'
       end
 
@@ -56,7 +57,7 @@ module Shipit
 
       def assert_payload(k, v)
         @project ||= get_project_from_xml(response.body)
-        assert_equal v, @project[k]
+        assert_equal(v, @project[k])
       end
     end
   end

data/test/controllers/api/commits_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -11,7 +12,7 @@ module Shipit
       test "#index returns a list of commits" do
         commit = @stack.commits.reachable.last
 
-        get :index, params: {stack_id: @stack.to_param}
+        get :index, params: { stack_id: @stack.to_param }
         assert_response :ok
         assert_json '0.sha', commit.sha
       end
@@ -19,7 +20,7 @@ module Shipit
       test "#index with undeployed=1 returns a list of undeployed commits" do
         commits = @stack.undeployed_commits.pluck(:sha)
 
-        get :index, params: {stack_id: @stack.to_param, undeployed: 1}
+        get :index, params: { stack_id: @stack.to_param, undeployed: 1 }
         assert_response :ok
         JSON.parse(response.body).each do |commit|
           assert commits.include?(commit.fetch("sha"))

data/test/controllers/api/deploys_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -13,7 +14,7 @@ module Shipit
       test "#deploys returns the deploys and revisions for a given stack" do
         tasks = @stack.deploys_and_rollbacks.order(id: :desc)
 
-        get :index, params: {stack_id: @stack.to_param}
+        get :index, params: { stack_id: @stack.to_param }
         assert_response :ok
 
         (0...tasks.length).each do |i|
@@ -23,60 +24,60 @@ module Shipit
 
       test "#create triggers a new deploy for the stack" do
         assert_difference -> { @stack.deploys.count }, 1 do
-          post :create, params: {stack_id: @stack.to_param, sha: @commit.sha}
+          post :create, params: { stack_id: @stack.to_param, sha: @commit.sha }
         end
         assert_response :accepted
         assert_json 'status', 'pending'
       end
 
       test "#create triggers a new deploy for whitelisted variables" do
-        correct_env = {'SAFETY_DISABLED' => 1}
-        post :create, params: {stack_id: @stack.to_param, sha: @commit.sha, env: correct_env}
+        correct_env = { 'SAFETY_DISABLED' => 1 }
+        post :create, params: { stack_id: @stack.to_param, sha: @commit.sha, env: correct_env }
         assert_response :accepted
         assert_json 'type', 'deploy'
         assert_json 'status', 'pending'
       end
 
       test "#create refuses to trigger a new deploy with incorrect variables" do
-        incorrect_env = {'DANGEROUS_VARIABLE' => 1}
-        post :create, params: {stack_id: @stack.to_param, sha: @commit.sha, env: incorrect_env}
+        incorrect_env = { 'DANGEROUS_VARIABLE' => 1 }
+        post :create, params: { stack_id: @stack.to_param, sha: @commit.sha, env: incorrect_env }
         assert_response :unprocessable_entity
         assert_json 'message', 'Variables DANGEROUS_VARIABLE have not been whitelisted'
       end
 
       test "#create use the claimed user as author" do
         request.headers['X-Shipit-User'] = @user.login
-        post :create, params: {stack_id: @stack.to_param, sha: @commit.sha}
+        post :create, params: { stack_id: @stack.to_param, sha: @commit.sha }
         deploy = Deploy.last
         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}
+        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'}
+        post :create, params: { stack_id: @stack.to_param, sha: '123443543545' }
         assert_response :unprocessable_entity
         assert_json 'errors', 'sha' => ['Unknown revision']
       end
 
       test "#create renders a 422 if the sha format is invalid" do
-        post :create, params: {stack_id: @stack.to_param, sha: '1'}
+        post :create, params: { stack_id: @stack.to_param, sha: '1' }
         assert_response :unprocessable_entity
         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}
+          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}
+          post :create, params: { stack_id: @stack.to_param, sha: @commit.sha }
         end
 
         assert_response :conflict
@@ -86,7 +87,7 @@ module Shipit
         @stack.update!(lock_reason: 'Something broken')
 
         assert_no_difference -> { @stack.deploys.count } do
-          post :create, params: {stack_id: @stack.to_param, sha: @commit.sha}
+          post :create, params: { stack_id: @stack.to_param, sha: @commit.sha }
         end
         assert_response :unprocessable_entity
         assert_json 'errors.force', ["Can't deploy a locked stack"]
@@ -96,7 +97,7 @@ module Shipit
         @stack.update!(lock_reason: 'Something broken')
 
         assert_difference -> { @stack.deploys.count }, 1 do
-          post :create, params: {stack_id: @stack.to_param, sha: @commit.sha, force: 'true'}
+          post :create, params: { stack_id: @stack.to_param, sha: @commit.sha, force: 'true' }
         end
         assert_response :accepted
         assert_json 'status', 'pending'

data/test/controllers/api/hooks_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -9,7 +10,7 @@ module Shipit
       end
 
       test "the route has priority over stacks one" do
-        assert_recognizes({controller: 'shipit/api/hooks', action: 'show', id: '42'}, '/api/hooks/42')
+        assert_recognizes({ controller: 'shipit/api/hooks', action: 'show', id: '42' }, '/api/hooks/42')
       end
 
       test "#index without a stack_id returns the list of global hooks" do
@@ -26,7 +27,7 @@ module Shipit
       test "#index with a stack_id returns the list of scoped hooks" do
         hook = Hook.scoped_to(@stack).first
 
-        get :index, params: {stack_id: @stack.to_param}
+        get :index, params: { stack_id: @stack.to_param }
         assert_response :ok
         assert_json '0.id', hook.id
         assert_json '0.delivery_url', hook.delivery_url
@@ -37,7 +38,7 @@ module Shipit
       test "#show returns the hooks" do
         hook = Hook.scoped_to(@stack).first
 
-        get :show, params: {stack_id: @stack.to_param, id: hook.id}
+        get :show, params: { stack_id: @stack.to_param, id: hook.id }
         assert_response :ok
 
         assert_json 'id', hook.id
@@ -48,7 +49,7 @@ module Shipit
 
       test "#create adds a new hook" do
         assert_difference -> { Hook.count }, 1 do
-          post :create, params: {delivery_url: 'https://example.com/hook', events: %w(deploy rollback)}
+          post :create, params: { delivery_url: 'https://example.com/hook', events: %w(deploy rollback) }
         end
         hook = Hook.last
         assert_json 'delivery_url', 'https://example.com/hook'
@@ -66,21 +67,21 @@ module Shipit
       end
 
       test "#create returns validation errors" do
-        post :create, params: {delivery_url: '../etc/passwd', events: %w(deploy)}
+        post :create, params: { delivery_url: '../etc/passwd', events: %w(deploy) }
         assert_response :unprocessable_entity
         assert_json 'errors', 'delivery_url' => ['is not a valid URL']
       end
 
       test "#update changes an existing hook" do
         hook = Hook.global.first
-        patch :update, params: {id: hook.id, delivery_url: 'https://shipit.com/'}
+        patch :update, params: { id: hook.id, delivery_url: 'https://shipit.com/' }
         assert_response :ok
         assert_json 'delivery_url', 'https://shipit.com/'
       end
 
       test "#destroy removes an existing hook" do
         hook = Hook.global.first
-        delete :destroy, params: {id: hook.id}
+        delete :destroy, params: { id: hook.id }
         assert_response :no_content
       end
     end