shipit-engine 0.14.0 → 0.15.0

data/test/dummy/db/seeds.rb

@@ -109,6 +109,7 @@ module Shipit
         description: "Your tests ran on travis-ci",
         target_url: "https://example.com",
         commit_id: commit.id,
+        stack_id: commit.stack_id,
         created_at: Time.now,
         updated_at: Time.now,
       )
@@ -120,6 +121,7 @@ module Shipit
           description: "Your tests ran on circle-ci",
           target_url: "https://example.com",
           commit_id: commit.id,
+          stack_id: commit.stack_id,
           created_at: Time.now,
           updated_at: Time.now,
         )

data/test/fixtures/shipit/statuses.yml

@@ -1,6 +1,7 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 first_pending:
+  stack: shipit
   commit_id: 1 # first
   description: lets go
   context: ci/travis
@@ -9,6 +10,7 @@ first_pending:
   target_url: "http://www.example.com"
 
 second_pending_travis:
+  stack: shipit
   commit_id: 2 # second
   description: lets go
   context: ci/travis
@@ -17,6 +19,7 @@ second_pending_travis:
   target_url: "http://www.example.com"
 
 second_pending_coveralls:
+  stack: shipit
   commit_id: 2 # second
   description: lets go
   context: metrics/coveralls
@@ -25,6 +28,7 @@ second_pending_coveralls:
   target_url: "http://www.example.com"
 
 second_success_travis:
+  stack: shipit
   commit_id: 2 # second
   description: lets go
   context: ci/travis
@@ -33,6 +37,7 @@ second_success_travis:
   target_url: "http://www.example.com"
 
 second_failure_coveralls:
+  stack: shipit
   commit_id: 2 # second
   description: lets go
   context: metrics/coveralls
@@ -41,6 +46,7 @@ second_failure_coveralls:
   target_url: "http://www.example.com"
 
 third_success_travis:
+  stack: shipit
   commit_id: 3 # third
   description: lets go
   context: ci/travis
@@ -49,6 +55,7 @@ third_success_travis:
   target_url: "http://www.example.com"
 
 third_success_coveralls:
+  stack: shipit
   commit_id: 3 # third
   description: lets go
   context: metrics/coveralls
@@ -57,6 +64,7 @@ third_success_coveralls:
   target_url: "http://www.example.com"
 
 fourth_pending_travis:
+  stack: shipit
   commit_id: 4 # fourth
   description: lets go
   context: ci/travis
@@ -65,6 +73,7 @@ fourth_pending_travis:
   target_url: "http://www.example.com"
 
 fourth_success_coveralls:
+  stack: shipit
   commit_id: 4 # fourth
   description: lets go
   context: metrics/coveralls
@@ -73,6 +82,7 @@ fourth_success_coveralls:
   target_url: "http://www.example.com"
 
 cyclimse_success_travis:
+  stack: cyclimse
   commit_id: 6 # cyclimse_first
   description: lets go
   context: ci/travis

data/test/models/commits_test.rb

@@ -70,7 +70,7 @@ module Shipit
 
       assert_difference "Deploy.count" do
         assert_enqueued_with(job: ContinuousDeliveryJob, args: [@stack]) do
-          @stack.commits.last.statuses.create!(state: 'success', context: 'ci/travis')
+          @stack.commits.last.statuses.create!(stack_id: @stack.id, state: 'success', context: 'ci/travis')
         end
         ContinuousDeliveryJob.new.perform(@stack)
       end
@@ -81,7 +81,7 @@ module Shipit
       @stack.trigger_deploy(@commit, @commit.committer)
 
       assert_no_difference "Deploy.count" do
-        @commit.statuses.create!(state: 'success', context: 'ci/travis')
+        @commit.statuses.create!(stack_id: @stack.id, state: 'success', context: 'ci/travis')
       end
     end
 
@@ -90,7 +90,7 @@ module Shipit
       @stack.reload.update!(continuous_deployment: true, lock_reason: "Maintenance ongoing")
 
       assert_no_difference "Deploy.count" do
