engineyard 2.3.3 → 3.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDhjMDU3YzJhYWUzMzRkNjQyZWJlZGJiMjQ1OGQ2MDdmYTZjZDBmNw==
-  data.tar.gz: !binary |-
-    NmE3MWNiYjFlYzk1NDE3MmNlY2UxZjFkNTNkNGNlMDNhYTMzYzIzYQ==
+SHA1:
+  metadata.gz: a21285072c40633408e1d024bb659a4afe81e032
+  data.tar.gz: c08bd05835ef584a8baee421bfd53b78ef4b5767
 SHA512:
-  metadata.gz: !binary |-
-    MWE0NjMyMmMzMDAzMzMzYzFjNTdiM2VkNDE2NmYzZWY3NjJmY2I3YzU0YWNi
-    NWYyMGRhYzVlNThhODY1YWIwZjU2NmI0MGVmNDFlZmFlNDY2YWM5ZGE0ZGI1
-    MDI1MzM1YTAyZDcxN2MyYjM1MDg3ODZhNzVmNjVkNDI5ZTQ5ZmQ=
-  data.tar.gz: !binary |-
-    YmU5ZDc5YzhiNWMzNTU2YWM3MTMyM2JjNDQ4M2ViYmIwNjU1ODE5YzlkZmYz
-    MTU1ZmRlYTgyOWNhNDAxYzI5YTIyYjc5MTJhOGNiYWIwNDhjMzAyOTNiN2Y2
-    ZWY1Mjk2Y2VmZmEzOTVhY2FkOTJjYmIzMWY2NWZhZDdjNjE3MjI=
+  metadata.gz: 211d35f2316b84133b6603c17ad18febb909f43617d4ce1c31b0fd425d7cd6f78a89c73a49f7f52ffb27c633aa41ad917d6428a012f2872902c8d95767476742
+  data.tar.gz: bac2d6e8a5b19a4b54a32f08121cae917540e730e5ddd065394e6f6691d1cbb9dd74d5e154ecdec0800d12181fd7529b790d7aa0444f263923c0880e7e6a3d50

data/lib/engineyard/cli.rb

@@ -20,7 +20,7 @@ module EY
     def self.start(given_args=ARGV, config={})
       Thor::Base.shell = EY::CLI::UI
       ui = EY::CLI::UI.new
-      super(given_args, {:shell => ui}.merge(config))
+      super(given_args, {shell: ui}.merge(config))
     rescue Thor::Error, EY::Error, EY::CloudClient::Error => e
       ui.print_exception(e)
       raise
@@ -37,9 +37,9 @@ module EY
       raise
     end
 
-    class_option :api_token, :type => :string, :desc => "Use API_TOKEN to authenticate this command"
-    class_option :serverside_version, :type => :string, :desc => "Please use with care! Override deploy system version (same as ENV variable ENGINEYARD_SERVERSIDE_VERSION)"
-    class_option :quiet, :aliases => %w[-q], :type => :boolean, :desc => "Quieter CLI output."
+    class_option :api_token, type: :string, desc: "Use API_TOKEN to authenticate this command"
+    class_option :serverside_version, type: :string, desc: "Please use with care! Override deploy system version (same as ENV variable ENGINEYARD_SERVERSIDE_VERSION)"
+    class_option :quiet, aliases: %w[-q], type: :boolean, desc: "Quieter CLI output."
 
     desc "init",
       "Initialize the current directory with an ey.yml configuration file."
@@ -53,8 +53,8 @@ module EY
       IMPORTANT: THE GENERATED FILE '#{EY::Config.pathname_for_write}'
       MUST BE COMMITTED TO YOUR REPOSITORY OR OPTIONS WILL NOT BE LOADED.
     DESC
-    method_option :path, :type => :string, :aliases => %w(-p),
-      :desc => "Path for ey.yml (supported paths: #{EY::Config::CONFIG_FILES.join(', ')})"
+    method_option :path, type: :string, aliases: %w(-p),
+      desc: "Path for ey.yml (supported paths: #{EY::Config::CONFIG_FILES.join(', ')})"
     def init
       unless EY::Repo.exist?
         raise EY::Error, "Working directory is not a repository. Aborting."
@@ -96,30 +96,30 @@ Go look at it, then add it to your repository!
       specifying --migrate or --migrate 'rake db:migrate'.
       Migrations can also be skipped by using --no-migrate.
     DESC
