ey-core 3.4.5 → 3.5.0

data/lib/ey-core/cli/helpers/log_streaming.rb

@@ -1,41 +1,41 @@
-module Ey
-  module Core
-    module Cli
-      module Helpers
-        module LogStreaming
-
-          def stream_deploy_log(request)
-            if request.finished_at
-              return finished_request(request)
-            end
-            unless request.read_channel
-              puts "Unable to stream log (streaming not enabled for this deploy)".yellow
-              return
-            end
-            request.subscribe { |m| print m["message"] if m.is_a?(Hash) }
-            puts "" # fix console output from stream
-            finished_request(request)
-          end
-
-          def finished_request(request)
-            if request.successful
-              if request.resource.successful
-                puts "Deploy successful!".green
-              else
-                puts "Deploy failed!".red
-              end
-            else
-              abort <<-EOF
-        Deploy failed!
-        Request output:
-        #{request.message}
-              EOF
-              .red
-            end
-          end
-
-        end
-      end
-    end
-  end
-end
+module Ey
+  module Core
+    module Cli
+      module Helpers
+        module LogStreaming
+
+          def stream_deploy_log(request)
+            if request.finished_at
+              return finished_request(request)
+            end
+            unless request.read_channel
+              puts "Unable to stream log (streaming not enabled for this deploy)".yellow
+              return
+            end
+            request.subscribe { |m| print m["message"] if m.is_a?(Hash) }
+            puts "" # fix console output from stream
+            finished_request(request)
+          end
+
+          def finished_request(request)
+            if request.successful
+              if request.resource.successful
+                puts "Deploy successful!".green
+              else
+                puts "Deploy failed!".red
+              end
+            else
+              abort <<-EOF
+        Deploy failed!
+        Request output:
+        #{request.message}
+              EOF
+              .red
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/ey-core/cli/helpers/server_sieve.rb

@@ -1,76 +1,76 @@
-module Ey
-  module Core
-    module Cli
-      module Helpers
-        class ServerSieve
-          ROLES = [
-            :app_servers,
-            :db_servers,
-            :db_master,
-            :utilities
-          ]
-
-          attr_reader :servers_api, :options
-
-          def self.filter(servers_api, options = {})
-            new(servers_api, options).filtered
-          end
-
-          def initialize(servers_api, options = {})
-            @servers_api = servers_api
-            @options = options
-          end
-
-          def filtered
-            return all_servers if requested?(:all)
-
-            requested_roles.map {|role|
-              role == :utilities ? utils_named(option(:utilities)) : send(role)
-            }.flatten.uniq
-          end
-
-          private
-          def requested_roles
-            #self.class::
-            ROLES.select {|role| requested?(role)}
-          end
-
-          def option(name)
-            options[name]
-          end
-
-          def requested?(name)
-            option(name)
-          end
-
-          def all_servers
-            servers_api.all.to_a.uniq
-          end
-
-          def app_servers
-            ['app_master', 'app', 'solo'].
-              map {|role| servers_api.all(role: role).to_a}.
-              flatten
-          end
-
-          def db_servers
-            db_master + servers_api.all(role: 'db_slave').to_a
-          end
-
-          def db_master
-            ['db_master', 'solo'].
-              map {|role| servers_api.all(role: role).to_a}.
-              flatten
-          end
-
-          def utils_named(name)
-            filter = {role: 'util'}
-            filter[:name] = name unless name.downcase == 'all'
-
-            servers_api.all(filter).to_a
-          end
-        end
-      end
-    end
-  end
-end
+module Ey
+  module Core
+    module Cli
+      module Helpers
+        class ServerSieve
+          ROLES = [
+            :app_servers,
+            :db_servers,
+            :db_master,
+            :utilities
+          ]
+
+          attr_reader :servers_api, :options
+
+          def self.filter(servers_api, options = {})
+            new(servers_api, options).filtered
+          end
+
+          def initialize(servers_api, options = {})
+            @servers_api = servers_api
+            @options = options
+          end
+
+          def filtered
+            return all_servers if requested?(:all)
+
+            requested_roles.map {|role|
+              role == :utilities ? utils_named(option(:utilities)) : send(role)
+            }.flatten.uniq
+          end
+
+          private
+          def requested_roles
+            #self.class::
+            ROLES.select {|role| requested?(role)}
+          end
+
+          def option(name)
+            options[name]
+          end
+
+          def requested?(name)
+            option(name)
+          end
+
+          def all_servers
+            servers_api.all.to_a.uniq
+          end
+
+          def app_servers
+            ['app_master', 'app', 'solo'].
+              map {|role| servers_api.all(role: role).to_a}.
+              flatten
+          end
+
+          def db_servers
+            db_master + servers_api.all(role: 'db_slave').to_a
+          end
+
+          def db_master
+            ['db_master', 'solo'].
+              map {|role| servers_api.all(role: role).to_a}.
+              flatten
+          end
+
+          def utils_named(name)
+            filter = {role: 'util'}
+            filter[:name] = name unless name.downcase == 'all'
+
+            servers_api.all(filter).to_a
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ey-core/cli/helpers/stream_printer.rb

