prof 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f28d50d262d8b8224ba2d09451964fdb63dd916
-  data.tar.gz: 77838236f26763ff9cc0dfb37e587f9ae675e24f
+  metadata.gz: dade8eaa281e844ba97b6a7585a538ce0d6979ca
+  data.tar.gz: e49902370f17f71a712bd66a7ac73a5490f0963b
 SHA512:
-  metadata.gz: 8533e5ddd7b7ccc465096ec48789f3089328cffd63ba8c22e0de802bfb0bec94a7dfdc99071d85ab0ebd1de01bcaff915ce5b22f57362064fa6153d1b24b75f2
-  data.tar.gz: db56ed3337f9a53ee7ef9c4c0c4ce62537cbad81c55069bad826726015a7b4e189c189f89ff00fcb07c6fe81c7518643a9ce9e82b20c35d2dc6b0005f5cf7760
+  metadata.gz: ac1f724bb366a27aea9a36f50bce7817c6fc710a7dfdd8a381f2e184468f79881b94acec9a75145682d23f3c6632f824ba3eac6b1019abc312e9f231eb893239
+  data.tar.gz: e8e441475bf7413c9e91981f8a4878e7fd56c83f044d7966a85356756deecd12ba4f44995e37ae40674b781b464b4d4f3efc03ef03829de90963035a10a08326

data/lib/prof/cloud_foundry.rb

@@ -19,7 +19,7 @@ module Prof
   class CloudFoundry
     extend Forwardable
 
-    attr_reader :api_url, :domain, :username, :password
+    attr_reader :api_url, :domain, :username, :password, :retry_timeout, :retry_interval
 
     def_delegators :hula_cloud_foundry,
                    :add_public_service_broker,
@@ -47,6 +47,11 @@ module Prof
       @api_url  = opts.fetch(:api_url) { "https://api.#{domain}" }
       @username = opts.fetch(:username)
       @password = opts.fetch(:password)
+
+      @retry_interval = opts.fetch(:retry_interval) { 5 }
+      @retry_timeout  = opts.fetch(:retry_timeout)  { 720 }
+
+      @hula_cloud_foundry = opts.fetch(:hula_cloud_foundry) if opts.key?(:hula_cloud_foundry)
     end
 
     def push_and_keep_app(app, pushed_app_name = "cf-app-#{SecureRandom.hex(4)}")
@@ -110,24 +115,12 @@ module Prof
 
     def provision_and_create_service_key(service, &_block)
       provision_service(service) do |service_instance|
-        wait_for_service_creation(service_instance)
         create_service_key(service_instance) do |service_key, service_key_data|
           yield service_instance, service_key, service_key_data
         end
       end
     end
 
-    def wait_for_service_creation(service_instance)
-      Timeout::timeout(12 * 60) do
-        loop do
-          status = hula_cloud_foundry.get_service_status(service_instance.name)
-          return if status == 'create succeeded'
-          raise "service instance creation failed: #{service_instance.name}" if status.include? 'failed'
-          sleep 5
-        end
-      end
-    end
-
     def list_service_keys(service_instance)
       hula_cloud_foundry.list_service_keys(service_instance.name)
     end
@@ -160,6 +153,7 @@ module Prof
       service_instance = ServiceInstance.new
 
       hula_cloud_foundry.create_service_instance(service.name, service_instance.name, service.plan)
+      wait_for_service_state(service_instance, "create succeeded", "create failed")
 
       yield service_instance if block_given?
 
@@ -169,6 +163,8 @@ module Prof
 
     def delete_service_instance_and_unbind(service_instance, options = {})
       hula_cloud_foundry.delete_service_instance_and_unbind(service_instance.name, options)
+
+      wait_for_service_state(service_instance, "Service instance #{service_instance.name} not found", "delete failed")
     end
 
     def auth_token
@@ -177,6 +173,17 @@ module Prof
 
     private
 
+    def wait_for_service_state(service_instance, expected_state, failure_state)
+      Timeout::timeout(retry_timeout) do
+        loop do
+          status = hula_cloud_foundry.get_service_status(service_instance.name)
+          return if status.include? expected_state
+          raise "Error #{failure_state} occured for service instance: #{service_instance.name}" if status.include? failure_state
+          sleep retry_interval
+        end
+      end
+    end
+
     def hula_cloud_foundry
       @hula_cloud_foundry ||= Hula::CloudFoundry.new(
         api_url:  api_url,

data/lib/prof/version.rb

@@ -9,5 +9,5 @@
 #
 
 module Prof
-  VERSION = '0.32.0'
+  VERSION = '0.33.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prof
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - CF London
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement