engineyard 2.0.13 → 2.1.0.rc1

data/README.md

@@ -0,0 +1,351 @@
+# ey
+
+### Install
+
+Install engineyard like any other ruby gem:
+
+    gem install engineyard
+
+Note: Don't add engineyard to your application's Gemfile. The engineyard gem is
+not made to be a part of your application and may cause version conflicts with
+other parts of rails.
+
+### Login
+
+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
+
+The `ey.yml` file allows options to be saved for each environment to which an
+application is deployed. Here's an example ey.yml file in `ROOT/config/ey.yml`:
+
+    $ cat config/ey.yml
+    ---
+    # 'defaults' applies to all environments running this application.
+    defaults:
+      bundle_without: test development mygroup  # exclude groups on bundle install (leave blank to remove --without)
+      bundle_options: --local                   # add extra options to the bundle install command line (does not override bundle_without)
+      copy_exclude:                             # don't rsync the following dirs
+      - .git
+      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)
+      precomplie_assets_task: assets:precompile # override the assets:precompile rake task
+      precompile_unchanged_assets: true         # precompiles assets even if no changes would be detected (does not check for changes at all).
+      asset_dependencies: app/assets            # a list of relative paths to search for asset changes during each deploy.
+      assets_strategy: shifting                 # choose an alternet asset management strategy (shifting, cleaning, private, shared)
+      asset_roles: :all                         # specify on which roles to compile assets (default: [:app, :app_master, :solo] - must be an Array)
+      asset_roles:                              # (Array input for multiple roles) - Use hook deploy/before_compile_assets.rb for finer grained control.
+      - :app
+      - :app_master
+      - :util
+      ignore_database_adapter_warning: true     # hide database adapter warning if you don't use MySQL or PostgreSQL (default: false)
+
+    # Environment specific options apply only to a single environment and override settings in defaults.
+    environments:
+      env_production:
+        precompile_unchanged_assets: true       # precompiles assets even if no changes would be detected (does not check for changes at all).
+        assets_strategy: shifting               # choose an alternet asset management strategy (shifting, cleaning, private, shared)
+        asset_roles: :all                       # specify on which roles to compile assets (default: [:app, :app_master, :solo] - must be an Array)
+      env_staging
+        assets_strategy: private                # Use an asset management that always refreshes, so staging enviroments don't get conflicts
+
+These options in `ey.yml` will only work if the file is committed to your
+application repository. Make sure to commit this file. Different branches
+may also have different versions of this file if necessary. The ey.yml file
+found in the deploying commit will be used for the current deploy.
+
+
+### Commands
+
+#### ey deploy
+
+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.
+
+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
+
+#### ey timeout-deploy
+
+The latest running deployment will be marked as failed, allowing a
+new deployment to be run. It is possible to mark a potentially successful
+deployment as failed. Only run this when a deployment is known to be
+wrongly unfinished/stuck and when further deployments are blocked.
+
+NOTICE: This command is will indiscriminately timeout any deploy, with no
+regard for its potential success or failure. Confirm that the running
+deploy is actually stuck or broken before running this command. If run
+against a deploy that would succeed, it could cause the deployment to be
+marked as failed incorrectly.
+
+Options:
+
+    -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
+
+
+#### ey status
+
+Show the status of most recent deployment of the specified application and
+environment. This action only informational and will not change your application.
+
+Options:
+
+    -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
+
+#### ey environments
+
+By default, environments for this app are displayed. The `--all` option will
+display all environments, including those for this app.
+
+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 logs
+
+Displays Engine Yard configuration logs for all servers in the environment. If
+recipes were uploaded to the environment and run, their logs will also be
+displayed beneath the main configuration logs.
+
+Options:
+
+    -e, [--environment=ENVIRONMENT]  # Environment with the interesting logs
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+
+#### ey rebuild
+
+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).
+
+Note that uploaded recipes are also run after the main configuration run has
+successfully completed.
+
+This command will return immediately, but the rebuild process may take a few
+minutes to complete.
+
+Options:
+
+    -e, [--environment=ENVIRONMENT]  # Environment to rebuild
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+
+#### ey rollback
+
+Uses code from previous deploy in the `/data/APP_NAME/releases` directory on
+remote server(s) to restart application servers.
+
+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 recipes apply
+
+This is similar to `ey rebuild` except Engine Yard's main configuration step is
+skipped.
+
+Options:
+
+    -e, [--environment=ENVIRONMENT]  # Environment in which to apply recipes
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+
+#### ey recipes upload
+
+The current directory should contain a subdirectory named `cookbooks` to be
+uploaded.
+
+Options:
+
+    -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
+
+#### ey recipes download
+
+The recipes will be unpacked into a directory called `cookbooks` in the current
+directory. If the cookbooks directory already exists, an error will be raised.
+
+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 web enable
+
+Remove the maintenance page for this application in the given environment.
+
+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 web disable
+
+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.
+
+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 file at env variable `$EYRC`
+
+
+### Global Options
+
+All commands accept the following options.
+
+    --api-token=API_TOKEN                    # Use API-TOKEN to authenticate this command
+    --serverside-version=SERVERSIDE_VERSION  # Please use with care! Override deploy system version
+                                             # (same as ENV variable ENGINEYARD_SERVERSIDE_VERSION)
+
+Not all commands will make use of these options. For example,
+ey status does not use, and will ignore the --serverside-version flag.
+
+Also, please consider that it's usually not a good idea to override the
+version of serverside unless you know what you're doing. CLI and serverside
+versions are designed to work together and mixing them can cause errors.
+
+
+### API Client
+
+See [engineyard-cloud-client](https://github.com/engineyard/engineyard-cloud-client) for the API client library.
+
+### DEBUG
+
+The API commands will print internal information if `$DEBUG` is set:
+
+    $ 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}]}
+
+### Releasing
+
+To release the engineyard gem, use the command below and then follow the
+instructions it outputs.
+
+    bundle exec rake release
+
+This will remove the `.pre` from the current version, then bump the patch level
+and add `.pre` after for the next version. The version will be tagged in git.
+
+To release a new `engineyard-serverside` gem that has already been pushed to
+rubygems.org, update `lib/engineyard/version.rb` to refer to the
+`engineyard-serverside` version you want to release, then make a commit.
+Each engineyard gem is hard-linked to a specific default engineyard-serverside
+version which can be overriden with the `--serverside-version` option.
+
+The `engineyard-serverside-adapter` version does not need to be bumped in the
+gemspec unless you're also releasing a new version of that gem. Versions
+of adapter are no longer linked to serverside.

