engineyard 2.2.1 → 2.3.0

data/spec/ey/deploy_spec.rb

@@ -37,7 +37,7 @@ describe "ey deploy" do
     cmd << "--account"     << opts[:account]     if opts[:account]
     cmd << "--ref"         << opts[:ref]         if opts[:ref]
     cmd << "--migrate"                           if opts[:migrate]
-    cmd                    << opts[:migrate]     if opts[:migrate].respond_to?(:str)
+    cmd                    << opts[:migrate]     if opts[:migrate].respond_to?(:to_str)
     cmd << "--no-migrate"                        if opts[:migrate] == nil
     cmd << "--verbose"                           if opts[:verbose]
     cmd
@@ -108,12 +108,7 @@ describe "ey deploy" do
       login_scenario "one app, one environment"
     end
 
-    it "finds engineyard-serverside despite its being buried in the filesystem" do
-      fast_ey %w[deploy --no-migrate]
-      @ssh_commands.last.should =~ %r{/usr/local/ey_resin/ruby/bin/engineyard-serverside}
-    end
-
-    context "without migrate sepecified, interactively reads migration command" do
+    context "no ey.yml" do
       def clean_ey_yml
         File.unlink 'ey.yml' if File.exist?('ey.yml')
         FileUtils.rm_r 'config' if FileTest.exist?('config')
@@ -122,48 +117,16 @@ describe "ey deploy" do
       before { clean_ey_yml }
       after  { clean_ey_yml }
 
-      it "defaults to yes, and then rake db:migrate (and installs to config/ey.yml if config/ exists already)" do
-        ey_yml = Pathname.new('config/ey.yml')
-        File.exist?('ey.yml').should be_false
-        ey_yml.dirname.mkpath
-        ey_yml.should_not be_exist
-        ey(%w[deploy]) do |input|
-          input.puts('')
-          input.puts('')
-        end
-        @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
-        @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)['defaults']
-        env_conf['migrate'].should == true
-        env_conf['migration_command'].should == 'rake db:migrate'
+      it "tells you to run ey init" do
+        fast_failing_ey %w[deploy]
+        @err.should match(/ey init/)
+        @ssh_commands.should be_empty
       end
 
-      it "accepts new commands" do
-        File.exist?('ey.yml').should be_false
-        FileTest.exist?('config').should be_false
-        ey(%w[deploy], :hide_err => true) do |input|
-          input.puts("y")
-          input.puts("ruby migrate")
-        end
-        @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')['defaults']
-        env_conf['migrate'].should == true
-        env_conf['migration_command'].should == 'ruby migrate'
-      end
-
-      it "doesn't ask for the command if you say no" do
-        File.exist?('ey.yml').should be_false
-        ey(%w[deploy], :hide_err => true) do |input|
-          input.puts("no")
-        end
-        @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
-        @ssh_commands.last.should_not =~ /--migrate/
-        File.exist?('ey.yml').should be_true
-        read_yaml('ey.yml')['defaults']['migrate'].should == false
+      it "tells you to run ey init" do
+        fast_failing_ey %w[deploy --migrate]
+        @err.should match(/ey init/)
+        @ssh_commands.should be_empty
       end
     end
 
@@ -173,40 +136,48 @@ describe "ey deploy" do
       @ssh_commands.last.should_not =~ /--migrate/
     end
 
-    it "uses the default when --migrate is specified with no value" do
-      fast_ey %w[deploy --migrate]
-      @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
+    it "runs the migrate command when one is given" do
+      fast_ey ['deploy', '--migrate', 'thor fancy:migrate']
+      @ssh_commands.last.should match(/--migrate 'thor fancy:migrate'/)
     end
 
