engineyard 2.0.0.rc1 → 2.0.0

data/README.rdoc

@@ -10,7 +10,7 @@ Note: Don't add engineyard to your application's Gemfile. The engineyard gem is
 
 == Login
 
-The first command you run will notice that you are not logged in and will ask you for your AppCloud email and password.
+The first command you run will notice that you are not logged in and will ask you for your Engine Yard email and password.
 
 == Configuration
 
@@ -27,7 +27,6 @@ The ey.yml file allows options to be saved for each environment to which an appl
         bundle_without: test development mygroup  # exclude groups on bundle install
         copy_exclude:                             # don't rsync the following dirs
         - .git
-        verbose: true                             # always run verbose deploy (unless overriden on command line)
         maintenance_on_restart: false             # show maintenance page during app restart (default: false except for glassfish and mongrel)
         maintenance_on_migrate: false             # show maintenance page during migrations (default: true)
         precompile_assets: true                   # enables rails assets precompilation (default: inferred using app/assets and config/application.rb)
@@ -37,193 +36,199 @@ Many of the options in ey.yml will only work if the file is committed to your ap
 
 == Commands
 
-Command:
-  ey deploy
+=== ey deploy
 
-  Options:
-    -r, [--ref=REF] [--branch=] [--tag=]        # Git ref to deploy. May be a branch, a tag, or a SHA.
-    -c, [--account=ACCOUNT]                   # Name of the account in which the environment can be found
-    -a, [--app=APP]                           # Name of the application to deploy
-    -e, [--environment=ENVIRONMENT]           # Environment in which to deploy this application
-    -m, [--migrate=MIGRATE]                   # Run migrations via [MIGRATE], defaults to 'rake db:migrate'; use --no-migrate to avoid running migrations
-    -v, [--verbose]                           # Be verbose
-        [--ignore-default-branch]             # Force a deploy of the specified branch even if a default is set
-        [--ignore-bad-master]                 # Force a deploy even if the master is in a bad state
-        [--extra-deploy-hook-options key:val] # Additional options to be made available in deploy hooks (in the 'config' hash)
-                                              # Add more keys as follows: --extra-deploy-hook-options key1:val1 key2:val2
+This command must be run within the current directory containing the app to be
+deployed. If ey.yml specifies a default branch then the ref parameter can be
+omitted. Furthermore, if a default branch is specified but a different
+command is supplied the deploy will fail unless --ignore-default-branch
+is used.
 
+If ey.yml does not specify a default migrate choice, you will be prompted to
+specify a migration choice. A different command can later be specified via
+--migrate "ruby do_migrations.rb". Migrations can also be skipped entirely
+by using --no-migrate.
 
-  Description:
-    This command must be run within the current directory containing the app to be
-    deployed. If ey.yml specifies a default branch then the ref parameter can be
-    omitted. Furthermore, if a default branch is specified but a different
-    command is supplied the deploy will fail unless --ignore-default-branch
-    is used.
+Options:
 
-    If ey.yml does not specify a default migrate choice, you will be prompted to
-    specify a migration choice. A different command can later be specified via
-    --migrate "ruby do_migrations.rb". Migrations can also be skipped entirely
-    by using --no-migrate.
+  -r, [--ref=REF] [--branch=] [--tag=]      # Git ref to deploy. May be a branch, a tag, or a SHA.
+  -c, [--account=ACCOUNT]                   # Name of the account in which the environment can be found
+  -a, [--app=APP]                           # Name of the application to deploy
+  -e, [--environment=ENVIRONMENT]           # Environment in which to deploy this application
+  -m, [--migrate=MIGRATE]                   # Run migrations via [MIGRATE], defaults to 'rake db:migrate'; use --no-migrate to avoid running migrations
+  -v, [--verbose]                           # Be verbose
+      [--ignore-default-branch]             # Force a deploy of the specified branch even if a default is set
+      [--ignore-bad-master]                 # Force a deploy even if the master is in a bad state
+      [--extra-deploy-hook-options key:val] # Additional options to be made available in deploy hooks (in the 'config' hash)
+                                            # Add more keys as follows: --extra-deploy-hook-options key1:val1 key2:val2
 
-Command:
-  ey environments
 
-  Options:
-    -c, [--account=ACCOUNT]                   # Name of the account in which the environment can be found
-    -a, [--app=APP]                           # Name of the application containing the environments
-    -e, [--environment=ENVIRONMENT]           # Show only environments matching named environment
-    -s, [--simple]                            # Print each environment name on its own on a new line
-    -a, [--all]                               # Show all environments, not just ones associated with this application.
+=== ey status
 