data/lib/engineyard/cli.rb

@@ -22,7 +22,7 @@ module EY
       super(given_args, {:shell => ui}.merge(config))
     rescue EY::Error, EY::CloudClient::Error => e
       ui.print_exception(e)
-      exit 1
+      raise
     rescue Interrupt => e
       puts
       ui.print_exception(e)
@@ -99,6 +99,12 @@ module EY
       ui.info  "Beginning deploy...", :green
       begin
         deployment.start
+      rescue
+        ui.error "Error encountered before deploy. Deploy not started."
+        raise
+      end
+
+      begin
         ui.show_deployment(deployment)
         out << "Deploy initiated.\n"
 
@@ -113,9 +119,17 @@ module EY
         end
         deployment.successful = runner.call(out, err)
       rescue Interrupt
+        Signal.trap(:INT) { # The fingers you have used to dial are too fat...
+          ui.info "\nRun `ey timeout-deploy` to mark an unfinished deployment as failed."
+          exit 1
+        }
         err << "Interrupted. Deployment halted.\n"
-        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."
+        ui.warn <<-WARN
+Recording interruption of this unfinished deployment in Engine Yard Cloud...
+
+WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
+         failed deployment. Unfinished deployments can block future deploys.
+        WARN
         raise
       rescue StandardError => e
         deployment.err << "Error encountered during deploy.\n#{e.class} #{e}\n"
@@ -135,6 +149,44 @@ module EY
       end
     end
 