-    method_option :ignore_bad_master, :type => :boolean, :aliases => %w(--ignore-bad-bridge),
-      :desc => "Force a deploy even if the master is in a bad state"
-    method_option :migrate, :type => :string, :aliases => %w(-m),
-      :lazy_default => true,
-      :desc => "Run migrations via [MIGRATE]; use --no-migrate to avoid running migrations"
-    method_option :ref, :type => :string, :aliases => %w(-r --branch --tag),
-      :required => true, :default => '',
-      :desc => "Git ref to deploy. May be a branch, a tag, or a SHA. Use -R to deploy a different ref if a default is set."
-    method_option :force_ref, :type => :string, :aliases => %w(--ignore-default-branch -R),
-      :lazy_default => true,
-      :desc => "Force a deploy of the specified git ref even if a default is set in ey.yml."
-    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"
-    method_option :config, :type => :hash, :default => {}, :aliases => %w(--extra-deploy-hook-options),
-      :desc => "Hash made available in deploy hooks (in the 'config' hash), can also override some ey.yml settings."
+    method_option :ignore_bad_master, type: :boolean, aliases: %w(--ignore-bad-bridge),
+      desc: "Force a deploy even if the master is in a bad state"
+    method_option :migrate, type: :string, aliases: %w(-m),
+      lazy_default: true,
+      desc: "Run migrations via [MIGRATE]; use --no-migrate to avoid running migrations"
+    method_option :ref, type: :string, aliases: %w(-r --branch --tag),
+      required: true, default: '',
+      desc: "Git ref to deploy. May be a branch, a tag, or a SHA. Use -R to deploy a different ref if a default is set."
+    method_option :force_ref, type: :string, aliases: %w(--ignore-default-branch -R),
+      lazy_default: true,
+      desc: "Force a deploy of the specified git ref even if a default is set in ey.yml."
+    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"
+    method_option :config, type: :hash, default: {}, aliases: %w(--extra-deploy-hook-options),
+      desc: "Hash made available in deploy hooks (in the 'config' hash), can also override some ey.yml settings."
     def deploy
       app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
 
@@ -127,11 +127,11 @@ Go look at it, then add it to your repository!
       deploy_config = EY::DeployConfig.new(options, env_config, repo, ui)
 
       deployment = app_env.new_deployment({
-        :ref                => deploy_config.ref,
-        :migrate            => deploy_config.migrate,
-        :migrate_command    => deploy_config.migrate_command,
-        :extra_config       => deploy_config.extra_config,
-        :serverside_version => serverside_version,
+        ref:                deploy_config.ref,
+        migrate:            deploy_config.migrate,
+        migrate_command:    deploy_config.migrate_command,
+        extra_config:       deploy_config.extra_config,
+        serverside_version: serverside_version,
       })
 
       runner = serverside_runner(app_env, deploy_config.verbose, deployment.serverside_version, options[:ignore_bad_master])
@@ -204,15 +204,15 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
       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"
+    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
@@ -235,15 +235,15 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
       Show the current status of most recent deployment of the specified
       application and environment.
     DESC
-    method_option :environment, :type => :string, :aliases => %w(-e),
-      :required => true, :default => '',
-      :desc => "Environment where the application is deployed"
-    method_option :app, :type => :string, :aliases => %w(-a),
-      :required => true, :default => '',
-      :desc => "Name of the application"
-    method_option :account, :type => :string, :aliases => %w(-c),
-      :required => true, :default => '',
-      :desc => "Name of the account in which the application can be found"
+    method_option :environment, type: :string, aliases: %w(-e),
+      required: true, default: '',
+      desc: "Environment where the application is deployed"
+    method_option :app, type: :string, aliases: %w(-a),
+      required: true, default: '',
+      desc: "Name of the application"
+    method_option :account, type: :string, aliases: %w(-c),
+      required: true, default: '',
+      desc: "Name of the account in which the application can be found"
     def status
       app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
       deployment = app_env.last_deployment
@@ -260,19 +260,19 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
       display all environments, including those for this app.
     DESC
 
