engineyard 1.4.29 → 1.7.0.pre2

data/spec/ey/list_environments_spec.rb

@@ -4,50 +4,105 @@ describe "ey environments" do
 
   given "integration"
 
+  before { @succeeds_on_multiple_matches = true }
+
+  def command_to_run(opts)
+    cmd = ["environments"]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--app"         << opts[:app]         if opts[:app]
+    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[:application]}/) if scenario[:application]
+  end
+
+  include_examples "it takes an environment name and an app name and an account name"
+
   context "with no apps" do
     before do
-      api_scenario "empty"
+      login_scenario "empty"
     end
 
     it "suggests that you use environments --all" do
-      ey %w[environments]
-      @out.should =~ /Use ey environments --all to see all environments./
+      fast_failing_ey %w[environments]
+      @err.should =~ /Use ey environments --all to see all environments./
     end
   end
 
   context "with apps" do
     before(:all) do
-      api_scenario "one app, many environments"
+      login_scenario "one app, many environments"
     end
 
     it "lists the environments your app is in" do
-      ey %w[environments]
-      @out.should include('rails232app (main)')
+      fast_ey %w[environments]
+      @out.should include('main/rails232app')
       @out.should =~ /giblets/
       @out.should =~ /bakon/
     end
 
+    it "lists the environments with specified app" do
+      fast_ey %w[environments --app rails232app]
+      @out.should include('main/rails232app')
+      @out.should =~ /giblets/
+      @out.should =~ /bakon/
+    end
+
+    it "finds no environments with gibberish app" do
+      fast_failing_ey %w[environments --account main --app gibberish]
+      @err.should =~ /Use ey environments --all to see all environments./
+    end
+
+    it "finds no environments with gibberish account" do
+      fast_failing_ey %w[environments --account gibberish --app rails232]
+      @err.should =~ /Use ey environments --all to see all environments./
+    end
+
+    it "lists the environments that the app is in" do
+      fast_ey %w[environments --app rails232app]
+      @out.should include('main/rails232app')
+      @out.should =~ /giblets/
+      @out.should =~ /bakon/
+    end
+
+    it "lists the environments that the app is in" do
+      fast_ey %w[environments --account main]
+      @out.should include('main/rails232app')
+      @out.should =~ /giblets/
+      @out.should =~ /bakon/
+    end
+
+    it "lists the environments matching --environment" do
+      fast_ey %w[environments -e gib]
+      @out.should include('main/rails232app')
+      @out.should =~ /giblets/
+      @out.should_not =~ /bakon/
+    end
+
     it "reports failure to find a git repo when not in one" do
       Dir.chdir(Dir.tmpdir) do
-        ey %w[environments], :expect_failure => true
-        @err.should =~ /fatal: No git remotes found in .*#{Regexp.escape(Dir.tmpdir)}/
+        fast_failing_ey %w[environments]
+        @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
 
-    it "lists all environments that have apps with -a" do
-      ey %w[environments -a]
+    it "lists all environments that have apps with -A" do
+      fast_ey %w[environments -A]
       @out.should include("bakon")
       @out.should include("giblets")
     end
 
     it "outputs simply with -s" do
-      ey %w[environments -s], :debug => false
+      fast_ey %w[environments -s], :debug => false
       @out.split(/\n/).sort.should == ["bakon", "giblets"]
     end
 
-    it "outputs all environments (including ones with no apps) simply with -a and -s" do
-      ey %w[environments -a -s], :debug => false
+    it "outputs all environments (including ones with no apps) simply with -A and -s" do
+      fast_ey %w[environments -A -s], :debug => false
       @out.split(/\n/).sort.should == ["bakon", "beef", "giblets"]
     end
   end
@@ -58,7 +113,7 @@ describe "ey environments with an ambiguous git repo" do
   include_examples "it has an ambiguous git repo"
 
   it "lists environments from all apps using the git repo" do
-    ey %w[environments]
+    fast_ey %w[environments]
     @out.should =~ /git repo matches multiple/i
     @out.should include("giblets")
     @out.should include("keycollector_production")

data/spec/ey/login_spec.rb

@@ -1,29 +1,33 @@
 require 'spec_helper'
 
 describe "ey login" do