+    desc "timeout-deploy [--environment ENVIRONMENT]",
+      "Fail a stuck unfinished deployment."
+    long_desc <<-DESC
+      NOTICE: Timing out a deploy does not stop currently running deploy
+      processes.
+
+      This command must be run in the current directory containing the app.
+      The latest running deployment will be marked as failed, allowing a
+      new deployment to be run. It is possible to mark a potentially successful
+      deployment as failed. Only run this when a deployment is known to be
+      wrongly unfinished/stuck and when further deployments are blocked.
+    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"
+    def timeout_deploy
+      app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
+      deployment = app_env.last_deployment
+      if deployment && !deployment.finished?
+        begin
+          ui.info  "Marking last deployment failed...", :green
+          deployment.timeout
+          ui.deployment_status(deployment)
+        rescue EY::CloudClient::RequestFailed => e
+          ui.error "Error encountered attempting to timeout previous deployment."
+          raise
+        end
+      else
+        raise EY::Error, "No unfinished deployment was found for #{app_env.hierarchy_name}."
+      end
+    end
+
     desc "status", "Show the deployment status of the app"
     long_desc <<-DESC
       Show the current status of most recent deployment of the specified

data/lib/engineyard/config.rb

@@ -10,7 +10,7 @@ module EY
     attr_reader :path
 
     def initialize(file = nil)
-      @path = file || CONFIG_FILES.find{|pathname| pathname.exist? }
+      @path = file ? Pathname.new(file) : CONFIG_FILES.find{|pathname| pathname.exist? }
       @config = (@path ? YAML.load_file(@path.to_s) : {}) || {} # load_file returns `false' when the file is empty
       @config["environments"] ||= {}
     end
@@ -29,6 +29,18 @@ module EY
       @config.key?(key) || super
     end
 
+    def fetch(key, default = nil, &block)
+      block ? @config.fetch(key.to_s, &block) : @config.fetch(key.to_s, default)
+    end
+
+    def fetch_from_defaults(key, default=nil, &block)
+      block ? defaults.fetch(key.to_s, &block) : defaults.fetch(key.to_s, default)
+    end
+
+    def [](key)
+      @config[key.to_s.downcase]
+    end
+
     def endpoint
       env_var_endpoint || default_endpoint
     end
@@ -52,6 +64,10 @@ module EY
       d && d.first
     end
 
+    def defaults
+      @config['defaults'] ||= {}
+    end
+
     def environment_config(environment_name)
       environments[environment_name] ||= {}
       EnvironmentConfig.new(environments[environment_name], environment_name, self)
@@ -60,6 +76,10 @@ module EY
     def set_environment_option(environment_name, key, value)
       environments[environment_name] ||= {}
       environments[environment_name][key] = value
+      write_ey_yaml
+    end
+
+    def write_ey_yaml
       ensure_path
       comments = ey_yml_comments
       @path.open('w') do |f|
@@ -68,24 +88,32 @@ module EY
       end
     end
 
+    def set_default_option(key, value)
+      defaults[key] = value
+      write_ey_yaml
+    end
+
     EY_YML_HINTS = <<-HINTS
 # ey.yml supports many deploy configuration options when committed in an
 # application's repository.
 #
 # Valid locations: REPO_ROOT/ey.yml or REPO_ROOT/config/ey.yml.
 #
-# Examples options:
+# Examples options (defaults apply to all environments for this application):
 #
+# defaults:
+#   migrate: true                           # Default --migrate choice for ey deploy
+#   migration_command: 'rake migrate'       # Default migrate command to run when migrations are enabled
+#   branch: default_deploy_branch           # Branch/ref to be deployed by default during ey deploy
+#   bundle_without: development test        # The string to pass to bundle install --without ''
+#   maintenance_on_migrate: true            # Enable maintenance page during migrate action (use with caution) (default: true)
+#   maintenance_on_restart: false           # Enable maintanence page during every deploy (default: false for unicorn & passenger)
+#   ignore_database_adapter_warning: false  # Hide the warning shown when the Gemfile does not contain a recognized database adapter (mongodb for example)
+#   your_own_custom_key: 'any attribute you put in ey.yml is available in deploy hooks'
 # environments:
 #   YOUR_ENVIRONMENT_NAME: # All options pertain only to the named environment
