ey-core 3.4.5 → 3.5.0

data/lib/ey-core/cli/servers.rb

@@ -1,41 +1,58 @@
-require 'ey-core/cli/subcommand'
-
-module Ey
-  module Core
-    module Cli
-      class Servers < Subcommand
-        title "servers"
-        summary "List servers you have access to"
-
-        option :account,
-          short: 'c',
-          long: 'account',
-          description: 'Filter by account name or id',
-          argument: 'Account'
-
-        option :environment,
-          short: "-e",
-          long: "environment",
-          description: "Filter by environment.",
-          argument: "environment"
-
-        def handle
-          puts TablePrint::Printer.
-            new(servers, [{id: {width: 10}}, :role, :provisioned_id]).
-            table_print
-        end
-
-        private
-        def servers
-          if option(:account)
-            core_client.servers.all(account: core_account)
-          elsif environment = option(:environment)
-            (core_client.environments.get(environment) || core_client.environments.first(name: environment)).servers.all
-          else
-            core_client.servers.all
-          end
-        end
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      class Servers < Subcommand
+        title 'servers'
+        summary 'List servers you have access to'
+
+        option :account,
+          short: 'c',
+          long: 'account',
+          description: 'Filter by account name or id',
+          argument: 'account'
+
+        option :environment,
+          short: 'e',
+          long: 'environment',
+          description: 'Filter by environment.',
+          argument: 'environment'
+
+        option :role,
+          short: 'r',
+          long: 'role',
+          description: 'Filter by server role.',
+          argument: 'role'
+
+        def handle
+          puts TablePrint::Printer.new(
+            servers,
+            [
+              { id: { width: 10 } },
+              :role,
+              :provisioned_id,
+              { public_hostname: { width: 50 } }
+            ]
+          ).table_print
+        end
+
+        private
+        def servers
+          filter_opts = {}
+
+          operator =
+            if option(:environment)
+              core_account.environments.first(name: option(:environment))
+            else
+              filter_opts[:account] = core_account.id if option(:account)
+              core_client
+            end
+
+          filter_opts[:role] = option(:role).split(',') if option(:role)
+          operator ? operator.servers.all(filter_opts) : nil
+        end
+      end
+    end
+  end
+end

data/lib/ey-core/cli/ssh.rb

@@ -1,150 +1,150 @@
-require 'ey-core/cli/helpers/server_sieve'
-require 'ey-core/cli/subcommand'
-
-module Ey
-  module Core
-    module Cli
-      class Ssh < Subcommand
-        title "ssh"
-        summary "Open an SSH session to the environment's application master"
-
-        option :account,
-          short: "c",
-          long: "account",
-          description: "Name or id of account",
-          argument: "account"
-
-        option :environment,
-          short: "e",
-          long: "environment",
-          description: "Name or id of environment",
-          argument: "environment"
-
-        option :server,
-          short: 's',
-          long: "server",
-          description: "Specific server to ssh into. Id or amazon id (i-12345)",
-          argument: "server"
-
-        option :utilities,
-          long: "utilities",
-          description: "Run command on the utility servers with the given names. Specify all to run the command on all utility servers.",
-          argument: "'all,resque,redis,etc'"
-
-        option :command,
-          long: "command",
-          description: "Command to run",
-          argument: "'command with args'"
-
-        option :shell,
-          long: "shell",
-          description: "Run command in a shell other than bash",
-          argument: "shell"
-
-        option :bind_address,
-          long: "bind_address",
-          description: "When no command is specified, pass -L to ssh",
-          argument: "bind address"
-
-        switch :all,
-          long: "all",
-          description: "Run command on all servers"
-
-        switch :app_servers,
-          long: "app_servers",
-          description: "Run command on all application servers"
-
-        switch :db_servers,
-          long: "db_servers",
-          description: "Run command on all database servers"
-
-        switch :db_master,
-          long: "db_master",
-          description: "Run command on database master"
-
-        switch :db_slaves,
-          long: "db_slaves",
-          description: "Run command on database slaves"
-
-        switch :tty,
-          short: 't',
-          long: "tty",
-          description: "Allocated a tty for the command"
-
-        def handle
-          operator, environment = core_operator_and_environment_for(options)
-          abort "Unable to find matching environment".red unless environment
-
-          cmd      = option(:command)
-          ssh_opts = []
-          ssh_cmd  = ["ssh"]
-          exits    = []
-          user     = environment.username
-          servers  = []
-
-          if option(:command)
-            if shell = option(:shell)
-              cmd = Escape.shell_command([shell,'-lc',cmd])
-            end
-
-            if switch_active?(:tty)
-              ssh_opts << "-t"
-            elsif cmd.match(/sudo/)
-              puts "sudo commands often need a tty to run correctly. Use -t option to spawn a tty.".yellow
-            end
-
-            servers += Ey::Core::Cli::Helpers::ServerSieve.filter(
-              environment.servers,
-              all: switch_active?(:all),
-              app_servers: switch_active?(:app_servers),
-              db_servers: switch_active?(:db_servers),
-              db_master: switch_active?(:db_master),
-              utilities: option(:utilities)
-            )
-          else
-            if option(:bind_address)
-              ssh_opts += ["-L", option(:bind_address)]
-            end
-
-            if option(:server)
-              servers += [core_server_for(server: option(:server), operator: environment)]
-            else
-              servers += Ey::Core::Cli::Helpers::ServerSieve.filter(
-                environment.servers,
-                all: switch_active?(:all),
-                app_servers: switch_active?(:app_servers),
-                db_servers: switch_active?(:db_servers),
-                db_master: switch_active?(:db_master),
-                utilities: option(:utilities)
-              )
-
-              # Reinstate default behavior: If no command is passed and no
-              # roles are passed, open a connection to the app master
-              if servers.empty?
-                servers += (environment.servers.all(role: "app_master") + environment.servers.all(role: "solo")).to_a
-              end
-            end
-          end
-
-          if servers.empty?
-            abort "Unable to find any matching servers. Aborting.".red
-          end
-
-          servers.uniq!
-
-          servers.each do |server|
-            host = server.public_hostname
-            name = server.name ? "#{server.role} (#{server.name})" : server.role
-            puts "\nConnecting to #{name} #{host}".green
-            sshcmd = Escape.shell_command((ssh_cmd + ["#{user}@#{host}"] + [cmd]).compact)
-            puts "Running command: #{sshcmd}".green
-            system sshcmd
-            exits << $?.exitstatus
-          end
-
-          exit exits.detect {|status| status != 0 } || 0
-        end
-      end
-    end
-  end
-end
+require 'ey-core/cli/helpers/server_sieve'
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      class Ssh < Subcommand
+        title "ssh"
+        summary "Open an SSH session to the environment's application master"
+
+        option :account,
+          short: "c",
+          long: "account",
+          description: "Name or id of account",
+          argument: "account"
+
+        option :environment,
+          short: "e",
+          long: "environment",
+          description: "Name or id of environment",
+          argument: "environment"
+
+        option :server,
+          short: 's',
+          long: "server",
+          description: "Specific server to ssh into. Id or amazon id (i-12345)",
+          argument: "server"
+
+        option :utilities,
+          long: "utilities",
+          description: "Run command on the utility servers with the given names. Specify all to run the command on all utility servers.",
+          argument: "'all,resque,redis,etc'"
+
+        option :command,
+          long: "command",
+          description: "Command to run",
+          argument: "'command with args'"
+
+        option :shell,
+          long: "shell",
+          description: "Run command in a shell other than bash",
+          argument: "shell"
+
+        option :bind_address,
+          long: "bind_address",
+          description: "When no command is specified, pass -L to ssh",
+          argument: "bind address"
+
+        switch :all,
+          long: "all",
+          description: "Run command on all servers"
+
+        switch :app_servers,
+          long: "app_servers",
+          description: "Run command on all application servers"
+
+        switch :db_servers,
+          long: "db_servers",
+          description: "Run command on all database servers"
+
+        switch :db_master,
+          long: "db_master",
+          description: "Run command on database master"
+
+        switch :db_slaves,
+          long: "db_slaves",
+          description: "Run command on database slaves"
+
+        switch :tty,
+          short: 't',
+          long: "tty",
+          description: "Allocated a tty for the command"
+
+        def handle
+          operator, environment = core_operator_and_environment_for(options)
+          abort "Unable to find matching environment".red unless environment
+
+          cmd      = option(:command)
+          ssh_opts = []
+          ssh_cmd  = ["ssh"]
+          exits    = []
+          user     = environment.username
+          servers  = []
+
+          if option(:command)
+            if shell = option(:shell)
+              cmd = Escape.shell_command([shell,'-lc',cmd])
+            end
+
+            if switch_active?(:tty)
+              ssh_opts << "-t"
+            elsif cmd.match(/sudo/)
+              puts "sudo commands often need a tty to run correctly. Use -t option to spawn a tty.".yellow
+            end
+
+            servers += Ey::Core::Cli::Helpers::ServerSieve.filter(
+              environment.servers,
+              all: switch_active?(:all),
+              app_servers: switch_active?(:app_servers),
+              db_servers: switch_active?(:db_servers),
+              db_master: switch_active?(:db_master),
+              utilities: option(:utilities)
+            )
+          else
+            if option(:bind_address)
+              ssh_opts += ["-L", option(:bind_address)]
+            end
+
+            if option(:server)
+              servers += [core_server_for(server: option(:server), operator: environment)]
+            else
+              servers += Ey::Core::Cli::Helpers::ServerSieve.filter(
+                environment.servers,
+                all: switch_active?(:all),
+                app_servers: switch_active?(:app_servers),
+                db_servers: switch_active?(:db_servers),
+                db_master: switch_active?(:db_master),
+                utilities: option(:utilities)
+              )
+
+              # Reinstate default behavior: If no command is passed and no
+              # roles are passed, open a connection to the app master
+              if servers.empty?
+                servers += (environment.servers.all(role: "app_master") + environment.servers.all(role: "solo")).to_a
+              end
+            end
+          end
+
+          if servers.empty?
+            abort "Unable to find any matching servers. Aborting.".red
+          end
+
+          servers.uniq!
+
+          servers.each do |server|
+            host = server.public_hostname
+            name = server.name ? "#{server.role} (#{server.name})" : server.role
+            puts "\nConnecting to #{name} #{host}".green
+            sshcmd = Escape.shell_command((ssh_cmd + ["#{user}@#{host}"] + [cmd]).compact)
+            puts "Running command: #{sshcmd}".green
+            system sshcmd
+            exits << $?.exitstatus
+          end
+
+          exit exits.detect {|status| status != 0 } || 0
+        end
+      end
+    end
+  end
+end