-  Description:
-    By default, environments for this app are displayed. The --all option will display all environments, including those for this app.
+Show the status of most recent deployment of the specified application and environment. This action only informational and will not change your application.
 
-Command:
-  ey logs
+Options:
 
-  Options:
-    -e, [--environment=ENVIRONMENT]  # Environment with the interesting logs
-    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+  -c, [--account=ACCOUNT]                   # Name of the account in which the environment can be found
+  -a, [--app=APP]                           # Name of the application containing the environment
+  -e, [--environment=ENVIRONMENT]           # Name of the environment with the desired deployment
 
-  Description:
-    Displays Engine Yard configuration logs for all servers in the environment. If recipes were uploaded to the environment & run, their logs will also be displayed beneath the
-    main configuration logs.
+=== ey environments
 
-Command:
-  ey rebuild
-
-  Options:
-    -e, [--environment=ENVIRONMENT]  # Environment to rebuild
-    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+By default, environments for this app are displayed. The --all option will display all environments, including those for this app.
 
-  Description:
-    Engine Yard's main configuration run occurs on all servers. Mainly used to fix failed configuration of new or existing servers, or to update servers to latest Engine Yard stack
-    (e.g. to apply an Engine Yard supplied security patch).
+Options:
 
-    Note that uploaded recipes are also run after the main configuration run has successfully completed.
+  -c, [--account=ACCOUNT]                   # Name of the account in which the environment can be found
+  -a, [--app=APP]                           # Name of the application containing the environments
+  -e, [--environment=ENVIRONMENT]           # Show only environments matching named environment
+  -s, [--simple]                            # Print each environment name on its own on a new line
+  -a, [--all]                               # Show all environments, not just ones associated with this application.
 
-Command:
-  ey rollback
 
-  Options:
-    -v, [--verbose]                  # Be verbose
-    -a, [--app=APP]                  # Name of the application to roll back
-    -e, [--environment=ENVIRONMENT]  # Environment in which to roll back the application
-    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+=== ey logs
 
-  Description:
-    Uses code from previous deploy in the "/data/APP_NAME/releases" directory on remote server(s) to restart application servers.
+Displays Engine Yard configuration logs for all servers in the environment. If recipes were uploaded to the environment & run, their logs will also be displayed beneath the main configuration logs.
 
-Command:
-  ey recipes apply
+Options:
 
-  Options:
-    -e, [--environment=ENVIRONMENT]  # Environment in which to apply recipes
-    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+  -e, [--environment=ENVIRONMENT]  # Environment with the interesting logs
+  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
-  Description:
-    This is similar to 'ey rebuild' except Engine Yard's main configuration step is skipped.
+=== ey rebuild
 
-Command:
-  ey recipes upload
+Engine Yard's main configuration run occurs on all servers. Mainly used to fix failed configuration of new or existing servers, or to update servers to latest Engine Yard stack
+(e.g. to apply an Engine Yard supplied security patch).
 
-  Options:
-    -e, [--environment=ENVIRONMENT]  # Environment that will receive the recipes
-    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+Note that uploaded recipes are also run after the main configuration run has successfully completed.
 
-  Description:
-    The current directory should contain a subdirectory named "cookbooks" to be uploaded.
+Options:
 
-Command:
-  ey recipes download
+  -e, [--environment=ENVIRONMENT]  # Environment to rebuild
+  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
-  Options:
-    -e, [--environment=ENVIRONMENT]  # Environment for which to download the recipes
-    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+=== ey rollback
 
-  Description:
-    The recipes will be unpacked into a directory called "cookbooks" in the current directory.
+Uses code from previous deploy in the "/data/APP_NAME/releases" directory on remote server(s) to restart application servers.
 
-    If the cookbooks directory already exists, an error will be raised.
+Options:
 
-Command:
-  ey web enable
+  -v, [--verbose]                  # Be verbose
+  -a, [--app=APP]                  # Name of the application to roll back
+  -e, [--environment=ENVIRONMENT]  # Environment in which to roll back the application
+  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
-  Options:
-    -v, [--verbose]                  # Be verbose
-    -a, [--app=APP]                  # Name of the application whose maintenance page will be removed
-    -e, [--environment=ENVIRONMENT]  # Environment on which to take down the maintenance page
-    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+=== ey recipes apply
 
-  Remove the maintenance page for this application in the given environment.
+This is similar to 'ey rebuild' except Engine Yard's main configuration step is skipped.
 
-Command:
-  ey web disable
+Options:
 
-  Options:
-    -v, [--verbose]                  # Be verbose
-    -a, [--app=APP]                  # Name of the application whose maintenance page will be put up
-    -e, [--environment=ENVIRONMENT]  # Environment on which to put up the maintenance page
-    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+  -e, [--environment=ENVIRONMENT]  # Environment in which to apply recipes
+  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
-  Description:
-    The maintenance page is taken from the app currently being deployed. This means that you can customize maintenance pages to tell users the reason for downtime on every
-    particular deploy.
+=== ey recipes upload
 
-    Maintenance pages searched for in order of decreasing priority:
-      * public/maintenance.html.custom
-      * public/maintenance.html.tmp
-      * public/maintenance.html
-      * public/system/maintenance.html.default
+The current directory should contain a subdirectory named "cookbooks" to be uploaded.
 
-Command:
-  ey ssh
+Options:
 
-  Options:
-        [--utilities=one two three]  # Run command on the utility servers with the given names. If no names are given, run on all utility servers.
-        [--app-servers]              # Run command on all application servers
-        [--db-servers]               # Run command on the database servers
-        [--db-master]                # Run command on the master database server
-    -a, [--all]                      # Run command on all servers
-        [--db-slaves]                # Run command on the slave database servers
-    -e, [--environment=ENVIRONMENT]  # Environment to ssh into
-    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+  -e, [--environment=ENVIRONMENT]  # Environment that will receive the recipes
+  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+      [--apply]                    # Apply the recipes (same as above) immediately after uploading
+  -f, [--file=FILE]                # Specify a gzipped tar file (.tgz) for upload instead of cookbooks/ directory
 
-  Description:
-    If a command is supplied, it will be run, otherwise a session will be opened. The application master is used for environments with clusters. Option --all requires a command to
-    be supplied and runs it on all servers.
+=== ey recipes download
 
-    Note: this command is a bit picky about its ordering. To run a command with arguments on all servers, like "rm -f /some/file", you need to order it like so:
+The recipes will be unpacked into a directory called "cookbooks" in the current directory.
 
-    $ ey ssh "rm -f /some/file" -e my-environment --all
+If the cookbooks directory already exists, an error will be raised.
 
-Command:
-  ey launch
+Options:
 
-  Options:
-    -e, [--environment=ENVIRONMENT]  # Environment to ssh into
-    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+  -e, [--environment=ENVIRONMENT]  # Environment for which to download the recipes
+  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
-  Description:
-    Open the application in a browser.
+=== ey web enable
 
-Command:
-  ey whoami
+Remove the maintenance page for this application in the given environment.
 
-  Description:
-    Who am I logged in as?
+Options:
 
-Command:
-  ey login
+  -v, [--verbose]                  # Be verbose
+  -a, [--app=APP]                  # Name of the application whose maintenance page will be removed
+  -e, [--environment=ENVIRONMENT]  # Environment on which to take down the maintenance page
+  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
-  Description:
-    Log in and verify access to EY Cloud. Use logout first if you need to switch user accounts.
+=== ey web disable
 
-Command:
-  ey logout
+The maintenance page is taken from the app currently being deployed. This means that you can customize maintenance pages to tell users the reason for downtime on every particular deploy.
 
-  Description:
-    Remove the current API key from ~/.eyrc or env variable $EYRC
+Maintenance pages searched for in order of decreasing priority:
+  * public/maintenance.html.custom
+  * public/maintenance.html.tmp
+  * public/maintenance.html
+  * public/system/maintenance.html.default
+
+Options:
+
+  -v, [--verbose]                  # Be verbose
+  -a, [--app=APP]                  # Name of the application whose maintenance page will be put up
+  -e, [--environment=ENVIRONMENT]  # Environment on which to put up the maintenance page
+  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+
+
+=== ey web restart
+
+Restarts the application servers for the given application. Enables maintenance pages if it would be enabled during a normal deploy. Respects the maintenance_on_restart ey.yml configuration.
+
+Options:
+
+  -v, [--verbose]                  # Be verbose
+  -a, [--app=APP]                  # Name of the application to restart
+  -e, [--environment=ENVIRONMENT]  # Name of the environment to restart
+  -c, [--account=ACCOUNT]          # Name of the account in which the app and environment can be found
+
+=== ey ssh
+
+If a command is supplied, it will be run, otherwise a session will be opened. The application master is used for environments with clusters. Option --all requires a command to be supplied and runs it on all servers.
+
+Note: this command is a bit picky about its ordering. To run a command with arguments on all servers, like "rm -f /some/file", you need to order it like so:
+
+  $ ey ssh "rm -f /some/file" -e my-environment --all
+
+Options:
+
+      [--utilities=one two three]  # Run command on the utility servers with the given names. If no names are given, run on all utility servers.
+      [--app-servers]              # Run command on all application servers
+      [--db-servers]               # Run command on the database servers
+      [--db-master]                # Run command on the master database server
+  -A, [--all]                      # Run command on all servers
+      [--db-slaves]                # Run command on the slave database servers
+  -e, [--environment=ENVIRONMENT]  # Name of the environment to ssh into
+  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+
+=== ey launch
+
+Open the application in a browser.
+
+Options:
+
+  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+  -a, [--app=APP]                  # Name of the application to launch
+  -e, [--environment=ENVIRONMENT]  # Name of the environment for the application
+
+=== ey whoami
+
+Who am I logged in as? Prints the name and email of the current logged in user.
+
+=== ey login
+
+Log in and verify access to EY Cloud. Use logout first if you need to switch user accounts.
+
+=== ey logout
+
+Remove the current API key from ~/.eyrc or env variable $EYRC
 
 
 == API Client