+  given "integration"
+
   context "logged in" do
-    given "integration"
+    before do
+      login_scenario 'empty'
+    end
 
     it "returns the logged in user name" do
       ey %w[login]
-      @out.should include("User Name (test@test.test)")
+      @out.should include("User Name (#{scenario_email})")
     end
   end
 
   context "not logged in" do
-    given "integration without an eyrc file"
-
     it "prompts for authentication before outputting the logged in user" do
+      api_scenario "empty"
+
       ey(%w[login], :hide_err => true) do |input|
-        input.puts("test@test.test")
-        input.puts("test")
+        input.puts(scenario_email)
+        input.puts(scenario_password)
       end
 
       @out.should include("We need to fetch your API token; please log in.")
       @out.should include("Email:")
       @out.should include("Password:")
 
-      @out.should include("User Name (test@test.test)")
+      @out.should include("User Name (#{scenario_email})")
     end
   end
 end

data/spec/ey/logout_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 
 describe "ey logout" do
+  given "integration"
+
   context "logged in" do
-    given "integration"
+    before { login_scenario 'empty' }
 
     it "logs you out" do
       ey %w[logout]
@@ -12,9 +14,7 @@ describe "ey logout" do
   end
 
   context "not logged in" do
-    given "integration without an eyrc file"
-
-    it "prompts for authentication before outputting the logged in user" do
+    it "doesn't prompt for login before logging out" do
       ey %w[logout]
       @out.should_not include("API token removed:")
       @out.should include("Already logged out.")

data/spec/ey/logs_spec.rb

@@ -4,17 +4,17 @@ describe "ey logs" do
   given "integration"
 
   it "prints logs returned by awsm" do
-    api_scenario "one app, one environment"
-    ey %w[logs -e giblets]
+    login_scenario "one app, one environment"
+    fast_ey %w[logs -e giblets]
     @out.should match(/MAIN LOG OUTPUT/)
     @out.should match(/CUSTOM LOG OUTPUT/)
-    @err.should be_empty
+    @err.should == ''
   end
 
   it "complains when it can't infer the environment" do
-    api_scenario "one app, many environments"
-    ey %w[logs], :expect_failure => true
-    @err.should =~ /repository url in this directory is ambiguous/i
+    login_scenario "one app, many environments"
+    fast_failing_ey %w[logs]
+    @err.should =~ /Multiple environments possible, please be more specific/i
   end
 end
 

data/spec/ey/recipes/apply_spec.rb

@@ -17,7 +17,7 @@ describe "ey recipes apply" do
   include_examples "it takes an environment name and an account name"
 
   it "fails when given a bad option" do
-    ey %w[web enable --lots --of --bogus --options], :expect_failure => true
+    fast_failing_ey %w[web enable --lots --of --bogus --options]
     @err.should include("Unknown switches")
   end
 end

data/spec/ey/recipes/download_spec.rb

@@ -29,7 +29,7 @@ describe "ey recipes download" do
   include_examples "it takes an environment name and an account name"
 
   it "fails when cookbooks/ already exists" do
-    api_scenario "one app, one environment"
+    login_scenario "one app, one environment"
     Dir.mkdir("cookbooks")
     ey %w[recipes download], :expect_failure => true
     @err.should match(/cookbooks.*already exists/i)

data/spec/ey/recipes/upload_spec.rb

@@ -5,7 +5,7 @@ describe "ey recipes upload" do
 
   define_git_repo('+cookbooks') do |git_dir|
     git_dir.join("cookbooks").mkdir
-    File.open(git_dir.join("cookbooks/file"), "w"){|f| f << "boo" }
+    git_dir.join("cookbooks/file").open("w") {|f| f << "boo" }
   end
   use_git_repo('+cookbooks')
 
@@ -57,8 +57,8 @@ describe "ey recipes upload -f with a missing filenamen" do
   end
 
   it "errors with file not found" do
-    api_scenario "one app, one environment"
-    ey(%w[recipes upload --environment giblets -f recipes.tgz], :expect_failure => true)
+    login_scenario "one app, one environment"
+    fast_failing_ey(%w[recipes upload --environment giblets -f recipes.tgz])
     @err.should match(/Recipes file not found: recipes.tgz/i)
   end
 end