-#     migrate: true                           # Default --migrate choice for ey deploy
-#     migration_command: 'rake migrate'       # Default migrate command to run when migrations are enabled
-#     branch: default_deploy_branch           # Branch/ref to be deployed by default during ey deploy
-#     bundle_without: development test        # The string to pass to bundle install --without ''
-#     maintenance_on_migrate: true            # Enable maintenance page during migrate action (use with caution) (default: true)
-#     maintenance_on_restart: false           # Enable maintanence page during every deploy (default: false for unicorn & passenger)
-#     ignore_database_adapter_warning: false  # Hide the warning shown when the Gemfile does not contain a recognized database adapter (mongodb for example)
-#     your_own_custom_key: 'any attribute you put in ey.yml is available in deploy hooks'
+#     any_option: 'override any of the options above with specific options for certain environments'
+#     migrate: false
 #
 # Further information available here:
 # https://support.cloud.engineyard.com/entries/20996661-customize-your-deployment-on-engine-yard-cloud
@@ -129,16 +157,18 @@ module EY
       end
 
       def fetch(key, default = nil, &block)
-        if block
-          @config.fetch(key.to_s, &block)
-        else
-          @config.fetch(key.to_s, default)
+        @config.fetch(key.to_s) do
+          @parent.fetch_from_defaults(key.to_s, default, &block)
         end
       end
 
       def set(key, val)
-        @config[key.to_s] = val
-        @parent.set_environment_option(@name, key, val)
+        if @config.empty? || !@config.has_key?(key.to_s)
+          @parent.set_default_option(key, val)
+        else
+          @config[key.to_s] = val
+          @parent.set_environment_option(@name, key, val)
+        end
         val
       end
 
@@ -154,8 +184,8 @@ module EY
         fetch('branch', nil)
       end
 
-      def migrate(&block)
-        fetch('migrate', &block)
+      def migrate
+        fetch('migrate')
       end
 
       def migrate=(mig)

data/lib/engineyard/deploy_config/migrate.rb

@@ -57,12 +57,12 @@ module EY
       end
 
       def perform_from_cli_opts
-        @perform = !!cli_opts.fetch('migrate') { return false } # yields on not found
+        @perform = cli_opts.fetch('migrate') { return false } # yields on not found
         true
       end
 
       def perform_from_config
-        @perform = !!env_config.migrate { return perform_implied_via_command_in_config }
+        @perform = env_config.fetch('migrate') { return perform_implied_via_command_in_config }
         if @perform
           unless command_from_config
             env_config.migration_command = DEFAULT

data/lib/engineyard/version.rb

@@ -1,4 +1,4 @@
 module EY
-  VERSION = '2.0.13'
-  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.0.7'
+  VERSION = '2.1.0.rc1'
+  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.1.0.rc1'
 end

data/spec/engineyard/deploy_config_spec.rb

@@ -1,15 +1,19 @@
 require 'spec_helper'
+require 'tempfile'
 
 describe EY::DeployConfig::Migrate do
   before do
-    @parent = mock('parent config mock')
-    @parent.stub!(:set_environment_option)
-    @parent.stub!(:path).and_return('path')
+    @tempfile = Tempfile.new('ey.yml')
+    @parent = EY::Config.new(@tempfile.path)
     @ui = EY::CLI::UI.new
     EY::CLI::UI::Prompter.enable_mock!
     @repo = mock('repo')
   end
 
+  after do
+    @tempfile.unlink
+  end
+
   def env_config(opts=nil)
     @env_config ||= EY::Config::EnvironmentConfig.new(opts, 'envname', @parent)
   end
@@ -20,26 +24,26 @@ describe EY::DeployConfig::Migrate do
 
   context "inside a repository" do
     context "no migrate options set (interactive)" do
-      it "prompts migrate and command by default" do
+      it "prompts migrate and command and adds to defaults section" do
         EY::CLI::UI::Prompter.add_answer "" # default
         EY::CLI::UI::Prompter.add_answer ""
