engineyard 0.4.0 → 0.5.0

data/spec/ey/ey_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe "ey" do
   context "run without arguments" do
     it "prints usage information" do
-      ey.should include("Tasks:")
+      ey.should include("Commands:")
     end
   end
 
   context "run with an argument that is not a command" do
     it "tells the user that is not a command" do
       ey "foobarbaz", :expect_failure => true
-      @err.should include("Could not find task")
+      @err.should include("Could not find command")
     end
   end
 end

data/spec/ey/list_environments_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "ey environments" do
 
-  it_should_behave_like "an integration test"
+  given "integration"
 
   before(:all) do
     api_scenario "one app, two environments"

data/spec/ey/logs_spec.rb

@@ -1,19 +1,11 @@
 require 'spec_helper'
 
 describe "ey logs" do
-  it_should_behave_like "an integration test"
+  given "integration"
 
   it "prints logs returned by awsm" do
     api_scenario "one app, one environment"
-    ey "logs giblets"
-    @out.should match(/MAIN LOG OUTPUT/)
-    @out.should match(/CUSTOM LOG OUTPUT/)
-    @err.should be_empty
-  end
-
-  it "can infer the environment" do
-    api_scenario "one app, one environment"
-    ey "logs"
+    ey "logs -e giblets"
     @out.should match(/MAIN LOG OUTPUT/)
     @out.should match(/CUSTOM LOG OUTPUT/)
     @err.should be_empty
@@ -26,20 +18,18 @@ describe "ey logs" do
   end
 end
 
-describe "ey logs ENV" do
-  it_should_behave_like "an integration test"
+describe "ey logs" do
+  given "integration"
 
-  before(:all) do
-    api_scenario "one app, many similarly-named environments"
+  def command_to_run(opts)
+    cmd = "logs"
+    cmd << " --environment #{opts[:env]}" if opts[:env]
+    cmd
   end
 
