prof 0.29.4 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe68c2393cee5a400b66a2a2f8aa06945f88287c
-  data.tar.gz: b2c5fa5f958f984515b4a39ef9db37e090ef8e30
+  metadata.gz: dc3e874340f1268df04fc3ec269a96ec7fef8867
+  data.tar.gz: 8162e2cddf4540447ae9f29aef512c61c62648b8
 SHA512:
-  metadata.gz: 7ce2975b6f803b0479faed8ab8d828bbae4a481c696d60eabd2fc7228f827194a7555ca948b4a13edf3e7e1c71e42b7c9a742b9e8eb5eb614589f89fd5317c2f
-  data.tar.gz: 1be3084886e7003d0a8f0a75143244fca70a897c5058a06c1d59eb929529b00469b84ae2d5c68e5fcbaeebe63dbd76760ec1316d6d550c3d86676536e8a7423f
+  metadata.gz: f5ad99c53dec9d256a64b55b7c9aaf8c33af4df61f7ff500b11a8208405fc2303c6983dcc3338753131956862ee4e1de007d0611b085ea4ba528f024465f19af
+  data.tar.gz: cd47767df21e3544cd1fa795b10f6fb93a2549d7666f8bb46c111cb857cc68e130760f2942dc5ef8086e4f42665d8cdbcceb15dadf3316f9246896e1d075c959

data/lib/prof/cloud_foundry.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2015 Pivotal Software, Inc.
+# Copyright (c) 2014-2016 Pivotal Software, Inc.
 # All rights reserved.
 # THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
 # INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
@@ -48,6 +48,14 @@ module Prof
       @password = opts.fetch(:password)
     end
 
+    def push_and_keep_app(app)
+      pushed_app_name = "cf-app-#{SecureRandom.hex(4)}"
+      deployed_app    = PushedTestApp.new(name: pushed_app_name, url: hula_cloud_foundry.url_for_app(pushed_app_name))
+
+      hula_cloud_foundry.push_app(app.path, deployed_app.name)
+      [deployed_app.name, deployed_app.url]
+    end
+
     def push_app(app, &_block)
       pushed_app_name = "cf-app-#{SecureRandom.hex(4)}"
       deployed_app    = PushedTestApp.new(name: pushed_app_name, url: hula_cloud_foundry.url_for_app(pushed_app_name))
@@ -82,6 +90,11 @@ module Prof
       end
     end
 
+    def bind_service_and_keep_running(pushed_app_name, service_instance_name)
+      hula_cloud_foundry.bind_app_to_service(pushed_app_name, service_instance_name)
+      hula_cloud_foundry.start_app(pushed_app_name)
+    end
+
     def bind_service_and_run(pushed_app, service_instance, &_block)
       hula_cloud_foundry.bind_app_to_service(pushed_app.name, service_instance.name)
       hula_cloud_foundry.start_app(pushed_app.name)
@@ -120,6 +133,13 @@ module Prof
       hula_cloud_foundry.delete_service_key(service_instance.name, service_key)
     end
 
+    def provision_and_keep_service(service)
+      service_instance = ServiceInstance.new
+
+      hula_cloud_foundry.create_service_instance(service.name, service_instance.name, service.plan)
+      service_instance.name
+    end
+
     def provision_service(service, &_block)
       service_instance = ServiceInstance.new
 

data/lib/prof/external_spec/helpers/capybara.rb

@@ -8,8 +8,6 @@
 # USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-require 'capybara/rspec'
-require 'capybara/query'
 require 'capybara/poltergeist'
 require 'capybara/webkit'
 

data/lib/prof/matchers/only_support_ssl_with_cipher_set.rb

@@ -11,8 +11,7 @@
 require 'ostruct'
 
 require 'prof/ssl/check'
-
-require 'rspec/matchers/pretty'
+require 'rspec/matchers/english_phrasing'
 
 module Prof
   module Matchers
@@ -26,8 +25,6 @@ module Prof
 
     class OnlySupportSslWithCipherSet
 
-      include RSpec::Matchers::Pretty
-
       def initialize(cipher_set)
         @cipher_set = cipher_set
       end
@@ -46,10 +43,10 @@ module Prof
 
       def failure_message
         [
-          ("The server is missing support for#{to_sentence server_missing_supported_ciphers}" if server_missing_supported_ciphers.any?),
-          ("The server supports#{to_sentence server_extra_ciphers} when it should not" if server_extra_ciphers.any?),
-          ("The server is missing support for#{to_sentence server_missing_supported_protocols}" if server_missing_supported_protocols.any?),
-          ("The server supports#{to_sentence server_extra_protocols} when it should not" if server_extra_protocols.any?),
+          ("The server is missing support for#{RSpec::Matchers::EnglishPhrasing.list(server_missing_supported_ciphers)}" if server_missing_supported_ciphers.any?),
+          ("The server supports#{RSpec::Matchers::EnglishPhrasing.list(server_extra_ciphers)} when it should not" if server_extra_ciphers.any?),
+          ("The server is missing support for#{RSpec::Matchers::EnglishPhrasing.list(server_missing_supported_protocols)}" if server_missing_supported_protocols.any?),
+           ("The server supports#{RSpec::Matchers::EnglishPhrasing.list(server_extra_protocols)} when it should not" if server_extra_protocols.any?),
           ("The server supports HTTP when it should not" if http_enabled)
         ].compact.join("\n")
       end

data/lib/prof/version.rb

@@ -9,5 +9,5 @@
 #
 
 module Prof
-  VERSION = '0.29.4'
+  VERSION = '0.30.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prof
 version: !ruby/object:Gem::Version
-  version: 0.29.4
+  version: 0.30.0
 platform: ruby
 authors:
 - CF London
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
@@ -266,16 +266,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -396,7 +396,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A gem to test CF service brokers