-        @parent.should_receive(:set_environment_option).with('envname', 'migrate', true)
-        @parent.should_receive(:set_environment_option).with('envname', 'migration_command', 'rake db:migrate')
+        @parent.should_receive(:set_default_option).with('migrate', true)
+        @parent.should_receive(:set_default_option).with('migration_command', 'rake db:migrate')
         dc = deploy_config({})
         out = capture_stdout do
           dc.migrate.should be_true
           dc.migrate_command.should == 'rake db:migrate'
         end
-        out.should =~ /path: migrate settings saved for envname/
+        out.should =~ /#{@tempfile.path}: migrate settings saved for envname/
         out.should =~ /You can override this default with --migrate or --no-migrate/
-        out.should =~ /Please git commit path with these new changes./
+        out.should =~ /Please git commit #{@tempfile.path} with these new changes./
       end
 
       it "prompts migration_command if first answer is yes" do
         EY::CLI::UI::Prompter.add_answer "yes" # default
         EY::CLI::UI::Prompter.add_answer "ruby script/migrate"
-        @parent.should_receive(:set_environment_option).with('envname', 'migrate', true)
-        @parent.should_receive(:set_environment_option).with('envname', 'migration_command', 'ruby script/migrate')
+        @parent.should_receive(:set_default_option).with('migrate', true)
+        @parent.should_receive(:set_default_option).with('migration_command', 'ruby script/migrate')
         dc = deploy_config({})
         capture_stdout do
           dc.migrate.should be_true
@@ -49,7 +53,7 @@ describe EY::DeployConfig::Migrate do
 
       it "doesn't prompt migration_command if first answer is no" do
         EY::CLI::UI::Prompter.add_answer "no" # default
-        @parent.should_receive(:set_environment_option).with('envname', 'migrate', false)
+        @parent.should_receive(:set_default_option).with('migrate', false)
         dc = deploy_config({})
         capture_stdout do
           dc.migrate.should be_false

data/spec/ey/deploy_spec.rb

@@ -135,7 +135,7 @@ describe "ey deploy" do
         @ssh_commands.last.should =~ /--migrate 'rake db:migrate'/
         File.exist?('ey.yml').should be_false
         ey_yml.should be_exist
-        env_conf = read_yaml(ey_yml.to_s)['environments']['giblets']
+        env_conf = read_yaml(ey_yml.to_s)['defaults']
         env_conf['migrate'].should == true
         env_conf['migration_command'].should == 'rake db:migrate'
       end
@@ -150,7 +150,7 @@ describe "ey deploy" do
         @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
         @ssh_commands.last.should =~ /--migrate 'ruby migrate'/
         File.exist?('ey.yml').should be_true
-        env_conf = read_yaml('ey.yml')['environments']['giblets']
+        env_conf = read_yaml('ey.yml')['defaults']
         env_conf['migrate'].should == true
         env_conf['migration_command'].should == 'ruby migrate'
       end
@@ -163,7 +163,7 @@ describe "ey deploy" do
         @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
         @ssh_commands.last.should_not =~ /--migrate/
         File.exist?('ey.yml').should be_true
-        read_yaml('ey.yml')['environments']['giblets']['migrate'].should == false
+        read_yaml('ey.yml')['defaults']['migrate'].should == false
       end
     end
 
@@ -178,14 +178,30 @@ describe "ey deploy" do
       @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
     end
 
-    context "customized in ey.yml" do
-      before { write_yaml({"environments" => {"giblets" => { "migration_command" => 'thor fancy:migrate' }}}, 'ey.yml') }
+    context "customized in ey.yml with defaults" do
+      before { write_yaml({"defaults" => { "migration_command" => "thor fancy:migrate"}}, 'ey.yml') }
       after  { File.unlink 'ey.yml' }
 
       it "migrates with the custom command by default (and fixes ey.yml to reflect the previous default behavior)" do
         fast_ey %w[deploy]
         @ssh_commands.last.should =~ /--migrate 'thor fancy:migrate'/
