From 6c820587de84b00a993d7fccc1a7284cc24a169e Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sun, 24 Jun 2012 14:21:58 -0400 Subject: [PATCH] Move everything in express/ into the root --- .gitignore | 3 + express/.simplecov => .simplecov | 0 .travis.yml | 3 +- express/COPYRIGHT => COPYRIGHT | 0 express/Gemfile => Gemfile | 0 express/LICENSE => LICENSE | 0 README.md | 94 ++++++++++++++++-- express/Rakefile => Rakefile | 0 {express/autocomplete => autocomplete}/rhc | 0 {express/bin => bin}/rhc | 0 {express/bin => bin}/rhc-app | 0 {express/bin => bin}/rhc-chk | 0 {express/bin => bin}/rhc-create-app | 0 {express/bin => bin}/rhc-create-domain | 0 {express/bin => bin}/rhc-ctl-app | 0 {express/bin => bin}/rhc-ctl-domain | 0 {express/bin => bin}/rhc-domain | 0 {express/bin => bin}/rhc-domain-info | 0 {express/bin => bin}/rhc-port-forward | 0 {express/bin => bin}/rhc-snapshot | 0 {express/bin => bin}/rhc-sshkey | 0 {express/bin => bin}/rhc-tail-files | 0 {express/bin => bin}/rhc-user-info | 0 express/build.sh => build.sh | 0 express/client.spec => client.spec | 0 {express/conf => conf}/express.conf | 0 {express/doc => doc}/API | 0 {express/doc => doc}/Gemfile.html | 0 {express/doc => doc}/Rakefile.html | 0 {express/doc => doc}/Rhc.html | 0 {express/doc => doc}/Rhc/Rest.html | 0 .../doc => doc}/Rhc/Rest/Application.html | 0 .../doc => doc}/Rhc/Rest/BaseException.html | 0 {express/doc => doc}/Rhc/Rest/Cartridge.html | 0 {express/doc => doc}/Rhc/Rest/Client.html | 0 .../Rhc/Rest/ClientErrorException.html | 0 {express/doc => doc}/Rhc/Rest/Domain.html | 0 {express/doc => doc}/Rhc/Rest/Key.html | 0 .../Rhc/Rest/RequestDeniedException.html | 0 .../Rhc/Rest/ResourceAccessException.html | 0 .../Rhc/Rest/ResourceNotFoundException.html | 0 .../Rhc/Rest/ServerErrorException.html | 0 .../Rhc/Rest/ServiceUnavailableException.html | 0 .../Rhc/Rest/UnAuthorizedException.html | 0 {express/doc => doc}/Rhc/Rest/User.html | 0 .../Rhc/Rest/ValidationException.html | 0 {express/doc => doc}/USAGE.txt | 0 {express/doc => doc}/created.rid | 0 {express/doc => doc}/images/add.png | Bin {express/doc => doc}/images/brick.png | Bin {express/doc => doc}/images/brick_link.png | Bin {express/doc => doc}/images/bug.png | Bin {express/doc => doc}/images/bullet_black.png | Bin .../images/bullet_toggle_minus.png | Bin .../doc => doc}/images/bullet_toggle_plus.png | Bin {express/doc => doc}/images/date.png | Bin {express/doc => doc}/images/delete.png | Bin {express/doc => doc}/images/find.png | Bin .../doc => doc}/images/loadingAnimation.gif | Bin {express/doc => doc}/images/macFFBgHack.png | Bin {express/doc => doc}/images/package.png | Bin {express/doc => doc}/images/page_green.png | Bin .../doc => doc}/images/page_white_text.png | Bin .../doc => doc}/images/page_white_width.png | Bin {express/doc => doc}/images/plugin.png | Bin {express/doc => doc}/images/ruby.png | Bin {express/doc => doc}/images/tag_blue.png | Bin {express/doc => doc}/images/tag_green.png | Bin {express/doc => doc}/images/transparent.png | Bin {express/doc => doc}/images/wrench.png | Bin {express/doc => doc}/images/wrench_orange.png | Bin {express/doc => doc}/images/zoom.png | Bin {express/doc => doc}/index.html | 0 {express/doc => doc}/js/darkfish.js | 0 {express/doc => doc}/js/jquery.js | 0 {express/doc => doc}/js/navigation.js | 0 {express/doc => doc}/js/search.js | 0 {express/doc => doc}/js/search_index.js | 0 {express/doc => doc}/js/searcher.js | 0 {express/doc => doc}/rdoc.css | 0 {express/doc => doc}/table_of_contents.html | 0 express/.gitignore | 3 - express/README.md | 81 --------------- {express/features => features}/README.md | 2 +- .../features => features}/lib/rhc_helper.rb | 0 .../lib/rhc_helper/app.rb | 0 .../lib/rhc_helper/commandify.rb | 0 .../lib/rhc_helper/domain.rb | 0 .../lib/rhc_helper/httpify.rb | 0 .../lib/rhc_helper/loggable.rb | 0 .../lib/rhc_helper/persistable.rb | 0 .../lib/rhc_helper/runnable.rb | 0 .../step_definitions/application_steps.rb | 0 .../step_definitions/client_steps.rb | 0 .../step_definitions/domain_steps.rb | 0 {express/features => features}/support/env.rb | 0 {express/features => features}/verify.feature | 0 {express/lib => lib}/rhc-common.rb | 0 {express/lib => lib}/rhc-rest.rb | 0 {express/lib => lib}/rhc-rest/application.rb | 0 {express/lib => lib}/rhc-rest/cartridge.rb | 0 {express/lib => lib}/rhc-rest/client.rb | 0 {express/lib => lib}/rhc-rest/domain.rb | 0 .../rhc-rest/exceptions/exceptions.rb | 0 {express/lib => lib}/rhc-rest/key.rb | 0 {express/lib => lib}/rhc-rest/user.rb | 0 {express/lib => lib}/rhc-rest/version.rb | 0 {express/lib => lib}/rhc.rb | 0 {express/lib => lib}/rhc/cli.rb | 0 {express/lib => lib}/rhc/client.rb | 0 {express/lib => lib}/rhc/commands.rb | 0 {express/lib => lib}/rhc/commands/base.rb | 0 {express/lib => lib}/rhc/commands/server.rb | 0 {express/lib => lib}/rhc/config.rb | 0 {express/lib => lib}/rhc/core_ext.rb | 0 {express/lib => lib}/rhc/helpers.rb | 0 {express/lib => lib}/rhc/json.rb | 0 {express/lib => lib}/rhc/targz.rb | 0 {express/lib => lib}/rhc/vendor/okjson.rb | 0 .../lib => lib}/rhc/vendor/parseconfig.rb | 0 {express/lib => lib}/rhc/vendor/sshkey.rb | 0 {express/lib => lib}/rhc/vendor/zliby.rb | 0 {express/lib => lib}/rhc/wizard.rb | 0 {express/man => man}/express.conf.5 | 0 {express/man => man}/rhc-app.1 | 0 {express/man => man}/rhc-chk.1 | 0 {express/man => man}/rhc-create-app.1 | 0 {express/man => man}/rhc-create-domain.1 | 0 {express/man => man}/rhc-ctl-app.1 | 0 {express/man => man}/rhc-ctl-domain.1 | 0 {express/man => man}/rhc-domain-info.1 | 0 {express/man => man}/rhc-domain.1 | 0 {express/man => man}/rhc-port-forward.1 | 0 {express/man => man}/rhc-snapshot.1 | 0 {express/man => man}/rhc-sshkey.1 | 0 {express/man => man}/rhc-tail-files.1 | 0 {express/man => man}/rhc-user-info.1 | 0 {express/man => man}/rhc.1 | 0 express/rhc.gemspec => rhc.gemspec | 0 {express/spec => spec}/rhc/assets/foo.txt | 0 .../rhc/assets/targz_corrupted.tar.gz | 0 .../rhc/assets/targz_sample.tar.gz | Bin {express/spec => spec}/rhc/cli_spec.rb | 0 {express/spec => spec}/rhc/command_spec.rb | 0 .../spec => spec}/rhc/commands/server_spec.rb | 0 {express/spec => spec}/rhc/config_spec.rb | 0 {express/spec => spec}/rhc/helpers_spec.rb | 0 {express/spec => spec}/rhc/json_spec.rb | 0 {express/spec => spec}/rhc/targz_spec.rb | 0 {express/spec => spec}/rhc/wizard_spec.rb | 0 {express/spec => spec}/spec_helper.rb | 0 {express/tasks => tasks}/package.rake | 0 {express/tasks => tasks}/test.rake | 0 express/test.sh => test.sh | 0 .../functional/application_test.rb | 0 .../test => test}/functional/domain_test.rb | 0 .../functional/test_credentials.rb | 0 {express/test => test}/sample-usage.rb | 0 {express/test => test}/support/server.rb | 0 {express/test => test}/support/testcase.rb | 0 {express/test => test}/test_helper.rb | 0 {express/test => test}/unit/command_test.rb | 0 162 files changed, 88 insertions(+), 98 deletions(-) rename express/.simplecov => .simplecov (100%) rename express/COPYRIGHT => COPYRIGHT (100%) rename express/Gemfile => Gemfile (100%) rename express/LICENSE => LICENSE (100%) rename express/Rakefile => Rakefile (100%) rename {express/autocomplete => autocomplete}/rhc (100%) rename {express/bin => bin}/rhc (100%) rename {express/bin => bin}/rhc-app (100%) rename {express/bin => bin}/rhc-chk (100%) rename {express/bin => bin}/rhc-create-app (100%) rename {express/bin => bin}/rhc-create-domain (100%) rename {express/bin => bin}/rhc-ctl-app (100%) rename {express/bin => bin}/rhc-ctl-domain (100%) rename {express/bin => bin}/rhc-domain (100%) rename {express/bin => bin}/rhc-domain-info (100%) rename {express/bin => bin}/rhc-port-forward (100%) rename {express/bin => bin}/rhc-snapshot (100%) rename {express/bin => bin}/rhc-sshkey (100%) rename {express/bin => bin}/rhc-tail-files (100%) rename {express/bin => bin}/rhc-user-info (100%) rename express/build.sh => build.sh (100%) rename express/client.spec => client.spec (100%) rename {express/conf => conf}/express.conf (100%) rename {express/doc => doc}/API (100%) rename {express/doc => doc}/Gemfile.html (100%) rename {express/doc => doc}/Rakefile.html (100%) rename {express/doc => doc}/Rhc.html (100%) rename {express/doc => doc}/Rhc/Rest.html (100%) rename {express/doc => doc}/Rhc/Rest/Application.html (100%) rename {express/doc => doc}/Rhc/Rest/BaseException.html (100%) rename {express/doc => doc}/Rhc/Rest/Cartridge.html (100%) rename {express/doc => doc}/Rhc/Rest/Client.html (100%) rename {express/doc => doc}/Rhc/Rest/ClientErrorException.html (100%) rename {express/doc => doc}/Rhc/Rest/Domain.html (100%) rename {express/doc => doc}/Rhc/Rest/Key.html (100%) rename {express/doc => doc}/Rhc/Rest/RequestDeniedException.html (100%) rename {express/doc => doc}/Rhc/Rest/ResourceAccessException.html (100%) rename {express/doc => doc}/Rhc/Rest/ResourceNotFoundException.html (100%) rename {express/doc => doc}/Rhc/Rest/ServerErrorException.html (100%) rename {express/doc => doc}/Rhc/Rest/ServiceUnavailableException.html (100%) rename {express/doc => doc}/Rhc/Rest/UnAuthorizedException.html (100%) rename {express/doc => doc}/Rhc/Rest/User.html (100%) rename {express/doc => doc}/Rhc/Rest/ValidationException.html (100%) rename {express/doc => doc}/USAGE.txt (100%) rename {express/doc => doc}/created.rid (100%) rename {express/doc => doc}/images/add.png (100%) rename {express/doc => doc}/images/brick.png (100%) rename {express/doc => doc}/images/brick_link.png (100%) rename {express/doc => doc}/images/bug.png (100%) rename {express/doc => doc}/images/bullet_black.png (100%) rename {express/doc => doc}/images/bullet_toggle_minus.png (100%) rename {express/doc => doc}/images/bullet_toggle_plus.png (100%) rename {express/doc => doc}/images/date.png (100%) rename {express/doc => doc}/images/delete.png (100%) rename {express/doc => doc}/images/find.png (100%) rename {express/doc => doc}/images/loadingAnimation.gif (100%) rename {express/doc => doc}/images/macFFBgHack.png (100%) rename {express/doc => doc}/images/package.png (100%) rename {express/doc => doc}/images/page_green.png (100%) rename {express/doc => doc}/images/page_white_text.png (100%) rename {express/doc => doc}/images/page_white_width.png (100%) rename {express/doc => doc}/images/plugin.png (100%) rename {express/doc => doc}/images/ruby.png (100%) rename {express/doc => doc}/images/tag_blue.png (100%) rename {express/doc => doc}/images/tag_green.png (100%) rename {express/doc => doc}/images/transparent.png (100%) rename {express/doc => doc}/images/wrench.png (100%) rename {express/doc => doc}/images/wrench_orange.png (100%) rename {express/doc => doc}/images/zoom.png (100%) rename {express/doc => doc}/index.html (100%) rename {express/doc => doc}/js/darkfish.js (100%) rename {express/doc => doc}/js/jquery.js (100%) rename {express/doc => doc}/js/navigation.js (100%) rename {express/doc => doc}/js/search.js (100%) rename {express/doc => doc}/js/search_index.js (100%) rename {express/doc => doc}/js/searcher.js (100%) rename {express/doc => doc}/rdoc.css (100%) rename {express/doc => doc}/table_of_contents.html (100%) delete mode 100644 express/.gitignore delete mode 100644 express/README.md rename {express/features => features}/README.md (98%) rename {express/features => features}/lib/rhc_helper.rb (100%) rename {express/features => features}/lib/rhc_helper/app.rb (100%) rename {express/features => features}/lib/rhc_helper/commandify.rb (100%) rename {express/features => features}/lib/rhc_helper/domain.rb (100%) rename {express/features => features}/lib/rhc_helper/httpify.rb (100%) rename {express/features => features}/lib/rhc_helper/loggable.rb (100%) rename {express/features => features}/lib/rhc_helper/persistable.rb (100%) rename {express/features => features}/lib/rhc_helper/runnable.rb (100%) rename {express/features => features}/step_definitions/application_steps.rb (100%) rename {express/features => features}/step_definitions/client_steps.rb (100%) rename {express/features => features}/step_definitions/domain_steps.rb (100%) rename {express/features => features}/support/env.rb (100%) rename {express/features => features}/verify.feature (100%) rename {express/lib => lib}/rhc-common.rb (100%) rename {express/lib => lib}/rhc-rest.rb (100%) rename {express/lib => lib}/rhc-rest/application.rb (100%) rename {express/lib => lib}/rhc-rest/cartridge.rb (100%) rename {express/lib => lib}/rhc-rest/client.rb (100%) rename {express/lib => lib}/rhc-rest/domain.rb (100%) rename {express/lib => lib}/rhc-rest/exceptions/exceptions.rb (100%) rename {express/lib => lib}/rhc-rest/key.rb (100%) rename {express/lib => lib}/rhc-rest/user.rb (100%) rename {express/lib => lib}/rhc-rest/version.rb (100%) rename {express/lib => lib}/rhc.rb (100%) rename {express/lib => lib}/rhc/cli.rb (100%) rename {express/lib => lib}/rhc/client.rb (100%) rename {express/lib => lib}/rhc/commands.rb (100%) rename {express/lib => lib}/rhc/commands/base.rb (100%) rename {express/lib => lib}/rhc/commands/server.rb (100%) rename {express/lib => lib}/rhc/config.rb (100%) rename {express/lib => lib}/rhc/core_ext.rb (100%) rename {express/lib => lib}/rhc/helpers.rb (100%) rename {express/lib => lib}/rhc/json.rb (100%) rename {express/lib => lib}/rhc/targz.rb (100%) rename {express/lib => lib}/rhc/vendor/okjson.rb (100%) rename {express/lib => lib}/rhc/vendor/parseconfig.rb (100%) rename {express/lib => lib}/rhc/vendor/sshkey.rb (100%) rename {express/lib => lib}/rhc/vendor/zliby.rb (100%) rename {express/lib => lib}/rhc/wizard.rb (100%) rename {express/man => man}/express.conf.5 (100%) rename {express/man => man}/rhc-app.1 (100%) rename {express/man => man}/rhc-chk.1 (100%) rename {express/man => man}/rhc-create-app.1 (100%) rename {express/man => man}/rhc-create-domain.1 (100%) rename {express/man => man}/rhc-ctl-app.1 (100%) rename {express/man => man}/rhc-ctl-domain.1 (100%) rename {express/man => man}/rhc-domain-info.1 (100%) rename {express/man => man}/rhc-domain.1 (100%) rename {express/man => man}/rhc-port-forward.1 (100%) rename {express/man => man}/rhc-snapshot.1 (100%) rename {express/man => man}/rhc-sshkey.1 (100%) rename {express/man => man}/rhc-tail-files.1 (100%) rename {express/man => man}/rhc-user-info.1 (100%) rename {express/man => man}/rhc.1 (100%) rename express/rhc.gemspec => rhc.gemspec (100%) rename {express/spec => spec}/rhc/assets/foo.txt (100%) rename {express/spec => spec}/rhc/assets/targz_corrupted.tar.gz (100%) rename {express/spec => spec}/rhc/assets/targz_sample.tar.gz (100%) rename {express/spec => spec}/rhc/cli_spec.rb (100%) rename {express/spec => spec}/rhc/command_spec.rb (100%) rename {express/spec => spec}/rhc/commands/server_spec.rb (100%) rename {express/spec => spec}/rhc/config_spec.rb (100%) rename {express/spec => spec}/rhc/helpers_spec.rb (100%) rename {express/spec => spec}/rhc/json_spec.rb (100%) rename {express/spec => spec}/rhc/targz_spec.rb (100%) rename {express/spec => spec}/rhc/wizard_spec.rb (100%) rename {express/spec => spec}/spec_helper.rb (100%) rename {express/tasks => tasks}/package.rake (100%) rename {express/tasks => tasks}/test.rake (100%) rename express/test.sh => test.sh (100%) rename {express/test => test}/functional/application_test.rb (100%) rename {express/test => test}/functional/domain_test.rb (100%) rename {express/test => test}/functional/test_credentials.rb (100%) rename {express/test => test}/sample-usage.rb (100%) rename {express/test => test}/support/server.rb (100%) rename {express/test => test}/support/testcase.rb (100%) rename {express/test => test}/test_helper.rb (100%) rename {express/test => test}/unit/command_test.rb (100%) diff --git a/.gitignore b/.gitignore index 3a4edf690..5904ad776 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ .project +pkg/ +Gemfile.lock +coverage diff --git a/express/.simplecov b/.simplecov similarity index 100% rename from express/.simplecov rename to .simplecov diff --git a/.travis.yml b/.travis.yml index 6352a1896..802454177 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,8 @@ language: ruby rvm: - 1.8.7 - 1.9.3 -gemfile: express/Gemfile +gemfile: Gemfile after_install: gem list -before_script: cd express script: bundle exec rake spec notifications: email: diff --git a/express/COPYRIGHT b/COPYRIGHT similarity index 100% rename from express/COPYRIGHT rename to COPYRIGHT diff --git a/express/Gemfile b/Gemfile similarity index 100% rename from express/Gemfile rename to Gemfile diff --git a/express/LICENSE b/LICENSE similarity index 100% rename from express/LICENSE rename to LICENSE diff --git a/README.md b/README.md index 1c8d75e4e..ba721a57a 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,93 @@ -OpenShift Command Line Tools (RHC) [![Build Status](https://secure.travis-ci.org/openshift/os-client-tools.png)](http://travis-ci.org/openshift/os-client-tools) -======== +# OpenShift Command Line Tools (RHC) [![Build Status](https://secure.travis-ci.org/openshift/os-client-tools.png)](http://travis-ci.org/openshift/os-client-tools) -This is the source repository for the OpenShift command line tools. - -Contents: - -* express/ - - The source for the 'rhc' OpenShift client gem. +The OpenShift command line tools allow you to manage your OpenShift +applications from the command line. The [Getting Started +guide](https://openshift.redhat.com/app/getting_started) has additional +info on installing the tool on each supported operating system. Please stop by #openshift on irc.freenode.net if you have any questions or comments. For more information about OpenShift, visit https://openshift.redhat.com or the OpenShift forum https://openshift.redhat.com/community/forums/openshift. -## Coding Standards -We are following the GitHub Ruby styleguide (https://github.com/styleguide/ruby) + +## Using RHC to create an application + +DEPENDENCIES: + +* git +* openssh-clients +* ruby (1.8.7 or later) +* rubygems + +Step 1: Create a domain to under which your applications will live: + + $ rhc domain create -n desirednamespace -l rhlogin + +The name you choose here will form part of your application's public +URL. + +Step 2: Create an OpenShift application: + + $ rhc app create -l rhlogin -a appname -r /path/to/new/git/repo -t + +Once that's complete, follow the directions printed at the end of running +rhc app create + + +## Making changes to your application + +Once your site is created, updating it is as simple as making changes to your +git repo. Commit them, then push. For example: + + $ edit index.php + $ git commit -a -m "what I did" + $ git push + +Then just reload your web page to see the changes. + +## OS X Notes: + +git: +OS X 10.6 comes w/ ssh and ruby, but not with git, unless you have +Xcode 4.0.x installed (as a developer you should have Xcode anyway). +Xcode, however, is not free (unless you are a registered Apple +Developer) and costs around $5 from the Apple App Store. + +If you do not have Xcode, you can obtain a pre-packaged version +of git from: + + http://code.google.com/p/git-osx-installer/ + +Installing git from MacPorts/HomeBrew/Fink/etc requires Xcode. + +Now obtain the client code, either via 'git clone' as above +or via the rhc gem. + +## Developing / Contributing +We expect code contributions to follow these standards: + +1. Ensure code matches the [GitHub Ruby styleguide](https://github.com/styleguide/ruby), except where the file establishes a different standard. +2. We use RSpec for functional testing and Cucumber for our high level + integration tests. Specs are in 'spec/' and can be run with bundle +exec rake spec. Features are in 'features/' and can be run with +bundle exec rake features (although these tests runs +against the gem installed locally so you will need to gem install +first). See [README.md](https://github.com/openshift/os-client-tools/blob/master/features/README.md) in the features dir for more info. +3. We maintain 100% line coverage of all newly added code via spec + testing. The build will fail if new code is added and it does not +have full line coverage. Some old code is currently excluded until it +can be refactored. Run bundle exec rake spec on Ruby 1.9+ +to see your code coverage level. + +Once you've made your changes: + +1. [Fork](http://help.github.com/forking/) the code +2. Create a topic branch - `git checkout -b my_branch` +3. Push to your branch - `git push origin my_branch` +4. Create a [Pull Request](http://help.github.com/pull-requests/) from your branch +5. That's it! If you use vim, we've included a .vimrc in the root of this project. In order to use it, install https://github.com/MarcWeber/vim-addon-local-vimrc + diff --git a/express/Rakefile b/Rakefile similarity index 100% rename from express/Rakefile rename to Rakefile diff --git a/express/autocomplete/rhc b/autocomplete/rhc similarity index 100% rename from express/autocomplete/rhc rename to autocomplete/rhc diff --git a/express/bin/rhc b/bin/rhc similarity index 100% rename from express/bin/rhc rename to bin/rhc diff --git a/express/bin/rhc-app b/bin/rhc-app similarity index 100% rename from express/bin/rhc-app rename to bin/rhc-app diff --git a/express/bin/rhc-chk b/bin/rhc-chk similarity index 100% rename from express/bin/rhc-chk rename to bin/rhc-chk diff --git a/express/bin/rhc-create-app b/bin/rhc-create-app similarity index 100% rename from express/bin/rhc-create-app rename to bin/rhc-create-app diff --git a/express/bin/rhc-create-domain b/bin/rhc-create-domain similarity index 100% rename from express/bin/rhc-create-domain rename to bin/rhc-create-domain diff --git a/express/bin/rhc-ctl-app b/bin/rhc-ctl-app similarity index 100% rename from express/bin/rhc-ctl-app rename to bin/rhc-ctl-app diff --git a/express/bin/rhc-ctl-domain b/bin/rhc-ctl-domain similarity index 100% rename from express/bin/rhc-ctl-domain rename to bin/rhc-ctl-domain diff --git a/express/bin/rhc-domain b/bin/rhc-domain similarity index 100% rename from express/bin/rhc-domain rename to bin/rhc-domain diff --git a/express/bin/rhc-domain-info b/bin/rhc-domain-info similarity index 100% rename from express/bin/rhc-domain-info rename to bin/rhc-domain-info diff --git a/express/bin/rhc-port-forward b/bin/rhc-port-forward similarity index 100% rename from express/bin/rhc-port-forward rename to bin/rhc-port-forward diff --git a/express/bin/rhc-snapshot b/bin/rhc-snapshot similarity index 100% rename from express/bin/rhc-snapshot rename to bin/rhc-snapshot diff --git a/express/bin/rhc-sshkey b/bin/rhc-sshkey similarity index 100% rename from express/bin/rhc-sshkey rename to bin/rhc-sshkey diff --git a/express/bin/rhc-tail-files b/bin/rhc-tail-files similarity index 100% rename from express/bin/rhc-tail-files rename to bin/rhc-tail-files diff --git a/express/bin/rhc-user-info b/bin/rhc-user-info similarity index 100% rename from express/bin/rhc-user-info rename to bin/rhc-user-info diff --git a/express/build.sh b/build.sh similarity index 100% rename from express/build.sh rename to build.sh diff --git a/express/client.spec b/client.spec similarity index 100% rename from express/client.spec rename to client.spec diff --git a/express/conf/express.conf b/conf/express.conf similarity index 100% rename from express/conf/express.conf rename to conf/express.conf diff --git a/express/doc/API b/doc/API similarity index 100% rename from express/doc/API rename to doc/API diff --git a/express/doc/Gemfile.html b/doc/Gemfile.html similarity index 100% rename from express/doc/Gemfile.html rename to doc/Gemfile.html diff --git a/express/doc/Rakefile.html b/doc/Rakefile.html similarity index 100% rename from express/doc/Rakefile.html rename to doc/Rakefile.html diff --git a/express/doc/Rhc.html b/doc/Rhc.html similarity index 100% rename from express/doc/Rhc.html rename to doc/Rhc.html diff --git a/express/doc/Rhc/Rest.html b/doc/Rhc/Rest.html similarity index 100% rename from express/doc/Rhc/Rest.html rename to doc/Rhc/Rest.html diff --git a/express/doc/Rhc/Rest/Application.html b/doc/Rhc/Rest/Application.html similarity index 100% rename from express/doc/Rhc/Rest/Application.html rename to doc/Rhc/Rest/Application.html diff --git a/express/doc/Rhc/Rest/BaseException.html b/doc/Rhc/Rest/BaseException.html similarity index 100% rename from express/doc/Rhc/Rest/BaseException.html rename to doc/Rhc/Rest/BaseException.html diff --git a/express/doc/Rhc/Rest/Cartridge.html b/doc/Rhc/Rest/Cartridge.html similarity index 100% rename from express/doc/Rhc/Rest/Cartridge.html rename to doc/Rhc/Rest/Cartridge.html diff --git a/express/doc/Rhc/Rest/Client.html b/doc/Rhc/Rest/Client.html similarity index 100% rename from express/doc/Rhc/Rest/Client.html rename to doc/Rhc/Rest/Client.html diff --git a/express/doc/Rhc/Rest/ClientErrorException.html b/doc/Rhc/Rest/ClientErrorException.html similarity index 100% rename from express/doc/Rhc/Rest/ClientErrorException.html rename to doc/Rhc/Rest/ClientErrorException.html diff --git a/express/doc/Rhc/Rest/Domain.html b/doc/Rhc/Rest/Domain.html similarity index 100% rename from express/doc/Rhc/Rest/Domain.html rename to doc/Rhc/Rest/Domain.html diff --git a/express/doc/Rhc/Rest/Key.html b/doc/Rhc/Rest/Key.html similarity index 100% rename from express/doc/Rhc/Rest/Key.html rename to doc/Rhc/Rest/Key.html diff --git a/express/doc/Rhc/Rest/RequestDeniedException.html b/doc/Rhc/Rest/RequestDeniedException.html similarity index 100% rename from express/doc/Rhc/Rest/RequestDeniedException.html rename to doc/Rhc/Rest/RequestDeniedException.html diff --git a/express/doc/Rhc/Rest/ResourceAccessException.html b/doc/Rhc/Rest/ResourceAccessException.html similarity index 100% rename from express/doc/Rhc/Rest/ResourceAccessException.html rename to doc/Rhc/Rest/ResourceAccessException.html diff --git a/express/doc/Rhc/Rest/ResourceNotFoundException.html b/doc/Rhc/Rest/ResourceNotFoundException.html similarity index 100% rename from express/doc/Rhc/Rest/ResourceNotFoundException.html rename to doc/Rhc/Rest/ResourceNotFoundException.html diff --git a/express/doc/Rhc/Rest/ServerErrorException.html b/doc/Rhc/Rest/ServerErrorException.html similarity index 100% rename from express/doc/Rhc/Rest/ServerErrorException.html rename to doc/Rhc/Rest/ServerErrorException.html diff --git a/express/doc/Rhc/Rest/ServiceUnavailableException.html b/doc/Rhc/Rest/ServiceUnavailableException.html similarity index 100% rename from express/doc/Rhc/Rest/ServiceUnavailableException.html rename to doc/Rhc/Rest/ServiceUnavailableException.html diff --git a/express/doc/Rhc/Rest/UnAuthorizedException.html b/doc/Rhc/Rest/UnAuthorizedException.html similarity index 100% rename from express/doc/Rhc/Rest/UnAuthorizedException.html rename to doc/Rhc/Rest/UnAuthorizedException.html diff --git a/express/doc/Rhc/Rest/User.html b/doc/Rhc/Rest/User.html similarity index 100% rename from express/doc/Rhc/Rest/User.html rename to doc/Rhc/Rest/User.html diff --git a/express/doc/Rhc/Rest/ValidationException.html b/doc/Rhc/Rest/ValidationException.html similarity index 100% rename from express/doc/Rhc/Rest/ValidationException.html rename to doc/Rhc/Rest/ValidationException.html diff --git a/express/doc/USAGE.txt b/doc/USAGE.txt similarity index 100% rename from express/doc/USAGE.txt rename to doc/USAGE.txt diff --git a/express/doc/created.rid b/doc/created.rid similarity index 100% rename from express/doc/created.rid rename to doc/created.rid diff --git a/express/doc/images/add.png b/doc/images/add.png similarity index 100% rename from express/doc/images/add.png rename to doc/images/add.png diff --git a/express/doc/images/brick.png b/doc/images/brick.png similarity index 100% rename from express/doc/images/brick.png rename to doc/images/brick.png diff --git a/express/doc/images/brick_link.png b/doc/images/brick_link.png similarity index 100% rename from express/doc/images/brick_link.png rename to doc/images/brick_link.png diff --git a/express/doc/images/bug.png b/doc/images/bug.png similarity index 100% rename from express/doc/images/bug.png rename to doc/images/bug.png diff --git a/express/doc/images/bullet_black.png b/doc/images/bullet_black.png similarity index 100% rename from express/doc/images/bullet_black.png rename to doc/images/bullet_black.png diff --git a/express/doc/images/bullet_toggle_minus.png b/doc/images/bullet_toggle_minus.png similarity index 100% rename from express/doc/images/bullet_toggle_minus.png rename to doc/images/bullet_toggle_minus.png diff --git a/express/doc/images/bullet_toggle_plus.png b/doc/images/bullet_toggle_plus.png similarity index 100% rename from express/doc/images/bullet_toggle_plus.png rename to doc/images/bullet_toggle_plus.png diff --git a/express/doc/images/date.png b/doc/images/date.png similarity index 100% rename from express/doc/images/date.png rename to doc/images/date.png diff --git a/express/doc/images/delete.png b/doc/images/delete.png similarity index 100% rename from express/doc/images/delete.png rename to doc/images/delete.png diff --git a/express/doc/images/find.png b/doc/images/find.png similarity index 100% rename from express/doc/images/find.png rename to doc/images/find.png diff --git a/express/doc/images/loadingAnimation.gif b/doc/images/loadingAnimation.gif similarity index 100% rename from express/doc/images/loadingAnimation.gif rename to doc/images/loadingAnimation.gif diff --git a/express/doc/images/macFFBgHack.png b/doc/images/macFFBgHack.png similarity index 100% rename from express/doc/images/macFFBgHack.png rename to doc/images/macFFBgHack.png diff --git a/express/doc/images/package.png b/doc/images/package.png similarity index 100% rename from express/doc/images/package.png rename to doc/images/package.png diff --git a/express/doc/images/page_green.png b/doc/images/page_green.png similarity index 100% rename from express/doc/images/page_green.png rename to doc/images/page_green.png diff --git a/express/doc/images/page_white_text.png b/doc/images/page_white_text.png similarity index 100% rename from express/doc/images/page_white_text.png rename to doc/images/page_white_text.png diff --git a/express/doc/images/page_white_width.png b/doc/images/page_white_width.png similarity index 100% rename from express/doc/images/page_white_width.png rename to doc/images/page_white_width.png diff --git a/express/doc/images/plugin.png b/doc/images/plugin.png similarity index 100% rename from express/doc/images/plugin.png rename to doc/images/plugin.png diff --git a/express/doc/images/ruby.png b/doc/images/ruby.png similarity index 100% rename from express/doc/images/ruby.png rename to doc/images/ruby.png diff --git a/express/doc/images/tag_blue.png b/doc/images/tag_blue.png similarity index 100% rename from express/doc/images/tag_blue.png rename to doc/images/tag_blue.png diff --git a/express/doc/images/tag_green.png b/doc/images/tag_green.png similarity index 100% rename from express/doc/images/tag_green.png rename to doc/images/tag_green.png diff --git a/express/doc/images/transparent.png b/doc/images/transparent.png similarity index 100% rename from express/doc/images/transparent.png rename to doc/images/transparent.png diff --git a/express/doc/images/wrench.png b/doc/images/wrench.png similarity index 100% rename from express/doc/images/wrench.png rename to doc/images/wrench.png diff --git a/express/doc/images/wrench_orange.png b/doc/images/wrench_orange.png similarity index 100% rename from express/doc/images/wrench_orange.png rename to doc/images/wrench_orange.png diff --git a/express/doc/images/zoom.png b/doc/images/zoom.png similarity index 100% rename from express/doc/images/zoom.png rename to doc/images/zoom.png diff --git a/express/doc/index.html b/doc/index.html similarity index 100% rename from express/doc/index.html rename to doc/index.html diff --git a/express/doc/js/darkfish.js b/doc/js/darkfish.js similarity index 100% rename from express/doc/js/darkfish.js rename to doc/js/darkfish.js diff --git a/express/doc/js/jquery.js b/doc/js/jquery.js similarity index 100% rename from express/doc/js/jquery.js rename to doc/js/jquery.js diff --git a/express/doc/js/navigation.js b/doc/js/navigation.js similarity index 100% rename from express/doc/js/navigation.js rename to doc/js/navigation.js diff --git a/express/doc/js/search.js b/doc/js/search.js similarity index 100% rename from express/doc/js/search.js rename to doc/js/search.js diff --git a/express/doc/js/search_index.js b/doc/js/search_index.js similarity index 100% rename from express/doc/js/search_index.js rename to doc/js/search_index.js diff --git a/express/doc/js/searcher.js b/doc/js/searcher.js similarity index 100% rename from express/doc/js/searcher.js rename to doc/js/searcher.js diff --git a/express/doc/rdoc.css b/doc/rdoc.css similarity index 100% rename from express/doc/rdoc.css rename to doc/rdoc.css diff --git a/express/doc/table_of_contents.html b/doc/table_of_contents.html similarity index 100% rename from express/doc/table_of_contents.html rename to doc/table_of_contents.html diff --git a/express/.gitignore b/express/.gitignore deleted file mode 100644 index 4c91ae2c4..000000000 --- a/express/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -pkg/ -Gemfile.lock -coverage diff --git a/express/README.md b/express/README.md deleted file mode 100644 index e1bd967b9..000000000 --- a/express/README.md +++ /dev/null @@ -1,81 +0,0 @@ -# OpenShift Command Line Tools (RHC) [![Build Status](https://secure.travis-ci.org/openshift/os-client-tools.png)](http://travis-ci.org/openshift/os-client-tools) - -The OpenShift command line tools allow you to manage your OpenShift -applications from the command line. The [Getting Started -guide](https://openshift.redhat.com/app/getting_started) has additional -info on installing the tool on each supported operating system. - -Please stop by #openshift on irc.freenode.net if you have any questions or -comments. For more information about OpenShift, visit https://openshift.redhat.com -or the OpenShift forum -https://openshift.redhat.com/community/forums/openshift. - - -## Using RHC to create an application - -DEPENDENCIES: - -* git -* openssh-clients -* ruby (1.8.7 or later) -* rubygems -* parseconfig gem - -Step 1: Create a domain to under which your applications will live: - - $ rhc domain create -n desirednamespace -l rhlogin - -The name you choose here will form part of your application's public -URL. - -Step 2: Create an OpenShift application: - - $ rhc app create -l rhlogin -a appname -r /path/to/new/git/repo -t - -Once that's complete, follow the directions printed at the end of running -rhc app create - - -## Making changes to your application - -Once your site is created, updating it is as simple as making changes to your -git repo. Commit them, then push. For example: - - $ edit index.php - $ git commit -a -m "what I did" - $ git push - -Then just reload your web page to see the changes. - -## OS X Notes: - -git: -OS X 10.6 comes w/ ssh and ruby, but not with git, unless you have -Xcode 4.0.x installed (as a developer you should have Xcode anyway). -Xcode, however, is not free (unless you are a registered Apple -Developer) and costs around $5 from the Apple App Store. - -If you do not have Xcode, you can obtain a pre-packaged version -of git from: - - http://code.google.com/p/git-osx-installer/ - -Installing git from MacPorts/HomeBrew/Fink/etc requires Xcode. - -Now obtain the client code, either via 'git clone' as above -or via the rhc gem. - -## Contributing -Once you've made your changes: - -1. [Fork](http://help.github.com/forking/) the code -2. Create a topic branch - `git checkout -b my_branch` -3. Push to your branch - `git push origin my_branch` -4. Create a [Pull Request](http://help.github.com/pull-requests/) from your branch -5. That's it! - -## Coding Standards -We are following the GitHub Ruby styleguide (https://github.com/styleguide/ruby) - -If you use vim, we've included a .vimrc in the root of this project. -In order to use it, install https://github.com/MarcWeber/vim-addon-local-vimrc diff --git a/express/features/README.md b/features/README.md similarity index 98% rename from express/features/README.md rename to features/README.md index 3558f205e..5eb5bfda2 100644 --- a/express/features/README.md +++ b/features/README.md @@ -11,7 +11,7 @@ verification tests for the entire stack. Usage ============= -Run from the express/ directory with +Run from the base directory with bundle exec rake features diff --git a/express/features/lib/rhc_helper.rb b/features/lib/rhc_helper.rb similarity index 100% rename from express/features/lib/rhc_helper.rb rename to features/lib/rhc_helper.rb diff --git a/express/features/lib/rhc_helper/app.rb b/features/lib/rhc_helper/app.rb similarity index 100% rename from express/features/lib/rhc_helper/app.rb rename to features/lib/rhc_helper/app.rb diff --git a/express/features/lib/rhc_helper/commandify.rb b/features/lib/rhc_helper/commandify.rb similarity index 100% rename from express/features/lib/rhc_helper/commandify.rb rename to features/lib/rhc_helper/commandify.rb diff --git a/express/features/lib/rhc_helper/domain.rb b/features/lib/rhc_helper/domain.rb similarity index 100% rename from express/features/lib/rhc_helper/domain.rb rename to features/lib/rhc_helper/domain.rb diff --git a/express/features/lib/rhc_helper/httpify.rb b/features/lib/rhc_helper/httpify.rb similarity index 100% rename from express/features/lib/rhc_helper/httpify.rb rename to features/lib/rhc_helper/httpify.rb diff --git a/express/features/lib/rhc_helper/loggable.rb b/features/lib/rhc_helper/loggable.rb similarity index 100% rename from express/features/lib/rhc_helper/loggable.rb rename to features/lib/rhc_helper/loggable.rb diff --git a/express/features/lib/rhc_helper/persistable.rb b/features/lib/rhc_helper/persistable.rb similarity index 100% rename from express/features/lib/rhc_helper/persistable.rb rename to features/lib/rhc_helper/persistable.rb diff --git a/express/features/lib/rhc_helper/runnable.rb b/features/lib/rhc_helper/runnable.rb similarity index 100% rename from express/features/lib/rhc_helper/runnable.rb rename to features/lib/rhc_helper/runnable.rb diff --git a/express/features/step_definitions/application_steps.rb b/features/step_definitions/application_steps.rb similarity index 100% rename from express/features/step_definitions/application_steps.rb rename to features/step_definitions/application_steps.rb diff --git a/express/features/step_definitions/client_steps.rb b/features/step_definitions/client_steps.rb similarity index 100% rename from express/features/step_definitions/client_steps.rb rename to features/step_definitions/client_steps.rb diff --git a/express/features/step_definitions/domain_steps.rb b/features/step_definitions/domain_steps.rb similarity index 100% rename from express/features/step_definitions/domain_steps.rb rename to features/step_definitions/domain_steps.rb diff --git a/express/features/support/env.rb b/features/support/env.rb similarity index 100% rename from express/features/support/env.rb rename to features/support/env.rb diff --git a/express/features/verify.feature b/features/verify.feature similarity index 100% rename from express/features/verify.feature rename to features/verify.feature diff --git a/express/lib/rhc-common.rb b/lib/rhc-common.rb similarity index 100% rename from express/lib/rhc-common.rb rename to lib/rhc-common.rb diff --git a/express/lib/rhc-rest.rb b/lib/rhc-rest.rb similarity index 100% rename from express/lib/rhc-rest.rb rename to lib/rhc-rest.rb diff --git a/express/lib/rhc-rest/application.rb b/lib/rhc-rest/application.rb similarity index 100% rename from express/lib/rhc-rest/application.rb rename to lib/rhc-rest/application.rb diff --git a/express/lib/rhc-rest/cartridge.rb b/lib/rhc-rest/cartridge.rb similarity index 100% rename from express/lib/rhc-rest/cartridge.rb rename to lib/rhc-rest/cartridge.rb diff --git a/express/lib/rhc-rest/client.rb b/lib/rhc-rest/client.rb similarity index 100% rename from express/lib/rhc-rest/client.rb rename to lib/rhc-rest/client.rb diff --git a/express/lib/rhc-rest/domain.rb b/lib/rhc-rest/domain.rb similarity index 100% rename from express/lib/rhc-rest/domain.rb rename to lib/rhc-rest/domain.rb diff --git a/express/lib/rhc-rest/exceptions/exceptions.rb b/lib/rhc-rest/exceptions/exceptions.rb similarity index 100% rename from express/lib/rhc-rest/exceptions/exceptions.rb rename to lib/rhc-rest/exceptions/exceptions.rb diff --git a/express/lib/rhc-rest/key.rb b/lib/rhc-rest/key.rb similarity index 100% rename from express/lib/rhc-rest/key.rb rename to lib/rhc-rest/key.rb diff --git a/express/lib/rhc-rest/user.rb b/lib/rhc-rest/user.rb similarity index 100% rename from express/lib/rhc-rest/user.rb rename to lib/rhc-rest/user.rb diff --git a/express/lib/rhc-rest/version.rb b/lib/rhc-rest/version.rb similarity index 100% rename from express/lib/rhc-rest/version.rb rename to lib/rhc-rest/version.rb diff --git a/express/lib/rhc.rb b/lib/rhc.rb similarity index 100% rename from express/lib/rhc.rb rename to lib/rhc.rb diff --git a/express/lib/rhc/cli.rb b/lib/rhc/cli.rb similarity index 100% rename from express/lib/rhc/cli.rb rename to lib/rhc/cli.rb diff --git a/express/lib/rhc/client.rb b/lib/rhc/client.rb similarity index 100% rename from express/lib/rhc/client.rb rename to lib/rhc/client.rb diff --git a/express/lib/rhc/commands.rb b/lib/rhc/commands.rb similarity index 100% rename from express/lib/rhc/commands.rb rename to lib/rhc/commands.rb diff --git a/express/lib/rhc/commands/base.rb b/lib/rhc/commands/base.rb similarity index 100% rename from express/lib/rhc/commands/base.rb rename to lib/rhc/commands/base.rb diff --git a/express/lib/rhc/commands/server.rb b/lib/rhc/commands/server.rb similarity index 100% rename from express/lib/rhc/commands/server.rb rename to lib/rhc/commands/server.rb diff --git a/express/lib/rhc/config.rb b/lib/rhc/config.rb similarity index 100% rename from express/lib/rhc/config.rb rename to lib/rhc/config.rb diff --git a/express/lib/rhc/core_ext.rb b/lib/rhc/core_ext.rb similarity index 100% rename from express/lib/rhc/core_ext.rb rename to lib/rhc/core_ext.rb diff --git a/express/lib/rhc/helpers.rb b/lib/rhc/helpers.rb similarity index 100% rename from express/lib/rhc/helpers.rb rename to lib/rhc/helpers.rb diff --git a/express/lib/rhc/json.rb b/lib/rhc/json.rb similarity index 100% rename from express/lib/rhc/json.rb rename to lib/rhc/json.rb diff --git a/express/lib/rhc/targz.rb b/lib/rhc/targz.rb similarity index 100% rename from express/lib/rhc/targz.rb rename to lib/rhc/targz.rb diff --git a/express/lib/rhc/vendor/okjson.rb b/lib/rhc/vendor/okjson.rb similarity index 100% rename from express/lib/rhc/vendor/okjson.rb rename to lib/rhc/vendor/okjson.rb diff --git a/express/lib/rhc/vendor/parseconfig.rb b/lib/rhc/vendor/parseconfig.rb similarity index 100% rename from express/lib/rhc/vendor/parseconfig.rb rename to lib/rhc/vendor/parseconfig.rb diff --git a/express/lib/rhc/vendor/sshkey.rb b/lib/rhc/vendor/sshkey.rb similarity index 100% rename from express/lib/rhc/vendor/sshkey.rb rename to lib/rhc/vendor/sshkey.rb diff --git a/express/lib/rhc/vendor/zliby.rb b/lib/rhc/vendor/zliby.rb similarity index 100% rename from express/lib/rhc/vendor/zliby.rb rename to lib/rhc/vendor/zliby.rb diff --git a/express/lib/rhc/wizard.rb b/lib/rhc/wizard.rb similarity index 100% rename from express/lib/rhc/wizard.rb rename to lib/rhc/wizard.rb diff --git a/express/man/express.conf.5 b/man/express.conf.5 similarity index 100% rename from express/man/express.conf.5 rename to man/express.conf.5 diff --git a/express/man/rhc-app.1 b/man/rhc-app.1 similarity index 100% rename from express/man/rhc-app.1 rename to man/rhc-app.1 diff --git a/express/man/rhc-chk.1 b/man/rhc-chk.1 similarity index 100% rename from express/man/rhc-chk.1 rename to man/rhc-chk.1 diff --git a/express/man/rhc-create-app.1 b/man/rhc-create-app.1 similarity index 100% rename from express/man/rhc-create-app.1 rename to man/rhc-create-app.1 diff --git a/express/man/rhc-create-domain.1 b/man/rhc-create-domain.1 similarity index 100% rename from express/man/rhc-create-domain.1 rename to man/rhc-create-domain.1 diff --git a/express/man/rhc-ctl-app.1 b/man/rhc-ctl-app.1 similarity index 100% rename from express/man/rhc-ctl-app.1 rename to man/rhc-ctl-app.1 diff --git a/express/man/rhc-ctl-domain.1 b/man/rhc-ctl-domain.1 similarity index 100% rename from express/man/rhc-ctl-domain.1 rename to man/rhc-ctl-domain.1 diff --git a/express/man/rhc-domain-info.1 b/man/rhc-domain-info.1 similarity index 100% rename from express/man/rhc-domain-info.1 rename to man/rhc-domain-info.1 diff --git a/express/man/rhc-domain.1 b/man/rhc-domain.1 similarity index 100% rename from express/man/rhc-domain.1 rename to man/rhc-domain.1 diff --git a/express/man/rhc-port-forward.1 b/man/rhc-port-forward.1 similarity index 100% rename from express/man/rhc-port-forward.1 rename to man/rhc-port-forward.1 diff --git a/express/man/rhc-snapshot.1 b/man/rhc-snapshot.1 similarity index 100% rename from express/man/rhc-snapshot.1 rename to man/rhc-snapshot.1 diff --git a/express/man/rhc-sshkey.1 b/man/rhc-sshkey.1 similarity index 100% rename from express/man/rhc-sshkey.1 rename to man/rhc-sshkey.1 diff --git a/express/man/rhc-tail-files.1 b/man/rhc-tail-files.1 similarity index 100% rename from express/man/rhc-tail-files.1 rename to man/rhc-tail-files.1 diff --git a/express/man/rhc-user-info.1 b/man/rhc-user-info.1 similarity index 100% rename from express/man/rhc-user-info.1 rename to man/rhc-user-info.1 diff --git a/express/man/rhc.1 b/man/rhc.1 similarity index 100% rename from express/man/rhc.1 rename to man/rhc.1 diff --git a/express/rhc.gemspec b/rhc.gemspec similarity index 100% rename from express/rhc.gemspec rename to rhc.gemspec diff --git a/express/spec/rhc/assets/foo.txt b/spec/rhc/assets/foo.txt similarity index 100% rename from express/spec/rhc/assets/foo.txt rename to spec/rhc/assets/foo.txt diff --git a/express/spec/rhc/assets/targz_corrupted.tar.gz b/spec/rhc/assets/targz_corrupted.tar.gz similarity index 100% rename from express/spec/rhc/assets/targz_corrupted.tar.gz rename to spec/rhc/assets/targz_corrupted.tar.gz diff --git a/express/spec/rhc/assets/targz_sample.tar.gz b/spec/rhc/assets/targz_sample.tar.gz similarity index 100% rename from express/spec/rhc/assets/targz_sample.tar.gz rename to spec/rhc/assets/targz_sample.tar.gz diff --git a/express/spec/rhc/cli_spec.rb b/spec/rhc/cli_spec.rb similarity index 100% rename from express/spec/rhc/cli_spec.rb rename to spec/rhc/cli_spec.rb diff --git a/express/spec/rhc/command_spec.rb b/spec/rhc/command_spec.rb similarity index 100% rename from express/spec/rhc/command_spec.rb rename to spec/rhc/command_spec.rb diff --git a/express/spec/rhc/commands/server_spec.rb b/spec/rhc/commands/server_spec.rb similarity index 100% rename from express/spec/rhc/commands/server_spec.rb rename to spec/rhc/commands/server_spec.rb diff --git a/express/spec/rhc/config_spec.rb b/spec/rhc/config_spec.rb similarity index 100% rename from express/spec/rhc/config_spec.rb rename to spec/rhc/config_spec.rb diff --git a/express/spec/rhc/helpers_spec.rb b/spec/rhc/helpers_spec.rb similarity index 100% rename from express/spec/rhc/helpers_spec.rb rename to spec/rhc/helpers_spec.rb diff --git a/express/spec/rhc/json_spec.rb b/spec/rhc/json_spec.rb similarity index 100% rename from express/spec/rhc/json_spec.rb rename to spec/rhc/json_spec.rb diff --git a/express/spec/rhc/targz_spec.rb b/spec/rhc/targz_spec.rb similarity index 100% rename from express/spec/rhc/targz_spec.rb rename to spec/rhc/targz_spec.rb diff --git a/express/spec/rhc/wizard_spec.rb b/spec/rhc/wizard_spec.rb similarity index 100% rename from express/spec/rhc/wizard_spec.rb rename to spec/rhc/wizard_spec.rb diff --git a/express/spec/spec_helper.rb b/spec/spec_helper.rb similarity index 100% rename from express/spec/spec_helper.rb rename to spec/spec_helper.rb diff --git a/express/tasks/package.rake b/tasks/package.rake similarity index 100% rename from express/tasks/package.rake rename to tasks/package.rake diff --git a/express/tasks/test.rake b/tasks/test.rake similarity index 100% rename from express/tasks/test.rake rename to tasks/test.rake diff --git a/express/test.sh b/test.sh similarity index 100% rename from express/test.sh rename to test.sh diff --git a/express/test/functional/application_test.rb b/test/functional/application_test.rb similarity index 100% rename from express/test/functional/application_test.rb rename to test/functional/application_test.rb diff --git a/express/test/functional/domain_test.rb b/test/functional/domain_test.rb similarity index 100% rename from express/test/functional/domain_test.rb rename to test/functional/domain_test.rb diff --git a/express/test/functional/test_credentials.rb b/test/functional/test_credentials.rb similarity index 100% rename from express/test/functional/test_credentials.rb rename to test/functional/test_credentials.rb diff --git a/express/test/sample-usage.rb b/test/sample-usage.rb similarity index 100% rename from express/test/sample-usage.rb rename to test/sample-usage.rb diff --git a/express/test/support/server.rb b/test/support/server.rb similarity index 100% rename from express/test/support/server.rb rename to test/support/server.rb diff --git a/express/test/support/testcase.rb b/test/support/testcase.rb similarity index 100% rename from express/test/support/testcase.rb rename to test/support/testcase.rb diff --git a/express/test/test_helper.rb b/test/test_helper.rb similarity index 100% rename from express/test/test_helper.rb rename to test/test_helper.rb diff --git a/express/test/unit/command_test.rb b/test/unit/command_test.rb similarity index 100% rename from express/test/unit/command_test.rb rename to test/unit/command_test.rb