shipit-engine 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f13ba52ac100c1c0d4bf8d32359864ccca6c0e4
-  data.tar.gz: 7ed436ab9d86d67a4501f7a68917fd8a625fe4dc
+  metadata.gz: 164e72e212fa74b62ae7adab49efea057f1d983a
+  data.tar.gz: c5fbe8b529b76c20298ea2394b79358cb3dd22be
 SHA512:
-  metadata.gz: 329503af159a4b9eabcd4a01e4fc82d48ab44b5e75780fe3c3d7a4cf3e7850b6074f489be837ba3d06a009f3adaffd88b92ef97b28980bbf3cff5e5af0a663e2
-  data.tar.gz: 3d5c1db15114c286e8d6196a92ca7ac38401b3ff5a1d86ab6adfeb1d8935e2cd964fe86046ee9cd15c98251b7428b9fc0c213612d68d6ab370a941c4049e75f9
+  metadata.gz: 2929a4f676679ea715b527c0ab62c22d63222cab8902c005a507ddd1e30d32246532039e7784c674af9daaf52c6ccdbab02488ca22ea847b59c2514f943499a9
+  data.tar.gz: 16fc66870a734dd2e2be52e3868417d32302a4ffb817064ac4d54334e152533e1021ab6b50e20f7dbb700f368dbbf3573258706d9618c27a97584c9d18be37de

data/app/controllers/shipit/api/deploys_controller.rb

@@ -11,7 +11,8 @@ module Shipit
       def create
         commit = stack.commits.by_sha(params.sha) || param_error!(:sha, 'Unknown revision')
         param_error!(:force, "Can't deploy a locked stack") if !params.force && stack.locked?
-        render_resource stack.trigger_deploy(commit, current_user, env: params.env), status: :accepted
+        deploy = stack.trigger_deploy(commit, current_user, env: params.env, force: params.force)
+        render_resource deploy, status: :accepted
       end
     end
   end

data/app/controllers/shipit/deploys_controller.rb

@@ -20,10 +20,15 @@ module Shipit
     end
 
     def create
-      return redirect_to new_stack_deploy_path(@stack, sha: @until_commit.sha) if !params[:force] && @stack.active_task?
-
-      @deploy = @stack.trigger_deploy(@until_commit, current_user, env: deploy_params[:env])
+      @deploy = @stack.trigger_deploy(
+        @until_commit,
+        current_user,
+        env: deploy_params[:env],
+        force: params[:force].present?,
+      )
       respond_with(@deploy.stack, @deploy)
+    rescue Task::ConcurrentTaskRunning
+      redirect_to new_stack_deploy_path(@stack, sha: @until_commit.sha)
     end
 
     def rollback

data/app/controllers/shipit/rollbacks_controller.rb

@@ -4,9 +4,10 @@ module Shipit
     before_action :load_deploy
 
     def create
-      return redirect_to rollback_stack_deploy_path(@stack, @deploy) if !params[:force] && @stack.active_task?
-      @rollback = @deploy.trigger_rollback(current_user, env: rollback_params[:env])
+      @rollback = @deploy.trigger_rollback(current_user, env: rollback_params[:env], force: params[:force].present?)
       redirect_to stack_deploy_path(@stack, @rollback)
+    rescue Task::ConcurrentTaskRunning
+      redirect_to rollback_stack_deploy_path(@stack, @deploy)
     end
 
     private

data/app/controllers/shipit/tasks_controller.rb

@@ -28,10 +28,15 @@ module Shipit
     def create
       @definition = stack.find_task_definition(params[:definition_id])
 
-      if @definition.allow_concurrency? || params[:force] || !@stack.active_task?
-        @task = stack.trigger_task(params[:definition_id], current_user, env: task_params[:env])
+      begin
+        @task = stack.trigger_task(
+          params[:definition_id],
+          current_user,
+          env: task_params[:env],
+          force: params[:force].present?,
+        )
         redirect_to [stack, @task]
-      else
+      rescue Task::ConcurrentTaskRunning
         redirect_to new_stack_tasks_path(stack, @definition)
       end
     end

data/app/models/shipit/deploy.rb

@@ -37,7 +37,7 @@ module Shipit
 
     delegate :broadcast_update, :filter_deploy_envs, to: :stack
 
