knapsack_pro 2.4.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be2eb19b6bc60ed03791ae1fd85b0893d85a42f96be0a584f7774174572e4982
-  data.tar.gz: e500f47322535c432f3cc89eed024708cf5e9e66162cecf3af5e6793d90a6794
+  metadata.gz: b4167b51e7f0af27a7d1482efb7a6c019f9aa99dd849f9488e47c4a33b5bd943
+  data.tar.gz: fff1d5e557813cd2829298c422d4ffae857e047d27aa001cf746a516270d9259
 SHA512:
-  metadata.gz: 2303b72bfe98c25b1b7ec464f0632ce80ae20233457d990c0f92755fff63173bfad4da9dd2f9dc12873892c5157919cdd618d9b3999bef82f46242758bbc18b7
-  data.tar.gz: f3f49a0618a13876aaec016e3458a673a4a1ce7a6fb168f8f44409c10d00791a8e2e8c4c542f6c015951d4bcb17c2052e613dcbba69cf898f1d653818ce3eca1
+  metadata.gz: fd9b442c01b5b58b295e6fc36d3879ddbf97b8770d4f96243f594f225ef3f73e23e75555cfba7adb6439dd5afa39a38ea756e5758628eed54c9305a12bd8b716
+  data.tar.gz: 7401c76f35ce8485a7dc8dc5742514803c8a045d7f431899b32aaa4795433b723b68e554386b7670abb367b1f9dfde2be9e4bc8b661ead354dbab366b56c1705

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+### 2.6.0
+
+* Improve logger to show failed requests URL and when retry will happen
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/127
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.5.0...v2.6.0
+
+### 2.5.0
+
+* Add production branch to non encryptable branches names
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/126
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.4.0...v2.5.0
+
 ### 2.4.0
 
 * Update list of non encryptable branches

data/README.md

