engineyard 1.3.13 → 1.3.14

data/lib/engineyard/model/instance.rb

@@ -1,5 +1,5 @@
 require 'escape'
-require 'open4'
+require 'net/ssh'
 
 module EY
   module Model
@@ -74,20 +74,47 @@ module EY
       def ssh(remote_command, verbose, &block)
         raise(ArgumentError, "Block required!") unless block
 
-        raw_cmd = %w[ssh -o StrictHostKeyChecking=no]
-        raw_cmd << '-q' unless verbose
-        raw_cmd << "#{environment.username}@#{hostname}"
-        raw_cmd << remote_command
-
-        cmd = Escape.shell_command(raw_cmd)
+        exit_code = nil
+        cmd = Escape.shell_command(['bash', '-lc', remote_command])
         EY.ui.debug(cmd)
         puts cmd if verbose
         if ENV["NO_SSH"]
           block.call("NO_SSH is set. No output.")
           true
         else
-          status = Open4.spawn(cmd, :out => block, :err => block, :quiet => true)
-          status.success?
+          begin
+            Net::SSH.start(hostname, environment.username, :paranoid => false) do |net_ssh|
+              net_ssh.open_channel do |channel|
+                channel.exec cmd do |_, success|
+                  unless success
+                    block.call "Remote command execution failed"
+                    return false
+                  end
+
+                  channel.on_data do |_, data|
+                    block.call data
+                  end
+
+                  channel.on_extended_data do |_, _, data|
+                    block.call data
+                  end
+
+                  channel.on_request("exit-status") do |_, data|
+                    exit_code = data.read_long
+                  end
+
+                  channel.on_request("exit-signal") do |_, data|
+                    exit_code = 255
+                  end
+                end
+              end
+
+              net_ssh.loop
+            end
+            exit_code.zero?
+          rescue Net::SSH::AuthenticationFailed
+            raise EY::Error, "Authentication Failed: Please add your environment's ssh key with: ssh-add path/to/key"
+          end
         end
       end
 

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.13'
+  VERSION = '1.3.14'
 end

data/spec/ey/deploy_spec.rb

@@ -53,25 +53,25 @@ describe "ey deploy" do
   context "with invalid input" do
     it "complains when there is no app" do
       api_scenario "empty"
-      ey "deploy", :expect_failure => true
+      fast_failing_ey ["deploy"]
       @err.should include(%|no application configured|)
     end
 
     it "complains when the specified environment does not contain the app" do
       api_scenario "one app, one environment, not linked"
-      ey "deploy -e giblets -r master", :expect_failure => true
+      fast_failing_ey %w[deploy -e giblets -r master]
       @err.should match(/there is no application configured/i)
     end
 
     it "complains when environment is not specified and app is in >1 environment" do
       api_scenario "one app, many environments"
-      ey "deploy", :expect_failure => true
+      fast_failing_ey %w[deploy]
       @err.should match(/multiple app deployments possible/i)
     end
 
     it "complains when the app master is in a non-running state" do
       api_scenario "one app, one environment, app master red"
-      ey "deploy --environment giblets --ref master", :expect_failure => true
+      fast_failing_ey %w[deploy --environment giblets --ref master]
       @err.should_not match(/No running instances/i)
       @err.should match(/running.*\(green\)/)
     end
@@ -83,24 +83,24 @@ describe "ey deploy" do
     end
 
     it "finds engineyard-serverside despite its being buried in the filesystem" do
-      ey "deploy"
+      fast_ey %w[deploy]
       @ssh_commands.last.should =~ %r{/usr/local/ey_resin/ruby/bin/engineyard-serverside}
     end
 
     it "defaults to 'rake db:migrate'" do
-      ey "deploy"
+      fast_ey %w[deploy]
       @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
       @ssh_commands.last.should =~ /--migrate 'rake db:migrate --trace'/
     end
 
     it "can be disabled with --no-migrate" do
-      ey "deploy --no-migrate"
+      fast_ey %w[deploy --no-migrate]
       @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
       @ssh_commands.last.should_not =~ /--migrate/
     end
 
     it "uses the default when --migrate is specified with no value" do
-      ey "deploy --migrate"
+      fast_ey %w[deploy --migrate]
       @ssh_commands.last.should match(/--migrate 'rake db:migrate --trace'/)
     end
 
@@ -111,7 +111,7 @@ describe "ey deploy" do
       after  { File.unlink 'ey.yml' }
 
       it "migrates with the custom command by default" do
-        ey "deploy"
+        fast_ey %w[deploy]
         @ssh_commands.last.should =~ /--migrate 'thor fancy:migrate'/
       end
     end
@@ -121,18 +121,18 @@ describe "ey deploy" do
       after  { File.unlink 'ey.yml' }
 
       it "does not migrate by default" do
-        ey "deploy"
+        fast_ey %w[deploy]
         @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
         @ssh_commands.last.should_not =~ /--migrate/
       end
 
       it "can be turned back on with --migrate" do
-        ey "deploy --migrate 'rake fancy:migrate'"
+        fast_ey ["deploy", "--migrate", "rake fancy:migrate"]
         @ssh_commands.last.should =~ /--migrate 'rake fancy:migrate'/
       end
 
       it "migrates with the default when --migrate is specified with no value" do
-        ey "deploy --migrate"
+        fast_ey %w[deploy --migrate]
         @ssh_commands.last.should match(/--migrate 'rake db:migrate --trace'/)
       end
     end
@@ -142,7 +142,7 @@ describe "ey deploy" do
       after  { File.unlink 'ey.yml' }
 
       it "migrates with the default" do
-        ey "deploy"
+        fast_ey %w[deploy]
         @ssh_commands.last.should match(/--migrate 'rake db:migrate --trace'/)
       end
     end
@@ -155,12 +155,12 @@ describe "ey deploy" do
       after  { File.unlink 'ey.yml' }
 
       it "does not migrate by default" do
-        ey "deploy"
+        fast_ey %w[deploy]
         @ssh_commands.last.should_not match(/--migrate/)
       end
 
       it "migrates with the custom command when --migrate is specified with no value" do
-        ey "deploy --migrate"
+        fast_ey %w[deploy --migrate]
         @ssh_commands.last.should match(/--migrate 'thor fancy:migrate'/)
       end
     end
@@ -172,7 +172,7 @@ describe "ey deploy" do
     end
 
     it "passes the framework environment" do
-      ey "deploy"
+      fast_ey %w[deploy]
       @ssh_commands.last.should match(/--framework-env production/)
     end
   end
@@ -199,27 +199,27 @@ describe "ey deploy" do
 
     context "without a configured default branch" do
       it "defaults to the checked-out local branch" do
-        ey "deploy"
+        fast_ey %w[deploy]
         @ssh_commands.last.should =~ /--ref resolved-current-branch/
       end
 
       it "deploys another branch if given" do
-        ey "deploy --ref master"
+        fast_ey %w[deploy --ref master]
         @ssh_commands.last.should =~ /--ref resolved-master/
       end
 
       it "deploys a tag if given" do
-        ey "deploy --ref v1"
+        fast_ey %w[deploy --ref v1]
         @ssh_commands.last.should =~ /--ref resolved-v1/
       end
 
       it "allows using --branch to specify a branch" do
-        ey "deploy --branch master"
+        fast_ey %w[deploy --branch master]
         @ssh_commands.last.should match(/--ref resolved-master/)
       end
 
       it "allows using --tag to specify the tag" do
-        ey "deploy --tag v1"
+        fast_ey %w[deploy --tag v1]
         @ssh_commands.last.should match(/--ref resolved-v1/)
       end
     end
@@ -234,7 +234,7 @@ describe "ey deploy" do
       end
 
       it "gets passed along to engineyard-serverside" do
-        ey "deploy"
+        fast_ey %w[deploy]
         @ssh_commands.last.should =~ /--config '\{\"bert\":\"ernie\"\}'/
       end
     end
@@ -249,17 +249,17 @@ describe "ey deploy" do
       end
 
       it "deploys the default branch by default" do
-        ey "deploy"
+        fast_ey %w[deploy]
         @ssh_commands.last.should =~ /--ref resolved-master/
       end
 
       it "complains about a non-default branch without --ignore-default_branch" do
-        ey "deploy -r current-branch", :expect_failure => true
+        fast_failing_ey %w[deploy -r current-branch]
         @err.should =~ /deploy branch is set to "master"/
       end
 
       it "deploys a non-default branch with --ignore-default-branch" do
-        ey "deploy -r current-branch --ignore-default-branch"
+        fast_ey %w[deploy -r current-branch --ignore-default-branch]
         @ssh_commands.last.should =~ /--ref resolved-current-branch/
       end
     end
@@ -271,7 +271,7 @@ describe "ey deploy" do
     end
 
     it "lets you choose by complete name even if the complete name is ambiguous" do
-      ey "deploy --environment railsapp_staging"
+      fast_ey %w[deploy --environment railsapp_staging]
       @out.should match(/Beginning deploy for.*'railsapp_staging'/)
     end
   end
@@ -304,7 +304,7 @@ describe "ey deploy" do
       after { File.unlink("ey.yml") }
 
       it "overrides what's in ey.yml" do
-        ey "deploy --extra-deploy-hook-options beer:esb"
+        fast_ey %w[deploy --extra-deploy-hook-options beer:esb]
         extra_deploy_hook_options['beer'].should == 'esb'
       end
     end
@@ -325,14 +325,14 @@ describe "ey deploy" do
     end
 
     it "allows you to specify an app when not in a directory" do