-        read_yaml('ey.yml')['environments']['giblets']['migrate'].should == true
+        read_yaml('ey.yml')['defaults']['migrate'].should == true
+      end
+    end
+
+    context "customized in ey.yml with environment specific options overriding the defaults" do
+      before do
+        write_yaml({
+          "defaults" => { "migration_command" => "rake plain:migrate"},
+          "environments" => {"giblets" => { "migration_command" => 'thor fancy:migrate' }}
+        }, 'ey.yml')
+      end
+      after  { File.unlink 'ey.yml' }
+
+      it "migrates with the custom command by default (and fixes ey.yml for the specific environment to reflect the previous default behavior)" do
+        fast_ey %w[deploy]
+        @ssh_commands.last.should =~ /--migrate 'thor fancy:migrate'/
+        read_yaml('ey.yml')['defaults']['migrate'].should == true
       end
     end
 
@@ -217,7 +233,7 @@ describe "ey deploy" do
       it "migrates with the default (and writes the default to ey.yml)" do
         fast_ey %w[deploy]
         @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
-        read_yaml('ey.yml')['environments']['giblets']['migration_command'].should == 'rake db:migrate'
+        read_yaml('ey.yml')['defaults']['migration_command'].should == 'rake db:migrate'
       end
     end
 

data/spec/ey/timeout_deploy_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe "ey timeout-deploy" do
+  given "integration"
+
+  it "timeouts the last deployment" do
+    login_scenario "Stuck Deployment"
+    fast_ey %w[timeout-deploy]
+    @out.should match(/Marking last deployment failed.../)
+    @out.should match(/Finished at:\s+\w+/)
+  end
+
+  it "complains when there is no stuck deployment" do
+    login_scenario "one app, one environment"
+    fast_failing_ey ["timeout-deploy"]
+    @err.should include(%|No unfinished deployment was found for main/rails232app/giblets.|)
+  end
+end

data/spec/support/helpers.rb

@@ -212,6 +212,7 @@ module SpecHelpers
     "one app, one environment, not linked"                => "Unlinked App",
     "two apps"                                            => "Two Apps",
     "one app, one environment"                            => "Linked App",
+    "Stuck Deployment"                                    => "Stuck Deployment",
     "two accounts, two apps, two environments, ambiguous" => "Multiple Ambiguous Accounts",
     "one app, one environment, no instances"              => "Linked App Not Running",
     "one app, one environment, app master red"            => "Linked App Red Master",

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.0.13
-  prerelease: 
+  version: 2.1.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Engine Yard Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.11
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -112,17 +112,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -299,6 +299,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem allows you to deploy your rails application to the Engine Yard
   cloud directly from the command line.
 email: cloud@engineyard.com
@@ -359,7 +375,7 @@ files:
 - lib/vendor/thor/README.md
 - lib/vendor/thor/thor.gemspec
 - LICENSE
-- README.rdoc
+- README.md
 - spec/engineyard/cli/api_spec.rb
 - spec/engineyard/cli_spec.rb
 - spec/engineyard/config_spec.rb
@@ -380,6 +396,7 @@ files:
 - spec/ey/rollback_spec.rb
 - spec/ey/ssh_spec.rb
 - spec/ey/status_spec.rb
+- spec/ey/timeout_deploy_spec.rb
 - spec/ey/web/disable_spec.rb
 - spec/ey/web/enable_spec.rb
 - spec/ey/web/restart_spec.rb
@@ -394,27 +411,11 @@ files:
 - spec/support/shared_behavior.rb
 homepage: http://github.com/engineyard/engineyard
 licenses: []