-    def build_rollback(user = nil, env: nil)
+    def build_rollback(user = nil, env: nil, force: false)
       Rollback.new(
         user_id: user.try!(:id),
         stack_id: stack_id,
@@ -45,12 +45,13 @@ module Shipit
         since_commit: stack.last_deployed_commit,
         until_commit: until_commit,
         env: env.try!(:to_h) || {},
+        allow_concurrency: force,
       )
     end
 
     # Rolls the stack back to this deploy
-    def trigger_rollback(user = AnonymousUser.new, env: nil)
-      rollback = build_rollback(user, env: env)
+    def trigger_rollback(user = AnonymousUser.new, env: nil, force: false)
+      rollback = build_rollback(user, env: env, force: force)
       rollback.save!
       rollback.enqueue
 

data/app/models/shipit/stack.rb

@@ -81,7 +81,7 @@ module Shipit
       undeployed_commits_count > 0
     end
 
-    def trigger_task(definition_id, user, env: nil)
+    def trigger_task(definition_id, user, env: nil, force: false)
       definition = find_task_definition(definition_id)
       env = env.try!(:to_h) || {}
 
@@ -96,18 +96,20 @@ module Shipit
         until_commit_id: commit.id,
         since_commit_id: commit.id,
         env: definition.filter_envs(env),
+        allow_concurrency: definition.allow_concurrency? || force,
       )
       task.enqueue
       task
     end
 
-    def build_deploy(until_commit, user, env: nil)
+    def build_deploy(until_commit, user, env: nil, force: false)
       since_commit = last_deployed_commit.presence || commits.first
       deploys.build(
         user_id: user.id,
         until_commit: until_commit,
         since_commit: since_commit,
         env: filter_deploy_envs(env.try!(:to_h) || {}),
+        allow_concurrency: force,
       )
     end
 
@@ -144,7 +146,10 @@ module Shipit
         return
       end
 
-      trigger_deploy(commit, Shipit.user, env: cached_deploy_spec.default_deploy_env)
+      begin
+        trigger_deploy(commit, Shipit.user, env: cached_deploy_spec.default_deploy_env)
+      rescue Task::ConcurrentTaskRunning
+      end
     end
 
     def schedule_merges

data/app/models/shipit/task.rb

@@ -2,6 +2,8 @@ module Shipit
   class Task < ActiveRecord::Base
     include DeferredTouch
 
+    ConcurrentTaskRunning = Class.new(StandardError)
+
     PRESENCE_CHECK_TIMEOUT = 15
     ACTIVE_STATUSES = %w(pending running aborting).freeze
     COMPLETED_STATUSES = %w(success error failed flapping aborted).freeze
@@ -32,6 +34,7 @@ module Shipit
     scope :due_for_rollup, -> { completed.where(rolled_up: false).where('created_at <= ?', 1.hour.ago) }
 
     after_save :record_status_change
+    after_create :prevent_concurrency, unless: :allow_concurrency?
     after_commit :emit_hooks
 
     class << self
@@ -264,6 +267,10 @@ module Shipit
 
     private
 
+    def prevent_concurrency
+      raise ConcurrentTaskRunning if stack.tasks.active.exclusive.count > 1
+    end
+
     def status_key
       "shipit:task:#{id}"
     end

data/db/migrate/20140226233935_create_baseline.rb

@@ -1,4 +1,4 @@
-class CreateBaseline < ActiveRecord::Migration
+class CreateBaseline < ActiveRecord::Migration[4.2]
   def change
     create_table "api_clients", force: :cascade do |t|
       t.text     "permissions", limit: 65535

data/db/migrate/20150515190352_add_output_column_to_tasks.rb

@@ -1,4 +1,4 @@
-class AddOutputColumnToTasks < ActiveRecord::Migration
+class AddOutputColumnToTasks < ActiveRecord::Migration[4.2]
   def change
     add_column :tasks, :gzip_output, :binary, limit: 16777215
   end

data/db/migrate/20150518214944_add_ignore_ci_to_stack.rb

@@ -1,4 +1,4 @@
-class AddIgnoreCiToStack < ActiveRecord::Migration
+class AddIgnoreCiToStack < ActiveRecord::Migration[4.2]
   def change
     add_column :stacks, :ignore_ci, :boolean
   end