-      ey "deploy --app rails232app --ref master"
+      fast_ey %w[deploy --app rails232app --ref master]
       @ssh_commands.last.should match(/--app rails232app/)
       @ssh_commands.last.should match(/--ref resolved-master/)
     end
 
     it "requires that you specify a ref when specifying the application" do
       Dir.chdir(File.expand_path("~")) do
-        ey "deploy --app rails232app", :expect_failure => true
+        fast_failing_ey %w[deploy --app rails232app]
         @err.should match(/you must also specify the ref to deploy/)
       end
     end
@@ -343,7 +343,7 @@ describe "ey deploy" do
 
     before(:all) do
       api_scenario "one app, one environment", "user@git.host:path/to/repo.git"
-      ey "deploy"
+      fast_ey ["deploy"]
       @deploy_command = @ssh_commands.find {|c| c =~ /engineyard-serverside.*deploy/ }
     end
 

data/spec/support/helpers.rb

@@ -1,6 +1,9 @@
+require 'engineyard/cli'
+
 require 'realweb'
-require "rest_client"
+require 'rest_client'
 require 'open4'
+require 'stringio'
 
 module Spec
   module Helpers
@@ -16,6 +19,56 @@ module Spec
     NonzeroExitStatus = Class.new(UnexpectedExit)
     ZeroExitStatus = Class.new(UnexpectedExit)
 
+    def fast_ey(args)
+      err, out = StringIO.new, StringIO.new
+      capture_stderr_into(err) do
+        capture_stdout_into(out) do
+          with_env('DEBUG' => 'true') do
+            EY::CLI.start(args)
+          end
+        end
+      end
+    ensure
+      @err, @out = err.string, out.string
+      @raw_ssh_commands, @ssh_commands = extract_ssh_commands(@out)
+    end
+
+    def fast_failing_ey(*args)
+      begin
+        fast_ey(*args)
+        raise ZeroExitStatus
+      rescue SystemExit => exit_status
+        # SystemExit typically indicates a bogus command, which we
+        # here in expected-to-fail land are entirely happy with.
+        nil
+      rescue EY::Error => e
+        more_err, more_out = StringIO.new, StringIO.new
+
+        capture_stderr_into(more_err) do
+          capture_stdout_into(more_out) do
+            EY.ui.print_exception(e)
+          end
+        end
+
+        @err << more_err.string
+        @out << more_out.string
+      end
+    end
+
+    def capture_stderr_into(stream)
+      $stderr = stream
+      yield
+    ensure
+      $stderr = STDERR
+    end
+
+    def capture_stdout_into(stream)
+      $stdout = stream
+      yield
+    ensure
+      $stdout = STDOUT
+    end
+
     def ey(cmd = nil, options = {}, &block)
       hide_err = options.has_key?(:hide_err) ? options[:hide_err] : options[:expect_failure]
       path_prepends = options[:prepend_to_path]
@@ -54,14 +107,26 @@ module Spec
         end
       end
 
-      @raw_ssh_commands = @out.split(/\n/).find_all do |line|
-        line =~ /^ssh/
+      @raw_ssh_commands, @ssh_commands = extract_ssh_commands(@out)
+
+      puts @err unless @err.empty? || hide_err
+      @out
+    end
+
+    def extract_ssh_commands(output)
+      raw_ssh_commands = @out.split(/\n/).find_all do |line|
+        line =~ /^bash -lc/ || line =~ /^ssh/
       end
 
-      @ssh_commands = @raw_ssh_commands.map do |cmd|
+      ssh_commands = raw_ssh_commands.map do |cmd|
         # Strip off everything up to and including user@host, leaving
         # just the command that the remote system would run
-        ssh_prefix_removed = cmd.gsub(/^.*?\w+@\S*\s*/, '')
+        #
+        # XXX: this is a really icky icky.
+        # engineyard gem was written as if shelling out to run serverside
+        # and running an ssh command will always be the same. This is a nasty
+        # hack to get it working with Net::SSH for now so we can repair 1.9.2.
+        ssh_prefix_removed = cmd.gsub(/^bash -lc /, '').gsub(/^ssh .*?\w+@\S*\s*/, '')
 
         # Its arguments have been double-escaped: one layer is to get
         # them through our local shell and into ssh, and the other
@@ -72,8 +137,7 @@ module Spec
         `echo #{just_the_remote_command}`.strip
       end
 
-      puts @err unless @err.empty? || hide_err
-      @out
+      [raw_ssh_commands, ssh_commands]
     end
 
     def api_scenario(scenario, remote = "user@git.host:path/to/repo.git")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 3
-  - 13
-  version: 1.3.13
+  - 14
+  version: 1.3.14
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 -08:00
+date: 2011-01-11 00:00:00 -08:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,14 +118,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 33
         segments: 
-        - 1
+        - 2
         - 0
-        - 1
-        version: 1.0.1
+        - 23
+        version: 2.0.23
   requirement: *id007
-  name: open4
+  name: net-ssh
   prerelease: false
   type: :runtime
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.