-    method_option :all, :type => :boolean, :aliases => %(-A),
-      :desc => "Show all environments (ignores --app, --account, and --environment arguments)"
-    method_option :simple, :type => :boolean, :aliases => %(-s),
-      :desc => "Display one environment per line with no extra output"
-    method_option :app, :type => :string, :aliases => %w(-a),
-      :required => true, :default => '',
-      :desc => "Show environments for this application"
-    method_option :account, :type => :string, :aliases => %w(-c),
-      :required => true, :default => '',
-      :desc => "Show environments in this account"
-    method_option :environment, :type => :string, :aliases => %w(-e),
-      :required => true, :default => '',
-      :desc => "Show environments matching environment name"
+    method_option :all, type: :boolean, aliases: %(-A),
+      desc: "Show all environments (ignores --app, --account, and --environment arguments)"
+    method_option :simple, type: :boolean, aliases: %(-s),
+      desc: "Display one environment per line with no extra output"
+    method_option :app, type: :string, aliases: %w(-a),
+      required: true, default: '',
+      desc: "Show environments for this application"
+    method_option :account, type: :string, aliases: %w(-c),
+      required: true, default: '',
+      desc: "Show environments in this account"
+    method_option :environment, type: :string, aliases: %w(-e),
+      required: true, default: '',
+      desc: "Show environments matching environment name"
     def environments
       if options[:all] && options[:simple]
         ui.print_simple_envs api.environments
@@ -286,10 +286,10 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
         end
 
         resolver = api.resolve_app_environments({
-          :account_name     => options[:account],
-          :app_name         => options[:app],
-          :environment_name => options[:environment],
-          :remotes          => remotes,
+          account_name:     options[:account],
+          app_name:         options[:app],
+          environment_name: options[:environment],
+          remotes:          remotes,
         })
 
         resolver.no_matches do |errors|
@@ -322,18 +322,32 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
       or -uS (--user --host) to output bash loop friendly "user@hostname"
     DESC
 
-    method_option :simple, :type => :boolean, :aliases => %(-s),
-      :desc => "Display all information in a simplified format without extra text or column alignment"
-    method_option :host, :type => :boolean, :aliases => %(-S),
-      :desc => "Display only hostnames, one per newline (use options -uS (--user --host) for user@hostname)"
-    method_option :user, :type => :boolean, :aliases => %w(-u),
-      :desc => "Include the ssh username in front of the hostname for easy SSH scripting"
-    method_option :account, :type => :string, :aliases => %w(-c),
-      :required => true, :default => '',
-      :desc => "Find environment in this account"
-    method_option :environment, :type => :string, :aliases => %w(-e),
-      :required => true, :default => '',
-      :desc => "Show servers in environment matching environment name"
+    method_option :simple, type: :boolean, aliases: %(-s),
+      desc: "Display all information in a simplified format without extra text or column alignment"
+    method_option :host, type: :boolean, aliases: %(-S),
+      desc: "Display only hostnames, one per newline (use options -uS (--user --host) for user@hostname)"
+    method_option :user, type: :boolean, aliases: %w(-u),
+      desc: "Include the ssh username in front of the hostname for easy SSH scripting"
+    method_option :account, type: :string, aliases: %w(-c),
+      required: true, default: '',
+      desc: "Find environment in this account"
+    method_option :environment, type: :string, aliases: %w(-e),
+      required: true, default: '',
+      desc: "Show servers in environment matching environment name"
+    method_option :all, type: :boolean, aliases: %(-A),
+      desc: "Show all servers (for compatibility only, this is the default for this command)"
+    method_option :app_master, type: :boolean,
+      desc: "Show only app master server"
+    method_option :app_servers, type: :boolean, aliases: %w(--app),
+      desc: "Show only application servers"
+    method_option :db_servers, type: :boolean, aliases: %w(--db),
+      desc: "Show only database servers"
+    method_option :db_master, type: :boolean,
+      desc: "Show only the master database server"
+    method_option :db_slaves, type: :boolean,
+      desc: "Show only the slave database servers"
+    method_option :utilities, type: :array, lazy_default: true, aliases: %w(--util),
+      desc: "Show only utility servers or only utility servers with the given names"
     def servers
       if options[:environment] == '' && options[:account] == ''
         repo.fail_on_no_remotes!
@@ -345,7 +359,8 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
       end
 
       username = options[:user] && environment.username
-      servers = environment.instances
+
+      servers = filter_servers(environment, options, default: {all: true})
 
       if options[:host]
         ui.print_hostnames(servers, username)
@@ -367,12 +382,12 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
       successfully completed.
     DESC
 