-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  * asset_roles: :all (specify on which roles to compile
-  assets (default: [:app, :app_master, :solo])\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"
+post_install_message: ! "Thanks for installing engineyard 2.1.\n\nNeed help? Problem?
+  https://support.cloud.engineyard.com\nNot working? Uninstall this version to downgrade.\n\nIMPORTANT:\n
+  \ Please verify eydeploy.rb files in staging after upgrading!\n  Many internals
+  have changed that could break eydeploy.rb.\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
@@ -424,18 +425,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2355853462827576949
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2355853462827576949
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -463,6 +458,7 @@ test_files:
 - spec/ey/rollback_spec.rb
 - spec/ey/ssh_spec.rb
 - spec/ey/status_spec.rb
+- spec/ey/timeout_deploy_spec.rb
 - spec/ey/web/disable_spec.rb
 - spec/ey/web/enable_spec.rb
 - spec/ey/web/restart_spec.rb

data/README.rdoc

@@ -1,275 +0,0 @@
-= ey
-
-== Install
-
-Install engineyard like any other ruby gem:
-
-    gem install engineyard
-
-Note: Don't add engineyard to your application's Gemfile. The engineyard gem is not made to be a part of your application and may cause version conflicts with other parts of rails.
-
-== Login
-
-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
-
-The ey.yml file allows options to be saved for each environment to which an application is deployed. Here's an example ey.yml file in RAILS_ROOT/config/ey.yml:
-
-    $ cat config/ey.yml
-    ---
-    environments:
-      env_production:
-        migrate: false                            # run migration command on every deploy
-        migration_command: rake fancy:migrate     # default migration command
-        branch: deploy                            # default branch to deploy
-        default: true                             # make this environment default
-        bundle_without: test development mygroup  # exclude groups on bundle install
-        copy_exclude:                             # don't rsync the following dirs
-        - .git
-        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)
-        asset_roles: :all                         # specify on which roles to compile assets (default: [:app, :app_master, :solo] - must be an Array)
-        asset_roles:                              # (Array input for multiple roles) - Use hook deploy/before_compile_assets.rb for finer grained control.
-        - :app
-        - :app_master
-        - :util
-        ignore_database_adapter_warning: true     # hide database adapter warning if you don't use MySQL or PostgreSQL (default: false)
-
-Many of the options in ey.yml will only work if the file is committed to your application repository. Make sure to commit this file.
-
-== Commands
-
-=== ey deploy
-
-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.
-
-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
-
-
-=== ey status
-
-Show the status of most recent deployment of the specified application and environment. This action only informational and will not change your application.
-
-Options:
-
-  -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
-
-=== ey environments
-
-By default, environments for this app are displayed. The --all option will display all environments, including those for this app.
-
-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 logs
-
-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.
-
-Options:
-
-  -e, [--environment=ENVIRONMENT]  # Environment with the interesting logs
-  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
-
-=== ey rebuild
-
-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).
-
-Note that uploaded recipes are also run after the main configuration run has successfully completed.
-
-Options:
-
-  -e, [--environment=ENVIRONMENT]  # Environment to rebuild
-  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
-
-=== ey rollback
-
-Uses code from previous deploy in the "/data/APP_NAME/releases" directory on remote server(s) to restart application servers.
-
-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 recipes apply
-
-This is similar to 'ey rebuild' except Engine Yard's main configuration step is skipped.
-
-Options:
-
-  -e, [--environment=ENVIRONMENT]  # Environment in which to apply recipes
-  -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
-
-=== ey recipes upload
-
-The current directory should contain a subdirectory named "cookbooks" to be uploaded.
-
-Options:
-
-  -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
-
-=== ey recipes download
-
-The recipes will be unpacked into a directory called "cookbooks" in the current directory.
-
-If the cookbooks directory already exists, an error will be raised.
-
-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 web enable
-
-Remove the maintenance page for this application in the given environment.
-
-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 web disable
-
-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.
-
-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
-
-
-== Global Options
-
-All commands accept the following options.
-
-  --api-token=API_TOKEN                    # Use API-TOKEN to authenticate this command
-  --serverside-version=SERVERSIDE_VERSION  # Please use with care! Override deploy system version
-                                           # (same as ENV variable ENGINEYARD_SERVERSIDE_VERSION)
-
-Not all commands will make use of these options. For example,
-ey status does not use, and will ignore the --serverside-version flag.
-
-Also, please consider that it's usually not a good idea to override the
-version of serverside unless you know what you're doing. CLI and serverside
-versions are designed to work together and mixing them can cause errors.
-
-
-== API Client
-
-See https://github.com/engineyard/engineyard-cloud-client for the API client library.
-
-== DEBUG
-
-The API commands will print internal information if $DEBUG is set:
-
-  $ 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}]}