-  it "works when given an unambiguous substring" do
-    ey "logs prod"
-    @out.should match(/MAIN LOG OUTPUT/)
+  def verify_ran(scenario)
+    @out.should match(/Main logs for #{scenario[:environment]}/)
   end
 
-  it "complains when given an ambiguous substring" do
-    ey "logs staging", :hide_err => true, :expect_failure => true
-    @err.should match(/'staging' is ambiguous/)
-  end
+  it_should_behave_like "it takes an environment name"
 end

data/spec/ey/rebuild_spec.rb

@@ -1,42 +1,17 @@
 require 'spec_helper'
 
 describe "ey rebuild" do
-  it_should_behave_like "an integration test"
+  given "integration"
 
-  before(:all) do
-    api_scenario "one app, one environment"
+  def command_to_run(opts)
+    cmd = "rebuild"
+    cmd << " --environment #{opts[:env]}" if opts[:env]
+    cmd
   end
 
-  it "works when the environment name is valid" do
-    ey "rebuild giblets", :debug => true
-    @out.should =~ /Rebuilding giblets/i
+  def verify_ran(scenario)
+    @out.should =~ /Rebuilding #{scenario[:environment]}/
   end
 
-  it "rebuilds the current environment by default" do
-    ey "rebuild", :debug => true
-    @out.should =~ /Rebuilding giblets/i
-  end
-
-  it "fails when the environment name is bogus" do
-    ey "rebuild typo", :expect_failure => true
-    @err.should match(/'typo'/)
-  end
-end
-
-describe "ey rebuild ENV" do
-  it_should_behave_like "an integration test"
-
-  before(:all) do
-    api_scenario "one app, many similarly-named environments"
-  end
-
-  it "works when given an unambiguous substring" do
-    ey "rebuild prod", :debug => true
-    @out.should =~ /Rebuilding railsapp_production/
-  end
-
-  it "complains when given an ambiguous substring" do
-    ey "rebuild staging", :hide_err => true, :expect_failure => true
-    @err.should =~ /'staging' is ambiguous/
-  end
+  it_should_behave_like "it takes an environment name"
 end

data/spec/ey/recipes/apply_spec.rb

@@ -1,42 +1,17 @@
 require 'spec_helper'
 
 describe "ey recipes apply" do
-  it_should_behave_like "an integration test"
+  given "integration"
 
-  before(:all) do
-    api_scenario "one app, one environment"
+  def command_to_run(opts)
+    cmd = "recipes apply"
+    cmd << " -e #{opts[:env]}" if opts[:env]
+    cmd
   end
 
-  it "works when the environment name is valid" do
-    ey "recipes apply giblets", :debug => true
-    @out.should =~ /Uploaded recipes started for giblets/i
+  def verify_ran(scenario)
+    @out.should =~ /Uploaded recipes started for #{scenario[:environment]}/
   end
 
-  it "runs recipes for the current environment by default" do
-    ey "recipes apply", :debug => true
-    @out.should =~ /Uploaded recipes started for giblets/i
-  end
-
-  it "fails when the environment name is bogus" do
-    ey "recipes apply typo", :expect_failure => true
-    @err.should match(/'typo'/)
-  end
+  it_should_behave_like "it takes an environment name"
 end
-
-describe "ey recipes apply ENV" do
-  it_should_behave_like "an integration test"
-
-  before(:all) do
-    api_scenario "one app, many similarly-named environments"
-  end
-
-  it "works when given an unambiguous substring" do
-    ey "recipes apply prod", :debug => true
-    @out.should =~ /Uploaded recipes started for railsapp_production/
-  end
-
-  it "complains when given an ambiguous substring" do
-    ey "recipes apply staging", :hide_err => true, :expect_failure => true
-    @err.should =~ /'staging' is ambiguous/
-  end
-end

data/spec/ey/recipes/download_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe "ey recipes download" do
+  given "integration"
+
+  after(:each) do
+    FileUtils.rm_rf('cookbooks')
+  end
+
+  def command_to_run(opts)
+    cmd = "recipes download"
+    cmd << " --environment #{opts[:env]}" if opts[:env]
+    cmd
+  end
+
+  def verify_ran(scenario)
+    @out.should =~ /Recipes downloaded successfully for #{scenario[:environment]}/
+    File.read('cookbooks/README').should == "Remove this file to clone an upstream git repository of cookbooks\n"
+  end
+
+  it_should_behave_like "it takes an environment name"
+
+  it "fails when cookbooks/ already exists" do
+    api_scenario "one app, one environment"
+    Dir.mkdir("cookbooks")
+    ey "recipes download", :expect_failure => true
+    @err.should match(/cookbooks.*already exists/i)
+  end
+end

data/spec/ey/recipes/upload_spec.rb

@@ -1,40 +1,23 @@
 require 'spec_helper'
 
 describe "ey recipes upload" do
-  it_should_behave_like "an integration test"
+  given "integration"
 
   define_git_repo('+cookbooks') do |git_dir|
     git_dir.join("cookbooks").mkdir
     File.open(git_dir.join("cookbooks/file"), "w"){|f| f << "boo" }
   end
-
   use_git_repo('+cookbooks')
 
-  it "posts the recipes to the correct url" do
-    api_scenario "one app, one environment"
-    ey "recipes upload giblets", :debug => true
-
-    @out.should =~ /Recipes uploaded successfully for giblets/i
-  end
-
-  it "errors correctly on bogus env name" do
-    api_scenario "one app, one environment"
-    ey "recipes upload bogusenv", :expect_failure => true
-
-    @err.should =~ /No environment named 'bogusenv'/
+  def command_to_run(opts)
+    cmd = "recipes upload"
+    cmd << " --environment #{opts[:env]}" if opts[:env]
+    cmd
   end
 
-  it "can infer the environment from the current application" do
-    api_scenario "one app, one environment"
-
-    ey "recipes upload", :debug => true
-    @out.should =~ /Recipes uploaded successfully for giblets/i
+  def verify_ran(scenario)
+    @out.should =~ /Recipes uploaded successfully for #{scenario[:environment]}/
   end
 
-  it "complains when it can't infer the environment from the current application" do
-    api_scenario "one app, one environment, not linked"
-
-    ey "recipes upload", :debug => true, :expect_failure => true
-    @err.should =~ /single environment/i
-  end
+  it_should_behave_like "it takes an environment name"
 end

data/spec/ey/rollback_spec.rb

@@ -1,50 +1,20 @@
 require 'spec_helper'
 
 describe "ey rollback" do
-  it_should_behave_like "an integration test"
+  given "integration"
 
-  before(:all) do
-    api_scenario "one app, one environment"
+  def command_to_run(opts)
+    cmd = "rollback"
+    cmd << " -e #{opts[:env]}" if opts[:env]
+    cmd
   end
 
-  it "works when the environment name is valid" do
-    ey "rollback giblets", :debug => true
-    @out.should match(/rolling back giblets/i)
+  def verify_ran(scenario)
+    @out.should match(/Rolling back #{scenario[:environment]}/)
     @err.should be_empty
-    @ssh_commands.last.should match(/eysd deploy rollback --app rails232app/)
+    @ssh_commands.last.should match(/eysd deploy rollback --app #{scenario[:application]}/)
   end
 
-  it "rollback the current environment by default" do
-    ey "rollback", :debug => true
-    @out.should match(/rolling back giblets/i)
-    @err.should be_empty
-    @ssh_commands.last.should match(/eysd deploy rollback --app rails232app/)
-  end
-
-  it "fails when the environment name is bogus" do
-    ey "rollback typo", :expect_failure => true
-    @err.should match(/'typo'/)
-    @ssh_commands.should be_empty
-  end
-end
-
-describe "ey rollback ENV" do
-  it_should_behave_like "an integration test"
-
-  before(:all) do
-    api_scenario "one app, many similarly-named environments"
-  end
-
-  it "works when given an unambiguous substring" do
-    ey "rollback prod", :debug => true
-    @out.should match(/Rolling back railsapp_production/i)
-    @err.should be_empty
-    @ssh_commands.last.should match(/eysd deploy rollback --app rails232app/)
-  end
-
-  it "complains when given an ambiguous substring" do
-    ey "rollback staging", :hide_err => true, :expect_failure => true
-    @err.should =~ /'staging' is ambiguous/
-    @ssh_commands.should be_empty
-  end
+  it_should_behave_like "it takes an environment name"
+  it_should_behave_like "it invokes eysd"
 end

data/spec/ey/ssh_spec.rb

@@ -3,68 +3,51 @@ require 'spec_helper'
 print_my_args_ssh = "#!/bin/sh\necho ssh $*"
 
 describe "ey ssh" do
-  it_should_behave_like "an integration test"
+  given "integration"
 
   before(:all) do
     api_scenario "one app, two environments"
   end
 
-  it "SSH-es into the right environment" do
-    ey "ssh giblets", :prepend_to_path => {'ssh' => print_my_args_ssh}
-    @raw_ssh_commands.should == ["ssh turkey@174.129.198.124"]
-  end
-
   it "complains if it has no app master" do
-    ey "ssh bakon", :expect_failure => true
+    ey "ssh -e bakon", :expect_failure => true
     @err.should =~ /'bakon' does not have a master instance/
   end
 
-  it "complains if you give it a bogus environment" do
-    ey "ssh bogusenv", :prepend_to_path => {'ssh' => print_my_args_ssh}, :expect_failure => true
-    @raw_ssh_commands.should be_empty
-    @err.should =~ /bogusenv/
-  end
 end
 
 describe "ey ssh" do
-  it_should_behave_like "an integration test"
+  given "integration"
 
-  it "guesses the environment from the current application" do
-    api_scenario "one app, one environment"
-
-    ey "ssh", :prepend_to_path => {'ssh' => print_my_args_ssh}
-    @raw_ssh_commands.should == ["ssh turkey@174.129.198.124"]
+  def extra_ey_options
+    {:prepend_to_path => {'ssh' => "#!/bin/sh\necho ssh $*"}}
   end
 
-  it "complains when it can't guess the environment and its name isn't specified" do
-    api_scenario "one app, one environment, not linked"
+  def command_to_run(opts)
+    cmd = "ssh"
+    cmd << " --environment #{opts[:env]}" if opts[:env]
+    cmd
+  end
 
-    ey "ssh", :prepend_to_path => {'ssh' => print_my_args_ssh}, :expect_failure => true
-    @err.should =~ /single environment/i
+  def verify_ran(scenario)
+    ssh_target = scenario[:ssh_username] + '@' + scenario[:master_ip]
+    @raw_ssh_commands.should == ["ssh #{ssh_target}"]
   end
+
+  it_should_behave_like "it takes an environment name"
 end
 
 describe "ey ssh ENV" do
-  it_should_behave_like "an integration test"
+  given "integration"
 
   before(:all) do
     api_scenario "one app, many similarly-named environments"
   end
 
-  it "works when given an unambiguous substring" do
-    ey "ssh prod", :prepend_to_path => {'ssh' => print_my_args_ssh}
-    @raw_ssh_commands.should == ["ssh turkey@174.129.198.124"]
-  end
-
   it "doesn't require you to be in any app's directory if the name is unambiguous" do
     Dir.chdir(Dir.tmpdir) do
-      ey "ssh prod", :prepend_to_path => {'ssh' => print_my_args_ssh}
+      ey "ssh -e prod", :prepend_to_path => {'ssh' => print_my_args_ssh}
       @raw_ssh_commands.should == ["ssh turkey@174.129.198.124"]
     end
   end
-
-  it "complains when given an ambiguous substring" do
-    ey "ssh staging", :hide_err => true, :expect_failure => true
-    @err.should match(/'staging' is ambiguous/)
-  end
 end

data/spec/ey/web/disable_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe "ey web disable" do
+  given "integration"
+
+  def command_to_run(opts)
+    cmd = "web disable"
+    cmd << " -e #{opts[:env]}" if opts[:env]
+    cmd
+  end
+
+  def verify_ran(scenario)
+    @ssh_commands.should have_command_like(/eysd deploy enable_maintenance_page --app #{scenario[:application]}/)
+  end
+
+  it_should_behave_like "it takes an environment name"
+  it_should_behave_like "it invokes eysd"
+end

data/spec/ey/web/enable_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe "ey web enable" do
+  given "integration"
+
+  def command_to_run(opts)
+    cmd = "web enable"
+    cmd << " -e #{opts[:env]}" if opts[:env]
+    cmd
+  end
+
+  def verify_ran(scenario)
+    @ssh_commands.should have_command_like(/eysd deploy disable_maintenance_page --app #{scenario[:application]}/)
+  end
+
+  it_should_behave_like "it takes an environment name"
+  it_should_behave_like "it invokes eysd"
+end