@@ -234,15 +239,16 @@ See https://github.com/engineyard/engineyard-cloud-client for the API client lib
 
 The API commands will print internal information if $DEBUG is set:
 
-    DEBUG=1 ey environments --all
-           Token  YOURTOKEN
-         Request  GET https://cloud.engineyard.com/api/v2/apps
-          Params  {}
-        Response
-    {"apps"=>
-      [{"environments"=>[],
-        "name"=>"myapp",
-        "repository_uri"=>"git@github.com:myaccount/myapp.git",
-        "app_type_id"=>"rails3",
-        "account"=>{"name"=>"myaccount", "id"=>1234},
-        "id"=>12345}]}
+  $ DEBUG=1 ey environments --all
+         GET  https://cloud.engineyard.com/api/v2/apps
+      Params  {"no_instances"=>"true"}
+     Headers  {"User-Agent"=>"EngineYard/2.0.0 EngineYardCloudClient/1.0.5",
+              "Accept"=>"application/json",
+              "X-EY-Cloud-Token"=>"YOURTOKEN"}
+    Response  {"apps"=>
+                [{"environments"=>[],
+                  "name"=>"myapp",
+                  "repository_uri"=>"git@github.com:myaccount/myapp.git",
+                  "app_type_id"=>"rails3",
+                  "account"=>{"name"=>"myaccount", "id"=>1234},
+                  "id"=>12345}]}

data/lib/engineyard/cli.rb

@@ -107,8 +107,8 @@ module EY
         deployment.successful = runner.call(out, err)
       rescue Interrupt
         err << "Interrupted. Deployment halted.\n"
-        ui.warn "Recording canceled deployment in EY Cloud..."
-        ui.warn "WARNING: Interrupting again may result in a never-finished deployment in the deployment history on EY Cloud."
+        ui.warn "Recording canceled deployment in Engine Yard Cloud..."
+        ui.warn "WARNING: Interrupting again may result in a never-finished deployment in the deployment history on Engine Yard Cloud."
         raise
       rescue StandardError => e
         deployment.err << "Error encountered during deploy.\n#{e.class} #{e}\n"
@@ -118,11 +118,11 @@ module EY
         deployment.finished
 
         if deployment.successful?
-          ui.info "Successful deployment recorded on EY Cloud"
+          ui.info "Successful deployment recorded on Engine Yard Cloud"
           ui.info "Deploy complete"
           ui.info "Now you can run `ey launch' to open the application in a browser."
         else
-          ui.info "Failed deployment recorded on EY Cloud"
+          ui.info "Failed deployment recorded on Engine Yard Cloud"
           raise EY::Error, "Deploy failed"
         end
       end
@@ -204,7 +204,7 @@ module EY
 
         if options[:simple]
           if apps.size > 1
-            message = "# This app matches multiple Applications in EY Cloud:\n"
+            message = "# This app matches multiple Applications in Engine Yard Cloud:\n"
             apps.each { |app| message << "#\t#{app.name}\n" }
             message << "# The following environments contain those applications:\n\n"
             ui.warn(message)
@@ -296,7 +296,7 @@ module EY
     method_option :account, :type => :string, :aliases => %w(-c),
       :required => true, :default => '',
       :desc => "Name of the account in which the environment can be found"
-    method_option :all, :type => :boolean, :aliases => %(-a),
+    method_option :all, :type => :boolean, :aliases => %(-A),
       :desc => "Run command on all servers"
     method_option :app_servers, :type => :boolean,
       :desc => "Run command on all application servers"
@@ -457,7 +457,19 @@ module EY
       ui.say "#{current_user.name} (#{current_user.email})"
     end
 