data/db/migrate/20150630154640_add_inaccessible_since_to_stacks.rb

@@ -1,4 +1,4 @@
-class AddInaccessibleSinceToStacks < ActiveRecord::Migration
+class AddInaccessibleSinceToStacks < ActiveRecord::Migration[4.2]
   def change
     add_column :stacks, :inaccessible_since, :datetime, default: nil
   end

data/db/migrate/20150708143032_add_rollback_when_complete_on_task.rb

@@ -1,4 +1,4 @@
-class AddRollbackWhenCompleteOnTask < ActiveRecord::Migration
+class AddRollbackWhenCompleteOnTask < ActiveRecord::Migration[4.2]
   def change
     add_column :tasks, :rollback_once_aborted, :boolean, default: false, null: false
   end

data/db/migrate/20150814182557_add_env_to_tasks.rb

@@ -1,4 +1,4 @@
-class AddEnvToTasks < ActiveRecord::Migration
+class AddEnvToTasks < ActiveRecord::Migration[4.2]
   def change
     add_column :tasks, :env, :text
   end

data/db/migrate/20150918190012_add_confirmations_to_tasks.rb

@@ -1,4 +1,4 @@
-class AddConfirmationsToTasks < ActiveRecord::Migration
+class AddConfirmationsToTasks < ActiveRecord::Migration[4.2]
   def change
     add_column :tasks, :confirmations, :integer, default: 0, null: false
   end

data/db/migrate/20151102201634_schema_constraints_cleanup.rb

@@ -1,4 +1,4 @@
-class SchemaConstraintsCleanup < ActiveRecord::Migration
+class SchemaConstraintsCleanup < ActiveRecord::Migration[4.2]
   # Set reasonable size limit to a bunch of indexed string columns. They were defaulted to 255
   def change
     change_column :github_hooks, :event, :string, limit: 50, null: false # The biggest existing event is 27

data/db/migrate/20151103144716_convert_stacks_lock_reason_to_text.rb

@@ -1,4 +1,4 @@
-class ConvertStacksLockReasonToText < ActiveRecord::Migration
+class ConvertStacksLockReasonToText < ActiveRecord::Migration[4.2]
   def change
     change_column :stacks, :lock_reason, :string, limit: 4096
   end

data/db/migrate/20151112152112_reduce_tasks_type_size.rb

@@ -1,4 +1,4 @@
-class ReduceTasksTypeSize < ActiveRecord::Migration
+class ReduceTasksTypeSize < ActiveRecord::Migration[4.2]
   def change
     change_column :tasks, :type, :string, limit: 10, null: true
   end

data/db/migrate/20151112152113_reduce_tasks_stats_size.rb

@@ -1,4 +1,4 @@
-class ReduceTasksStatsSize < ActiveRecord::Migration
+class ReduceTasksStatsSize < ActiveRecord::Migration[4.2]
   def change
     change_column :tasks, :status, :string, null: false, default: 'pending', limit: 10
   end

data/db/migrate/20151113151323_improve_indexes_on_tasks.rb

@@ -1,4 +1,4 @@
-class ImproveIndexesOnTasks < ActiveRecord::Migration
+class ImproveIndexesOnTasks < ActiveRecord::Migration[4.2]
   def change
     add_index :tasks, [:type, :stack_id, :status], name: :index_tasks_by_stack_and_status
     add_index :tasks, [:type, :stack_id, :parent_id], name: :index_tasks_by_stack_and_parent

data/db/migrate/20160104151742_increase_tasks_type_size_back.rb

@@ -1,4 +1,4 @@
-class IncreaseTasksTypeSizeBack < ActiveRecord::Migration
+class IncreaseTasksTypeSizeBack < ActiveRecord::Migration[4.2]
   def change
     change_column :tasks, :type, :string, limit: 20, null: true
   end

data/db/migrate/20160104151833_convert_sti_columns.rb

@@ -1,4 +1,4 @@
-class ConvertStiColumns < ActiveRecord::Migration
+class ConvertStiColumns < ActiveRecord::Migration[4.2]
   def up
     Shipit::Task.where(type: 'Task').update_all(type: 'Shipit::Task')
     Shipit::Task.where(type: 'Deploy').update_all(type: 'Shipit::Deploy')