data/lib/ey-core/cli/status.rb

@@ -1,60 +1,60 @@
-require 'ey-core/cli/subcommand'
-require 'ey-core/cli/helpers/log_streaming'
-
-module Ey
-  module Core
-    module Cli
-      class Status < Subcommand
-        include Ey::Core::Cli::Helpers::LogStreaming
-        title "status"
-        summary "Show the deployment status of the app"
-        description <<-DESC
-Show the current status of the most recent deployment of the specifed application and environment
-DESC
-
-        option :environment,
-          short: "e",
-          long: "environment",
-          description: "Name or id of the environment to deploy to.",
-          argument: "Environment"
-
-        option :account,
-          short: 'c',
-          long: 'account',
-          description: 'Name or ID of the account that the environment resides in.  If no account is specified, the app will deploy to the first environment that meets the criteria, in the accounts you have access to.',
-          argument: 'Account name or id'
-
-        option :app,
-          short: "a",
-          long: "app",
-          description: "Application name or ID to deploy.  If :account is not specified, this will be the first app that matches the criteria in the accounts you have access to.",
-          argument: "app"
-
-        switch :tail,
-          long: "tail",
-          description: "tail in-progress deployment log"
-
-        def handle
-          operator, environment = core_operator_and_environment_for(self.options)
-          app                   = core_application_for(environment, self.options)
-          deploy                = environment.latest_deploy(app)
-
-          puts environment.release_label
-          puts "#{environment.servers.size} servers"
-          environment.servers.each do |s|
-            puts [s.provisioned_id, s.role, s.state].join(" ")
-          end
-          if deploy
-            ap deploy
-            if switch_active?(:tail)
-              stream_deploy_log(deploy.request)
-            end
-          else
-            puts "Never Deployed"
-          end
-        end
-
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/log_streaming'
+
+module Ey
+  module Core
+    module Cli
+      class Status < Subcommand
+        include Ey::Core::Cli::Helpers::LogStreaming
+        title "status"
+        summary "Show the deployment status of the app"
+        description <<-DESC
+Show the current status of the most recent deployment of the specifed application and environment
+DESC
+
+        option :environment,
+          short: "e",
+          long: "environment",
+          description: "Name or id of the environment to deploy to.",
+          argument: "Environment"
+
+        option :account,
+          short: 'c',
+          long: 'account',
+          description: 'Name or ID of the account that the environment resides in.  If no account is specified, the app will deploy to the first environment that meets the criteria, in the accounts you have access to.',
+          argument: 'Account name or id'
+
+        option :app,
+          short: "a",
+          long: "app",
+          description: "Application name or ID to deploy.  If :account is not specified, this will be the first app that matches the criteria in the accounts you have access to.",
+          argument: "app"
+
+        switch :tail,
+          long: "tail",
+          description: "tail in-progress deployment log"
+
+        def handle
+          operator, environment = core_operator_and_environment_for(self.options)
+          app                   = core_application_for(environment, self.options)
+          deploy                = environment.latest_deploy(app)
+
+          puts environment.release_label
+          puts "#{environment.servers.size} servers"
+          environment.servers.each do |s|
+            puts [s.provisioned_id, s.role, s.state].join(" ")
+          end
+          if deploy
+            ap deploy
+            if switch_active?(:tail)
+              stream_deploy_log(deploy.request)
+            end
+          else
+            puts "Never Deployed"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/ey-core/cli/subcommand.rb

@@ -1,53 +1,53 @@
-require 'belafonte'
-require 'colorize'
-require 'table_print'
-require 'ey-core'
-require 'ey-core/cli/helpers/core'
-
-module Ey
-  module Core
-    module Cli
-      class Subcommand < Belafonte::App
-        include Ey::Core::Cli::Helpers::Core
-
-        def setup
-          $stdout = stdout
-          $stderr = stderr
-          $stdin = stdin
-          $kernel = kernel
-        end
-
-        def run_handle
-          super
-        rescue Ey::Core::Response::Error => e
-          if ENV["DEBUG"]
-            puts e.inspect
-            puts e.backtrace
-          end
-          handle_core_error(e)
-        rescue => e
-          if ENV["DEBUG"]
-            puts e.inspect
-            puts e.backtrace
-          end
-          stderr.puts "Error:".red
-          stderr.puts Wrapomatic.wrap(e.message, indents: 1)
-          raise SystemExit.new(255)
-        end
-
-        #TODO: a lot more errors that would could handle with nice messages, eventually this should probably be it's own class
-        def handle_core_error(e)
-          stderr.puts "Error: #{e.error_type}".red
-          (e.response.body["errors"] || [e.message]).each do |message|
-            stderr.puts Wrapomatic.wrap(message, indents: 1)
-          end
-          if e.is_a?(Ey::Core::Response::Unauthorized)
-            stderr.puts "Check the contents of ~/.ey-core vs https://cloud.engineyard.com/cli"
-          end
-          raise SystemExit.new(255)
-        end
-
-      end
-    end
-  end
-end
+require 'belafonte'
+require 'colorize'
+require 'table_print'
+require 'ey-core'
+require 'ey-core/cli/helpers/core'
+
+module Ey
+  module Core
+    module Cli
+      class Subcommand < Belafonte::App
+        include Ey::Core::Cli::Helpers::Core
+
+        def setup
+          $stdout = stdout
+          $stderr = stderr
+          $stdin = stdin
+          $kernel = kernel
+        end
+
+        def run_handle
+          super
+        rescue Ey::Core::Response::Error => e
+          if ENV["DEBUG"]
+            puts e.inspect
+            puts e.backtrace
+          end
+          handle_core_error(e)
+        rescue => e
+          if ENV["DEBUG"]
+            puts e.inspect
+            puts e.backtrace
+          end
+          stderr.puts "Error:".red
+          stderr.puts Wrapomatic.wrap(e.message, indents: 1)
+          raise SystemExit.new(255)
+        end
+
+        #TODO: a lot more errors that would could handle with nice messages, eventually this should probably be it's own class
+        def handle_core_error(e)
+          stderr.puts "Error: #{e.error_type}".red
+          (e.response.body["errors"] || [e.message]).each do |message|
+            stderr.puts Wrapomatic.wrap(message, indents: 1)
+          end
+          if e.is_a?(Ey::Core::Response::Unauthorized)
+            stderr.puts "Check the contents of ~/.ey-core vs https://cloud.engineyard.com/cli"
+          end
+          raise SystemExit.new(255)
+        end
+
+      end
+    end
+  end
+end