-    desc "login", "Log in and verify access to EY Cloud."
+    desc "login", "Log in and verify access to Engine Yard Cloud."
+    long_desc <<-DESC
+      You may run this command to log in to EY Cloud without performing
+      any other action.
+
+      Once you are logged in, a file will be stored at ~/.eyrc with your
+      API token. You may override the location of this file using the
+      $EYRC environment variable.
+
+      Instead of logging in, you may specify a token on the command line
+      with --api-token or using the $ENGINEYARD_API_TOKEN environment
+      variable.
+    DESC
     def login
       whoami
     end

data/lib/engineyard/cli/api.rb

@@ -5,71 +5,94 @@ require 'engineyard/eyrc'
 module EY
   class CLI
     class API
-      def self.authenticate(ui)
-        ui.info("We need to fetch your API token; please log in.")
-        begin
-          email    = ui.ask("Email: ")
-          password = ui.ask("Password: ", true)
-          token    = EY::CloudClient.authenticate(email, password, ui)
-          EY::EYRC.load.api_token = token
-          token
-        rescue EY::CloudClient::InvalidCredentials
-          ui.warn "Invalid username or password; please try again."
-          retry
-        end
-      end
+      USER_AGENT = "EngineYard/#{EY::VERSION}"
 
       attr_reader :token
 
       def initialize(endpoint, ui, token = nil)
+        @client = EY::CloudClient.new(:endpoint => endpoint, :output => ui.out, :user_agent => USER_AGENT)
         @ui = ui
-        EY::CloudClient.endpoint = endpoint
-
-        # If the token is specified, we don't ask for authentication when
-        # the token is reject, we just exit.
-        if @token = token
-          @specified = true
-          @source = 'token from --api-token'
-        elsif @token = ENV['ENGINEYARD_API_TOKEN']
-          @specified = true
-          @source = 'token from $ENGINEYARD_API_TOKEN'
-        elsif @token = EY::EYRC.load.api_token
-          @specified = false
-          @source = "api_token in #{EY::EYRC.load.path}"
-        elsif @token = self.class.authenticate(ui)
-          @specified = false
-          @source = 'credentials'
-        else
-          raise EY::Error, "Sorry, we couldn't get your API token."
-        end
-
-        @api = EY::CloudClient.new(@token, @ui)
+        @eyrc = EY::EYRC.load
+        token_from('--api-token') { token } ||
+          token_from('$ENGINEYARD_API_TOKEN') { ENV['ENGINEYARD_API_TOKEN'] } ||
+          token_from(@eyrc.path, false) { @eyrc.api_token } ||
+          authenticate ||
+          token_not_loaded
       end
 
       def respond_to?(*a)
-        super or @api.respond_to?(*a)
+        super or @client.respond_to?(*a)
       end
 
       protected
 
       def method_missing(meth, *args, &block)
-        if @api.respond_to?(meth)
-          @api.send(meth, *args, &block)
+        if @client.respond_to?(meth)
+          with_reauthentication { @client.send(meth, *args, &block) }
         else
           super
         end
-      rescue EY::CloudClient::InvalidCredentials
-        if @specified
-          ui.error "Authentication failed: Invalid #{@source}."
-          exit(255)
+      end
+
+      def with_reauthentication
+        begin
+          yield
+        rescue EY::CloudClient::InvalidCredentials
+          if @specified || !@ui.interactive?
+            # If the token is specified, we raise immediately if it is rejected.
+            raise EY::Error, "Authentication failed: Invalid #{@source}."
+          else
+            @ui.warn "Authentication failed: Invalid #{@source}."
+            authenticate
+            retry
+          end
+        end
+      end
+
+      # Get the token from the provided block, saving it if it works.
+      # Specified will help us know what to do if loading the token fails.
+      # Returns true if it gets a token.
+      # Returns false if there is no token.
+      def token_from(source, specified = true)
+        token = yield
+        if token
+          @client.token = token
+          @specified    = specified
+          @source       = "token from #{source}"
+          @token        = token
+          true
         else
-          ui.warn "Authentication failed: Invalid #{@source}. Retrying..."
-          @token = self.class.authenticate(@ui)
-          @api = EY::CloudClient.new(@token, @ui)
+          false
+        end
+      end
+
+      # Load the token from EY Cloud if interactive and
+      # token wasn't explicitly specified previously.
+      def authenticate
+        if @specified
+          return false
+        end
+
+        @source    = "credentials"
+        @specified = false
+
+        @ui.info("We need to fetch your API token; please log in.")
+        begin
+          email  = @ui.ask("Email: ")
+          passwd = @ui.ask("Password: ", true)
+          @token = @client.authenticate!(email, passwd)
+          @eyrc.api_token = @token
+          true
+        rescue EY::CloudClient::InvalidCredentials
+          @ui.warn "Authentication failed. Please try again."
           retry
         end
       end
 