data/db/migrate/20160122165559_rename_hooks_url_in_delivery_url.rb

@@ -1,4 +1,4 @@
-class RenameHooksUrlInDeliveryUrl < ActiveRecord::Migration
+class RenameHooksUrlInDeliveryUrl < ActiveRecord::Migration[4.2]
   def change
     rename_column :hooks, :url, :delivery_url
   end

data/db/migrate/20160210183823_add_allow_concurrency_to_tasks.rb

@@ -1,4 +1,4 @@
-class AddAllowConcurrencyToTasks < ActiveRecord::Migration
+class AddAllowConcurrencyToTasks < ActiveRecord::Migration[4.2]
   def change
     add_column :tasks, :allow_concurrency, :boolean, null: false, default: false
   end

data/db/migrate/20160303163611_create_shipit_commit_deployments.rb

@@ -1,4 +1,4 @@
-class CreateShipitCommitDeployments < ActiveRecord::Migration
+class CreateShipitCommitDeployments < ActiveRecord::Migration[4.2]
   def change
     create_table :commit_deployments do |t|
       t.references :commit, foreign_key: true

data/db/migrate/20160303170913_create_shipit_commit_deployment_statuses.rb

@@ -1,4 +1,4 @@
-class CreateShipitCommitDeploymentStatuses < ActiveRecord::Migration
+class CreateShipitCommitDeploymentStatuses < ActiveRecord::Migration[4.2]
   def change
     create_table :commit_deployment_statuses do |t|
       t.references :commit_deployment, index: true, foreign_key: true

data/db/migrate/20160303203940_add_encrypted_token_to_users.rb

@@ -1,4 +1,4 @@
-class AddEncryptedTokenToUsers < ActiveRecord::Migration
+class AddEncryptedTokenToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :encrypted_github_access_token, :string
     add_column :users, :encrypted_github_access_token_iv, :string

data/db/migrate/20160324155046_add_started_at_and_ended_at_on_tasks.rb

@@ -1,4 +1,4 @@
-class AddStartedAtAndEndedAtOnTasks < ActiveRecord::Migration
+class AddStartedAtAndEndedAtOnTasks < ActiveRecord::Migration[4.2]
   def up
     add_column :tasks, :started_at, :datetime, null: true
     add_column :tasks, :ended_at, :datetime, null: true

data/db/migrate/20160426155146_add_index_for_stack_active_task.rb

@@ -1,4 +1,4 @@
-class AddIndexForStackActiveTask < ActiveRecord::Migration
+class AddIndexForStackActiveTask < ActiveRecord::Migration[4.2]
   def change
     add_index :tasks, [:status, :stack_id, :allow_concurrency], name: :index_active_tasks
   end

data/db/migrate/20160502150713_add_estimated_deploy_duration_to_stacks.rb

@@ -1,4 +1,4 @@
-class AddEstimatedDeployDurationToStacks < ActiveRecord::Migration
+class AddEstimatedDeployDurationToStacks < ActiveRecord::Migration[4.2]
   def change
     add_column :stacks, :estimated_deploy_duration, :integer, null: false, default: 1
   end

data/db/migrate/20160526192650_reorder_active_tasks_index.rb

@@ -1,4 +1,4 @@
-class ReorderActiveTasksIndex < ActiveRecord::Migration
+class ReorderActiveTasksIndex < ActiveRecord::Migration[4.2]
   def change
     remove_index :tasks, name: :index_active_tasks
     add_index :tasks, %i(stack_id allow_concurrency status), name: :index_active_tasks

data/db/migrate/20160802092812_add_continuous_delivery_delayed_since_to_stacks.rb

@@ -1,4 +1,4 @@
-class AddContinuousDeliveryDelayedSinceToStacks < ActiveRecord::Migration
+class AddContinuousDeliveryDelayedSinceToStacks < ActiveRecord::Migration[4.2]
   def change
     add_column :stacks, :continuous_delivery_delayed_since, :datetime, null: true
   end

data/db/migrate/20160822131405_add_locked_since_to_stacks.rb

@@ -1,4 +1,4 @@
-class AddLockedSinceToStacks < ActiveRecord::Migration
+class AddLockedSinceToStacks < ActiveRecord::Migration[4.2]
   def change
     add_column :stacks, :locked_since, :datetime, null: true
   end