-        @commit.statuses.create!(state: 'success', context: 'ci/travis')
+        @commit.statuses.create!(stack_id: @stack.id, state: 'success', context: 'ci/travis')
       end
     end
 
@@ -116,7 +116,7 @@ module Shipit
       )
 
       assert_no_difference "Deploy.count" do
-        @commit.statuses.create!(state: 'success')
+        @commit.statuses.create!(stack_id: @stack.id, state: 'success')
       end
     end
 
@@ -124,7 +124,7 @@ module Shipit
       @stack.reload.update!(continuous_deployment: true)
 
       assert_no_difference "Deploy.count" do
-        @stack.last_deployed_commit.statuses.create!(state: 'success')
+        @stack.last_deployed_commit.statuses.create!(stack_id: @stack.id, state: 'success')
       end
     end
 
@@ -132,7 +132,7 @@ module Shipit
       @stack.reload.deploys.destroy_all
 
       assert_no_difference "Deploy.count" do
-        @commit.statuses.create!(state: 'success')
+        @commit.statuses.create!(stack_id: @stack.id, state: 'success')
       end
     end
 
@@ -141,19 +141,21 @@ module Shipit
       @stack.deploys.destroy_all
 
       assert_no_difference "Deploy.count" do
-        @commit.statuses.create!(state: 'failure')
+        @commit.statuses.create!(stack_id: @stack.id, state: 'failure')
       end
     end
 
     test "creating broadcasts an update event" do
       expect_event(@stack)
       walrus = shipit_users(:walrus)
-      @stack.commits.create(author: walrus,
-                            committer: walrus,
-                            sha: "ab12",
-                            authored_at: DateTime.now,
-                            committed_at: DateTime.now,
-                            message: "more fish!")
+      @stack.commits.create(
+        author: walrus,
+        committer: walrus,
+        sha: "ab12",
+        authored_at: DateTime.now,
+        committed_at: DateTime.now,
+        message: "more fish!",
+      )
     end
 
     test "refresh_statuses! pull state from github" do
@@ -241,8 +243,8 @@ module Shipit
     test "#state doesn't consider statuses that are hidden or allowed to fail" do
       assert_equal 'pending', @commit.state
 
