shipit-engine 0.7.0 → 0.8.0

data/test/dummy/data/stacks/byroot/junk/production/git/bar.txt

@@ -0,0 +1 @@
+foo

data/test/dummy/data/stacks/byroot/junk/production/git/sdkfjsdf

@@ -0,0 +1 @@
+dslkfnds

data/test/dummy/data/stacks/byroot/junk/production/git/shipit.yml

@@ -0,0 +1,27 @@
+review:
+  checklist:
+    - Blah Blah
+  checks:
+    - echo 42
+
+deploy:
+  variables:
+    -
+      name: REBUILD
+      title: Force artifacts rebuild
+      default: '0'
+  override:
+    - echo 1
+    - sleep 10
+
+rollback:
+  override:
+    - echo done
+    
+
+tasks:
+  restart:
+    action: Restart application
+    description: Trigger the restart of both app and jobs servers
+    steps:
+      - cap $ENVIRONMENT deploy:restart

data/test/dummy/data/stacks/byroot/junk/production/git/toto.txt

@@ -0,0 +1,2 @@
+A
+A

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160122165559) do
+ActiveRecord::Schema.define(version: 20160303203940) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text     "permissions", limit: 65535
@@ -24,6 +24,29 @@ ActiveRecord::Schema.define(version: 20160122165559) do
 
   add_index "api_clients", ["creator_id"], name: "index_api_clients_on_creator_id"
 
+  create_table "commit_deployment_statuses", force: :cascade do |t|
+    t.integer  "commit_deployment_id"
+    t.string   "status"
+    t.integer  "github_id"
+    t.string   "api_url"
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
+  end
+
+  add_index "commit_deployment_statuses", ["commit_deployment_id"], name: "index_commit_deployment_statuses_on_commit_deployment_id"
+
+  create_table "commit_deployments", force: :cascade do |t|
+    t.integer  "commit_id"
+    t.integer  "task_id"
+    t.integer  "github_id"
+    t.string   "api_url"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "commit_deployments", ["commit_id", "task_id"], name: "index_commit_deployments_on_commit_id_and_task_id", unique: true
+  add_index "commit_deployments", ["task_id"], name: "index_commit_deployments_on_task_id"
+
   create_table "commits", force: :cascade do |t|
     t.integer  "stack_id",     limit: 4,                     null: false
     t.integer  "author_id",    limit: 4,                     null: false
@@ -156,11 +179,14 @@ ActiveRecord::Schema.define(version: 20160122165559) do
     t.boolean  "rollback_once_aborted",               default: false,     null: false
     t.text     "env"
     t.integer  "confirmations",                       default: 0,         null: false
+    t.boolean  "allow_concurrency",                   default: false,     null: false
   end
 
   add_index "tasks", ["rolled_up", "created_at", "status"], name: "index_tasks_on_rolled_up_and_created_at_and_status"
   add_index "tasks", ["since_commit_id"], name: "index_tasks_on_since_commit_id"
   add_index "tasks", ["stack_id"], name: "index_tasks_on_stack_id"
+  add_index "tasks", ["type", "stack_id", "parent_id"], name: "index_tasks_by_stack_and_parent"
+  add_index "tasks", ["type", "stack_id", "status"], name: "index_tasks_by_stack_and_status"
   add_index "tasks", ["until_commit_id"], name: "index_tasks_on_until_commit_id"
   add_index "tasks", ["user_id"], name: "index_tasks_on_user_id"
 
@@ -177,14 +203,16 @@ ActiveRecord::Schema.define(version: 20160122165559) do
   add_index "teams", ["organization", "slug"], name: "index_teams_on_organization_and_slug", unique: true
 
   create_table "users", force: :cascade do |t|
-    t.integer  "github_id",  limit: 4
-    t.string   "name",       limit: 255, null: false
-    t.string   "email",      limit: 255
-    t.string   "login",      limit: 39
-    t.string   "api_url",    limit: 255
+    t.integer  "github_id",                        limit: 4
+    t.string   "name",                             limit: 255, null: false
+    t.string   "email",                            limit: 255
+    t.string   "login",                            limit: 39
+    t.string   "api_url",                          limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "avatar_url", limit: 255
+    t.string   "avatar_url",                       limit: 255
+    t.string   "encrypted_github_access_token"
+    t.string   "encrypted_github_access_token_iv"
   end
 
   add_index "users", ["login"], name: "index_users_on_login"

data/test/dummy/db/seeds.rb

@@ -51,6 +51,9 @@ module Shipit
               "steps": [
                 "bundle exec cap $ENVIRONMENT deploy:restart"
               ],
+              "variables": [
+                {"name": "SAFETY_DISABLED", "title": "Set to 1 to do stuff", "default": "0"}
+              ],
               "checklist": [
                 "Hold on your butts",
                 "Eat some chips"

data/test/fixtures/shipit/commit_deployment_statuses.yml

@@ -0,0 +1,19 @@
+shipit_deploy_second_pending:
+  commit_deployment: shipit_deploy_second
+  status: pending
+  github_id: 42
+  api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/1/statuses/42
+
+shipit_deploy_second_success:
+  commit_deployment: shipit_deploy_second
+  status: success
+  github_id: 43
+  api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/1/statuses/43
+
+shipit2_deploy_third_pending:
+  commit_deployment: shipit2_deploy_third
+  status: pending
+
+shipit2_deploy_third_failure:
+  commit_deployment: shipit2_deploy_third
+  status: failure

data/test/fixtures/shipit/commit_deployments.yml

@@ -0,0 +1,37 @@
+shipit_deploy_second:
+  commit_id: 2 # second
+  task: shipit
+  api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/1
+  github_id: 1
+
+shipit2_deploy_third:
+  commit_id: 3 # third
+  task: shipit2
+  api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/2
+  github_id: 2
+
+shipit_pending_third:
+  commit_id: 3 # third
+  task: shipit_pending
+  api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/3
+  github_id: 3
+
+shipit_pending_fourth:
+  commit_id: 4 # fourth
+  task: shipit_pending
+
+shipit_running_fourth:
+  commit_id: 4 # fourth
+  task: shipit_running
+
+shipit_complete_fourth:
+  commit_id: 4 # fourth
+  task: shipit_complete
+
+shipit_aborted_fourth:
+  commit_id: 4 # fourth
+  task: shipit_aborted
+
+shipit_rollback_fourth:
+  commit_id: 4 # fourth
+  task: shipit_rollback

data/test/fixtures/shipit/commits.yml

@@ -40,7 +40,7 @@ third:
 fourth:
   id: 4
   sha: 467578b362bf2b4df5903e1c7960929361c3435a
-  message: "#yoloshipit!"
+  message: "Merge pull request #7 from shipit-engine/yoloshipit\n\nyoloshipit!"
   stack: shipit
   author: walrus
   committer: walrus

data/test/fixtures/shipit/stacks.yml

@@ -23,9 +23,21 @@ shipit:
         "restart": {
           "action": "Restart application",
           "description": "Restart app and job servers",
+          "variables": [
+            {"name": "FOO", "title": "Set to 0 to foo", "default": 1},
+            {"name": "BAR", "title": "Set to 1 to bar", "default": 0}
+          ],
           "steps": [
             "cap $ENVIRONMENT deploy:restart"
           ]
+        },
+        "flush_cache": {
+          "action": "Flush cache",
+          "description": "Flush the application cache",
+          "steps": [
+            "cap $ENVIRONMENT cache:flush"
+          ],
+          "allow_concurrency": true
         }
       },
       "ci": {

data/test/fixtures/shipit/tasks.yml

@@ -32,6 +32,10 @@ shipit_restart:
       "id": "restart",
       "action": "Restart application",
       "description": "Restart app and job servers",
+      "variables": [
+        {"name": "FOO", "title": "Set to 0 to foo", "default": 1},
+        {"name": "BAR", "title": "Set to 1 to bar", "default": 0}
+      ],
       "steps": [
         "cap $ENVIRONMENT deploy:restart"
       ]

data/test/fixtures/shipit/users.yml

@@ -2,6 +2,8 @@ walrus:
   name:  Lando Walrussian
   email: walrus@shopify.com
   login: walrus
+  encrypted_github_access_token: FuQv9jpHmMZ8Px64xmqASJtKlefv # t0k3n
+  encrypted_github_access_token_iv: "QNS4smChXEXtOjxb\n"
 
 bob:
   name:  Bob the Builder

data/test/jobs/fetch_deployed_revision_job_test.rb

@@ -9,21 +9,21 @@ module Shipit
     end
 
     test 'the job abort if the stack is deploying' do
-      @stack.expects(:deploying?).returns(true)
+      @stack.expects(:active_task?).returns(true)
       assert_no_difference 'Deploy.count' do
         @job.perform(@stack)
       end
     end
 
     test 'the job abort if #fetch_deployed_revision returns nil' do
-      @stack.expects(:deploying?).returns(false)
+      @stack.expects(:active_task?).returns(false)
       StackCommands.any_instance.expects(:fetch_deployed_revision).returns(nil)
       @stack.expects(:update_deployed_revision).never
       @job.perform(@stack)
     end
 
     test 'the job call update_deployed_revision if #fetch_deployed_revision returns something' do
-      @stack.expects(:deploying?).returns(false)
+      @stack.expects(:active_task?).returns(false)
       StackCommands.any_instance.expects(:fetch_deployed_revision).returns(@commit.sha)
       @stack.expects(:update_deployed_revision).with(@commit.sha)
       @job.perform(@stack)

data/test/models/commit_deployment_status_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+module Shipit
+  class CommitDeploymentStatusTest < ActiveSupport::TestCase
+    setup do
+      @status = shipit_commit_deployment_statuses(:shipit2_deploy_third_pending)
+      @deployment = @status.commit_deployment
+      @task = @deployment.task
+      @commit = @deployment.commit
+      @author = @deployment.author
+    end
+
+    test 'creation on GitHub' do
+      response = stub(id: 44, url: 'https://example.com')
+      @author.github_api.expects(:create_deployment_status).with(
+        @deployment.api_url,
+        'pending',
+        target_url: "http://shipit.com/shopify/shipit-engine/production/deploys/#{@task.id}",
+        description: "walrus triggered the deploy of shopify/shipit-engine/production to #{@commit.sha}",
+      ).returns(response)
+
+      @status.create_on_github!
+      assert_equal response.id, @status.github_id
+      assert_equal response.url, @status.api_url
+    end
+  end
+end

data/test/models/commit_deployment_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+module Shipit
+  class CommitDeploymentTest < ActiveSupport::TestCase
+    setup do
+      @deployment = shipit_commit_deployments(:shipit_pending_fourth)
+      @commit = @deployment.commit
+      @task = @deployment.task
+      @stack = @task.stack
+      @author = @deployment.author
+    end
+
+    test "there can only be one record per deploy and commit pair" do
+      assert_raises ActiveRecord::RecordNotUnique do
+        CommitDeployment.create!(task: @deployment.task, commit: @deployment.commit)
+      end
+    end
+
+    test "creation on GitHub" do
+      pull_request_response = stub(head: stub(sha: '6dcb09b5b57875f334f61aebed695e2e4193db5e'))
+      @author.github_api.expects(:pull_request).with('shopify/shipit-engine', 7).returns(pull_request_response)
+
+      deployment_response = stub(id: 42, url: 'https://example.com')
+      @author.github_api.expects(:create_deployment).with(
+        'shopify/shipit-engine',
+        pull_request_response.head.sha,
+        auto_merge: false,
+        description: "Via Shipit",
+        environment: @stack.environment,
+      ).returns(deployment_response)
+
+      @deployment.create_on_github!
+      assert_equal deployment_response.id, @deployment.github_id
+      assert_equal deployment_response.url, @deployment.api_url
+    end
+  end
+end

data/test/models/commits_test.rb

@@ -20,9 +20,9 @@ module Shipit
       assert_equal "Bump to v1.0.1", @pr.pull_request_title
     end
 
-    test "#pull_request_id extract the pull request id from the message" do
-      assert_equal 31, @pr.pull_request_id
-      assert_nil @commit.pull_request_id
+    test "#pull_request_number extract the pull request id from the message" do
+      assert_equal 31, @pr.pull_request_number
+      assert_nil @commit.pull_request_number
     end
 
     test "#pull_request_title extract the pull request title from the message" do
@@ -69,7 +69,10 @@ module Shipit
       @stack.deploys.destroy_all
 
       assert_difference "Deploy.count" do
-        @stack.commits.last.statuses.create!(state: 'success', context: 'ci/travis')
+        assert_enqueued_with(job: ContinuousDeliveryJob, args: [@stack]) do
+          @stack.commits.last.statuses.create!(state: 'success', context: 'ci/travis')
+        end
+        ContinuousDeliveryJob.new.perform(@stack)
       end
     end
 

data/test/models/deploys_test.rb

@@ -148,10 +148,14 @@ module Shipit
       shipit_commits(:fifth).statuses.create!(state: 'success')
 
       deploy = shipit_deploys(:shipit_running)
+      deploy.stack.tasks.where.not(id: deploy.id).update_all(status: 'success')
       deploy.stack.update(continuous_deployment: true)
 
       assert_difference "Deploy.count" do
-        deploy.complete!
+        assert_enqueued_with(job: ContinuousDeliveryJob, args: [deploy.stack]) do
+          deploy.complete!
+        end
+        ContinuousDeliveryJob.new.perform(deploy.stack)
       end
     end
 
@@ -207,6 +211,18 @@ module Shipit
       end
     end
 
+    test "creating a deploy creates one CommitDeployment per commit" do
+      shipit = shipit_stacks(:shipit)
+      deploy = shipit.deploys.build(
+        since_commit: shipit.commits.first,
+        until_commit: shipit.commits.last,
+      )
+
+      assert_difference -> { CommitDeployment.count }, deploy.commits.size do
+        deploy.save!
+      end
+    end
+
     test "#build_rollback returns an unsaved record" do
       assert @deploy.build_rollback.new_record?
     end

data/test/models/stacks_test.rb

@@ -205,39 +205,39 @@ module Shipit
       shipit_stacks(:shipit).destroy
     end
 
-    test "#deploying? is false if stack has no deploy in either pending or running state" do
+    test "#active_task? is false if stack has no deploy in either pending or running state" do
       @stack.deploys.active.destroy_all
-      refute @stack.deploying?
+      refute @stack.active_task?
     end
 
-    test "#deploying? is false if stack has no deploy at all" do
+    test "#active_task? is false if stack has no deploy at all" do
       @stack.deploys.destroy_all
-      refute @stack.deploying?
+      refute @stack.active_task?
     end
 
-    test "#deploying? is true if stack has a deploy in either pending or running state" do
+    test "#active_task? is true if stack has a deploy in either pending or running state" do
       @stack.trigger_deploy(shipit_commits(:third), AnonymousUser.new)
-      assert @stack.deploying?
+      assert @stack.active_task?
     end
 
-    test "#deploying? is true if a rollback is ongoing" do
+    test "#active_task? is true if a rollback is ongoing" do
       shipit_deploys(:shipit_complete).trigger_rollback(AnonymousUser.new)
-      assert @stack.deploying?
+      assert @stack.active_task?
     end
 
-    test "#deploying? is memoized" do
+    test "#active_task? is memoized" do
       assert_queries(1) do
-        10.times { @stack.deploying? }
+        10.times { @stack.active_task? }
       end
     end
 
-    test "#deploying? cache is cleared if a deploy change state" do
+    test "#active_task? cache is cleared if a deploy change state" do
       assert_queries(1) do
-        10.times { @stack.deploying? }
+        10.times { @stack.active_task? }
       end
       @stack.tasks.where(status: 'running').first.error!
       assert_queries(1) do
-        10.times { @stack.deploying? }
+        10.times { @stack.active_task? }
       end
     end