engineyard 3.1.2 → 3.1.3

data/spec/ey/login_spec.rb

@@ -10,7 +10,7 @@ describe "ey login" do
 
     it "returns the logged in user name" do
       ey %w[login]
-      @out.should include("User Name (#{scenario_email})")
+      expect(@out).to include("User Name (#{scenario_email})")
     end
   end
 
@@ -23,11 +23,11 @@ describe "ey login" do
         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:")
+      expect(@out).to include("We need to fetch your API token; please log in.")
+      expect(@out).to include("Email:")
+      expect(@out).to include("Password:")
 
-      @out.should include("User Name (#{scenario_email})")
+      expect(@out).to include("User Name (#{scenario_email})")
     end
   end
 end

data/spec/ey/logout_spec.rb

@@ -8,17 +8,17 @@ describe "ey logout" do
 
     it "logs you out" do
       ey %w[logout]
-      @out.should include("API token removed: #{ENV['EYRC']}")
-      @out.should include("Run any other command to login again.")
+      expect(@out).to include("API token removed: #{ENV['EYRC']}")
+      expect(@out).to include("Run any other command to login again.")
     end
   end
 
   context "not logged in" 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.")
-      @out.should include("Run any other command to login again.")
+      expect(@out).not_to include("API token removed:")
+      expect(@out).to include("Already logged out.")
+      expect(@out).to include("Run any other command to login again.")
     end
   end
 end

data/spec/ey/logs_spec.rb

@@ -6,15 +6,15 @@ describe "ey logs" do
   it "prints logs returned by awsm" do
     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 == ''
+    expect(@out).to match(/MAIN LOG OUTPUT/)
+    expect(@out).to match(/CUSTOM LOG OUTPUT/)
+    expect(@err).to eq('')
   end
 
   it "complains when it can't infer the environment" do
     login_scenario "one app, many environments"
     fast_failing_ey %w[logs]
-    @err.should =~ /Multiple environments possible, please be more specific/i
+    expect(@err).to match(/Multiple environments possible, please be more specific/i)
   end
 end
 
@@ -29,7 +29,7 @@ describe "ey logs" do
   end
 
   def verify_ran(scenario)
-    @out.should match(/Main logs for #{scenario[:environment]}/)
+    expect(@out).to match(/Main logs for #{scenario[:environment]}/)
   end
 
   include_examples "it takes an environment name and an account name"

data/spec/ey/rebuild_spec.rb

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

data/spec/ey/recipes/apply_spec.rb

@@ -11,14 +11,14 @@ describe "ey recipes apply" do
   end
 
   def verify_ran(scenario)
-    @out.should =~ /Uploaded recipes started for #{scenario[:environment]}/
+    expect(@out).to match(/Uploaded recipes started for #{scenario[:environment]}/)
   end
 
   include_examples "it takes an environment name and an account name"
 
   it "fails when given a bad option" do
     fast_failing_ey %w[web enable --lots --of --bogus --options]
-    @err.should include("Unknown switches")
+    expect(@err).to include("Unknown switches")
   end
 end
 

data/spec/ey/recipes/download_spec.rb

@@ -22,8 +22,8 @@ describe "ey recipes download" do
   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"
+    expect(@out).to match(/Recipes downloaded successfully for #{scenario[:environment]}/)
+    expect(File.read('cookbooks/README')).to eq("Remove this file to clone an upstream git repository of cookbooks\n")
   end
 
   include_examples "it takes an environment name and an account name"
@@ -32,7 +32,7 @@ describe "ey recipes download" do
     login_scenario "one app, one environment"
     Dir.mkdir("cookbooks")
     ey %w[recipes download], :expect_failure => true
-    @err.should match(/cookbooks.*already exists/i)
+    expect(@err).to match(/cookbooks.*already exists/i)
   end
 end
 

data/spec/ey/recipes/upload_spec.rb

@@ -13,7 +13,7 @@ describe "ey recipes upload" do
   end
 
   def verify_ran(scenario)
-    @out.should =~ %r|Recipes in cookbooks/ uploaded successfully for #{scenario[:environment]}|
+    expect(@out).to match(%r|Recipes in cookbooks/ uploaded successfully for #{scenario[:environment]}|)
   end
 
   include_examples "it takes an environment name and an account name"
@@ -33,7 +33,7 @@ describe "ey recipes upload -f recipes.tgz" do
   end
 
   def verify_ran(scenario)
-    @out.should =~ %r|Recipes file recipes.tgz uploaded successfully for #{scenario[:environment]}|
+    expect(@out).to match(%r|Recipes file recipes.tgz uploaded successfully for #{scenario[:environment]}|)
   end
 
   include_examples "it takes an environment name and an account name"
@@ -52,7 +52,7 @@ describe "ey recipes upload -f with a missing filenamen" do
   it "errors with file not found" do
     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)
+    expect(@err).to match(/Recipes file not found: recipes.tgz/i)
   end
 end
 
@@ -72,16 +72,16 @@ describe "ey recipes upload from a separate cookbooks directory" do
       login_scenario "one app, one environment"
 
       ey %w[recipes upload -e giblets]
-      @out.should =~ %r|Recipes in cookbooks/ uploaded successfully|
-      @out.should_not =~ /Uploaded recipes started for giblets/
+      expect(@out).to match(%r|Recipes in cookbooks/ uploaded successfully|)
+      expect(@out).not_to match(/Uploaded recipes started for giblets/)
     end
 
     it "applies the recipes with --apply" do
       login_scenario "one app, one environment"
 
       ey %w[recipes upload -e giblets --apply]
-      @out.should =~ %r|Recipes in cookbooks/ uploaded successfully|
-      @out.should =~ /Uploaded recipes started for giblets/
+      expect(@out).to match(%r|Recipes in cookbooks/ uploaded successfully|)
+      expect(@out).to match(/Uploaded recipes started for giblets/)
     end
   end
 
@@ -92,7 +92,7 @@ describe "ey recipes upload from a separate cookbooks directory" do
       login_scenario "one app, one environment"
 
       ey %w[recipes upload -e giblets]
-      @out.should =~ %r|Recipes in cookbooks/ uploaded successfully|
+      expect(@out).to match(%r|Recipes in cookbooks/ uploaded successfully|)
     end
 
   end

data/spec/ey/rollback_spec.rb

@@ -13,9 +13,9 @@ describe "ey rollback" do
   end
 
   def verify_ran(scenario)
-    @out.should match(/Rolling back.*#{scenario[:application]}.*#{scenario[:environment]}/)
-    @err.should == ''
-    @ssh_commands.last.should match(/engineyard-serverside.*deploy rollback.*--app #{scenario[:application]}/)
+    expect(@out).to match(/Rolling back.*#{scenario[:application]}.*#{scenario[:environment]}/)
+    expect(@err).to eq('')
+    expect(@ssh_commands.last).to match(/engineyard-serverside.*deploy rollback.*--app #{scenario[:application]}/)
   end
 
   include_examples "it takes an environment name and an app name and an account name"
@@ -24,7 +24,7 @@ describe "ey rollback" do
   it "passes along the web server stack to engineyard-serverside" do
     login_scenario "one app, one environment"
     ey %w[rollback]
-    @ssh_commands.last.should =~ /--stack nginx_mongrel/
+    expect(@ssh_commands.last).to match(/--stack nginx_mongrel/)
   end
 
   context "--config (--extra-deploy-hook-options)" do
@@ -42,18 +42,18 @@ describe "ey rollback" do
 
     it "passes --config to engineyard-serverside" do
       ey %w[rollback --config some:stuff more:crap]
-      config_options.should_not be_nil
-      config_options['some'].should == 'stuff'
-      config_options['more'].should == 'crap'
-      config_options['input_ref'].should_not be_nil
-      config_options['deployed_by'].should_not be_nil
+      expect(config_options).not_to be_nil
+      expect(config_options['some']).to eq('stuff')
+      expect(config_options['more']).to eq('crap')
+      expect(config_options['input_ref']).not_to be_nil
+      expect(config_options['deployed_by']).not_to be_nil
     end
 
     it "supports legacy --extra-deploy-hook-options" do
       ey %w[rollback --extra-deploy-hook-options some:stuff more:crap]
-      config_options.should_not be_nil
-      config_options['some'].should == 'stuff'
-      config_options['more'].should == 'crap'
+      expect(config_options).not_to be_nil
+      expect(config_options['some']).to eq('stuff')
+      expect(config_options['more']).to eq('crap')
     end
 
     context "when ey.yml is present" do
@@ -65,7 +65,7 @@ describe "ey rollback" do
 
       it "overrides what's in ey.yml" do
         ey %w[rollback --config beer:esb]
-        config_options['beer'].should == 'esb'
+        expect(config_options['beer']).to eq('esb')
       end
     end
   end

data/spec/ey/scp_spec.rb

@@ -26,16 +26,16 @@ shared_examples_for "running ey scp for select role" 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
+      expect(@raw_ssh_commands.grep(/^scp from turkey@#{host_prefix}.+:to$/)).not_to be_empty
     end
-    @raw_ssh_commands.grep(/^scp from turkey@.+:to$/).count.should == @hosts.count
+    expect(@raw_ssh_commands.grep(/^scp from turkey@.+:to$/).count).to eq(@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/
+    expect(@out).to match(/scp.*from.*to/)
+    expect(@out).not_to match(/Loading application data/)
   end
 
   it "raises an error when there are no matching hosts" do
@@ -59,7 +59,7 @@ describe "ey scp" do
 
   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/
+    expect(@err).to match(/'bakon' does not have any matching instances/)
   end
 
 end
@@ -82,7 +82,7 @@ describe "ey scp" do
 
   def verify_ran(scenario)
     scp_target = scenario[:ssh_username] + '@' + scenario[:master_hostname]
-    @raw_ssh_commands.should == ["scp #{scp_target}:from to"]
+    expect(@raw_ssh_commands).to eq(["scp #{scp_target}:from to"])
   end
 
   include_examples "it takes an environment name and an account name"

data/spec/ey/servers_spec.rb

@@ -12,8 +12,8 @@ describe "ey servers" do
   end
 
   def verify_ran(scenario)
-    @out.should match(/#{scenario[:environment]}/) if scenario[:environment]
-    @out.should match(/#{scenario[:account]}/) if scenario[:account]
+    expect(@out).to match(/#{scenario[:environment]}/) if scenario[:environment]
+    expect(@out).to match(/#{scenario[:account]}/) if scenario[:account]
   end
 
   include_examples "it takes an environment name and an account name"
@@ -25,7 +25,7 @@ describe "ey servers" do
 
     it "prints error when no application found" do
       fast_failing_ey %w[servers]
-      @err.should =~ /No application found/
+      expect(@err).to match(/No application found/)
     end
   end
 
@@ -36,8 +36,8 @@ describe "ey servers" do
 
     it "lists the servers with specified env" do
       fast_ey %w[servers -e giblets]
-      @out.should =~ /main \/ giblets/
-      @out.should include('1 server ')
+      expect(@out).to match(/main \/ giblets/)
+      expect(@out).to include('1 server ')
     end
   end
 
@@ -48,31 +48,31 @@ describe "ey servers" do
 
     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")
+      expect(@out).to include("# 7 servers on main / giblets")
+      expect(@out).to include("app_master_hostname.compute-1.amazonaws.com \ti-ddbbdd92\tapp_master")
+      expect(@out).to include("app_hostname.compute-1.amazonaws.com        \ti-d2e3f1b9\tapp")
+      expect(@out).to include("db_master_hostname.compute-1.amazonaws.com  \ti-d4cdddbf\tdb_master")
+      expect(@out).to include("db_slave_1_hostname.compute-1.amazonaws.com \ti-asdfasdfaj\tdb_slave  \tSlave I")
+      expect(@out).to include("db_slave_2_hostname.compute-1.amazonaws.com \ti-asdfasdfaj\tdb_slave")
+      expect(@out).to include("util_fluffy_hostname.compute-1.amazonaws.com\ti-80e3f1eb\tutil      \tfluffy")
+      expect(@out).to 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")
+      expect(@out).to include("# 7 servers on main / giblets")
+      expect(@out).to include("turkey@app_master_hostname.compute-1.amazonaws.com \ti-ddbbdd92\tapp_master")
+      expect(@out).to include("turkey@app_hostname.compute-1.amazonaws.com        \ti-d2e3f1b9\tapp")
+      expect(@out).to include("turkey@db_master_hostname.compute-1.amazonaws.com  \ti-d4cdddbf\tdb_master")
+      expect(@out).to include("turkey@db_slave_1_hostname.compute-1.amazonaws.com \ti-asdfasdfaj\tdb_slave  \tSlave I")
+      expect(@out).to include("turkey@db_slave_2_hostname.compute-1.amazonaws.com \ti-asdfasdfaj\tdb_slave")
+      expect(@out).to include("turkey@util_fluffy_hostname.compute-1.amazonaws.com\ti-80e3f1eb\tutil      \tfluffy")
+      expect(@out).to 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 == [
+      expect(@out.split(/\n/).map {|x| x.split(/\t/) }).to eq([
         ['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'          ],
@@ -80,12 +80,12 @@ describe "ey servers" do
         ['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 == [
+      expect(@out.split(/\n/).map {|x| x.split(/\t/) }).to eq([
         ['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'          ],
@@ -93,12 +93,12 @@ describe "ey servers" do
         ['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 == [
+      expect(@out.split(/\n/)).to eq([
         'app_master_hostname.compute-1.amazonaws.com',
         'app_hostname.compute-1.amazonaws.com',
         'db_master_hostname.compute-1.amazonaws.com',
@@ -106,12 +106,12 @@ describe "ey servers" do
         '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 == [
+      expect(@out.split(/\n/)).to eq([
         'turkey@app_master_hostname.compute-1.amazonaws.com',
         'turkey@app_hostname.compute-1.amazonaws.com',
         'turkey@db_master_hostname.compute-1.amazonaws.com',
@@ -119,90 +119,90 @@ describe "ey servers" do
         '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 "lists servers constrained to app servers" do
       fast_ey %w[servers -c main -e giblets -qs --app-servers], :debug => false
-      @out.split(/\n/).map {|x| x.split(/\t/) }.should == [
+      expect(@out.split(/\n/).map {|x| x.split(/\t/) }).to eq([
         ['app_master_hostname.compute-1.amazonaws.com',  'i-ddbbdd92',   'app_master'         ],
         ['app_hostname.compute-1.amazonaws.com',         'i-d2e3f1b9',   'app'                ],
-      ]
+      ])
     end
 
     it "lists servers constrained to db servers" do
       fast_ey %w[servers -c main -e giblets -qs --db-servers], :debug => false
-      @out.split(/\n/).map {|x| x.split(/\t/) }.should == [
+      expect(@out.split(/\n/).map {|x| x.split(/\t/) }).to eq([
         ['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'           ],
-      ]
+      ])
     end
 
     it "lists servers constrained to db master" do
       fast_ey %w[servers -c main -e giblets -qs --db-master], :debug => false
-      @out.split(/\n/).map {|x| x.split(/\t/) }.should == [
+      expect(@out.split(/\n/).map {|x| x.split(/\t/) }).to eq([
         ['db_master_hostname.compute-1.amazonaws.com',   'i-d4cdddbf',   'db_master'          ],
-      ]
+      ])
     end
 
     it "lists servers constrained to db slaves" do
       fast_ey %w[servers -c main -e giblets -qs --db-slaves], :debug => false
-      @out.split(/\n/).map {|x| x.split(/\t/) }.should == [
+      expect(@out.split(/\n/).map {|x| x.split(/\t/) }).to eq([
         ['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'           ],
-      ]
+      ])
     end
 
     it "lists servers constrained to utilities" do
       fast_ey %w[servers -c main -e giblets -qs --utilities], :debug => false
-      @out.split(/\n/).map {|x| x.split(/\t/) }.should == [
+      expect(@out.split(/\n/).map {|x| x.split(/\t/) }).to eq([
         ['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 servers constrained to utilities with names" do
       fast_ey %w[servers -c main -e giblets -qs --utilities fluffy], :debug => false
-      @out.split(/\n/).map {|x| x.split(/\t/) }.should == [
+      expect(@out.split(/\n/).map {|x| x.split(/\t/) }).to eq([
         ['util_fluffy_hostname.compute-1.amazonaws.com', 'i-80e3f1eb',   'util',     'fluffy' ],
-      ]
+      ])
     end
 
     it "lists servers constrained to app servers and utilities" do
       fast_ey %w[servers -c main -e giblets -qs --app --util], :debug => false
-      @out.split(/\n/).map {|x| x.split(/\t/) }.should == [
+      expect(@out.split(/\n/).map {|x| x.split(/\t/) }).to eq([
         ['app_master_hostname.compute-1.amazonaws.com',  'i-ddbbdd92',   'app_master'         ],
         ['app_hostname.compute-1.amazonaws.com',         'i-d2e3f1b9',   'app'                ],
         ['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 servers constrained to app or util with name" do
       fast_ey %w[servers -c main -e giblets -qs --app --util rocky], :debug => false
-      @out.split(/\n/).map {|x| x.split(/\t/) }.should == [
+      expect(@out.split(/\n/).map {|x| x.split(/\t/) }).to eq([
         ['app_master_hostname.compute-1.amazonaws.com',  'i-ddbbdd92',   'app_master'         ],
         ['app_hostname.compute-1.amazonaws.com',         'i-d2e3f1b9',   'app'                ],
         ['util_rocky_hostname.compute-1.amazonaws.com',  'i-80etf1eb',   'util',     'rocky'  ],
-      ]
+      ])
     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"')
+      expect(@err).to 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"')
+      expect(@err).to 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/
+        expect(@err).to match(/fatal: Not a git repository \(or any of the parent directories\): .*#{Regexp.escape(Dir.tmpdir)}/)
+        expect(@out).not_to match(/no application configured/)
       end
     end
   end