masamune 0.18.3 → 0.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc35b976d3a3db9e1c607ed58c09e38dadbf2928
-  data.tar.gz: 79d7c83267acf6faed9ada08768f515dc927782a
+  metadata.gz: 74acb711585f7828067e24f3598a32ea3a60e9d9
+  data.tar.gz: a65eb2509f2b91f10b2819c64603496d41bde2d8
 SHA512:
-  metadata.gz: ee73bba553255b67aa74bf852cc36a1d7a345cf9d1f586f85c115ac384e044c7e658e4c40d4f32707647ab846030c4635ac8dab5aa962f6e7525a619cd8effca
-  data.tar.gz: a428ee198c1e77a39f8a3ea362fd525c09dbda6efba3ef9ac6d4688c8a7860d2584dc747485872e080224bf182b16ed44923f50af223410436ecbd785b32ca0e
+  metadata.gz: f1be2f3708efa65705e0ff2745027d564f9e8035b034764c062e04d19fb089ffc03d7383104fa7b3773fa658d8d11f237ef18694243d941a6f74ec3491467c50
+  data.tar.gz: fd906239e801f5b6f72b675f93e6ff48bcb004827f2f14da6be7be870d8f5fed4bfd177c5c28629e4f14a41b95bb67655d3d7e254b709bd4f69e3e8b340419b2

data/lib/masamune/actions/postgres_admin.rb

@@ -26,9 +26,16 @@ module Masamune::Actions
       opts = opts.to_hash.symbolize_keys
 
       command = Masamune::Commands::PostgresAdmin.new(environment, opts)
+      command = Masamune::Commands::RetryWithBackoff.new(command, postgres_admin_retry_with_backoff_options.merge(opts))
       command = Masamune::Commands::Shell.new(command, opts)
 
       command.execute
     end
+
+    private
+
+    def postgres_admin_retry_with_backoff_options
+      configuration.commands.postgres.merge(configuration.commands.postgres_admin).slice(:retries, :backoff)
+    end
   end
 end

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.18.3'.freeze
+  VERSION = '0.18.4'.freeze
 end

data/spec/masamune/actions/postgres_admin_spec.rb

@@ -30,6 +30,28 @@ describe Masamune::Actions::PostgresAdmin do
 
   let(:instance) { klass.new }
 
+  shared_context 'retries and backoff' do
+    context 'with retries and backoff configured via postgres_admin command' do
+      before do
+        allow(instance).to receive_message_chain(:configuration, :commands, :postgres).and_return(retries: 1, backoff: 10)
+        allow(instance).to receive_message_chain(:configuration, :commands, :postgres_admin).and_return(retries: 3, backoff: 1)
+        expect(Masamune::Commands::RetryWithBackoff).to receive(:new).with(anything, hash_including(retries: 3, backoff: 1)).once.and_call_original
+      end
+
+      it { is_expected.to be_success }
+    end
+
+    context 'with retries and backoff configured via postgres command' do
+      before do
+        allow(instance).to receive_message_chain(:configuration, :commands, :postgres).and_return(retries: 1, backoff: 10)
+        allow(instance).to receive_message_chain(:configuration, :commands, :postgres_admin).and_return({})
+        expect(Masamune::Commands::RetryWithBackoff).to receive(:new).with(anything, hash_including(retries: 1, backoff: 10)).once.and_call_original
+      end
+
+      it { is_expected.to be_success }
+    end
+  end
+
   describe '.postgres_admin' do
     subject { instance.postgres_admin(action: action, database: 'zombo') }
 
@@ -41,6 +63,8 @@ describe Masamune::Actions::PostgresAdmin do
       end
 
       it { is_expected.to be_success }
+
+      include_context 'retries and backoff'
     end
 
     context 'with :action :drop' do
@@ -51,6 +75,8 @@ describe Masamune::Actions::PostgresAdmin do
       end
 
       it { is_expected.to be_success }
+
+      include_context 'retries and backoff'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.18.3
+  version: 0.18.4
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor