From 8959f382c280eb9bc7ebf1b8bacc7d0c59490d6a Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 3 Feb 2015 10:12:53 +0100 Subject: [PATCH] Move server/ to waiter/ Apparently server dir conflicts with some scripts in ember-cli --- Gemfile | 2 +- Procfile | 2 +- {server => waiter}/Rakefile | 0 {server => waiter}/config.ru | 0 {server => waiter}/lib/travis/web.rb | 0 {server => waiter}/lib/travis/web/allow.rb | 0 {server => waiter}/lib/travis/web/api_redirect.rb | 0 {server => waiter}/lib/travis/web/app.rb | 0 {server => waiter}/lib/travis/web/app/alt_versions.rb | 0 {server => waiter}/lib/travis/web/app/mobile_redirect.rb | 0 {server => waiter}/lib/travis/web/config.rb | 0 {server => waiter}/lib/travis/web/set_token.rb | 0 {server => waiter}/script/ci | 0 {server => waiter}/script/prepare_deploy | 0 {server => waiter}/script/saucelabs.rb | 0 {server => waiter}/script/server | 0 {server => waiter}/spec/allow_spec.rb | 0 {server => waiter}/spec/api_redirect_spec.rb | 0 {server => waiter}/spec/app_spec.rb | 0 {server => waiter}/spec/mobile_redirect_spec.rb | 0 {server => waiter}/spec/spec_helper.rb | 0 {server => waiter}/travis-web.gemspec | 0 22 files changed, 2 insertions(+), 2 deletions(-) rename {server => waiter}/Rakefile (100%) rename {server => waiter}/config.ru (100%) rename {server => waiter}/lib/travis/web.rb (100%) rename {server => waiter}/lib/travis/web/allow.rb (100%) rename {server => waiter}/lib/travis/web/api_redirect.rb (100%) rename {server => waiter}/lib/travis/web/app.rb (100%) rename {server => waiter}/lib/travis/web/app/alt_versions.rb (100%) rename {server => waiter}/lib/travis/web/app/mobile_redirect.rb (100%) rename {server => waiter}/lib/travis/web/config.rb (100%) rename {server => waiter}/lib/travis/web/set_token.rb (100%) rename {server => waiter}/script/ci (100%) rename {server => waiter}/script/prepare_deploy (100%) rename {server => waiter}/script/saucelabs.rb (100%) rename {server => waiter}/script/server (100%) rename {server => waiter}/spec/allow_spec.rb (100%) rename {server => waiter}/spec/api_redirect_spec.rb (100%) rename {server => waiter}/spec/app_spec.rb (100%) rename {server => waiter}/spec/mobile_redirect_spec.rb (100%) rename {server => waiter}/spec/spec_helper.rb (100%) rename {server => waiter}/travis-web.gemspec (100%) diff --git a/Gemfile b/Gemfile index e1e36cda..3a2b8cf1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' ruby '2.1.2' -gem 'travis-web', path: 'server' +gem 'travis-web', path: 'waiter' gem 'puma' gem 'rack-ssl', '~> 1.3' gem 'rack-protection', '~> 1.3' diff --git a/Procfile b/Procfile index 7990da73..5297e6dd 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,3 @@ -web: bundle exec rackup -s puma -p $PORT server/config.ru +web: bundle exec rackup -s puma -p $PORT waiter/config.ru assets: rerun -x -p 'assets/**/*' 'bundle exec rakep' #specs: rerun -x -p 'public/**/*' './run_jasmine.coffee public/spec.html' diff --git a/server/Rakefile b/waiter/Rakefile similarity index 100% rename from server/Rakefile rename to waiter/Rakefile diff --git a/server/config.ru b/waiter/config.ru similarity index 100% rename from server/config.ru rename to waiter/config.ru diff --git a/server/lib/travis/web.rb b/waiter/lib/travis/web.rb similarity index 100% rename from server/lib/travis/web.rb rename to waiter/lib/travis/web.rb diff --git a/server/lib/travis/web/allow.rb b/waiter/lib/travis/web/allow.rb similarity index 100% rename from server/lib/travis/web/allow.rb rename to waiter/lib/travis/web/allow.rb diff --git a/server/lib/travis/web/api_redirect.rb b/waiter/lib/travis/web/api_redirect.rb similarity index 100% rename from server/lib/travis/web/api_redirect.rb rename to waiter/lib/travis/web/api_redirect.rb diff --git a/server/lib/travis/web/app.rb b/waiter/lib/travis/web/app.rb similarity index 100% rename from server/lib/travis/web/app.rb rename to waiter/lib/travis/web/app.rb diff --git a/server/lib/travis/web/app/alt_versions.rb b/waiter/lib/travis/web/app/alt_versions.rb similarity index 100% rename from server/lib/travis/web/app/alt_versions.rb rename to waiter/lib/travis/web/app/alt_versions.rb diff --git a/server/lib/travis/web/app/mobile_redirect.rb b/waiter/lib/travis/web/app/mobile_redirect.rb similarity index 100% rename from server/lib/travis/web/app/mobile_redirect.rb rename to waiter/lib/travis/web/app/mobile_redirect.rb diff --git a/server/lib/travis/web/config.rb b/waiter/lib/travis/web/config.rb similarity index 100% rename from server/lib/travis/web/config.rb rename to waiter/lib/travis/web/config.rb diff --git a/server/lib/travis/web/set_token.rb b/waiter/lib/travis/web/set_token.rb similarity index 100% rename from server/lib/travis/web/set_token.rb rename to waiter/lib/travis/web/set_token.rb diff --git a/server/script/ci b/waiter/script/ci similarity index 100% rename from server/script/ci rename to waiter/script/ci diff --git a/server/script/prepare_deploy b/waiter/script/prepare_deploy similarity index 100% rename from server/script/prepare_deploy rename to waiter/script/prepare_deploy diff --git a/server/script/saucelabs.rb b/waiter/script/saucelabs.rb similarity index 100% rename from server/script/saucelabs.rb rename to waiter/script/saucelabs.rb diff --git a/server/script/server b/waiter/script/server similarity index 100% rename from server/script/server rename to waiter/script/server diff --git a/server/spec/allow_spec.rb b/waiter/spec/allow_spec.rb similarity index 100% rename from server/spec/allow_spec.rb rename to waiter/spec/allow_spec.rb diff --git a/server/spec/api_redirect_spec.rb b/waiter/spec/api_redirect_spec.rb similarity index 100% rename from server/spec/api_redirect_spec.rb rename to waiter/spec/api_redirect_spec.rb diff --git a/server/spec/app_spec.rb b/waiter/spec/app_spec.rb similarity index 100% rename from server/spec/app_spec.rb rename to waiter/spec/app_spec.rb diff --git a/server/spec/mobile_redirect_spec.rb b/waiter/spec/mobile_redirect_spec.rb similarity index 100% rename from server/spec/mobile_redirect_spec.rb rename to waiter/spec/mobile_redirect_spec.rb diff --git a/server/spec/spec_helper.rb b/waiter/spec/spec_helper.rb similarity index 100% rename from server/spec/spec_helper.rb rename to waiter/spec/spec_helper.rb diff --git a/server/travis-web.gemspec b/waiter/travis-web.gemspec similarity index 100% rename from server/travis-web.gemspec rename to waiter/travis-web.gemspec