-    method_option :environment, :type => :string, :aliases => %w(-e),
-      :required => true, :default => '',
-      :desc => "Environment to rebuild"
-    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 :environment, type: :string, aliases: %w(-e),
+      required: true, default: '',
+      desc: "Environment to rebuild"
+    method_option :account, type: :string, aliases: %w(-c),
+      required: true, default: '',
+      desc: "Name of the account in which the environment can be found"
     def rebuild
       environment = fetch_environment(options[:environment], options[:account])
       ui.info "Updating instances on #{environment.hierarchy_name}"
@@ -386,19 +401,19 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
       remote server(s) to restart application servers.
     DESC
 
-    method_option :environment, :type => :string, :aliases => %w(-e),
-      :required => true, :default => '',
-      :desc => "Environment in which to roll back the application"
-    method_option :app, :type => :string, :aliases => %w(-a),
-      :required => true, :default => '',
-      :desc => "Name of the application to roll back"
-    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"
-    method_option :config, :type => :hash, :default => {}, :aliases => %w(--extra-deploy-hook-options),
-      :desc => "Hash made available in deploy hooks (in the 'config' hash), can also override some ey.yml settings."
+    method_option :environment, type: :string, aliases: %w(-e),
+      required: true, default: '',
+      desc: "Environment in which to roll back the application"
+    method_option :app, type: :string, aliases: %w(-a),
+      required: true, default: '',
+      desc: "Name of the application to roll back"
+    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"
+    method_option :config, type: :hash, default: {}, aliases: %w(--extra-deploy-hook-options),
+      desc: "Hash made available in deploy hooks (in the 'config' hash), can also override some ey.yml settings."
     def rollback
       app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
       env_config    = config.environment_config(app_env.environment_name)
@@ -421,7 +436,7 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
     desc "ssh [COMMAND] [--all] [--environment ENVIRONMENT]", "Open an ssh session to the master app server, or run a command."
     long_desc <<-DESC
       If a command is supplied, it will be run, otherwise a session will be
-      opened. The application master is used for environments with clusters.
+      opened. The bridge server (app master) is used for environments with multiple instances.
 
       Option --all requires a command to be supplied and runs it on all servers or
       pass --each to connect to each server one after another.
@@ -431,36 +446,37 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
 
       $ #{banner_base} ssh "rm -f /some/file" -e my-environment --all
     DESC
-    method_option :environment, :type => :string, :aliases => %w(-e),
-      :required => true, :default => '',
-      :desc => "Environment to ssh into"
-    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),
-      :desc => "Run command on all servers"
-    method_option :app_servers, :type => :boolean,
-      :desc => "Run command on all application servers"
-    method_option :db_servers, :type => :boolean,
-      :desc => "Run command on the database servers"
-    method_option :db_master, :type => :boolean,
-      :desc => "Run command on the master database server"
-    method_option :db_slaves, :type => :boolean,
-      :desc => "Run command on the slave database servers"
-    method_option :utilities, :type => :array, :lazy_default => true,
-      :desc => "Run command on the utility servers with the given names. If no names are given, run on all utility servers."
-    method_option :shell, :type => :string, :default => 'bash', :aliases => %w(-s),
-      :desc => "Run command in a shell other than bash. Use --no-shell to run the command without a shell."
-    method_option :pty, :type => :boolean, :default => false, :aliases => %w(-t),
-      :desc => "If a command is given, run in a pty. Required for interactive commands like sudo."
-    method_option :bind_address, :type => :string, :aliases => %w(-L),
-      :desc => "When a command is not given, pass -L to the ssh command."
-    method_option :each, :type => :boolean, :default => false,
-      :desc => "If no command is given, connect to multiple servers each one after another, instead of exiting with an error."
+    method_option :environment, type: :string, aliases: %w(-e),
+      required: true, default: '',
+      desc: "Environment to ssh into"
+    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),
+      desc: "Run command on all servers"
+    method_option :app_servers, type: :boolean,
+      desc: "Run command on all application servers"
+    method_option :db_servers, type: :boolean,
+      desc: "Run command on the database servers"
+    method_option :db_master, type: :boolean,
+      desc: "Run command on the master database server"
+    method_option :db_slaves, type: :boolean,
+      desc: "Run command on the slave database servers"
+    method_option :utilities, type: :array, lazy_default: true,
+      desc: "Run command on the utility servers with the given names. If no names are given, run on all utility servers."
+    method_option :shell, type: :string, default: 'bash', aliases: %w(-s),
+      desc: "Run command in a shell other than bash. Use --no-shell to run the command without a shell."
+    method_option :pty, type: :boolean, default: false, aliases: %w(-t),
+      desc: "If a command is given, run in a pty. Required for interactive commands like sudo."
+    method_option :bind_address, type: :string, aliases: %w(-L),
+      desc: "When a command is not given, pass -L to the ssh command."
+    method_option :each, type: :boolean, default: false,
+      desc: "If no command is given, connect to multiple servers each one after another, instead of exiting with an error."
 
     def ssh(cmd=nil)
       environment = fetch_environment(options[:environment], options[:account])