-      @commit.statuses.create!(context: 'metrics/coveralls', state: 'failure')
-      @commit.statuses.create!(context: 'metrics/performance', state: 'failure')
+      @commit.statuses.create!(stack_id: @stack.id, context: 'metrics/coveralls', state: 'failure')
+      @commit.statuses.create!(stack_id: @stack.id, context: 'metrics/performance', state: 'failure')
       assert_equal 'failure', @commit.reload.state
 
       @commit.stack.update!(cached_deploy_spec: DeploySpec.new('ci' => {
@@ -316,7 +318,11 @@ module Shipit
           commit.statuses.destroy_all
           commit.reload
           unless initial_state == 'unknown'
-            commit.statuses.create!(initial_status_attributes.merge(created_at: 10.days.ago.to_s(:db)))
+            attrs = initial_status_attributes.merge(
+              stack_id: commit.stack_id,
+              created_at: 10.days.ago.to_s(:db),
+            )
+            commit.statuses.create!(attrs)
           end
           assert_equal initial_state, commit.state
 
@@ -388,10 +394,10 @@ module Shipit
 
     test "#significant_status hierarchy uses failures and errors, then pending, then successes, then UnknownStatus" do
       commit = shipit_commits(:first)
-      pending = commit.statuses.new(state: 'pending', context: 'ci/pending')
-      failure = commit.statuses.new(state: 'failure', context: 'ci/failure')
-      error = commit.statuses.new(state: 'error', context: 'ci/error')
-      success = commit.statuses.new(state: 'success', context: 'ci/success')
+      pending = commit.statuses.new(stack_id: @stack.id, state: 'pending', context: 'ci/pending')
+      failure = commit.statuses.new(stack_id: @stack.id, state: 'failure', context: 'ci/failure')
+      error = commit.statuses.new(stack_id: @stack.id, state: 'error', context: 'ci/error')
+      success = commit.statuses.new(stack_id: @stack.id, state: 'success', context: 'ci/success')
 
       commit.reload.statuses = [pending, failure, success, error]
       assert_includes [error, failure], commit.significant_status

data/test/models/deploys_test.rb

@@ -185,7 +185,7 @@ module Shipit
     end
 
     test "transitioning to success triggers next deploy when stack uses CD" do
-      shipit_commits(:fifth).statuses.create!(state: 'success')
+      shipit_commits(:fifth).statuses.create!(stack_id: @stack.id, state: 'success')
 
       deploy = shipit_deploys(:shipit_running)
       deploy.stack.tasks.where.not(id: deploy.id).update_all(status: 'success')
@@ -200,7 +200,7 @@ module Shipit
     end
 
     test "transitioning to success skips CD deploy when stack doesn't use it" do
-      shipit_commits(:fifth).statuses.create!(state: 'success')
+      shipit_commits(:fifth).statuses.create!(stack_id: @stack.id, state: 'success')
 
       deploy = shipit_deploys(:shipit_running)
 

data/test/models/stacks_test.rb

@@ -258,16 +258,6 @@ module Shipit
       end
     end
 
-    test "#active_task? cache is cleared if a deploy change state" do
-      assert_queries(1) do
-        10.times { @stack.active_task? }
-      end
-      @stack.tasks.where(status: 'running').first.error!
-      assert_queries(1) do
-        10.times { @stack.active_task? }
-      end
-    end
-
     test "#deployable? returns true if stack is not locked and is not deploying" do
       @stack.deploys.destroy_all
       assert @stack.deployable?
@@ -534,6 +524,13 @@ module Shipit
       end
     end
 
+    test "#trigger_continuous_delivery use default env vars" do
+      @stack.tasks.delete_all
+
+      deploy = @stack.trigger_continuous_delivery
+      assert_equal({'SAFETY_DISABLED' => '0'}, deploy.env)
+    end
+
     test "#next_commit_to_deploy returns the last deployable commit" do
       @stack.tasks.where.not(until_commit_id: shipit_commits(:second).id).destroy_all
       assert_equal shipit_commits(:second), @stack.last_deployed_commit
@@ -541,7 +538,7 @@ module Shipit
       assert_equal shipit_commits(:third), @stack.next_commit_to_deploy
 
       fifth_commit = shipit_commits(:fifth)
-      fifth_commit.statuses.create!(state: 'success', context: 'ci/travis')
+      fifth_commit.statuses.create!(stack_id: @stack.id, state: 'success', context: 'ci/travis')
       assert_predicate fifth_commit, :deployable?
 
       assert_equal shipit_commits(:fifth), @stack.next_commit_to_deploy
@@ -551,7 +548,7 @@ module Shipit
       @stack.tasks.destroy_all
 
       fifth_commit = shipit_commits(:fifth)
-      fifth_commit.statuses.create!(state: 'success', context: 'ci/travis')
+      fifth_commit.statuses.create!(stack_id: @stack.id, state: 'success', context: 'ci/travis')
       assert_predicate fifth_commit, :deployable?
 
       assert_equal shipit_commits(:fifth), @stack.next_commit_to_deploy

data/test/models/status_test.rb

@@ -9,24 +9,24 @@ module Shipit
 
     test ".replicate_from_github! is idempotent" do
       assert_difference '@commit.statuses.count', 1 do
-        @commit.statuses.replicate_from_github!(github_status)
+        @commit.statuses.replicate_from_github!(@stack.id, github_status)
       end
 
       assert_no_difference '@commit.statuses.count' do
-        @commit.statuses.replicate_from_github!(github_status)
+        @commit.statuses.replicate_from_github!(@stack.id, github_status)
       end
     end
 
     test "once created a commit broadcasts an update event" do
       expect_event(@stack)
-      @commit.statuses.create!(state: 'success')
+      @commit.statuses.create!(stack_id: @stack.id, state: 'success')
     end
 
     test ".replicate_from_github! touches the related stack" do
       stack_last_updated_at = @stack.updated_at
       commit_last_updated_at = @commit.updated_at
 
-      @commit.statuses.replicate_from_github!(github_status)
+      @commit.statuses.replicate_from_github!(@stack.id, github_status)
 
       assert_not_equal commit_last_updated_at, @commit.reload.updated_at
       assert_not_equal stack_last_updated_at, @stack.reload.updated_at

data/test/unit/deploy_spec_test.rb

@@ -116,6 +116,16 @@ module Shipit
       assert_equal ['bundle exec cap $ENVIRONMENT deploy'], @spec.deploy_steps
     end
 
+    test "#deploy_steps returns `kubernetes-deploy <namespace> <context>` if `kubernetes` is present" do
+      @spec.stubs(:load_config).returns(
+        'kubernetes' => {
+          'namespace' => 'foo',
+          'context' => 'bar',
+        },
+      )
+      assert_equal ["kubernetes-deploy foo bar"], @spec.deploy_steps
+    end
+
     test "#deploy_steps prepend and append pre and post steps" do
       @spec.stubs(:load_config).returns('deploy' => {'pre' => ['before'], 'post' => ['after']})
       @spec.expects(:bundler?).returns(true).at_least_once
@@ -148,11 +158,32 @@ module Shipit
       assert_equal ['before', 'bundle exec cap $ENVIRONMENT deploy:rollback', 'after'], @spec.rollback_steps
     end
 
-    test '#machine_env return an environment hash' do
+    test "#rollback_steps returns `kubernetes-deploy <namespace> <context>` if `kubernetes` is present" do
+      @spec.stubs(:load_config).returns(
+        'kubernetes' => {
+          'namespace' => 'foo',
+          'context' => 'bar',
+        },
+      )
+      assert_equal ["kubernetes-deploy foo bar"], @spec.rollback_steps
+    end
+
+    test '#machine_env returns an environment hash' do
       @spec.stubs(:load_config).returns('machine' => {'environment' => {'GLOBAL' => '1'}})
       assert_equal({'GLOBAL' => '1'}, @spec.machine_env)
     end
 
+    test '#discover_machine_env contains K8S_TEMPLATE_FOLDER if `kubernetes.template_dir` is present' do
+      @spec.stubs(:load_config).returns(
+        'kubernetes' => {
+          'namespace' => 'foo',
+          'context' => 'bar',
+          'template_dir' => '/egg/spam',
+        },
+      )
+      assert_equal '/egg/spam', @spec.discover_machine_env['K8S_TEMPLATE_FOLDER']
+    end
+
     test '#load_config can grab the env-specific shipit.yml file' do
       config = {}
       config.expects(:exist?).returns(true)
@@ -359,5 +390,119 @@ module Shipit
     test "#clear_working_directory? returns true by default" do
       assert_predicate @spec, :clear_working_directory?
     end
+
+    test 'bundler installs take priority over npm installs' do
+      @spec.expects(:discover_package_json).never
+      @spec.stubs(:discover_bundler).returns(['fake bundler task']).once
+
+      assert_equal ['fake bundler task'], @spec.dependencies_steps
+    end
+
+    test 'Gems deploys take priority over npm deploys' do
+      @spec.expects(:discover_npm_package).never
+      @spec.stubs(:discover_gem).returns(['fake gem task']).once
+
+      assert_equal ['fake gem task'], @spec.deploy_steps
+    end
+
+    test '#npm? is false if there is no package.json' do
+      @spec.expects(:package_json).returns(Shipit::Engine.root.join("tmp-#{SecureRandom.hex}"))
+      refute @spec.npm?
+    end
+
+    test '#npm? is false if npm package is private' do
+      file = Pathname.new('/tmp/fake_package.json')
+      file.write('{"private": true}')
+
+      @spec.expects(:package_json).returns(file)
+      refute @spec.npm?
+    end
+
+    test '#npm? is true if npm package is public' do
+      file = Pathname.new('/tmp/fake_package.json')
+      file.write('{"private": false}')
+
+      @spec.expects(:package_json).returns(file)
+
+      assert @spec.npm?
+    end
+
+    test 'npm packages have a checklist' do
+      @spec.stubs(:npm?).returns(true).at_least_once
+      assert_match(/npm version/, @spec.review_checklist[0])
+    end
+
+    test '#dependencies_steps returns `npm install` if a `package.json` is present' do
+      @spec.expects(:npm?).returns(true).at_least_once
+      assert_equal ['npm install --no-progress'], @spec.dependencies_steps
+    end
+
+    test '#publish_npm_package checks if version tag exists, and then invokes npm deploy script' do
+      @spec.stubs(:npm?).returns(true)
+      assert_equal ['assert-npm-version-tag', 'npm publish'], @spec.deploy_steps
+    end
+
+    test 'bundler installs take priority over yarn installs' do
+      @spec.expects(:discover_yarn).never
+      @spec.stubs(:discover_bundler).returns(['fake bundler task']).once
+
+      assert_equal ['fake bundler task'], @spec.dependencies_steps
+    end
+
+    test 'Gems deploys take priority over yarn deploys' do
+      @spec.expects(:discover_yarn_package).never
+      @spec.stubs(:discover_gem).returns(['fake gem task']).once
+
+      assert_equal ['fake gem task'], @spec.deploy_steps
+    end
+
+    test '#yarn? is false if there is no package.json' do
+      @spec.expects(:package_json).returns(Shipit::Engine.root.join("tmp-#{SecureRandom.hex}"))
+      @spec.expects(:yarn_lock).returns(Shipit::Engine.root.join('Gemfile'))
+
+      refute @spec.yarn?
+    end
+
+    test '#yarn? is false if there is no yarn.lock' do
+      @spec.expects(:yarn_lock).returns(Shipit::Engine.root.join("tmp-#{SecureRandom.hex}"))
+
+      refute @spec.yarn?
+    end
+
+    test '#yarn? is false if a private package.json and yarn.lock are present' do
+      package_json = Pathname.new('/tmp/fake_package.json')
+      package_json.write('{"private": true}')
+
+      @spec.expects(:package_json).returns(package_json)
+      @spec.expects(:yarn_lock).returns(Shipit::Engine.root.join('Gemfile'))
+      refute @spec.yarn?
+    end
+
+    test '#yarn? is true if a public package.json and yarn.lock are present' do
+      package_json = Pathname.new('/tmp/fake_package.json')
+      package_json.write('{"private": false}')
+
+      yarn_lock = Pathname.new('/tmp/fake_yarn.lock')
+      yarn_lock.write('')
+
+      @spec.expects(:package_json).returns(package_json)
+      @spec.expects(:yarn_lock).returns(yarn_lock)
+      assert @spec.yarn?
+    end
+
+    test '#dependencies_steps returns `yarn install` if a `yarn.lock` is present' do
+      @spec.expects(:yarn?).returns(true).at_least_once
+      assert_equal ['yarn install --no-progress'], @spec.dependencies_steps
+    end
+
+    test '#publish_yarn_package checks if version tag exists, and then invokes yarn publish script' do
+      @spec.stubs(:yarn?).returns(true).at_least_once
+      assert_equal ['assert-npm-version-tag', 'yarn publish'], @spec.deploy_steps
+    end
+
+    test 'yarn checklist takes precedence over npm checklist' do
+      @spec.stubs(:yarn?).returns(true).at_least_once
+      assert_match(/yarn version/, @spec.review_checklist[0])
+    end
   end
 end