@@ -85,7 +85,7 @@ describe "ey recipes upload from a separate cookbooks directory" do
     use_git_repo "only cookbooks, no remotes"
 
     it "takes the environment specified by -e" do
-      api_scenario "one app, one environment"
+      login_scenario "one app, one environment"
 
       ey %w[recipes upload -e giblets]
       @out.should =~ %r|Recipes in cookbooks/ uploaded successfully|
@@ -93,7 +93,7 @@ describe "ey recipes upload from a separate cookbooks directory" do
     end
 
     it "applies the recipes with --apply" do
-      api_scenario "one app, one environment"
+      login_scenario "one app, one environment"
 
       ey %w[recipes upload -e giblets --apply]
       @out.should =~ %r|Recipes in cookbooks/ uploaded successfully|
@@ -116,7 +116,7 @@ describe "ey recipes upload from a separate cookbooks directory" do
     use_git_repo "only cookbooks, unrelated remotes"
 
     it "takes the environment specified by -e" do
-      api_scenario "one app, one environment"
+      login_scenario "one app, one environment"
 
       ey %w[recipes upload -e giblets]
       @out.should =~ %r|Recipes in cookbooks/ uploaded successfully|

data/spec/ey/rollback_spec.rb

@@ -14,7 +14,7 @@ describe "ey rollback" do
 
   def verify_ran(scenario)
     @out.should match(/Rolling back.*#{scenario[:application]}.*#{scenario[:environment]}/)
-    @err.should be_empty
+    @err.should == ''
     @ssh_commands.last.should match(/engineyard-serverside.*deploy rollback.*--app #{scenario[:application]}/)
   end
 
@@ -22,14 +22,14 @@ describe "ey rollback" do
   include_examples "it invokes engineyard-serverside"
 
   it "passes along the web server stack to engineyard-serverside" do
-    api_scenario "one app, one environment"
+    login_scenario "one app, one environment"
     ey %w[rollback]
     @ssh_commands.last.should =~ /--stack nginx_mongrel/
   end
 
   context "--extra-deploy-hook-options" do
     before(:all) do
-      api_scenario "one app, one environment"
+      login_scenario "one app, one environment"
     end
 
     def extra_deploy_hook_options

data/spec/ey/ssh_spec.rb

@@ -30,8 +30,8 @@ shared_examples_for "running ey ssh for select role" do
   end
 
   it "runs the command on the right servers" do
-    api_scenario "one app, one environment"
-    run_ey(:ssh_command => "ls", :environment => 'giblets', :verbose => true)
+    login_scenario "one app, one environment"
+    ey command_to_run(:ssh_command => "ls", :environment => 'giblets', :verbose => true)
     @hosts.each do |host|
       @raw_ssh_commands.select do |command|
         command =~ /^ssh turkey@#{host}.+ ls$/
@@ -43,14 +43,14 @@ shared_examples_for "running ey ssh for select role" do
   end
 
   it "raises an error when there are no matching hosts" do
-    api_scenario "one app, one environment, no instances"
-    run_ey({:ssh_command => "ls", :environment => 'giblets', :verbose => true}, :expect_failure => true)
+    login_scenario "one app, one environment, no instances"
+    ey command_to_run({:ssh_command => "ls", :environment => 'giblets', :verbose => true}), :expect_failure => true
   end
 
   it "responds correctly when there is no command" do
     if @hosts.count != 1
-      api_scenario "one app, one environment"
-      run_ey({:environment => 'giblets', :verbose => true}, :expect_failure => true)
+      login_scenario "one app, one environment"
+      ey command_to_run({:environment => 'giblets', :verbose => true}), :expect_failure => true
     end
   end
 end
@@ -59,7 +59,7 @@ describe "ey ssh" do
   include_examples "running ey ssh"
 
   before(:all) do
-    api_scenario "one app, many environments"
+    login_scenario "one app, many environments"
   end
 
   it "complains if it has no app master" do
@@ -127,8 +127,8 @@ describe "ey ssh with a command that fails" do
   end
 
   it "fails just like the ssh command fails" do
-    api_scenario "one app, one environment"
-    run_ey({:ssh_command => "ls", :environment => 'giblets', :verbose => true}, :expect_failure => true)
+    login_scenario "one app, one environment"
+    ey command_to_run({:ssh_command => "ls", :environment => 'giblets', :verbose => true}), :expect_failure => true
   end
 end
 

data/spec/ey/status_spec.rb

@@ -5,7 +5,7 @@ describe "ey environments" do
   given "integration"
 
   before(:all) do
-    api_scenario "one app, many environments"
+    login_scenario "one app, many environments"
   end
 
   it "outputs the status of the deployment" do
@@ -15,7 +15,7 @@ describe "ey environments" do
     @out.should =~ /Ref:\s+HEAD/
     @out.should =~ /Resolved Ref:\s+HEAD/
     @out.should =~ /Deployed by:\s+User Name/
-    @out.should =~ /Created at:/
+    @out.should =~ /Started at:/
     @out.should =~ /Finished at:/
     @out.should =~ /This deployment was successful/
   end

data/spec/ey/whoami_spec.rb

@@ -1,29 +1,30 @@
 require 'spec_helper'
 
 describe "ey whoami" do
-  context "logged in" do
-    given "integration"
+  given "integration"
 
+  context "logged in" do
+    before { login_scenario 'empty' }
     it "outputs the currently logged in user" do
       ey %w[whoami]
-      @out.should include("User Name (test@test.test)")
+      @out.should include("User Name (#{scenario_email})")
     end
   end
 
   context "not logged in" do
-    given "integration without an eyrc file"
-
     it "prompts for authentication before outputting the logged in user" do
+      api_scenario 'empty'
+
       ey(%w[whoami], :hide_err => true) do |input|
-        input.puts("test@test.test")
-        input.puts("test")
+        input.puts(scenario_email)
+        input.puts(scenario_password)
       end
 
       @out.should include("We need to fetch your API token; please log in.")
       @out.should include("Email:")
       @out.should include("Password:")
 
-      @out.should include("User Name (test@test.test)")
+      @out.should include("User Name (#{scenario_email})")
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,6 +2,11 @@ if self.class.const_defined?(:EY_ROOT)
   raise "don't require the spec helper twice!"
 end
 
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start
+end
+
 EY_ROOT = File.expand_path("../..", __FILE__)
 require 'rubygems'
 require 'bundler/setup'
@@ -18,15 +23,23 @@ require 'json'
 $LOAD_PATH.unshift(File.join(EY_ROOT, "lib"))
 require 'engineyard'
 
+require 'engineyard-cloud-client/test'
+
 # Spec stuff
 require 'rspec'
 require 'tmpdir'
 require 'yaml'
 require 'pp'
-support = Dir[File.join(EY_ROOT,'/spec/support/*.rb')]
-support.each{|helper| require helper }
+
+Dir[File.join(EY_ROOT,'/spec/support/*.rb')].each do |helper|
+  require helper
+end
 
 RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
   config.include SpecHelpers
   config.include SpecHelpers::IntegrationHelpers
 
@@ -49,8 +62,7 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    clean_eyrc
-    EY.instance_eval{ @config = nil }
+    EY::CloudClient.default_endpoint!
   end
 end
 
@@ -60,12 +72,12 @@ EY.define_git_repo("default") do |git_dir|
   system("git commit -m 'initial commit' >/dev/null 2>&1")
 end
 
-shared_examples_for "integration without an eyrc file" do
+shared_examples_for "integration" do
   use_git_repo('default')
 
   before(:all) do
     FakeWeb.allow_net_connect = true
-    ENV['CLOUD_URL'] = EY.fake_awsm
+    ENV['CLOUD_URL'] = EY::CloudClient::Test::FakeAwsm.uri
   end
 
   after(:all) do
@@ -73,12 +85,3 @@ shared_examples_for "integration without an eyrc file" do
     FakeWeb.allow_net_connect = false
   end
 end
-
-# Use this in conjunction with the 'ey' helper method
-shared_examples_for "integration" do
-  given "integration without an eyrc file"
-
-  before(:each) do
-    write_eyrc({"api_token" => "f81a1706ddaeb148cfb6235ddecfc1cf"})
-  end
-end