-    context "customized in ey.yml with defaults" do
-      before { write_yaml({"defaults" => { "migration_command" => "thor fancy:migrate"}}, 'ey.yml') }
+    context "ey.yml migrate only" do
+      before { write_yaml({"defaults" => {"migrate" => true}}, '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')['defaults']['migrate'].should == true
+      it "tells you to run ey init" do
+        fast_failing_ey %w[deploy]
+        @err.should match(/ey init/)
       end
     end
 
-    context "customized in ey.yml with environment specific options overriding the defaults" do
+    context "ey.yml migration_command only" do
+      before { write_yaml({"defaults" => {"migration_command" => "thor fancy:migrate"}}, 'ey.yml') }
+      after  { File.unlink 'ey.yml' }
+
+      it "tells you to run ey init" do
+        fast_failing_ey %w[deploy]
+        @err.should match(/ey init/)
+      end
+    end
+
+    context "ey.yml with environment specific options overriding the defaults" do
       before do
         write_yaml({
-          "defaults" => { "migration_command" => "rake plain:migrate"},
+          "defaults" => { "migrate" => true, "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
+      it "migrates with the custom command" do
         fast_ey %w[deploy]
         @ssh_commands.last.should =~ /--migrate 'thor fancy:migrate'/
-        read_yaml('ey.yml')['defaults']['migrate'].should == true
       end
     end
 
     context "disabled in ey.yml" do
-      before { write_yaml({"environments" => {"giblets" => {"migrate" => false}}}, 'ey.yml') }
+      before { write_yaml({"defaults" => {"migrate" => false}}, 'ey.yml') }
       after  { File.unlink 'ey.yml' }
 
       it "does not migrate by default" do
@@ -220,25 +191,14 @@ describe "ey deploy" do
         @ssh_commands.last.should =~ /--migrate 'rake fancy:migrate'/
       end
 
-      it "migrates with the default when --migrate is specified with no value" do
-        fast_ey %w[deploy --migrate]
-        @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
-      end
-    end
-
-    context "explicitly enabled in ey.yml (the default)" do
-      before { write_yaml({"environments" => {"giblets" => {"migrate" => true}}}, 'ey.yml') }
-      after  { File.unlink 'ey.yml' }
-
-      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')['defaults']['migration_command'].should == 'rake db:migrate'
+      it "tells you to initialize ey.yml when --migrate is specified with no value" do
+        fast_failing_ey %w[deploy --migrate]
+        @err.should match(/ey init/)
       end
     end
 
     context "customized and disabled in ey.yml" do
-      before { write_yaml({"environments" => {"giblets" => { "migrate" => false, "migration_command" => "thor fancy:migrate" }}}, 'ey.yml') }
+      before { write_yaml({"defaults" => { "migrate" => false, "migration_command" => "thor fancy:migrate" }}, 'ey.yml') }
       after  { File.unlink 'ey.yml' }
 
       it "does not migrate by default" do
@@ -298,21 +258,6 @@ describe "ey deploy" do
       end
     end
 
-    context "when there is extra configuration" do
-      before(:each) do
-        write_yaml({"environments" => {"giblets" => {"bert" => "ernie"}}}, 'ey.yml')
-      end
-
-      after(:each) do
-        File.unlink("ey.yml")
-      end
-
-      it "no longer gets passed along to engineyard-serverside (since serverside will read it on its own)" do
-        fast_ey %w[deploy --no-migrate]
-        @ssh_commands.last.should_not =~ /"bert":"ernie"/
-      end
-    end
-
     context "with a configured default branch" do
       before(:each) do
         write_yaml({"environments" => {"giblets" => {"branch" => "master", "migrate" => false}}}, 'ey.yml')
@@ -344,6 +289,21 @@ describe "ey deploy" do
     end
   end
 
+  context "when there is extra configuration" do
+    before(:each) do
+      write_yaml({"environments" => {"giblets" => {"migrate" => true, "migration_command" => "rake", "bert" => "ernie"}}}, 'ey.yml')
+    end
+
+    after(:each) do
+      File.unlink("ey.yml")
+    end
+
+    it "no longer gets passed along to engineyard-serverside (since serverside will read it on its own)" do
+      fast_ey %w[deploy --no-migrate]
+      @ssh_commands.last.should_not =~ /"bert":"ernie"/
+    end
+  end
+
   context "specifying an environment" do
     before(:all) do
       login_scenario "one app, many similarly-named environments"
@@ -386,7 +346,7 @@ describe "ey deploy" do
 
     context "when ey.yml is present" do
       before do
-        write_yaml({"environments" => {"giblets" => {"beer" => "stout", "migrate" => true}}}, 'ey.yml')
+        write_yaml({"environments" => {"giblets" => {"beer" => "stout", "migrate" => true, "migration_command" => "rake"}}}, 'ey.yml')
       end
 
       after { File.unlink("ey.yml") }
@@ -416,7 +376,7 @@ describe "ey deploy" do
       fast_ey %w[deploy --app rails232app --ref master --migrate]
       @ssh_commands.last.should match(/--app rails232app/)
       @ssh_commands.last.should match(/--ref resolved-master/)
-      @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
+      @ssh_commands.last.should match(/--migrate 'rake db:migrate --trace'/)
     end
 
     it "requires that you specify a ref when specifying the application" do
@@ -464,7 +424,7 @@ describe "ey deploy" do
     end
 
     it "passes along the repository URL to engineyard-serverside" do
-      @deploy_command.should =~ /--repo user@git.host:path\/to\/repo.git/
+      @deploy_command.should =~ /--git user@git.host:path\/to\/repo.git/
     end
 
     it "passes along the web server stack to engineyard-serverside" do

data/spec/ey/init_spec.rb

@@ -0,0 +1,123 @@
+require 'spec_helper'
+
+describe "ey init" do
+  given "integration"
+
+  let(:default_migration_command) { "rake db:migrate --trace" }
+
+  before do
+    login_scenario "one app, one environment"
+  end
+
+  before { clean_ey_yml }
+  after  { clean_ey_yml }
+
+  context "with no ey.yml file" do
+    it "writes the file" do
+      fast_ey %w[init]
+
+      expect(ey_yml).to exist
+      expect_config('migrate').to eq(false)
+    end
+  end
+
+  context "with existing ey.yml file" do
+    let(:existing) {
+      {
+        "defaults" => {
+          "migrate" => false,
+          "migration_command" => "thor fancy:migrate",
+          "precompile_assets" => false,
+          "precompile_assets_task" => "assets:precompile",
+        },
+        "environments" => {
+          "my_env" => {
+            "default" => true,
+            "migrate" => true,
+            "migration_command" => default_migration_command,
+          }
+        }
+      }
+    }
+
+    before do
+      write_yaml(existing, 'ey.yml')
+    end
+
+    it "reinitializes the file" do
+      fast_ey %w[init]
+
+      expect_config('defaults','migration_command').to eq("thor fancy:migrate")
+      expect_config('defaults','migrate').to eq(false)
+      expect_config('defaults','precompile_assets').to eq(false)
+
+      expect_config('environments','my_env','default').to eq(true)
+      expect_config('environments','my_env','migrate').to eq(true)
+      expect_config('environments','my_env','migration_command').to eq(default_migration_command)
+    end
+
+    it "makes a backup when overwriting an existing file" do
+      fast_ey %w[init]
+      data = read_yaml('ey.yml.backup')
+      expect(data['defaults']['migration_command']).to eq('thor fancy:migrate')
+    end
+  end
+
+  context "smart defaults" do
+    describe "migrate" do
+      let(:db) { Pathname.new('db') }
+      let(:db_migrate) { db.join('migrate') }
+
+      context "with db/migrate directory" do
+        before { db_migrate.mkpath }
+        after { db.rmtree }
+
+        it "sets migrate to true and uses default migration command" do
+          fast_ey %w[init]
+
+          expect_config('migrate').to eq(true)
+          expect_config('migration_command').to eq(default_migration_command)
+        end
+      end
+
+      context "without db/migrate directory" do
+        it "sets migrate to false and doesn't write migration_command" do
+          expect(db_migrate).to_not exist
+
+          fast_ey %w[init]
+
+          expect_config('migrate').to eq(false)
+          expect_config('migration_command').to be_nil
+        end
+      end
+    end
+
+    context "precompile_assets" do
+      let(:app) { Pathname.new('app') }
+      let(:assets) { app.join('assets') }
+
+      context "with app/assets directory" do
+        before { assets.mkpath }
+        after { app.rmtree }
+
+        it "sets precompile_assets to true and doesn't write precompile_assets_task" do
+          fast_ey %w[init]
+
+          expect_config('precompile_assets').to eq(true)
+          expect_config('precompile_assets_task').to be_nil
+        end
+      end
+
+      context "without app/assets directory" do
+        it "sets precompile_assets to false and does not set an precompile_assets_task" do
+          expect(assets).to_not exist
+
+          fast_ey %w[init]
+
+          expect_config('precompile_assets').to eq(false)
+          expect_config('precompile_assets_task').to be_nil
+        end
+      end
+    end
+  end
+end

data/spec/ey/rebuild_spec.rb

@@ -11,7 +11,7 @@ describe "ey rebuild" do
   end
 
   def verify_ran(scenario)
-    @out.should =~ /Updating instances on \w+\/#{scenario[:environment]}/
+    @out.should =~ /Updating instances on #{scenario[:account]} \/ #{scenario[:environment]}/
   end
 
   include_examples "it takes an environment name and an account name"

data/spec/ey/servers_spec.rb

@@ -0,0 +1,143 @@
+require 'spec_helper'
+
+describe "ey servers" do
+
+  given "integration"
+
+  def command_to_run(opts)
+    cmd = ["servers"]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--account"     << opts[:account]     if opts[:account]
+    cmd
+  end
+
+  def verify_ran(scenario)
+    @out.should match(/#{scenario[:environment]}/) if scenario[:environment]
+    @out.should match(/#{scenario[:account]}/) if scenario[:account]
+  end
+
+  include_examples "it takes an environment name and an account name"
+
+  context "with no servers" do
+    before do
+      login_scenario "empty"
+    end
+
+    it "prints error when no application found" do
+      fast_failing_ey %w[servers]
+      @err.should =~ /No application found/
+    end
+  end
+
+  context "with 1 server" do
+    before(:all) do
+      login_scenario "one app, many environments"
+    end
+
+    it "lists the servers with specified env" do
+      fast_ey %w[servers -e giblets]
+      @out.should =~ /main \/ giblets/
+      @out.should include('1 server ')
+    end
+  end
+
+  context "with servers" do
+    before(:all) do
+      login_scenario "two accounts, two apps, two environments, ambiguous"
+    end
+
+    it "lists the servers with specified env" do
+      fast_ey %w[servers -c main -e giblets]
+      @out.should include("# 7 servers on main / giblets")
+      @out.should include("app_master_hostname.compute-1.amazonaws.com \ti-ddbbdd92\tapp_master")
+      @out.should include("app_hostname.compute-1.amazonaws.com        \ti-d2e3f1b9\tapp")
+      @out.should include("db_master_hostname.compute-1.amazonaws.com  \ti-d4cdddbf\tdb_master")
+      @out.should include("db_slave_1_hostname.compute-1.amazonaws.com \ti-asdfasdfaj\tdb_slave  \tSlave I")
+      @out.should include("db_slave_2_hostname.compute-1.amazonaws.com \ti-asdfasdfaj\tdb_slave")
+      @out.should include("util_fluffy_hostname.compute-1.amazonaws.com\ti-80e3f1eb\tutil      \tfluffy")
+      @out.should include("util_rocky_hostname.compute-1.amazonaws.com \ti-80etf1eb\tutil      \trocky")
+    end
+
+    it "lists the servers with specified env with users" do
+      fast_ey %w[servers -c main -e giblets -u]
+      @out.should include("# 7 servers on main / giblets")
+      @out.should include("turkey@app_master_hostname.compute-1.amazonaws.com \ti-ddbbdd92\tapp_master")
+      @out.should include("turkey@app_hostname.compute-1.amazonaws.com        \ti-d2e3f1b9\tapp")
+      @out.should include("turkey@db_master_hostname.compute-1.amazonaws.com  \ti-d4cdddbf\tdb_master")
+      @out.should include("turkey@db_slave_1_hostname.compute-1.amazonaws.com \ti-asdfasdfaj\tdb_slave  \tSlave I")
+      @out.should include("turkey@db_slave_2_hostname.compute-1.amazonaws.com \ti-asdfasdfaj\tdb_slave")
+      @out.should include("turkey@util_fluffy_hostname.compute-1.amazonaws.com\ti-80e3f1eb\tutil      \tfluffy")
+      @out.should include("turkey@util_rocky_hostname.compute-1.amazonaws.com \ti-80etf1eb\tutil      \trocky")
+    end
+
+    it "lists simple format servers" do
+      fast_ey %w[servers -c main -e giblets -qs], :debug => false
+      @out.split(/\n/).map {|x| x.split(/\t/) }.should == [
+        ['app_master_hostname.compute-1.amazonaws.com',  'i-ddbbdd92',   'app_master'         ],
+        ['app_hostname.compute-1.amazonaws.com',         'i-d2e3f1b9',   'app'                ],
+        ['db_master_hostname.compute-1.amazonaws.com',   'i-d4cdddbf',   'db_master'          ],
+        ['db_slave_1_hostname.compute-1.amazonaws.com',  'i-asdfasdfaj', 'db_slave', 'Slave I'],
+        ['db_slave_2_hostname.compute-1.amazonaws.com',  'i-asdfasdfaj', 'db_slave'           ],
+        ['util_fluffy_hostname.compute-1.amazonaws.com', 'i-80e3f1eb',   'util',     'fluffy' ],
+        ['util_rocky_hostname.compute-1.amazonaws.com',  'i-80etf1eb',   'util',     'rocky'  ],
+      ]
+    end
+
+    it "lists simple format servers with users" do
+      fast_ey %w[servers -c main -e giblets -qsu], :debug => false
+      @out.split(/\n/).map {|x| x.split(/\t/) }.should == [
+        ['turkey@app_master_hostname.compute-1.amazonaws.com',  'i-ddbbdd92',   'app_master'         ],
+        ['turkey@app_hostname.compute-1.amazonaws.com',         'i-d2e3f1b9',   'app'                ],
+        ['turkey@db_master_hostname.compute-1.amazonaws.com',   'i-d4cdddbf',   'db_master'          ],
+        ['turkey@db_slave_1_hostname.compute-1.amazonaws.com',  'i-asdfasdfaj', 'db_slave', 'Slave I'],
+        ['turkey@db_slave_2_hostname.compute-1.amazonaws.com',  'i-asdfasdfaj', 'db_slave'           ],
+        ['turkey@util_fluffy_hostname.compute-1.amazonaws.com', 'i-80e3f1eb',   'util',     'fluffy' ],
+        ['turkey@util_rocky_hostname.compute-1.amazonaws.com',  'i-80etf1eb',   'util',     'rocky'  ],
+      ]
+    end
+
+    it "lists host only" do
+      fast_ey %w[servers -c main -e giblets -qS], :debug => false
+      @out.split(/\n/).should == [
+        'app_master_hostname.compute-1.amazonaws.com',
+        'app_hostname.compute-1.amazonaws.com',
+        'db_master_hostname.compute-1.amazonaws.com',
+        'db_slave_1_hostname.compute-1.amazonaws.com',
+        'db_slave_2_hostname.compute-1.amazonaws.com',
+        'util_fluffy_hostname.compute-1.amazonaws.com',
+        'util_rocky_hostname.compute-1.amazonaws.com',
+      ]
+    end
+
+    it "lists host only with users" do
+      fast_ey %w[servers -c main -e giblets -qSu], :debug => false
+      @out.split(/\n/).should == [
+        'turkey@app_master_hostname.compute-1.amazonaws.com',
+        'turkey@app_hostname.compute-1.amazonaws.com',
+        'turkey@db_master_hostname.compute-1.amazonaws.com',
+        'turkey@db_slave_1_hostname.compute-1.amazonaws.com',
+        'turkey@db_slave_2_hostname.compute-1.amazonaws.com',
+        'turkey@util_fluffy_hostname.compute-1.amazonaws.com',
+        'turkey@util_rocky_hostname.compute-1.amazonaws.com',
+      ]
+    end
+
+    it "finds no servers with gibberish " do
+      fast_failing_ey %w[servers --account main --environment gibberish]
+      @err.should include('No environment found matching "gibberish"')
+    end
+
+    it "finds no servers with gibberish account" do
+      fast_failing_ey %w[servers --account gibberish --environment giblets]
+      @err.should include('No account found matching "gibberish"')
+    end
+
+    it "reports failure to find a git repo when not in one" do
+      Dir.chdir(Dir.tmpdir) do
+        fast_failing_ey %w[servers]
+        @err.should =~ /fatal: Not a git repository \(or any of the parent directories\): .*#{Regexp.escape(Dir.tmpdir)}/
+        @out.should_not =~ /no application configured/
+      end
+    end
+  end
+end