shipit-engine 0.11.0 → 0.12.0

data/test/models/stacks_test.rb

@@ -383,6 +383,10 @@ module Shipit
     end
 
     test "updating the stack doesn't emit a hook if only `updated_at` is changed" do
+      # force a save to make sure `cached_deploy_spec` serialization is consistent with how Active Record would
+      # serialize it.
+      @stack.update(updated_at: 2.days.ago)
+
       expect_no_hook(:stack) do
         @stack.update(updated_at: Time.zone.now)
       end
@@ -469,8 +473,12 @@ module Shipit
     end
 
     test "#trigger_continuous_delivery bails out if the stack isn't deployable" do
+      Hook.stubs(:emit) # TODO: Once on rails 5, use assert_no_enqueued_jobs(only: Shipit::PerformTaskJob)
+
+      @stack.lock('yada yada yada', AnonymousUser.new)
       refute_predicate @stack, :deployable?
       refute_predicate @stack, :deployed_too_recently?
+
       assert_no_enqueued_jobs do
         assert_no_difference -> { Deploy.count } do
           @stack.trigger_continuous_delivery
@@ -479,9 +487,14 @@ module Shipit
     end
 
     test "#trigger_continuous_delivery bails out if the stack is deployable but was deployed too recently" do
-      @stack.tasks.active.each(&:error!)
+      Hook.stubs(:emit) # TODO: Once on rails 5, use assert_no_enqueued_jobs(only: Shipit::PerformTaskJob)
+
+      @stack.tasks.delete_all
+      deploy = @stack.trigger_deploy(shipit_commits(:first), AnonymousUser.new)
+      deploy.run!
+      deploy.complete!
+
       assert_predicate @stack, :deployable?
-      @stack.last_active_task.update(ended_at: 20.seconds.ago)
       assert_predicate @stack, :deployed_too_recently?
 
       assert_no_enqueued_jobs do
@@ -491,12 +504,32 @@ module Shipit
       end
     end
 
+    test "#trigger_continuous_delivery bails out if the commit was already unsuccessfully deployed" do
+      Hook.stubs(:emit) # TODO: Once on rails 5, use assert_no_enqueued_jobs(only: Shipit::PerformTaskJob)
+
+      @stack.tasks.delete_all
+
+      assert_predicate @stack, :deployable?
+      refute_predicate @stack, :deployed_too_recently?
+
+      commit = @stack.next_commit_to_deploy
+      deploy = @stack.trigger_deploy(commit, AnonymousUser.new)
+      deploy.error!
+      assert_predicate commit, :deploy_failed?
+
+      assert_no_enqueued_jobs do
+        assert_no_difference -> { Deploy.count } do
+          @stack.trigger_continuous_delivery
+        end
+      end
+    end
+
     test "#trigger_continuous_delivery trigger a deploy if all conditions are met" do
-      @stack.tasks.active.each(&:error!)
+      @stack.tasks.delete_all
       assert_predicate @stack, :deployable?
       refute_predicate @stack, :deployed_too_recently?
 
-      assert_no_difference -> { Deploy.count } do
+      assert_difference -> { Deploy.count }, +1 do
         @stack.trigger_continuous_delivery
       end
     end
@@ -526,5 +559,46 @@ module Shipit
       @stack.expects(:maximum_commits_per_deploy).returns(3).at_least_once
       assert_equal shipit_commits(:third), @stack.next_commit_to_deploy
     end
+
+    test "#lock sets reason, user and locked_since" do
+      reason = "Here comes the walrus"
+      user = shipit_users(:walrus)
+      @stack.lock(reason, user)
+      assert @stack.locked?
+      assert_equal reason, @stack.lock_reason
+      assert_equal user, @stack.lock_author
+      assert_not_nil user, @stack.locked_since
+    end
+
+    test "#unlock deletes reason, user and locked_since" do
+      user = shipit_users(:walrus)
+      @stack.lock("Here comes the walrus", user)
+      @stack.unlock
+      refute @stack.locked?
+      assert_nil @stack.lock_reason
+      assert_nil @stack.locked_since
+      assert_not_equal user, @stack.lock_author
+    end
+
+    test "#lock does not overwrite locked_since if already locked" do
+      @stack.lock("Here comes the walrus", shipit_users(:walrus))
+      old_time = @stack.locked_since
+
+      new_reason = "Its still coming!"
+      @stack.lock(new_reason, shipit_users(:walrus))
+
+      assert @stack.locked?
+      assert_equal new_reason, @stack.lock_reason
+      assert_equal old_time, @stack.locked_since
+    end
+
+    test "stack contains valid deploy_url" do
+      @stack.deploy_url = "Javascript:alert(0);//"
+      assert_not_predicate @stack, :valid?
+      @stack.deploy_url = "https://shopify.com"
+      assert_predicate @stack, :valid?
+      @stack.deploy_url = "ssh://abc"
+      assert_predicate @stack, :valid?
+    end
   end
 end

data/test/models/users_test.rb

@@ -107,6 +107,22 @@ module Shipit
       assert_equal Shipit.github_api, AnonymousUser.new.github_api
     end
 
+    test "users with legacy encrypted access token get their token reset automatically" do
+      # See: https://github.com/attr-encrypted/attr_encrypted/blob/53266da546a21afaa1f1b93a461b912f4ccf363b/README.md#upgrading-from-attr_encrypted-v2x-to-v3x
+      legacy = shipit_users(:legacy)
+      assert_not_nil legacy.encrypted_github_access_token
+      assert_not_nil legacy.encrypted_github_access_token_iv
+
+      assert_nil legacy.github_access_token
+      legacy.reload
+      assert_nil legacy.encrypted_github_access_token
+      assert_nil legacy.encrypted_github_access_token_iv
+
+      legacy.update!(github_access_token: 't0k3n')
+      legacy.reload
+      assert_equal 't0k3n', legacy.github_access_token
+    end
+
     private
 
     def fetch_user