@@ -1,42 +1,42 @@
-module Ey
-  module Core
-    module Cli
-      module Helpers
-        module StreamPrinter
-
-          def stream_print(opts)
-            yield Printer.new(opts)
-          end
-
-          class Printer
-            def initialize(rows = {})
-              @rows = rows
-            end
-            def print(*vals)
-              unless @header_printed
-                header = []
-                separator = []
-                @rows.each do |k,v|
-                  header << format(k, v)
-                  separator << '-' * v
-                end
-                puts header.join("| ")
-                puts separator.join("|-")
-                @header_printed = true
-              end
-              line = []
-              vals.each_with_index do |v,index|
-                line << format(v, @rows.values[index])
-              end
-              puts line.join("| ")
-            end
-            def format(value, width)
-              TablePrint::FixedWidthFormatter.new(width).format(value)
-            end
-          end
-
-        end
-      end
-    end
-  end
-end
+module Ey
+  module Core
+    module Cli
+      module Helpers
+        module StreamPrinter
+
+          def stream_print(opts)
+            yield Printer.new(opts)
+          end
+
+          class Printer
+            def initialize(rows = {})
+              @rows = rows
+            end
+            def print(*vals)
+              unless @header_printed
+                header = []
+                separator = []
+                @rows.each do |k,v|
+                  header << format(k, v)
+                  separator << '-' * v
+                end
+                puts header.join("| ")
+                puts separator.join("|-")
+                @header_printed = true
+              end
+              line = []
+              vals.each_with_index do |v,index|
+                line << format(v, @rows.values[index])
+              end
+              puts line.join("| ")
+            end
+            def format(value, width)
+              TablePrint::FixedWidthFormatter.new(width).format(value)
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -1,14 +1,14 @@
-require 'ey-core/cli/subcommand'
-require 'ey-core/cli/helpers/deprecated'
-
-module Ey
-  module Core
-    module Cli
-      class Init < Subcommand
-        include Helpers::Deprecated
-
-        deprecate('init')
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/deprecated'
+
+module Ey
+  module Core
+    module Cli
+      class Init < Subcommand
+        include Helpers::Deprecated
+
+        deprecate('init')
+      end
+    end
+  end
+end

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

@@ -1,38 +1,38 @@
-require 'ey-core/cli/subcommand'
-
-module Ey
-  module Core
-    module Cli
-      class Login < Subcommand
-        title "login"
-        summary "Retrieve API token from Engine Yard Cloud"
-
-        def handle
-          email    = ENV["EMAIL"]    || ask("Email: ")
-          password = ENV["PASSWORD"] || ask("Password: ") { |q| q.echo = false }
-
-          token = unauthenticated_core_client.
-            get_api_token(email, password).
-            body["api_token"]
-
-          existing_token = core_yaml[core_url]
-          write_token= if existing_token && existing_token != token
-                         puts "New token does not match existing token.  Overwriting".yellow
-                         true
-                       elsif existing_token == token
-                         puts "Token already exists".green
-                         false
-                       else
-                         puts "Writing token".green
-                         true
-                       end
-
-          write_core_yaml(token) if write_token
-
-        rescue Ey::Core::Response::Unauthorized
-          abort "Invalid email or password".yellow
-        end
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      class Login < Subcommand
+        title "login"
+        summary "Retrieve API token from Engine Yard Cloud"
+
+        def handle
+          email    = ENV["EMAIL"]    || ask("Email: ")
+          password = ENV["PASSWORD"] || ask("Password: ") { |q| q.echo = false }
+
+          token = unauthenticated_core_client.
+            get_api_token(email, password).
+            body["api_token"]
+
+          existing_token = core_yaml[core_url]
+          write_token= if existing_token && existing_token != token
+                         puts "New token does not match existing token.  Overwriting".yellow
+                         true
+                       elsif existing_token == token
+                         puts "Token already exists".green
+                         false
+                       else
+                         puts "Writing token".green
+                         true
+                       end
+
+          write_core_yaml(token) if write_token
+
+        rescue Ey::Core::Response::Unauthorized
+          abort "Invalid email or password".yellow
+        end
+      end
+    end
+  end
+end

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