+      # Occurs when all avenues for getting the token are exhausted.
+      def token_not_loaded
+        raise EY::Error, "Sorry, we couldn't get your API token."
+      end
     end
   end
 end

data/lib/engineyard/cli/recipes.rb

@@ -28,7 +28,7 @@ module EY
         "Upload custom chef recipes to specified environment so they can be applied."
       long_desc <<-DESC
         Make an archive of the "cookbooks/" subdirectory in your current working
-        directory and upload it to EY Cloud's recipe storage.
+        directory and upload it to Engine Yard Cloud's recipe storage.
 
         Alternatively, specify a .tgz of a cookbooks/ directory yourself as follows:
 

data/lib/engineyard/cli/web.rb

@@ -49,6 +49,37 @@ module EY
         ui.info "Putting up maintenance page for '#{app_env.app.name}' in '#{app_env.environment.name}'"
         serverside_runner(app_env, options[:verbose]).put_up_maintenance_page.call(ui.out, ui.err)
       end
+
+      desc "restart [--environment ENVIRONMENT]",
+        "Restart the application servers without deploying."
+      long_desc <<-DESC
+        Restarts the application servers (e.g. Passenger, Unicorn, etc).
+
+        Respects the maintenance_on_restart settings in the application's ey.yml.
+
+        Note: Uses the version of the ey.yml currently checked out on the servers.
+      DESC
+      method_option :environment, :type => :string, :aliases => %w(-e),
+        :required => true, :default => false,
+        :desc => "Environment in which to deploy this application"
+      method_option :app, :type => :string, :aliases => %w(-a),
+        :required => true, :default => '',
+        :desc => "Name of the application to deploy"
+      method_option :account, :type => :string, :aliases => %w(-c),
+        :required => true, :default => '',
+        :desc => "Name of the account in which the environment can be found"
+      method_option :verbose, :type => :boolean, :aliases => %w(-v),
+        :desc => "Be verbose"
+      def restart
+        app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
+        ui.info "Restarting servers on #{app_env.hierarchy_name}"
+        if serverside_runner(app_env, options[:verbose]).restart.call(ui.out, ui.err)
+          ui.info "Restart complete"
+        else
+          raise EY::Error, "Restart failed"
+        end
+      end
+
     end
   end
 end

data/lib/engineyard/commands/deploy.rb

@@ -36,8 +36,8 @@ class EY
         deployment.successful = runner.call(out, err)
       rescue Interrupt
         err << "Interrupted. Deployment halted.\n"
-        ui.warn "Recording canceled deployment in EY Cloud..."
-        ui.warn "WARNING: Interrupting again may result in a never-finished deployment in the deployment history on EY Cloud."
+        ui.warn "Recording canceled deployment in Engine Yard Cloud..."
+        ui.warn "WARNING: Interrupting again may result in a never-finished deployment in the deployment history on Engine Yard Cloud."
         raise
       rescue StandardError => e
         deployment.err << "Error encountered during deploy.\n#{e.class} #{e}\n"
@@ -47,11 +47,11 @@ class EY
         deployment.finished
 
         if deployment.successful?
-          ui.info "Successful deployment recorded on EY Cloud"
+          ui.info "Successful deployment recorded on Engine Yard Cloud"
           ui.info "Deploy complete"
           ui.info "Now you can run `ey launch' to open the application in a browser."
         else
-          ui.info "Failed deployment recorded on EY Cloud"
+          ui.info "Failed deployment recorded on Engine Yard Cloud"
           raise EY::Error, "Deploy failed"
         end
       end

data/lib/engineyard/config.rb

@@ -96,7 +96,7 @@ module EY
 
     def ey_yml_comments
       if @path.exist?