-      instances = ssh_hosts(options, environment)
+      instances = filter_servers(environment, options, default: {app_master: true})
+      user = environment.username
       ssh_opts = []
 
       if cmd
@@ -488,7 +504,8 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
 
       trap(:INT) { abort "Aborting..." }
 
-      exits = instances.map do |instance|
+      exits = []
+      instances.each do |instance|
         host = instance.public_hostname
         name = instance.name ? "#{instance.role} (#{instance.name})" : instance.role
         ui.info "\nConnecting to #{name} #{host}..."
@@ -496,37 +513,122 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
           ui.info "Ctrl + C to abort"
           sleep 1.3
         end
-        system Escape.shell_command((ssh_cmd + ["#{environment.username}@#{host}"] + [cmd]).compact)
-        $?.exitstatus
+        sshcmd = Escape.shell_command((ssh_cmd + ["#{user}@#{host}"] + [cmd]).compact)
+        ui.debug "$ #{sshcmd}"
+        system sshcmd
+        exits << $?.exitstatus
       end
 
       exit exits.detect {|status| status != 0 } || 0
     end
 
-    no_tasks do
-      def ssh_host_filter(opts)
-        return lambda {|instance| true }                                                if opts[:all]
-        return lambda {|instance| %w(solo app app_master    ).include?(instance.role) } if opts[:app_servers]
-        return lambda {|instance| %w(solo db_master db_slave).include?(instance.role) } if opts[:db_servers ]
-        return lambda {|instance| %w(solo db_master         ).include?(instance.role) } if opts[:db_master  ]
-        return lambda {|instance| %w(db_slave               ).include?(instance.role) } if opts[:db_slaves  ]
-        return lambda {|instance| %w(util).include?(instance.role) && opts[:utilities].include?(instance.name) } if opts[:utilities]
-        return lambda {|instance| %w(solo app_master        ).include?(instance.role) }
+    desc "scp [FROM_PATH] [TO_PATH] [--all] [--environment ENVIRONMENT]", "scp a file to/from multiple servers in an environment"
+    long_desc <<-DESC
+      Use the system `scp` command to copy files to some or all of the servers.
+
+      If `HOST:` is found in the FROM_PATH or TO_PATH, the server name will be
+      substituted in place of `HOST:` when scp is run. This allows you to scp in
+      either direction by putting `HOST:` in the FROM_PATH or TO_PATH, as follows:
+
+      $ #{banner_base} scp example.json HOST:/data/app_name/current/config/ -e env --app-servers
+
+      $ #{banner_base} scp HOST:/data/app_name/current/config/example.json ./ -e env --app-servers
+
+      If `HOST:` is not specified, TO_PATH will be used as the remote path.
+      Be sure to escape shell words so they don't expand locally (e.g. '~').
+
+      Note: this command is a bit picky about its ordering. FROM_PATH TO_PATH
+      must follow immediately after `ey scp` with no flags in between.
+    DESC
+    method_option :environment, :type => :string, :aliases => %w(-e),
+      :required => true, :default => '',
+      :desc => "Name of the destination environment"
+    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),
+      :desc => "scp to all servers"
+    method_option :app_servers, :type => :boolean,
+      :desc => "scp to all application servers"
+    method_option :db_servers, :type => :boolean,
+      :desc => "scp to database servers"
+    method_option :db_master, :type => :boolean,
+      :desc => "scp to the master database server"
+    method_option :db_slaves, :type => :boolean,
+      :desc => "scp to the slave database servers"
+    method_option :utilities, :type => :array, :lazy_default => true,
+      :desc => "scp to all utility servers or only those with the given names"
+
+    def scp(from_path, to_path)
+      environment = fetch_environment(options[:environment], options[:account])
+      instances   = filter_servers(environment, options, default: {app_master: true})
+      user        = environment.username
+
+      ui.info "Copying '#{from_path}' to '#{to_path}' on #{instances.count} server#{instances.count == 1 ? '' : 's'} serially..."
+
+      # default to `scp FROM_PATH HOST:TO_PATH`
+      unless [from_path, to_path].detect { |path| path =~ /HOST:/ }
+        to_path = "HOST:#{to_path}"
       end
 