@@ -1,22 +1,22 @@
-require 'ey-core/cli/subcommand'
-
-module Ey
-  module Core
-    module Cli
-      class Logout < Subcommand
-        title "logout"
-        summary "Remove your Engine Yard API token"
-
-        def handle
-          if core_yaml[core_url]
-            core_yaml.delete(core_url)
-            write_core_yaml
-            puts "Successfully removed API token from credentials file".green
-          else
-            puts "No API token found".yellow
-          end
-        end
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      class Logout < Subcommand
+        title "logout"
+        summary "Remove your Engine Yard API token"
+
+        def handle
+          if core_yaml[core_url]
+            core_yaml.delete(core_url)
+            write_core_yaml
+            puts "Successfully removed API token from credentials file".green
+          else
+            puts "No API token found".yellow
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,70 +1,70 @@
-require 'ey-core/cli/subcommand'
-
-module Ey
-  module Core
-    module Cli
-      class Logs < Subcommand
-        title "logs"
-        summary "Retrieve the latest logs for an environment"
-        description <<-DESC
-Displays Engine Yard configuration logs for all servers in the environment.  If
-recipes were uploaded to the environment & run, their logs will also be
-displayed beneath the main configuration logs.
-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 :server,
-          short: 's',
-          long: 'server',
-          description: "Only retrieve logs for the specified server",
-          argument: "id or amazon_id"
-
-        def handle
-          operator, environment = core_operator_and_environment_for(options)
-          abort "Unable to find matching environment".red unless environment
-
-          servers = if option(:server)
-                      if option(:server).match(/i-/)
-                        environment.servers.all(provisioned_id: option(:server))
-                      else
-                        [environment.servers.get(option(:server))].compact
-                      end
-                    else
-                      environment.servers.all
-                    end
-
-          abort "No servers found".red if servers.empty?
-
-          servers.each do |server|
-            name = [server.provisioned_id, server.name, server.role].compact.join(" ")
-
-            if main_log = server.latest_main_log
-              puts "Main logs for #{name}:".green
-              puts main_log.contents
-              if custom_log = server.latest_custom_log
-                #only older stack versions will have custom logs at all, so to avoid showing in-accurate logs, ensure the latest custom log is created (run) chronologically after the latest main log
-                if main_log.created_at < custom_log.created_at
-                  puts "Custom logs for #{name}:".green
-                  puts custom_log.contents
-                end
-              end
-            else
-              puts "No Logs".yellow
-            end
-          end
-        end
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      class Logs < Subcommand
+        title "logs"
+        summary "Retrieve the latest logs for an environment"
+        description <<-DESC
+Displays Engine Yard configuration logs for all servers in the environment.  If
+recipes were uploaded to the environment & run, their logs will also be
+displayed beneath the main configuration logs.
+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 :server,
+          short: 's',
+          long: 'server',
+          description: "Only retrieve logs for the specified server",
+          argument: "id or amazon_id"
+
+        def handle
+          operator, environment = core_operator_and_environment_for(options)
+          abort "Unable to find matching environment".red unless environment
+
+          servers = if option(:server)
+                      if option(:server).match(/i-/)
+                        environment.servers.all(provisioned_id: option(:server))
+                      else
+                        [environment.servers.get(option(:server))].compact
+                      end
+                    else
+                      environment.servers.all
+                    end
+
+          abort "No servers found".red if servers.empty?
+
+          servers.each do |server|
+            name = [server.provisioned_id, server.name, server.role].compact.join(" ")
+
+            if main_log = server.latest_main_log
+              puts "Main logs for #{name}:".green
+              puts main_log.contents
+              if custom_log = server.latest_custom_log
+                #only older stack versions will have custom logs at all, so to avoid showing in-accurate logs, ensure the latest custom log is created (run) chronologically after the latest main log
+                if main_log.created_at < custom_log.created_at
+                  puts "Custom logs for #{name}:".green
+                  puts custom_log.contents
+                end
+              end
+            else
+              puts "No Logs".yellow
+            end
+          end
+        end
+      end
+    end
+  end
+end