data/lib/shipit/command.rb

@@ -86,7 +86,7 @@ module Shipit
       FileUtils.mkdir_p(@chdir)
       with_full_path do
         begin
-          @out, child_in, @pid = PTY.spawn(@env, *interpolated_arguments, chdir: @chdir)
+          @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"

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.18.0'.freeze
+  VERSION = '0.18.1'.freeze
 end

data/test/controllers/deploys_controller_test.rb

@@ -32,7 +32,7 @@ module Shipit
     end
 
     test ":new shows a warning if a deploy is already running" do
-      shipit_deploys(:shipit_running).update_column(:status, 'running')
+      shipit_deploys(:shipit_running).update!(allow_concurrency: false, status: 'running')
 
       get :new, params: {stack_id: @stack.to_param, sha: @commit.sha}
       assert_response :success
@@ -70,7 +70,7 @@ module Shipit
     end
 
     test ":create redirect back to :new with a warning if there is an active deploy" do
-      shipit_deploys(:shipit_running).update_column(:status, 'running')
+      shipit_deploys(:shipit_running).update!(allow_concurrency: false, status: 'running')
 
       assert_no_difference '@stack.deploys.count' do
         post :create, params: {stack_id: @stack.to_param, deploy: {until_commit_id: @commit.id}}
@@ -90,7 +90,7 @@ module Shipit
     end
 
     test ":rollback shows a warning if a deploy is already running" do
-      shipit_deploys(:shipit_running).update_column(:status, 'running')
+      shipit_deploys(:shipit_running).update!(allow_concurrency: false, status: 'running')
 
       get :rollback, params: {stack_id: @stack.to_param, id: @deploy.id}
       assert_response :success

data/test/controllers/rollbacks_controller_test.rb

@@ -39,7 +39,7 @@ module Shipit
     end
 
     test ":create redirects back to the :new page if there is an active deploy" do
-      shipit_deploys(:shipit_running).update_column(:status, 'running')
+      shipit_deploys(:shipit_running).update!(allow_concurrency: false, status: 'running')
       assert_no_difference '@stack.deploys.count' do
         post :create, params: {stack_id: @stack.to_param, rollback: {parent_id: @deploy.id}}
       end

data/test/controllers/tasks_controller_test.rb

@@ -16,15 +16,19 @@ module Shipit
     end
 
     test "tasks defined in the shipit.yml can't be triggered if the stack is being deployed" do
-      assert @stack.active_task?
+      shipit_deploys(:shipit_running).update!(allow_concurrency: false, status: 'running')
+
+      assert_predicate @stack, :active_task?
       assert_no_difference -> { @stack.tasks.count } do
         post :create, params: {stack_id: @stack, definition_id: @definition.id}
       end
       assert_redirected_to new_stack_tasks_path(@stack, @definition)
     end
 
-    test "tasks defined in the shipit.yml can be triggered anyway if force apram is present" do
-      assert @stack.active_task?
+    test "tasks defined in the shipit.yml can be triggered anyway if force param is present" do
+      shipit_deploys(:shipit_running).update!(allow_concurrency: false, status: 'running')
+
+      assert_predicate @stack, :active_task?
       assert_difference -> { @stack.tasks.count } do
         post :create, params: {stack_id: @stack, definition_id: @definition.id, force: 'true'}
       end

data/test/fixtures/shipit/tasks.yml

@@ -61,6 +61,7 @@ shipit_pending:
   additions: 432
   deletions: 406
   created_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+  allow_concurrency: true
 
 shipit_running:
   id: 5
@@ -74,6 +75,7 @@ shipit_running:
   deletions: 342
   created_at: <%= (60 - 5).minutes.ago.to_s(:db) %>
   started_at: <%= (60 - 5).minutes.ago.to_s(:db) %>
+  allow_concurrency: true
 
 shipit_complete:
   id: 6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -776,7 +776,6 @@ files:
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3
-- test/dummy/db/test.sqlite3-journal
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -879,7 +878,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Application deployment software
@@ -956,7 +955,6 @@ test_files:
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3
-- test/dummy/db/test.sqlite3-journal
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html