@@ -3258,6 +3258,8 @@ $ gem build knapsack_pro.gemspec
 $ gem push knapsack_pro-X.X.X.gem
 ```
 
+Update the latest available gem version in `TestSuiteClientVersionChecker` for the Knapsack Pro API repository.
+
 ## Mentions
 
 List of articles where people mentioned Knapsack Pro:

data/lib/knapsack_pro/client/connection.rb

@@ -115,14 +115,19 @@ module KnapsackPro
 
         response_body
       rescue ServerError, Errno::ECONNREFUSED, Errno::ETIMEDOUT, Errno::EPIPE, EOFError, SocketError, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError => e
+        logger.warn("#{action.http_method.to_s.upcase} #{endpoint_url}")
+        logger.warn('Request failed due to:')
         logger.warn(e.inspect)
         retries += 1
         if retries < max_request_retries
           wait = retries * REQUEST_RETRY_TIMEBOX
-          logger.warn("Wait #{wait}s and retry request to Knapsack Pro API.")
           print_every = 2 # seconds
           (wait / print_every).ceil.times do |i|
-            logger.warn("Next request in #{wait - i * print_every}s...")
+            if i == 0
+              logger.warn("Wait for #{wait}s before retrying the request to Knapsack Pro API.")
+            else
+              logger.warn("#{wait - i * print_every}s left before retry...")
+            end
             Kernel.sleep(print_every)
           end
           retry

data/lib/knapsack_pro/crypto/branch_encryptor.rb

@@ -8,6 +8,7 @@ module KnapsackPro
         'development',
         'dev',
         'staging',
+        'production',
         # GitHub Actions has branch names starting with refs/heads/
         'refs/heads/master',
         'refs/heads/main',
@@ -15,6 +16,7 @@ module KnapsackPro
         'refs/heads/development',
         'refs/heads/dev',
         'refs/heads/staging',
+        'refs/heads/production',
       ]
 
       def self.call(branch)

data/lib/knapsack_pro/version.rb

@@ -1,3 +1,3 @@
 module KnapsackPro
-  VERSION = '2.4.0'
+  VERSION = '2.6.0'
 end

data/spec/knapsack_pro/client/connection_spec.rb

@@ -84,22 +84,22 @@ shared_examples 'when retry request' do
       expect(logger).to receive(:error).exactly(3).with(parsed_response)
 
       server_error = described_class::ServerError.new(parsed_response)
+      expect(logger).to receive(:warn).exactly(3).with("#{expected_http_method} http://api.knapsackpro.test:3000/v1/fake_endpoint")
+      expect(logger).to receive(:warn).exactly(3).with('Request failed due to:')
       expect(logger).to receive(:warn).exactly(3).with(server_error.inspect)
 
-      expect(logger).to receive(:warn).with("Wait 8s and retry request to Knapsack Pro API.")
-      expect(logger).to receive(:warn).with("Next request in 8s...")
-      expect(logger).to receive(:warn).with("Next request in 6s...")
-      expect(logger).to receive(:warn).with("Next request in 4s...")
-      expect(logger).to receive(:warn).with("Next request in 2s...")
-      expect(logger).to receive(:warn).with("Wait 16s and retry request to Knapsack Pro API.")
-      expect(logger).to receive(:warn).with("Next request in 16s...")
-      expect(logger).to receive(:warn).with("Next request in 14s...")
-      expect(logger).to receive(:warn).with("Next request in 12s...")
-      expect(logger).to receive(:warn).with("Next request in 10s...")
-      expect(logger).to receive(:warn).with("Next request in 8s...")
-      expect(logger).to receive(:warn).with("Next request in 6s...")
-      expect(logger).to receive(:warn).with("Next request in 4s...")
-      expect(logger).to receive(:warn).with("Next request in 2s...")
+      expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+      expect(logger).to receive(:warn).with("6s left before retry...")
+      expect(logger).to receive(:warn).with("4s left before retry...")
+      expect(logger).to receive(:warn).with("2s left before retry...")
+      expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+      expect(logger).to receive(:warn).with("14s left before retry...")
+      expect(logger).to receive(:warn).with("12s left before retry...")
+      expect(logger).to receive(:warn).with("10s left before retry...")
+      expect(logger).to receive(:warn).with("8s left before retry...")
+      expect(logger).to receive(:warn).with("6s left before retry...")
+      expect(logger).to receive(:warn).with("4s left before retry...")
+      expect(logger).to receive(:warn).with("2s left before retry...")
       expect(Kernel).to receive(:sleep).exactly(12).with(2)
 
       expect(subject).to eq(parsed_response)
@@ -123,27 +123,27 @@ shared_examples 'when retry request' do
         expect(logger).to receive(:error).exactly(4).with(parsed_response)
 
         server_error = described_class::ServerError.new(parsed_response)
+        expect(logger).to receive(:warn).exactly(4).with("#{expected_http_method} http://api.knapsackpro.test:3000/v1/fake_endpoint")
+        expect(logger).to receive(:warn).exactly(4).with('Request failed due to:')
         expect(logger).to receive(:warn).exactly(4).with(server_error.inspect)
 
-        expect(logger).to receive(:warn).with("Wait 8s and retry request to Knapsack Pro API.")
-        expect(logger).to receive(:warn).with("Next request in 8s...")
-        expect(logger).to receive(:warn).with("Next request in 6s...")
-        expect(logger).to receive(:warn).with("Next request in 4s...")
-        expect(logger).to receive(:warn).with("Next request in 2s...")
-
-        expect(logger).to receive(:warn).with("Wait 16s and retry request to Knapsack Pro API.")
-        expect(logger).to receive(:warn).with("Next request in 16s...")
-        expect(logger).to receive(:warn).with("Next request in 14s...")
-        expect(logger).to receive(:warn).with("Next request in 12s...")
-        expect(logger).to receive(:warn).with("Next request in 10s...")
-        expect(logger).to receive(:warn).with("Next request in 8s...")
-        expect(logger).to receive(:warn).with("Next request in 6s...")
-        expect(logger).to receive(:warn).with("Next request in 4s...")
-        expect(logger).to receive(:warn).with("Next request in 2s...")
-
-        expect(logger).to receive(:warn).with("Wait 24s and retry request to Knapsack Pro API.")
-        12.times do |i|
-          expect(logger).to receive(:warn).with("Next request in #{(i+1)*2}s...")
+        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("14s left before retry...")
+        expect(logger).to receive(:warn).with("12s left before retry...")
+        expect(logger).to receive(:warn).with("10s left before retry...")
+        expect(logger).to receive(:warn).with("8s left before retry...")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to Knapsack Pro API.")
+        11.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
         expect(Kernel).to receive(:sleep).exactly(4+8+12).with(2)
@@ -170,37 +170,37 @@ shared_examples 'when retry request' do
         expect(logger).to receive(:error).exactly(6).with(parsed_response)
 
         server_error = described_class::ServerError.new(parsed_response)
+        expect(logger).to receive(:warn).exactly(6).with("#{expected_http_method} http://api.knapsackpro.test:3000/v1/fake_endpoint")
+        expect(logger).to receive(:warn).exactly(6).with('Request failed due to:')
         expect(logger).to receive(:warn).exactly(6).with(server_error.inspect)
 
-        expect(logger).to receive(:warn).with("Wait 8s and retry request to Knapsack Pro API.")
-        expect(logger).to receive(:warn).with("Next request in 8s...")
-        expect(logger).to receive(:warn).with("Next request in 6s...")
-        expect(logger).to receive(:warn).with("Next request in 4s...")
-        expect(logger).to receive(:warn).with("Next request in 2s...")
-
-        expect(logger).to receive(:warn).with("Wait 16s and retry request to Knapsack Pro API.")
-        expect(logger).to receive(:warn).with("Next request in 16s...")
-        expect(logger).to receive(:warn).with("Next request in 14s...")
-        expect(logger).to receive(:warn).with("Next request in 12s...")
-        expect(logger).to receive(:warn).with("Next request in 10s...")
-        expect(logger).to receive(:warn).with("Next request in 8s...")
-        expect(logger).to receive(:warn).with("Next request in 6s...")
-        expect(logger).to receive(:warn).with("Next request in 4s...")
-        expect(logger).to receive(:warn).with("Next request in 2s...")
-
-        expect(logger).to receive(:warn).with("Wait 24s and retry request to Knapsack Pro API.")
-        12.times do |i|
-          expect(logger).to receive(:warn).with("Next request in #{(i+1)*2}s...")
+        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("14s left before retry...")
+        expect(logger).to receive(:warn).with("12s left before retry...")
+        expect(logger).to receive(:warn).with("10s left before retry...")
+        expect(logger).to receive(:warn).with("8s left before retry...")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to Knapsack Pro API.")
+        11.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
-        expect(logger).to receive(:warn).with("Wait 32s and retry request to Knapsack Pro API.")
-        16.times do |i|
-          expect(logger).to receive(:warn).with("Next request in #{(i+1)*2}s...")
+        expect(logger).to receive(:warn).with("Wait for 32s before retrying the request to Knapsack Pro API.")
+        15.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
-        expect(logger).to receive(:warn).with("Wait 40s and retry request to Knapsack Pro API.")
-        20.times do |i|
-          expect(logger).to receive(:warn).with("Next request in #{(i+1)*2}s...")
+        expect(logger).to receive(:warn).with("Wait for 40s before retrying the request to Knapsack Pro API.")
+        19.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
         expect(Kernel).to receive(:sleep).exactly(60).with(2)
@@ -227,37 +227,37 @@ shared_examples 'when retry request' do
         expect(logger).to receive(:error).exactly(6).with(parsed_response)
 
         server_error = described_class::ServerError.new(parsed_response)
+        expect(logger).to receive(:warn).exactly(6).with("#{expected_http_method} http://api.knapsackpro.test:3000/v1/fake_endpoint")
+        expect(logger).to receive(:warn).exactly(6).with('Request failed due to:')
         expect(logger).to receive(:warn).exactly(6).with(server_error.inspect)
 
-        expect(logger).to receive(:warn).with("Wait 8s and retry request to Knapsack Pro API.")
-        expect(logger).to receive(:warn).with("Next request in 8s...")
-        expect(logger).to receive(:warn).with("Next request in 6s...")
-        expect(logger).to receive(:warn).with("Next request in 4s...")
-        expect(logger).to receive(:warn).with("Next request in 2s...")
-
-        expect(logger).to receive(:warn).with("Wait 16s and retry request to Knapsack Pro API.")
-        expect(logger).to receive(:warn).with("Next request in 16s...")
-        expect(logger).to receive(:warn).with("Next request in 14s...")
-        expect(logger).to receive(:warn).with("Next request in 12s...")
-        expect(logger).to receive(:warn).with("Next request in 10s...")
-        expect(logger).to receive(:warn).with("Next request in 8s...")
-        expect(logger).to receive(:warn).with("Next request in 6s...")
-        expect(logger).to receive(:warn).with("Next request in 4s...")
-        expect(logger).to receive(:warn).with("Next request in 2s...")
-
-        expect(logger).to receive(:warn).with("Wait 24s and retry request to Knapsack Pro API.")
-        12.times do |i|
-          expect(logger).to receive(:warn).with("Next request in #{(i+1)*2}s...")
+        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("14s left before retry...")
+        expect(logger).to receive(:warn).with("12s left before retry...")
+        expect(logger).to receive(:warn).with("10s left before retry...")
+        expect(logger).to receive(:warn).with("8s left before retry...")
+        expect(logger).to receive(:warn).with("6s left before retry...")
+        expect(logger).to receive(:warn).with("4s left before retry...")
+        expect(logger).to receive(:warn).with("2s left before retry...")
+
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to Knapsack Pro API.")
+        11.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
-        expect(logger).to receive(:warn).with("Wait 32s and retry request to Knapsack Pro API.")
-        16.times do |i|
-          expect(logger).to receive(:warn).with("Next request in #{(i+1)*2}s...")
+        expect(logger).to receive(:warn).with("Wait for 32s before retrying the request to Knapsack Pro API.")
+        15.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
-        expect(logger).to receive(:warn).with("Wait 40s and retry request to Knapsack Pro API.")
-        20.times do |i|
-          expect(logger).to receive(:warn).with("Next request in #{(i+1)*2}s...")
+        expect(logger).to receive(:warn).with("Wait for 40s before retrying the request to Knapsack Pro API.")
+        19.times do |i|
+          expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
         expect(Kernel).to receive(:sleep).exactly(60).with(2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.0
 platform: ruby
 authors:
 - ArturT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake