engineyard 2.3.3 → 3.0.0

data/lib/engineyard/cli/api.rb

@@ -10,7 +10,7 @@ module EY
       attr_reader :token
 
       def initialize(endpoint, ui, token = nil)
-        @client = EY::CloudClient.new(:endpoint => endpoint, :output => ui.out, :user_agent => USER_AGENT)
+        @client = EY::CloudClient.new(endpoint: endpoint, output: ui.out, user_agent: USER_AGENT)
         @ui = ui
         @eyrc = EY::EYRC.load
         token_from('--api-token') { token } ||

data/lib/engineyard/cli/recipes.rb

@@ -13,12 +13,12 @@ module EY
         you run '#{banner_base} recipes apply'.
       DESC
 
-      method_option :environment, :type => :string, :aliases => %w(-e),
-        :required => true, :default => '',
-        :desc => "Environment in which to apply recipes"
-      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 in which to apply recipes"
+      method_option :account, type: :string, aliases: %w(-c),
+        required: true, default: '',
+        desc: "Name of the account in which the environment can be found"
       def apply
         environment = fetch_environment(options[:environment], options[:account])
         apply_recipes(environment)
@@ -38,17 +38,17 @@ module EY
         and also automatically each time you update/rebuild your instances.
       DESC
 
-      method_option :environment, :type => :string, :aliases => %w(-e),
-        :required => true, :default => '',
-        :desc => "Environment that will receive the recipes"
-      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 :apply, :type => :boolean,
-        :desc => "Apply the recipes immediately after they are uploaded"
-      method_option :file, :type => :string, :aliases => %w(-f),
-        :required => true, :default => '',
-        :desc => "Specify a gzipped tar file (.tgz) for upload instead of cookbooks/ directory"
+      method_option :environment, type: :string, aliases: %w(-e),
+        required: true, default: '',
+        desc: "Environment that will receive the recipes"
+      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 :apply, type: :boolean,
+        desc: "Apply the recipes immediately after they are uploaded"
+      method_option :file, type: :string, aliases: %w(-f),
+        required: true, default: '',
+        desc: "Specify a gzipped tar file (.tgz) for upload instead of cookbooks/ directory"
       def upload
         environment = fetch_environment(options[:environment], options[:account])
         upload_recipes(environment, options[:file])
@@ -80,7 +80,11 @@ module EY
           end
 
           recipes_file = Tempfile.new("recipes")
+
           cmd = "tar czf '#{recipes_file.path}' cookbooks/"
+          if FileTest.exist?("data_bags")
+            cmd = cmd + " data_bags/"
+          end
 
           unless system(cmd)
             raise EY::Error, "Could not archive recipes.\nCommand `#{cmd}` exited with an error."
@@ -97,12 +101,12 @@ module EY
 
         If the cookbooks directory already exists, an error will be raised.
       DESC
-      method_option :environment, :type => :string, :aliases => %w(-e),
-        :required => true, :default => '',
-        :desc => "Environment for which to download the recipes"
-      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 for which to download the recipes"
+      method_option :account, type: :string, aliases: %w(-c),
+        required: true, default: '',
+        desc: "Name of the account in which the environment can be found"
       def download
         if File.exist?('cookbooks')
           raise EY::Error, "Cannot download recipes, cookbooks directory already exists."

data/lib/engineyard/cli/ui.rb

@@ -255,7 +255,7 @@ module EY
       end
 
       def print_help(table)
-        print_table(table, :ident => 2, :truncate => true, :colwidth => 20)
+        print_table(table, ident: 2, truncate: true, colwidth: 20)
       end
 
       def set_color(string, color, bold=false)

data/lib/engineyard/cli/web.rb

@@ -3,17 +3,17 @@ module EY
     class Web < EY::Thor
       desc "enable [--environment/-e ENVIRONMENT]",
         "Remove the maintenance page for this application in the given environment."
-      method_option :environment, :type => :string, :aliases => %w(-e),
-        :required => true, :default => '',
-        :desc => "Environment on which to take down the maintenance page"
-      method_option :app, :type => :string, :aliases => %w(-a),
-        :required => true, :default => '',
-        :desc => "Name of the application whose maintenance page will be removed"
-      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 :environment, type: :string, aliases: %w(-e),
+        required: true, default: '',
+        desc: "Environment on which to take down the maintenance page"
+      method_option :app, type: :string, aliases: %w(-a),
+        required: true, default: '',
+        desc: "Name of the application whose maintenance page will be removed"
+      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 enable
         app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
         ui.info "Taking down maintenance page for '#{app_env.app.name}' in '#{app_env.environment.name}'"
@@ -33,17 +33,17 @@ module EY
         * public/maintenance.html
         * public/system/maintenance.html.default
       DESC
-      method_option :environment, :type => :string, :aliases => %w(-e),
-        :required => true, :default => '',
-        :desc => "Environment on which to put up the maintenance page"
-      method_option :app, :type => :string, :aliases => %w(-a),
-        :required => true, :default => '',
-        :desc => "Name of the application whose maintenance page will be put up"
-      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 :environment, type: :string, aliases: %w(-e),
+        required: true, default: '',
+        desc: "Environment on which to put up the maintenance page"
+      method_option :app, type: :string, aliases: %w(-a),
+        required: true, default: '',
+        desc: "Name of the application whose maintenance page will be put up"
+      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 disable
         app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
         ui.info "Putting up maintenance page for '#{app_env.app.name}' in '#{app_env.environment.name}'"
@@ -59,17 +59,17 @@ module EY
 
         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"
+      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}"

data/lib/engineyard/serverside_runner.rb

@@ -71,9 +71,9 @@ module EY
     def instances_data(instances, bridge)
       instances.map do |i|
         {
-          :hostname => i.hostname == bridge ? 'localhost' : i.hostname,
-          :roles    => [i.role],
-          :name     => i.name,
+          hostname: i.hostname == bridge ? 'localhost' : i.hostname,
+          roles:    [i.role],
+          name:     i.name,
         }
       end
     end
@@ -115,7 +115,8 @@ Authentication Failed. Things to fix:
           level = debug.downcase.to_sym
         end
       end
-      {:paranoid => false, :verbose => level, :keepalive => true, :keepalive_interval => 60}
+
+      {paranoid: false, verbose: level, keepalive: true, keepalive_interval: 60}
     end
 
     def ssh(cmd, hostname, username, out, err)
@@ -143,6 +144,9 @@ Authentication Failed. Things to fix:
             channel.on_request("exit-signal") do |_, data|
               exit_code = 255
             end
+
+            # sending eof declares no more data coming from this end (close stdin)
+            channel.eof!
           end
         end
 

data/lib/engineyard/templates/ey.yml.erb

@@ -38,7 +38,10 @@ defaults:
   #
   # By default, assets are detected using app/assets and config/application.rb.
   #
-  # If you use rails assets, set this to true.
+  # If you use rails assets and you want Engine Yard to compile your assets
+  # during deploy, set this to true. If you want to compile assets locally
+  # before deploy, set this to false. Make sure you add `public/assets` to
+  # `.gitignore` if you want Engine Yard to precompile your assets.
   #
   # For more control over assets, set precompile_assets: false and
   # run your precompile task in the deploy/before_compile_assets.rb deploy hook.

data/lib/engineyard/thor.rb

@@ -31,11 +31,11 @@ module EY
 
     def serverside_runner(app_env, verbose, serverside_version = serverside_version, ignore_bad_bridge = false)
       ServersideRunner.new({
-        :bridge             => app_env.environment.bridge!(ignore_bad_bridge).hostname,
-        :app                => app_env.app,
-        :environment        => app_env.environment,
-        :verbose            => verbose,
-        :serverside_version => serverside_version
+        bridge:             app_env.environment.bridge!(ignore_bad_bridge).hostname,
+        app:                app_env.app,
+        environment:        app_env.environment,
+        verbose:            verbose,
+        serverside_version: serverside_version
       })
     end
 
@@ -52,9 +52,9 @@ module EY
       environment_name ||= use_default_environment
       remotes = repo.remotes if in_repo?
       constraints = {
-        :environment_name => environment_name,
-        :account_name     => account_name,
-        :remotes          => remotes,
+        environment_name: environment_name,
+        account_name:     account_name,
+        remotes:          remotes,
       }
 
       resolver = api.resolve_environments(constraints)
@@ -84,10 +84,10 @@ module EY
       environment_name ||= use_default_environment
       remotes = repo.remotes if in_repo?
       constraints = {
-        :app_name         => app_name,
-        :environment_name => environment_name,
-        :account_name     => account_name,
-        :remotes          => remotes,
+        app_name:         app_name,
+        environment_name: environment_name,
+        account_name:     account_name,
+        remotes:          remotes,
       }
 
       if constraints.all? { |k,v| v.nil? || v.empty? || v.to_s.empty? }

data/lib/engineyard/version.rb

@@ -1,4 +1,4 @@
 module EY
-  VERSION = '2.3.3'
-  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.3.9'
+  VERSION = '3.0.0'
+  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.4.2'
 end

data/spec/ey/scp_spec.rb

@@ -0,0 +1,176 @@
+require 'spec_helper'
+
+shared_examples_for "running ey scp" do
+  given "integration"
+
+  def extra_ey_options
+    {:prepend_to_path => {'scp' => "#!/bin/sh\necho scp $*"}}
+  end
+end
+
+shared_examples_for "running ey scp for select role" do
+  given "integration"
+
+  def extra_ey_options
+    {:prepend_to_path => {'scp' => "#!/bin/sh\necho scp $*"}}
+  end
+
+  def command_to_run(opts)
+    cmd = ["scp", opts[:from], opts[:to]].compact + (@scp_flag || [])
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--quiet"                             if opts[:quiet]
+    cmd
+  end
+
+  it "runs the command on the right servers" do
+    login_scenario "one app, one environment"
+    ey command_to_run(from: "from", to: "to", environment: 'giblets', verbose: true)
+    @hosts.each do |host_prefix|
+      @raw_ssh_commands.grep(/^scp from turkey@#{host_prefix}.+:to$/).should_not be_empty
+    end
+    @raw_ssh_commands.grep(/^scp from turkey@.+:to$/).count.should == @hosts.count
+  end
+
+  it "is quiet" do
+    login_scenario "one app, one environment"
+    ey command_to_run(from: "from", to: "to", environment: 'giblets', quiet: true)
+    @out.should =~ /scp.*from.*to/
+    @out.should_not =~ /Loading application data/
+  end
+
+  it "raises an error when there are no matching hosts" do
+    login_scenario "one app, one environment, no instances"
+    ey command_to_run({from: "from", to: "to", environment: 'giblets', verbose: true}), expect_failure: true
+  end
+
+  it "errors correctly when no file paths are specified" do
+    login_scenario "one app, one environment"
+    ey command_to_run({environment: 'giblets', verbose: true}), expect_failure: true
+    ey command_to_run({from: "from", environment: 'giblets', verbose: true}), expect_failure: true
+  end
+end
+
+describe "ey scp" do
+  include_examples "running ey scp"
+
+  before(:all) do
+    login_scenario "one app, many environments"
+  end
+
+  it "complains if it has no app master" do
+    ey %w[scp from to -e bakon], :expect_failure => true
+    @err.should =~ /'bakon' does not have any matching instances/
+  end
+
+end
+
+describe "ey scp with an ambiguous git repo" do
+  include_examples "running ey scp"
+  def command_to_run(_) %w[scp from to] end
+  include_examples "it requires an unambiguous git repo"
+end
+
+describe "ey scp" do
+  include_examples "running ey scp"
+
+  def command_to_run(opts)
+    cmd = %w[scp HOST:from to]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--account"     << opts[:account]     if opts[:account]
+    cmd
+  end
+
+  def verify_ran(scenario)
+    scp_target = scenario[:ssh_username] + '@' + scenario[:master_hostname]
+    @raw_ssh_commands.should == ["scp #{scp_target}:from to"]
+  end
+
+  include_examples "it takes an environment name and an account name"
+end
+
+describe "ey scp --all" do
+  before do
+    @scp_flag = %w[--all]
+    @hosts = %w(app_hostname
+                app_master_hostname
+                util_fluffy_hostname
+                util_rocky_hostname
+                db_master_hostname
+                db_slave_1_hostname
+                db_slave_2_hostname)
+  end
+
+  include_examples "running ey scp"
+  include_examples "running ey scp for select role"
+end
+
+describe "ey scp --app-servers" do
+  before do
+    @scp_flag = %w[--app-servers]
+    @hosts = %w(app_hostname app_master_hostname)
+  end
+
+  include_examples "running ey scp"
+  include_examples "running ey scp for select role"
+end
+
+describe "ey scp --db-master" do
+  before do
+    @scp_flag = %w[--db-master]
+    @hosts = %w(db_master_hostname)
+  end
+
+  include_examples "running ey scp"
+  include_examples "running ey scp for select role"
+end
+
+describe "ey scp --db-slaves" do
+  before do
+    @scp_flag = %w[--db-slaves]
+    @hosts = %w(db_slave_1_hostname db_slave_2_hostname)
+  end
+
+  include_examples "running ey scp"
+  include_examples "running ey scp for select role"
+end
+
+describe "ey scp --db-servers" do
+  before do
+    @scp_flag = %w[--db-servers]
+    @hosts = %w(db_master_hostname db_slave_1_hostname db_slave_2_hostname)
+  end
+
+  include_examples "running ey scp"
+  include_examples "running ey scp for select role"
+end
+
+describe "ey scp --utilities" do
+  before do
+    @scp_flag = %w[--utilities]
+    @hosts = %w(util_fluffy_hostname util_rocky_hostname)
+  end
+
+  include_examples "running ey scp"
+  include_examples "running ey scp for select role"
+end
+
+describe "ey scp --utilities fluffy" do
+  before do
+    @scp_flag = %w[--utilities fluffy]
+    @hosts = %w(util_fluffy_hostname)
+  end
+
+  include_examples "running ey scp"
+  include_examples "running ey scp for select role"
+end
+
+describe "ey scp --utilities fluffy rocky" do
+  before do
+    @scp_flag = %w[--utilities fluffy rocky]
+    @hosts = %w(util_fluffy_hostname util_rocky_hostname)
+  end
+
+  include_examples "running ey scp"
+  include_examples "running ey scp for select role"
+end
+