shipit-engine 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32c15d6ba8aee487f4738a05b978cb87ce525c51
-  data.tar.gz: 4652419bd067b12dc0e8689f1bc76befdfa96657
+  metadata.gz: 32d85f27b707a0fd01fd1772e5803af8663d195b
+  data.tar.gz: 3f5df442e05fc1048307226080695c438fce46aa
 SHA512:
-  metadata.gz: 3d815536be09f672e39a8eaa61347321765a884707720f22d88985908b6eb0065426c0252d6906e8a9485fd2e178aa5aa64401eb1f92c054e57a5a93e58cb048
-  data.tar.gz: c4ab143452da7c46d36374cc4b778bed710d1fe8144a043d22af140dda730e37610350c18787e20a635eb91e1f6d2421de754facc1fccbf61caf4ac0931d1381
+  metadata.gz: d7a9dbec229ef543d4e4b884c75539abf59f143d67fd068cee822c609a4fcd5232dae511215d54674064a52a912645036ed7f4bdcfeb2263343a4e57d5559965
+  data.tar.gz: 3a02db736fb43949135fdada6d039c32f1a810204a20152c049c775d9bc17d5de526bf783bee98d9f2f892e753cf6bd329994881282344b40079329b6aaac809

data/app/models/shipit/hook.rb

@@ -81,7 +81,7 @@ module Shipit
 
     def purge_old_deliveries!(keep: DELIVERIES_LOG_SIZE)
       if cut_off_time = deliveries.order(created_at: :desc).limit(1).offset(keep).pluck(:created_at).first
-        deliveries.where('created_at > ?', cut_off_time).delete_all
+        deliveries.where('created_at <= ?', cut_off_time).delete_all
       end
     end
 

data/app/models/shipit/pull_request.rb

@@ -102,7 +102,7 @@ module Shipit
     end
 
     def self.schedule_merges
-      Shipit::Stack.where(id: pending.uniq.pluck(:stack_id)).find_each(&:schedule_merges)
+      Shipit::Stack.where(merge_queue_enabled: true).find_each(&:schedule_merges)
     end
 
     def self.extract_number(stack, number_or_url)

data/app/models/shipit/stack.rb

@@ -198,14 +198,14 @@ module Shipit
       commits.reachable.first.try!(:sha)
     end
 
-    def merge_status(backlog_leniency_factor: 1.5)
+    def merge_status(backlog_leniency_factor: 2.0)
       return 'locked' if locked?
       return 'failure' if %w(failure error).freeze.include?(branch_status)
       return 'backlogged' if backlogged?(backlog_leniency_factor: backlog_leniency_factor)
       'success'
     end
 
-    def backlogged?(backlog_leniency_factor: 1.5)
+    def backlogged?(backlog_leniency_factor: 2.0)
       maximum_commits_per_deploy && (undeployed_commits_count > maximum_commits_per_deploy * backlog_leniency_factor)
     end
 

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.20.0'.freeze
+  VERSION = '0.20.1'.freeze
 end

data/test/models/hook_test.rb

@@ -59,9 +59,14 @@ module Shipit
     test "#purge_old_deliveries!" do
       Hook.deliver(:deploy, @stack, 'foo' => 42)
 
-      assert_difference -> { Delivery.count }, -1 do
+      previous_ids = @hook.deliveries.order(created_at: :desc).pluck(:id)
+
+      assert_difference -> { @hook.deliveries.count }, -1 do
         @hook.purge_old_deliveries!(keep: 1)
       end
+
+      after_ids = @hook.deliveries.order(created_at: :desc).pluck(:id)
+      assert_equal previous_ids[0..-2], after_ids
     end
   end
 end

data/test/models/stacks_test.rb

@@ -441,14 +441,14 @@ module Shipit
       @stack.deploys_and_rollbacks.destroy_all
       @stack.update_undeployed_commits_count
       @stack.reload
-      assert_equal 'backlogged', @stack.merge_status
+      assert_equal 'backlogged', @stack.merge_status(backlog_leniency_factor: 1.5)
     end
 
     test "#merge_status returns success with a higher leniency factor" do
       @stack.deploys_and_rollbacks.destroy_all
       @stack.update_undeployed_commits_count
       @stack.reload
-      assert_equal 'success', @stack.merge_status(backlog_leniency_factor: 2.0)
+      assert_equal 'success', @stack.merge_status(backlog_leniency_factor: 3.0)
     end
 
     test "#handle_github_redirections update the stack if the repository was renamed" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -782,7 +782,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
@@ -963,7 +962,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