-        existing = @path.readlines.grep(/^#/).join("\n")
+        existing = @path.readlines.grep(/^#/).map {|line| line.strip }.join("\n")
       else
         EY_YML_HINTS
       end

data/lib/engineyard/deploy_config/migrate.rb

@@ -90,18 +90,15 @@ module EY
       end
 
       def perform_from_interaction
-        ui.warn "**********************************************************************"
-        ui.warn "No default migrate choice for environment: #{env_config.name}"
-        ui.warn "Migrate can be toggled per-deploy using --migrate or --no-migrate."
-        ui.warn "Let's set a default migration choice."
-        ui.warn "**********************************************************************"
-        @perform = ui.agree('Migrate every deploy by default? ', true)
+        ui.warn "Please choose a default migration behavior for this environment."
+        @perform = ui.agree("Run migrations by default on #{env_config.name}? ", true)
         env_config.migrate = @perform
         if @perform
           command_from_interaction
         end
         ui.say "#{env_config.path}: migrate settings saved for #{env_config.name}."
-        ui.info "It's a good idea to git commit #{env_config.path} with these new changes."
+        ui.say "You can override this default with --migrate or --no-migrate."
+        ui.info "Please git commit #{env_config.path} with these new changes."
         true
       rescue Timeout::Error
         @perform = nil

data/lib/engineyard/eyrc.rb

@@ -2,14 +2,14 @@ module EY
   class EYRC
     attr_reader :path
 
-    DEFAULT_PATH = "~/.eyrc"
+    DEFAULT_PATH = "#{ENV['HOME']}/.eyrc"
 
     def self.load
       new(ENV['EYRC'] || DEFAULT_PATH)
     end
 
     def initialize(path)
-      self.path = path
+      @path = Pathname.new(path).expand_path
     end
 
     def exist?
@@ -30,10 +30,6 @@ module EY
 
     private
 
-    def path=(p)
-      @path = Pathname.new(p).expand_path
-    end
-
     def [](key)
       read_data[key.to_s]
     end

data/lib/engineyard/serverside_runner.rb

@@ -10,6 +10,7 @@ module EY
       @username = environment.username
       @hostname = bridge
       @command = nil
+      @acc_env_name = "#{app.account.name}/#{environment.name}"
     end
 
     def deploy(&block)
@@ -22,6 +23,11 @@ module EY
       self
     end
 
+    def restart(&block)
+      @command = @adapter.restart(&block)
+      self
+    end
+
     def put_up_maintenance_page(&block)
       @command = @adapter.enable_maintenance(&block)
       self
@@ -89,16 +95,30 @@ module EY
         begin
           ssh(cmd, @hostname, @username, out, err)
         rescue Net::SSH::AuthenticationFailed
-          raise EY::Error, "Authentication Failed: Please add your environment's ssh key with: ssh-add path/to/key"
+          raise EY::Error, <<-ERROR
+Authentication Failed. Things to fix:
+  1. Add your SSH key to your local SSH agent with `ssh-add path/to/key`.
+  2. Add your SSH key to #{@acc_env_name} on Engine Yard Cloud and apply the changes.
+  (https://support.cloud.engineyard.com/entries/20996846-set-up-ssh-keys)
+          ERROR
+        end
+      end
+    end
+
+    def net_ssh_options
+      level = :fatal # default in Net::SSH
+      if debug = ENV["DEBUG"]
+        level = :info
+        if %w[debug info warn error fatal].include?(debug.downcase)
+          level = debug.downcase.to_sym
         end
       end
+      {:paranoid => false, :verbose => level}
     end
 
     def ssh(cmd, hostname, username, out, err)
       exit_code = 1
-      options_for_ssh = {:paranoid => false}
-      options_for_ssh[:verbose] = ENV["DEBUG"].downcase.to_sym if ENV["DEBUG"]
-      Net::SSH.start(hostname, username, options_for_ssh) do |net_ssh|
+      Net::SSH.start(hostname, username, net_ssh_options) do |net_ssh|
         net_ssh.open_channel do |channel|
           channel.exec cmd do |_, success|
             unless success

data/lib/engineyard/thor.rb

@@ -40,7 +40,7 @@ module EY
     end
 
     def fetch_environment(environment_name, account_name)
-      ui.info "Loading application data from EY Cloud..."
+      ui.info "Loading application data from Engine Yard Cloud..."
 
       environment_name ||= use_default_environment
       remotes = repo.remotes if in_repo?
@@ -72,7 +72,7 @@ module EY
     end
 
     def fetch_app_environment(app_name, environment_name, account_name)
-      ui.info "Loading application data from EY Cloud..."
+      ui.info "Loading application data from Engine Yard Cloud..."
 
       environment_name ||= use_default_environment
       remotes = repo.remotes if in_repo?

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '2.0.0.rc1'
+  VERSION = '2.0.0'
 end

data/spec/engineyard/config_spec.rb

@@ -17,7 +17,7 @@ describe EY::Config do
   end
 
   describe "endpoint" do
-    it "defaults to production EY Cloud" do
+    it "defaults to production Engine Yard Cloud" do
       EY::Config.new.endpoint.should == EY::Config.new.default_endpoint
     end
 

data/spec/engineyard/eyrc_spec.rb

@@ -11,7 +11,7 @@ describe EY::EYRC do
 
     it "looks for .eyrc in $HOME/.eyrc by default" do
       ENV.delete('EYRC')
-      EY::EYRC.load.path.should == Pathname.new("~/.eyrc").expand_path
+      EY::EYRC.load.path.should == Pathname.new("#{ENV['HOME']}/.eyrc")
     end
   end
 

data/spec/ey/web/restart_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe "ey web restart" do
+  given "integration"
+
+  def command_to_run(opts)
+    cmd = %w[web restart]
+    cmd << "-e" << opts[:environment] if opts[:environment]
+    cmd << "-a" << opts[:app]         if opts[:app]
+    cmd << "-c" << opts[:account]     if opts[:account]
+    cmd << "--verbose"                if opts[:verbose]
+    cmd
+  end
+
+  def verify_ran(scenario)
+    @ssh_commands.should have_command_like(/engineyard-serverside.*restart.*--app #{scenario[:application]}/)
+  end
+
+  include_examples "it takes an environment name and an app name and an account name"
+  include_examples "it invokes engineyard-serverside"
+end

data/spec/spec_helper.rb

@@ -72,10 +72,6 @@ RSpec.configure do |config|
     ENV["NO_SSH"] = "true"
   end
 
-  config.before(:each) do
-    EY::CloudClient.default_endpoint!
-  end
-
   config.after(:all) do
     clean_eyrc
   end

data/spec/support/helpers.rb

@@ -75,7 +75,7 @@ module SpecHelpers
   ZeroExitStatus = Class.new(UnexpectedExit)
 
   def ey_api
-    @api ||= EY::CloudClient.new('asdf', EY::CLI::UI.new)
+    @api ||= EY::CloudClient.new(:token => 'asdf')
   end
 
   def ensure_eyrc

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
-- EY Cloud Team
+- Engine Yard Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -144,17 +144,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -366,6 +366,7 @@ files:
 - spec/ey/status_spec.rb
 - spec/ey/web/disable_spec.rb
 - spec/ey/web/enable_spec.rb
+- spec/ey/web/restart_spec.rb
 - spec/ey/whoami_spec.rb
 - spec/spec_helper.rb
 - spec/support/bundled_ey
@@ -377,11 +378,26 @@ files:
 - spec/support/shared_behavior.rb
 homepage: http://github.com/engineyard/engineyard
 licenses: []
-post_install_message: ! "\nWelcome to Engine Yard!\n \nDeploying for the first time?
-  The Engine Yard Pandas want to help you! \n\nEmail pandas@engineyard.com with your
-  questions or queries. \n(Panda = 1. Polite Agent of Non-Destructive Assimilation;
-  2. Cute fluffy animal.)\n \nWe wish you every success with your business!\n \n -
-  The Pandas\n\n"
+post_install_message: ! "Thank you for downloading engineyard gem version 2!\n\n############
+  NOTICE when upgrading from 1.x to 2.x ############\n\nFirst, if you have any trouble,
+  you can uninstall this version to downgrade.\nThis version of the CLI does not affect
+  the web deploy system.\nPlease file a support ticket if you have any issues at:
+  support.cloud.engineyard.com\n\n* IMPORTANT: eydeploy.rb modifications MUST be verified
+  in staging!\n  Many internals have changed that could break eydeploy.rb!\n* The
+  order of compile_assets has *changed*. It now runs before\n  the maintenance page
+  is enabled, to reduce downtime.\n* ey.yml files should be checked in to your repository.\n*
+  Default bundler version is now 1.1.5.\n\nA few other nice changes:\n\n* All CLI
+  commands are significantly faster. Woo!\n* Deploy hooks now have access to `account_name`
+  and `environment_name`.\n* Deploy hooks can now use run! and sudo! to abort on failure.\n*
+  Supports new ey.yml options when ey.yml is committed:\n  * maintenance_on_restart:
+  true/false (default: false except for glassfish and mongrel)\n  * maintenance_on_migrate:
+  true/false (default: true)\n  * precompile_assets: true/false (default: inferred
+  using app/assets and config/application.rb)\n  * ignore_database_adapter_warning:
+  true (hides adapter warning)\n* Don't remove maintenance pages that weren't put
+  up during this deploy if maintenance options (above) are set to false.\n* ey web
+  restart - restarts web servers without deploying.\n\nDeploying for the first time?
+  The Engine Yard Pandas want to help you!\nEmail pandas@engineyard.com with your
+  questions.\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -391,12 +407,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4522439113898007272
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -4522439113898007272
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -426,6 +448,7 @@ test_files:
 - spec/ey/status_spec.rb
 - spec/ey/web/disable_spec.rb
 - spec/ey/web/enable_spec.rb
+- spec/ey/web/restart_spec.rb
 - spec/ey/whoami_spec.rb
 - spec/spec_helper.rb
 - spec/support/bundled_ey