-      def ssh_hosts(opts, environment)
-        if opts[:utilities] and not opts[:utilities].respond_to?(:include?)
-          includes_everything = []
-          class << includes_everything
-            def include?(*) true end
-          end
-          filter = ssh_host_filter(opts.merge(:utilities => includes_everything))
+      exits = []
+      instances.each do |instance|
+        host = instance.public_hostname
+        authority = "#{user}@#{host}:"
+
+        name = instance.name ? "#{instance.role} (#{instance.name})" : instance.role
+        ui.info "# #{name} #{host}"
+
+        from = from_path.sub(/^HOST:/, authority)
+        to   =   to_path.sub(/^HOST:/, authority)
+
+        cmd  = Escape.shell_command(["scp", from, to])
+        ui.debug "$ #{cmd}"
+        system cmd
+        exits << $?.exitstatus
+      end
+
+      exit exits.detect {|status| status != 0 } || 0
+    end
+
+    no_tasks do
+      OPT_TO_ROLES = {
+        all:         %w[all],
+        app_master:  %w[solo app_master],
+        app_servers: %w[solo app app_master],
+        db_servers:  %w[solo db_master db_slave],
+        db_master:   %w[solo db_master],
+        db_slaves:   %w[db_slave],
+        utilities:   %w[util],
+      }
+
+      def filter_servers(environment, cli_opts, filter_opts)
+        if (cli_opts.keys.map(&:to_sym) & OPT_TO_ROLES.keys).any?
+          options = cli_opts.dup
+        else
+          options = filter_opts[:default].dup
+        end
+
+        options.keep_if {|k,v| OPT_TO_ROLES.has_key?(k.to_sym) }
+
+        if options[:all]
+          instances = environment.instances
         else
-          filter = ssh_host_filter(opts)
+          roles = {}
+          options.each do |cli_opt,cli_val|
+            if cli_val && OPT_TO_ROLES.has_key?(cli_opt.to_sym)
+              OPT_TO_ROLES[cli_opt.to_sym].each do |role|
+                roles[role] = cli_val # val is true or an array of strings
+              end
+            end
+          end
+          instances = environment.select_instances(roles)
+        end
+
+        if instances.empty?
+          raise NoInstancesError.new(environment.name)
         end
 
-        instances = environment.instances.select {|instance| filter[instance] }
-        raise NoInstancesError.new(environment.name) if instances.empty?
         return instances
       end
     end
@@ -537,12 +639,12 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
       recipes were uploaded to the environment & run, their logs will also be
       displayed beneath the main configuration logs.
     DESC
-    method_option :environment, :type => :string, :aliases => %w(-e),
-      :required => true, :default => '',
-      :desc => "Environment with the interesting logs"
-    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 :environment, type: :string, aliases: %w(-e),
+      required: true, default: '',
+      desc: "Environment with the interesting logs"
+    method_option :account, type: :string, aliases: %w(-c),
+      required: true, default: '',
+      desc: "Name of the account in which the environment can be found"
     def logs
       environment = fetch_environment(options[:environment], options[:account])
       environment.logs.each do |log|
@@ -618,15 +720,15 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
     end
 
     desc "launch [--app APP] [--environment ENVIRONMENT] [--account ACCOUNT]", "Open application in browser."
-    method_option :environment, :type => :string, :aliases => %w(-e),
-      :required => true, :default => '',
-      :desc => "Environment where the application is deployed"
-    method_option :app, :type => :string, :aliases => %w(-a),
-      :required => true, :default => '',
-      :desc => "Name of the application"
-    method_option :account, :type => :string, :aliases => %w(-c),
-      :required => true, :default => '',
-      :desc => "Name of the account in which the application can be found"
+    method_option :environment, type: :string, aliases: %w(-e),
+      required: true, default: '',
+      desc: "Environment where the application is deployed"
+    method_option :app, type: :string, aliases: %w(-a),
+      required: true, default: '',
+      desc: "Name of the application"
+    method_option :account, type: :string, aliases: %w(-c),
+      required: true, default: '',
+      desc: "Name of the account in which the application can be found"
     def launch
       app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
       Launchy.open(app_env.uri)