miasma 0.2.28 → 0.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b2d18aa4668b4cd91f5d0c98895983fbded4a0d
-  data.tar.gz: 203bbd13208a023c62f71d6c30d034df3043af82
+  metadata.gz: c9d47952cbfd15fb3a57ddfd6103c5024a689456
+  data.tar.gz: 5a06b29d9f76fae06e9ee1cc2ee5343eb0bfd948
 SHA512:
-  metadata.gz: 5ff97e15e0702de0fb9606bcba54de85730416d666235dfe70050d2a19c2d88202d70228e511fbd5626d0b4d575fb82d06b09b27ecdba5452c7f507e1c63b2eb
-  data.tar.gz: c8873ed07fb88bf5375f1b2f2db2f21647dbf22bfcdc1e0d7f1a1f6dd663f1299fcc2191bfc9eb1f74b952f6a7795616bb15c7985af50d8beccc1b40939fbfee
+  metadata.gz: 8b78609a2d1cb7150337f29ed0dada0c69f9274d7407f83fde98c23b8bd13e5e648fd2cdc1059968687b4d45009d8a0038720f8260483691cc462a181893fb1e
+  data.tar.gz: 8fc58eb0e34295f1bd04e0f693ac0a2a540e52ad246d27d372b4e0c1483c78b47d8311cc06960dba7defcdbc5d67b9ee096816106cca8abbbcf59da0a9e3f044

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.30
+* Provide interface for API implementations to customize retry behavior
+
 # v0.2.28
 * Include original exception information on API load failures
 * Provide better retry functionality on non-modify requests

data/lib/miasma/models/orchestration.rb

@@ -13,7 +13,10 @@ module Miasma
 
       ## mapping example
       # RESOURCE_MAPPING = Smash.new(
-      #   'AWS::EC2::Instance' => Miasma::Models::Compute::Server
+      #   'AWS::EC2::Instance' => Smash.new(
+      #     :api => :compute,
+      #     :collection => :servers
+      #   )
       # )
 
       # @return [Array<Symbol>] valid resource states

data/lib/miasma/types/api.rb

@@ -128,12 +128,28 @@ module Miasma
       def retryable_request(http_method, &block)
         Bogo::Retry.build(
           data.fetch(:retry_type, :exponential),
-          :max_attempts => VALID_REQUEST_RETRY_METHODS.include?(http_method) ? data.fetch(:retry_max, MAX_REQUEST_RETRIES) : 1,
+          :max_attempts => retryable_allowed?(http_method) ? data.fetch(:retry_max, MAX_REQUEST_RETRIES) : 0,
           :wait_interval => data[:retry_interval],
           :ui => data[:retry_ui],
           :auto_run => false,
           &block
-        ).run!
+        ).run!{|e| perform_request_retry(e) }
+      end
+
+      # Determine if request type is allowed to be retried
+      #
+      # @param http_method [Symbol] request type
+      # @return [TrueClass, FalseClass]
+      def retryable_allowed?(http_method)
+        VALID_REQUEST_RETRY_METHODS.include?(http_method)
+      end
+
+      # Determine if a retry on the request should be performed
+      #
+      # @param exception [Exception]
+      # @return [TrueClass, FalseClass]
+      def perform_request_retry(exception)
+        true
       end
 
       # Perform request

data/lib/miasma/version.rb

@@ -1,4 +1,4 @@
 module Miasma
   # current library version
-  VERSION = Gem::Version.new('0.2.28')
+  VERSION = Gem::Version.new('0.2.30')
 end

data/miasma.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'multi_json'
   s.add_runtime_dependency 'multi_xml'
   s.add_runtime_dependency 'xml-simple'
-  s.add_runtime_dependency 'bogo', '>= 0.1.27', '< 1.0'
+  s.add_runtime_dependency 'bogo', '>= 0.1.30', '< 1.0'
   # Include provider libs that do not have outside deps
   s.add_runtime_dependency 'miasma-aws'
   s.add_runtime_dependency 'miasma-open-stack'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.30
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -72,7 +72,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.27
+        version: 0.1.30
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.27
+        version: 0.1.30
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'