engineyard 2.1.2 → 2.1.3

data/README.md

@@ -267,6 +267,8 @@ Options:
         [--db-slaves]                # Run command on the slave database servers
     -e, [--environment=ENVIRONMENT]  # Name of the environment to ssh into
     -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+    -s, [--shell]                    # Use a particular shell instead of the default bash
+        [--no-shell]                 # Don't use a shell to run the command (default behavior of ssh)
 
 #### ey launch
 

data/lib/engineyard/cli.rb

@@ -363,6 +363,8 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
       :desc => "Run command on the slave database servers"
     method_option :utilities, :type => :array, :lazy_default => true,
       :desc => "Run command on the utility servers with the given names. If no names are given, run on all utility servers."
+    method_option :shell, :type => :string, :default => 'bash', :aliases => %w(-s),
+      :desc => "Run command in a shell other than bash. Use --no-shell to run the command without a shell."
 
     def ssh(cmd=nil)
       environment = fetch_environment(options[:environment], options[:account])
@@ -370,6 +372,10 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
 
       raise NoCommandError.new if cmd.nil? and hosts.size != 1
 
+      if options[:shell] && cmd
+        cmd = Escape.shell_command([options[:shell],'-lc',cmd])
+      end
+
       exits = hosts.map do |host|
         system Escape.shell_command(['ssh', "#{environment.username}@#{host}", cmd].compact)
         $?.exitstatus

data/lib/engineyard/version.rb

@@ -1,4 +1,4 @@
 module EY
-  VERSION = '2.1.2'
-  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.1.3'
+  VERSION = '2.1.3'
+  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.1.4'
 end

data/spec/ey/ssh_spec.rb

@@ -26,7 +26,9 @@ shared_examples_for "running ey ssh for select role" do
   def command_to_run(opts)
     cmd = ["ssh", opts[:ssh_command]].compact + (@ssh_flag || [])
     cmd << "--environment" << opts[:environment] if opts[:environment]
-    cmd << "--quiet" if opts[:quiet]
+    cmd << "--shell"       << opts[:shell]       if opts[:shell]
+    cmd << "--no-shell"                          if opts[:no_shell]
+    cmd << "--quiet"                             if opts[:quiet]
     cmd
   end
 
@@ -50,6 +52,25 @@ shared_examples_for "running ey ssh for select role" do
     @out.should_not =~ /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/
+  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/
+  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/
+  end
+
   it "raises an error when there are no matching hosts" do
     login_scenario "one app, one environment, no instances"
     ey command_to_run({:ssh_command => "ls", :environment => 'giblets', :verbose => true}), :expect_failure => true
@@ -108,12 +129,14 @@ describe "ey ssh with a command" do
     cmd = %w[ssh ls]
     cmd << "--environment" << opts[:environment] if opts[:environment]
     cmd << "--account"     << opts[:account]     if opts[:account]
+    cmd << "--shell"       << opts[:shell]       if opts[:shell]
+    cmd << "--no-shell"                          if opts[:no_shell]
     cmd
   end
 
   def verify_ran(scenario)
     ssh_target = scenario[:ssh_username] + '@' + scenario[:master_hostname]
-    @raw_ssh_commands.should == ["ssh #{ssh_target} ls"]
+    @raw_ssh_commands.should == ["ssh #{ssh_target} 'bash -lc ls'"]
   end
 
   include_examples "it takes an environment name and an account name"
@@ -131,6 +154,8 @@ describe "ey ssh with a command that fails" do
     cmd = %w[ssh ls]
     cmd << "--environment" << opts[:environment] if opts[:environment]
     cmd << "--account"     << opts[:account]     if opts[:account]
+    cmd << "--shell"       << opts[:shell]       if opts[:shell]
+    cmd << "--no-shell"                          if opts[:no_shell]
     cmd
   end
 
@@ -147,12 +172,14 @@ describe "ey ssh with a multi-part command" do
     cmd = ['ssh', 'echo "echo"']
     cmd << "--environment" << opts[:environment] if opts[:environment]
     cmd << "--account"     << opts[:account]     if opts[:account]
+    cmd << "--shell"       << opts[:shell]       if opts[:shell]
+    cmd << "--no-shell"                          if opts[:no_shell]
     cmd
   end
 
   def verify_ran(scenario)
     ssh_target = scenario[:ssh_username] + '@' + scenario[:master_hostname]
-    @raw_ssh_commands.should == ["ssh #{ssh_target} 'echo \"echo\"'"]
+    @raw_ssh_commands.should == ["ssh #{ssh_target} 'bash -lc '\\''echo \"echo\"'\\'"]
   end
 
   include_examples "it takes an environment name and an account name"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -426,7 +426,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4232735394062201752
+      hash: -4308353544926307178
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -435,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4232735394062201752
+      hash: -4308353544926307178
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25