Permalink
Browse files

Merge "Allow any whitespace between 'require' and 'sinatra' in main S…

…inatra app file"
  • Loading branch information...
2 parents 04c9943 + 5225b85 commit 387c44524fd77413f5fad717256c2674f96291c6 Jennifer Hickey committed with Gerrit Code Review May 25, 2012
View
2 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:
View
2 spec/fixtures/apps/sinatra_trivial/source/app.rb
@@ -1,5 +1,5 @@
require 'rubygems'
-require 'sinatra'
+require 'sinatra'
get '/' do
results = <<-OUT

0 comments on commit 387c445

Please sign in to comment.