data/test/unit/commands_test.rb

@@ -9,5 +9,9 @@ module Shipit
     test 'SHIPIT gets added to the environment variables' do
       assert_equal '1', @commands.env['SHIPIT']
     end
+
+    test 'parse_git_version handles rc releases' do
+      assert_equal Gem::Version.new('2.8.0'), Commands.parse_git_version('git version 2.8.0.rc3')
+    end
   end
 end

data/test/unit/deploy_commands_test.rb

@@ -139,7 +139,7 @@ module Shipit
       commands = @commands.perform
       assert_equal 1, commands.length
       command = commands.first
-      assert_equal "Sirupsen (Simon Horup Eskildsen) via Shipit", command.env['USER']
+      assert_equal "Sirupsen (Simon Horup Eskildsen) via Shipit", command.env['SHIPIT_USER']
     end
 
     test "#perform calls cap $environment deploy with the ENVIRONMENT in the environment" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,19 +25,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: securecompare
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +196,16 @@ dependencies:
   name: pubsubstub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.12.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.12.3
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +366,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.2
+        version: 6.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.2
+        version: 6.4.1
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
@@ -530,7 +600,6 @@ files:
 - app/jobs/shipit/emit_event_job.rb
 - app/jobs/shipit/fetch_commit_stats_job.rb
 - app/jobs/shipit/fetch_deployed_revision_job.rb
-- app/jobs/shipit/git_mirror_update_job.rb
 - app/jobs/shipit/github_sync_job.rb
 - app/jobs/shipit/perform_commit_checks_job.rb
 - app/jobs/shipit/perform_task_job.rb
@@ -553,6 +622,7 @@ files:
 - app/models/shipit/deploy_spec/pypi_discovery.rb
 - app/models/shipit/deploy_spec/rubygems_discovery.rb
 - app/models/shipit/duration.rb
+- app/models/shipit/ephemeral_commit_checks.rb
 - app/models/shipit/github_hook.rb
 - app/models/shipit/hook.rb
 - app/models/shipit/membership.rb
@@ -587,10 +657,11 @@ files:
 - app/views/layouts/shipit.html.erb
 - app/views/layouts/shipit_bootstrap.html.erb
 - app/views/shipit/_variables.html.erb
+- app/views/shipit/commit_checks/_checks.html.erb
+- app/views/shipit/commit_checks/show.html.erb
 - app/views/shipit/commits/_commit.html.erb
 - app/views/shipit/commits/_commit_author.html.erb
 - app/views/shipit/deploys/_checklist.html.erb
-- app/views/shipit/deploys/_checks.html.erb
 - app/views/shipit/deploys/_concurrent_deploy_warning.html.erb
 - app/views/shipit/deploys/_deploy.html.erb
 - app/views/shipit/deploys/_monitoring.html.erb
@@ -640,6 +711,8 @@ files:
 - db/migrate/20160426155146_add_index_for_stack_active_task.rb
 - db/migrate/20160502150713_add_estimated_deploy_duration_to_stacks.rb
 - db/migrate/20160526192650_reorder_active_tasks_index.rb
+- db/migrate/20160802092812_add_continuous_delivery_delayed_since_to_stacks.rb
+- db/migrate/20160822131405_add_locked_since_to_stacks.rb
 - lib/shipit-engine.rb
 - lib/shipit.rb
 - lib/shipit/command.rb
@@ -717,6 +790,19 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
+- test/dummy/data/stacks/byroot/junk/production/git/bar.txt
+- test/dummy/data/stacks/byroot/junk/production/git/bin/slow
+- test/dummy/data/stacks/byroot/junk/production/git/bin/timeout
+- test/dummy/data/stacks/byroot/junk/production/git/dkfdsf
+- test/dummy/data/stacks/byroot/junk/production/git/dskjfsd
+- test/dummy/data/stacks/byroot/junk/production/git/dslkjfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/plopfizz
+- test/dummy/data/stacks/byroot/junk/production/git/sd
+- test/dummy/data/stacks/byroot/junk/production/git/sdkfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/sdlfjsdfdsfj
+- test/dummy/data/stacks/byroot/junk/production/git/sdlkfjsdlkfjsdlkfjdsfsdfksdfjsldkfjsdlkfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/shipit.yml
+- test/dummy/data/stacks/byroot/junk/production/git/toto.txt
 - test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
@@ -819,7 +905,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Application deployment software
@@ -870,6 +956,19 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
+- test/dummy/data/stacks/byroot/junk/production/git/bar.txt
+- test/dummy/data/stacks/byroot/junk/production/git/bin/slow
+- test/dummy/data/stacks/byroot/junk/production/git/bin/timeout
+- test/dummy/data/stacks/byroot/junk/production/git/dkfdsf
+- test/dummy/data/stacks/byroot/junk/production/git/dskjfsd
+- test/dummy/data/stacks/byroot/junk/production/git/dslkjfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/plopfizz
+- test/dummy/data/stacks/byroot/junk/production/git/sd
+- test/dummy/data/stacks/byroot/junk/production/git/sdkfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/sdlfjsdfdsfj
+- test/dummy/data/stacks/byroot/junk/production/git/sdlkfjsdlkfjsdlkfjdsfsdfksdfjsldkfjsdlkfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/shipit.yml
+- test/dummy/data/stacks/byroot/junk/production/git/toto.txt
 - test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb