engineyard 3.1.2 → 3.1.3

data/spec/ey/ssh_spec.rb

@@ -36,39 +36,39 @@ shared_examples_for "running ey ssh for select role" do
     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|
+      expect(@raw_ssh_commands.select do |command|
         command =~ /^ssh turkey@#{host}.+ ls$/
-      end.should_not be_empty
+      end).not_to be_empty
     end
-    @raw_ssh_commands.select do |command|
+    expect(@raw_ssh_commands.select do |command|
       command =~ /^ssh turkey.+ ls$/
-    end.count.should == @hosts.count
+    end.count).to eq(@hosts.count)
   end
 
   it "is quiet" do
     login_scenario "one app, one environment"
     ey command_to_run(:ssh_command => "ls", :environment => 'giblets', :quiet => true)
-    @out.should =~ /ssh.*ls/
-    @out.should_not =~ /Loading application data/
+    expect(@out).to match(/ssh.*ls/)
+    expect(@out).not_to match(/Loading application data/)
   end
 
   it "runs in bash by default" do
     login_scenario "one app, one environment"
     ey command_to_run(:ssh_command => "ls", :environment => 'giblets')
-    @out.should =~ /ssh.*bash -lc ls/
+    expect(@out).to match(/ssh.*bash -lc ls/)
   end
 
   it "excludes shell with --no-shell" do
     login_scenario "one app, one environment"
     ey command_to_run(:ssh_command => "ls", :environment => 'giblets', :no_shell => true)
-    @out.should_not =~ /bash/
-    @out.should =~ /ssh.*ls/
+    expect(@out).not_to match(/bash/)
+    expect(@out).to match(/ssh.*ls/)
   end
 
   it "accepts an alternate shell" do
     login_scenario "one app, one environment"
     ey command_to_run(:ssh_command => "ls", :environment => 'giblets', :shell => 'zsh')
-    @out.should =~ /ssh.*zsh -lc ls/
+    expect(@out).to match(/ssh.*zsh -lc ls/)
   end
 
   it "raises an error when there are no matching hosts" do
@@ -93,7 +93,7 @@ describe "ey ssh" do
 
   it "complains if it has no app master" do
     ey %w[ssh -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
@@ -116,7 +116,7 @@ describe "ey ssh without a command" do
 
   def verify_ran(scenario)
     ssh_target = scenario[:ssh_username] + '@' + scenario[:master_hostname]
-    @raw_ssh_commands.should == ["ssh #{ssh_target}"]
+    expect(@raw_ssh_commands).to eq(["ssh #{ssh_target}"])
   end
 
   include_examples "it takes an environment name and an account name"
@@ -136,7 +136,7 @@ describe "ey ssh with a command" do
 
   def verify_ran(scenario)
     ssh_target = scenario[:ssh_username] + '@' + scenario[:master_hostname]
-    @raw_ssh_commands.should == ["ssh #{ssh_target} 'bash -lc ls'"]
+    expect(@raw_ssh_commands).to eq(["ssh #{ssh_target} 'bash -lc ls'"])
   end
 
   include_examples "it takes an environment name and an account name"
@@ -179,7 +179,7 @@ describe "ey ssh with a multi-part command" do
 
   def verify_ran(scenario)
     ssh_target = scenario[:ssh_username] + '@' + scenario[:master_hostname]
-    @raw_ssh_commands.should == ["ssh #{ssh_target} 'bash -lc '\\''echo \"echo\"'\\'"]
+    expect(@raw_ssh_commands).to eq(["ssh #{ssh_target} 'bash -lc '\\''echo \"echo\"'\\'"])
   end
 
   include_examples "it takes an environment name and an account name"

data/spec/ey/status_spec.rb

@@ -10,36 +10,36 @@ describe "ey environments" do
 
   it "tells you it's never been deployed" do
     fast_failing_ey %w[status -e giblets]
-    @err.should =~ /Application rails232app has not been deployed on giblets./
+    expect(@err).to match(/Application rails232app has not been deployed on giblets./)
   end
 
   it "outputs the status of the deployment" do
     fast_ey %w[deploy -e giblets --ref HEAD --no-migrate]
     fast_ey %w[status -e giblets]
-    @out.should =~ /Application:\s+rails232app/
-    @out.should =~ /Environment:\s+giblets/
-    @out.should =~ /Ref:\s+HEAD/
-    @out.should =~ /Resolved Ref:\s+resolved-HEAD/
-    @out.should =~ /Commit:\s+[a-f0-9]{40}/
-    @out.should =~ /Migrate:\s+false/
-    @out.should =~ /Deployed by:\s+One App Many Envs/
-    @out.should =~ /Started at:/
-    @out.should =~ /Finished at:/
-    @out.should =~ /Deployment was successful/
+    expect(@out).to match(/Application:\s+rails232app/)
+    expect(@out).to match(/Environment:\s+giblets/)
+    expect(@out).to match(/Ref:\s+HEAD/)
+    expect(@out).to match(/Resolved Ref:\s+resolved-HEAD/)
+    expect(@out).to match(/Commit:\s+[a-f0-9]{40}/)
+    expect(@out).to match(/Migrate:\s+false/)
+    expect(@out).to match(/Deployed by:\s+One App Many Envs/)
+    expect(@out).to match(/Started at:/)
+    expect(@out).to match(/Finished at:/)
+    expect(@out).to match(/Deployment was successful/)
   end
 
   it "quiets almost all of the output with --quiet" do
     fast_ey %w[deploy -e giblets --ref HEAD --no-migrate]
     fast_ey %w[status -e giblets -q]
-    @out.should_not =~ /Application:\s+rails232app/
-    @out.should_not =~ /Environment:\s+giblets/
-    @out.should_not =~ /Ref:\s+HEAD/
-    @out.should_not =~ /Resolved Ref:\s+resolved-HEAD/
-    @out.should_not =~ /Commit:\s+[a-f0-9]{40}/
-    @out.should_not =~ /Migrate:\s+false/
-    @out.should_not =~ /Deployed by:\s+One App Many Envs/
-    @out.should_not =~ /Started at:/
-    @out.should_not =~ /Finished at:/
-    @out.should =~ /Deployment was successful/
+    expect(@out).not_to match(/Application:\s+rails232app/)
+    expect(@out).not_to match(/Environment:\s+giblets/)
+    expect(@out).not_to match(/Ref:\s+HEAD/)
+    expect(@out).not_to match(/Resolved Ref:\s+resolved-HEAD/)
+    expect(@out).not_to match(/Commit:\s+[a-f0-9]{40}/)
+    expect(@out).not_to match(/Migrate:\s+false/)
+    expect(@out).not_to match(/Deployed by:\s+One App Many Envs/)
+    expect(@out).not_to match(/Started at:/)
+    expect(@out).not_to match(/Finished at:/)
+    expect(@out).to match(/Deployment was successful/)
   end
 end

data/spec/ey/timeout_deploy_spec.rb

@@ -6,13 +6,13 @@ describe "ey timeout-deploy" do
   it "timeouts the last deployment" do
     login_scenario "Stuck Deployment"
     fast_ey %w[timeout-deploy]
-    @out.should match(/Marking last deployment failed.../)
-    @out.should match(/Finished at:\s+\w+/)
+    expect(@out).to match(/Marking last deployment failed.../)
+    expect(@out).to match(/Finished at:\s+\w+/)
   end
 
   it "complains when there is no stuck deployment" do
     login_scenario "one app, one environment"
     fast_failing_ey ["timeout-deploy"]
-    @err.should include(%|No unfinished deployment was found for main / rails232app / giblets.|)
+    expect(@err).to include(%|No unfinished deployment was found for main / rails232app / giblets.|)
   end
 end

data/spec/ey/web/disable_spec.rb

@@ -13,7 +13,7 @@ describe "ey web disable" do
   end
 
   def verify_ran(scenario)
-    @ssh_commands.should have_command_like(/engineyard-serverside.*enable_maintenance.*--app #{scenario[:application]}/)
+    expect(@ssh_commands).to have_command_like(/engineyard-serverside.*enable_maintenance.*--app #{scenario[:application]}/)
   end
 
   include_examples "it takes an environment name and an app name and an account name"

data/spec/ey/web/enable_spec.rb

@@ -13,7 +13,7 @@ describe "ey web enable" do
   end
 
   def verify_ran(scenario)
-    @ssh_commands.should have_command_like(/engineyard-serverside.*disable_maintenance.*--app #{scenario[:application]}/)
+    expect(@ssh_commands).to have_command_like(/engineyard-serverside.*disable_maintenance.*--app #{scenario[:application]}/)
   end
 
   include_examples "it takes an environment name and an app name and an account name"
@@ -21,6 +21,6 @@ describe "ey web enable" do
 
   it "fails when given a bad option" do
     ey %w[web enable --lots --of --bogus --options], :expect_failure => true
-    @err.should include("Unknown switches")
+    expect(@err).to include("Unknown switches")
   end
 end

data/spec/ey/web/restart_spec.rb

@@ -13,7 +13,7 @@ describe "ey web restart" do
   end
 
   def verify_ran(scenario)
-    @ssh_commands.should have_command_like(/engineyard-serverside.*restart.*--app #{scenario[:application]}/)
+    expect(@ssh_commands).to have_command_like(/engineyard-serverside.*restart.*--app #{scenario[:application]}/)
   end
 
   include_examples "it takes an environment name and an app name and an account name"

data/spec/ey/whoami_spec.rb

@@ -7,7 +7,7 @@ describe "ey whoami" do
     before { login_scenario 'empty' }
     it "outputs the currently logged in user" do
       ey %w[whoami]
-      @out.should include("User Name (#{scenario_email})")
+      expect(@out).to include("User Name (#{scenario_email})")
     end
   end
 
@@ -20,11 +20,11 @@ describe "ey whoami" 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/support/shared_behavior.rb

@@ -13,9 +13,9 @@ shared_examples_for "it requires an unambiguous git repo" do
 
   it "lists disambiguating environments to choose from" do
     run_ey({}, {:expect_failure => true})
-    @err.should include('Multiple environments possible, please be more specific')
-    @err.should =~ /giblets/
-    @err.should =~ /keycollector_production/
+    expect(@err).to include('Multiple environments possible, please be more specific')
+    expect(@err).to match(/giblets/)
+    expect(@err).to match(/keycollector_production/)
   end
 end
 
@@ -26,9 +26,9 @@ shared_examples_for "it takes an environment name and an app name and an account
   it "complains when you send --account without a value" do
     login_scenario "empty"
     fast_failing_ey command_to_run({}) << '--account'
-    @err.should include("No value provided for option '--account'")
+    expect(@err).to include("No value provided for option '--account'")
     fast_failing_ey command_to_run({}) << '-c'
-    @err.should include("No value provided for option '--account'")
+    expect(@err).to include("No value provided for option '--account'")
   end
 
   context "when multiple accounts with collaboration" do
@@ -39,11 +39,11 @@ shared_examples_for "it takes an environment name and an app name and an account
     it "fails when the app and environment are ambiguous across accounts" do
       run_ey({:environment => "giblets", :app => "rails232app", :ref => 'master'}, {:expect_failure => !@succeeds_on_multiple_matches})
       if @succeeds_on_multiple_matches
-        @err.should_not match(/multiple/i)
+        expect(@err).not_to match(/multiple/i)
       else
-        @err.should match(/Multiple application environments possible/i)
-        @err.should match(/ey \S+ --account='account_2' --app='rails232app' --environment='giblets'/i)
-        @err.should match(/ey \S+ --account='main' --app='rails232app' --environment='giblets'/i)
+        expect(@err).to match(/Multiple application environments possible/i)
+        expect(@err).to match(/ey \S+ --account='account_2' --app='rails232app' --environment='giblets'/i)
+        expect(@err).to match(/ey \S+ --account='main' --app='rails232app' --environment='giblets'/i)
       end
     end
 
@@ -65,9 +65,9 @@ shared_examples_for "it takes an environment name and an account name" do
   it "complains when you send --account without a value" do
     login_scenario "empty"
     fast_failing_ey command_to_run({}) << '--account'
-    @err.should include("No value provided for option '--account'")
+    expect(@err).to include("No value provided for option '--account'")
     fast_failing_ey command_to_run({}) << '-c'
-    @err.should include("No value provided for option '--account'")
+    expect(@err).to include("No value provided for option '--account'")
   end
 
   context "when multiple accounts with collaboration" do
@@ -77,9 +77,9 @@ shared_examples_for "it takes an environment name and an account name" do
 
     it "fails when the app and environment are ambiguous across accounts" do
       run_ey({:environment => "giblets"}, {:expect_failure => true})
-      @err.should match(/multiple environments possible/i)
-      @err.should match(/ey \S+ --environment='giblets' --account='account_2'/i)
-      @err.should match(/ey \S+ --environment='giblets' --account='main'/i)
+      expect(@err).to match(/multiple environments possible/i)
+      expect(@err).to match(/ey \S+ --environment='giblets' --account='account_2'/i)
+      expect(@err).to match(/ey \S+ --environment='giblets' --account='main'/i)
     end
 
     it "runs when specifying the account disambiguates the app to deploy" do
@@ -96,12 +96,12 @@ shared_examples_for "it takes an environment name and an account name" do
     context "when the backend raises an error" do
       before do
         # FIXME, cloud-client needs to provide an API for making responses raise
-        EY::CLI::API.stub(:new).and_raise(EY::CloudClient::RequestFailed.new("Error: Important infos"))
+        allow(EY::CLI::API).to receive(:new).and_raise(EY::CloudClient::RequestFailed.new("Error: Important infos"))
       end
 
       it "returns the error message to the user" do
         fast_failing_ey(command_to_run({:environment => "giblets", :account => "main"}))
-        @err.should match(/Important infos/)
+        expect(@err).to match(/Important infos/)
       end
     end
 
@@ -125,15 +125,15 @@ shared_examples_for "it takes an environment name" do
     login_scenario "one app, one environment"
     # This test must shell out (not sure why, plz FIXME)
     ey command_to_run(:environment => 'typo-happens-here'), {:expect_failure => true}
-    @err.should match(/No environment found matching .*typo-happens-here/i)
+    expect(@err).to match(/No environment found matching .*typo-happens-here/i)
   end
 
   it "complains when you send --environment without a value" do
     login_scenario "empty"
     fast_failing_ey command_to_run({}) << '--environment'
-    @err.should include("No value provided for option '--environment'")
+    expect(@err).to include("No value provided for option '--environment'")
     fast_failing_ey command_to_run({}) << '-e'
-    @err.should include("No value provided for option '--environment'")
+    expect(@err).to include("No value provided for option '--environment'")
   end
 
   context "outside a git repo" do
@@ -158,12 +158,12 @@ shared_examples_for "it takes an environment name" do
       run_ey({:environment => 'staging'}, {:expect_failure => !@succeeds_on_multiple_matches})
 
       if @succeeds_on_multiple_matches
-        @err.should_not match(/multiple .* possible/i)
+        expect(@err).not_to match(/multiple .* possible/i)
       else
         if @takes_app_name
-          @err.should match(/multiple application environments possible/i)
+          expect(@err).to match(/multiple application environments possible/i)
         else
-          @err.should match(/multiple environments possible/i)
+          expect(@err).to match(/multiple environments possible/i)
         end
       end
     end
@@ -184,7 +184,7 @@ shared_examples_for "it takes an environment name" do
   it "complains when it can't guess the environment and its name isn't specified" do
     login_scenario "one app without environment"
     run_ey({:environment => nil}, {:expect_failure => true})
-    @err.should match(/No environment found for applications matching remotes:/i)
+    expect(@err).to match(/No environment found for applications matching remotes:/i)
   end
 end
 
@@ -194,9 +194,9 @@ shared_examples_for "it takes an app name" do
   it "complains when you send --app without a value" do
     login_scenario "empty"
     fast_failing_ey command_to_run({}) << '--app'
-    @err.should include("No value provided for option '--app'")
+    expect(@err).to include("No value provided for option '--app'")
     fast_failing_ey command_to_run({}) << '-a'
-    @err.should include("No value provided for option '--app'")
+    expect(@err).to include("No value provided for option '--app'")
   end
 
   it "allows you to specify a valid app" do
@@ -229,7 +229,7 @@ shared_examples_for "it takes an app name" do
     login_scenario "one app, one environment"
     run_ey({:environment => 'giblets', :app => 'P-time-SAT-solver', :ref => 'master'},
       {:expect_failure => true})
-    @err.should =~ /No app.*P-time-SAT-solver/i
+    expect(@err).to match(/No app.*P-time-SAT-solver/i)
   end
 
 end
@@ -242,7 +242,7 @@ shared_examples_for "it invokes engineyard-serverside" do
     end
 
     it "passes --verbose to engineyard-serverside" do
-      @ssh_commands.should have_command_like(/engineyard-serverside.*--verbose/)
+      expect(@ssh_commands).to have_command_like(/engineyard-serverside.*--verbose/)
     end
 
     it "passes along instance information to engineyard-serverside" do
@@ -256,11 +256,11 @@ shared_examples_for "it invokes engineyard-serverside" do
 
       # apps + utilities are all mentioned
       instance_args.each do |i|
-        @ssh_commands.last.should =~ /#{i}/
+        expect(@ssh_commands.last).to match(/#{i}/)
       end
 
       # but not database instances
-      @ssh_commands.last.should_not =~ /#{db_instance}/
+      expect(@ssh_commands.last).not_to match(/#{db_instance}/)
     end
 
   end
@@ -272,7 +272,7 @@ shared_examples_for "it invokes engineyard-serverside" do
     end
 
     it "omits the --instance-names parameter" do
-      @ssh_commands.last.should_not include("--instance-names")
+      expect(@ssh_commands.last).not_to include("--instance-names")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Engine Yard Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -42,30 +42,30 @@ dependencies:
   name: engineyard-serverside-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -367,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Command-line deployment for the Engine Yard cloud