engineyard 3.1.3 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db1c2f9e038b686249fa2d9de438e2a4b15b97e5
-  data.tar.gz: 812ae3efa8e5b4548ef34740ccf76e4f1121a0ce
+  metadata.gz: f1e06c616357b9704ae4bc72a77c8a3f1db653d6
+  data.tar.gz: 74c3b3bc128af34c303ef237e5ce93078e213732
 SHA512:
-  metadata.gz: f8e2f9e4d93b5482a9901c5f0074ff19a9ec27d417b2137024894b1ffc21a67dd3a2ffa0bc4d25adec738f9ddb597d4b22217527bc8c056145fe9aae1d5ce577
-  data.tar.gz: bdb090c43460f0e3bbf695f8229485633052456a390e5239377a1a6a162631c5289de1b9506d496026f384c35965261f291d52714c7b38661194e6de5923d0a5
+  metadata.gz: 046cb60b0d7a6c1c36f3577c86050da53a9d99fbb97ed4974886717aed1a08185d7fabfd931e6557241f28132305695c2c00c817aa7c81873bb3f750ab23d0c5
+  data.tar.gz: 4eff8c75b738ecdba7fbc0eb930acb3cd3311696faf1d9496a5aa84f36de13b838671a9ac5698d57572ba70c1ad739ce3ef4ae42ce867df75db3e787a3d45d21

data/lib/engineyard/cli.rb

@@ -522,6 +522,50 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
       exit exits.detect {|status| status != 0 } || 0
     end
 
+    desc "console [--app APP] [--environment ENVIRONMENT] [--account ACCOUNT]", "Open a Rails console session to the master app server."
+    long_desc <<-DESC
+      Opens a Rails console session on app master.
+    DESC
+    method_option :environment, type: :string, aliases: %w(-e),
+      required: true, default: '',
+      desc: "Environment to console into"
+    method_option :app, type: :string, aliases: %w(-a),
+      required: true, default: '',
+      desc: "Name of the application"
+    method_option :account, type: :string, aliases: %w(-c),
+      required: true, default: '',
+      desc: "Name of the account in which the environment can be found"
+
+    def console
+      app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
+      instances = filter_servers(app_env.environment, options, default: {app_master: true})
+      user = app_env.environment.username
+      cmd = "cd /data/#{app_env.app.name}/current && bundle exec rails console"
+      cmd = Escape.shell_command(['bash','-lc',cmd])
+
+      ssh_cmd = ["ssh"]
+      ssh_cmd += ["-t"]
+
+      trap(:INT) { abort "Aborting..." }
+
+      exits = []
+      instances.each do |instance|
+        host = instance.public_hostname
+        name = instance.name ? "#{instance.role} (#{instance.name})" : instance.role
+        ui.info "\nConnecting to #{name} #{host}..."
+        unless cmd
+          ui.info "Ctrl + C to abort"
+          sleep 1.3
+        end
+        sshcmd = Escape.shell_command((ssh_cmd + ["#{user}@#{host}"] + [cmd]).compact)
+        ui.debug "$ #{sshcmd}"
+        system sshcmd
+        exits << $?.exitstatus
+      end
+
+      exit exits.detect {|status| status != 0 } || 0
+    end
+
     desc "scp [FROM_PATH] [TO_PATH] [--all] [--environment ENVIRONMENT]", "scp a file to/from multiple servers in an environment"
     long_desc <<-DESC
       Use the system `scp` command to copy files to some or all of the servers.

data/lib/engineyard/version.rb

@@ -1,4 +1,4 @@
 module EY
-  VERSION = '3.1.3'
+  VERSION = '3.2.0'
   ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.6.3'
 end

data/spec/ey/console_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+print_my_args_ssh = "#!/bin/sh\necho ssh $*"
+
+shared_examples_for "running ey console" do
+  given "integration"
+
+  def extra_ey_options
+    {:prepend_to_path => {'ssh' => "#!/bin/sh\necho ssh $*"}}
+  end
+
+  def command_to_run(opts)
+    cmd = ["console"]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--quiet"                             if opts[:quiet]
+    cmd
+  end
+end
+
+describe "ey console" do
+  include_examples "running ey console"
+
+  it "complains if it has no app master" do
+    login_scenario "one app, many environments"
+    ey %w[console -e bakon], :expect_failure => true
+    expect(@err).to match(/'bakon' does not have any matching instances/)
+  end
+
+  it "opens the console on the right server" do
+    login_scenario "one app, one environment"
+    ey command_to_run(:environment => 'giblets', :verbose => true)
+    expect(@raw_ssh_commands.select do |command|
+      command =~ /^ssh -t turkey@app_master_hostname.+ bash -lc '.+bundle exec rails console'$/
+    end).not_to be_empty
+    expect(@raw_ssh_commands.select do |command|
+      command =~ /^ssh -t turkey.+$/
+    end.count).to eq(1)
+  end
+
+  it "is quiet" do
+    login_scenario "one app, one environment"
+    ey command_to_run(:environment => 'giblets', :quiet => true)
+    expect(@out).to match(/ssh.*-t turkey/)
+    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(:environment => 'giblets', :quiet => true)
+    expect(@out).to match(/ssh.*bash -lc '.+bundle/)
+  end
+
+  it "raises an error when there are no matching hosts" do
+    login_scenario "one app, one environment, no instances"
+    ey command_to_run(:environment => 'giblets', :quiet => true), :expect_failure => true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0
 platform: ruby
 authors:
 - Engine Yard Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -303,6 +303,7 @@ files:
 - spec/engineyard/eyrc_spec.rb
 - spec/engineyard/repo_spec.rb
 - spec/engineyard_spec.rb
+- spec/ey/console_spec.rb
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb
 - spec/ey/init_spec.rb
@@ -379,6 +380,7 @@ test_files:
 - spec/engineyard/eyrc_spec.rb
 - spec/engineyard/repo_spec.rb
 - spec/engineyard_spec.rb
+- spec/ey/console_spec.rb
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb
 - spec/ey/init_spec.rb