Allow any whitespace between 'require' and 'sinatra'

in main Sinatra app file

Change-Id: I430575cde67eb30db059b0ece554434ee01d246f

dev_setup/cookbooks/cloud_controller/templates/default/sinatra.yml.erb

@@ -24,7 +24,7 @@ app_servers:
       executable: false # determined during staging
       default: true
 detection:
-  - "*.rb": "require 'sinatra'|require \"sinatra\"" # .rb files in the root dir containing a require?
+  - "*.rb": "require\\s+'sinatra'|require\\s+\"sinatra\"" # .rb files in the root dir containing a require?
   - "config/environment.rb": false # and config/environment.rb must not exist
 staged_services:
   - "name": "mysql"

staging/lib/vcap/staging/plugin/manifests/sinatra.yml

@@ -24,7 +24,7 @@ app_servers:
       executable: false # determined during staging
       default: true
 detection:
-  - "*.rb": "require 'sinatra'|require \"sinatra\"" # .rb files in the root dir containing a require?
+  - "*.rb": "require\\s+'sinatra'|require\\s+\"sinatra\"" # .rb files in the root dir containing a require?
   - "config.ru": false # use rack if it detects a config.ru
   - "config/environment.rb": false # and config/environment.rb must not exist
 staged_services:

staging/spec/fixtures/apps/sinatra_trivial/source/app.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'sinatra'
+require	'sinatra'
 
 get '/' do
   results = <<-OUT