ey-core 3.6.4 → 3.6.5

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

@@ -1,126 +1,126 @@
-require 'ey-core/cli/subcommand'
-require 'ey-core/cli/helpers/log_streaming'
-
-module Ey
-  module Core
-    module Cli
-      class Deploy < Subcommand
-        include Ey::Core::Cli::Helpers::LogStreaming
-        title "deploy"
-        summary "Deploy your application"
-
-        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 :ref,
-          short: "r",
-          long: "ref",
-          description: "A git reference to deploy.",
-          argument: "ref"
-
-        option :migrate,
-          short: "m",
-          long: "migrate",
-          description: "The migration command to run.  This option has a 50 character limit.",
-          argument: "migrate"
-        option :serverside_version,
-          short: "S",
-          long: "serverside_version",
-          description: "Override the default version of engineyard-serverside. The version must match a released version. Use with care.",
-          argument: "serverside_version"
-
-        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 :no_wait,
-          long: "no-wait",
-          description: "Don't wait for deploy to finish, exit after deploy is started"
-
-        switch :verbose,
-          short: "v",
-          long: "verbose",
-          description: "Stream deploy output to this console. Alias to stream for backwards compatibility."
-
-        switch :no_migrate,
-          long: "no-migrate",
-          description: "Skip migration."
-
-        def handle
-          operator, environment = core_operator_and_environment_for(self.options)
-          if operator.is_a?(Ey::Core::Client::Account)
-            abort <<-EOF
-Found account #{operator.name} but requested account #{option(:account)}.
-Use the ID of the account instead of the name.
-This can be retrieved by running "ey-core accounts".
-EOF
-            .red unless operator.name == option(:account) || operator.id == option(:account)
-          end
-
-          unless environment
-            abort "Unable to locate environment #{option[:environment]} in #{operator.name}".red
-          end
-
-          unless option(:account)
-            self.options.merge!(environment: environment)
-          end
-
-          app = core_application_for(environment, self.options)
-
-          deploy_options = {verbose: switch_active?(:verbose), cli_args: ARGV}
-          latest_deploy = nil
-	  if options[:serverside_version]
-            deploy_options.merge!(serverside_version: option(:serverside_version))
-          end
-          if options[:ref]
-            deploy_options.merge!(ref: option(:ref))
-          else
-            puts "--ref not provided, checking latest deploy...".yellow
-            latest_deploy ||= environment.latest_deploy(app)
-            if latest_deploy && latest_deploy.ref
-              deploy_options[:ref] = latest_deploy.ref
-            else
-              raise "--ref is required (HEAD is the typical choice)"
-            end
-          end
-          if (option(:migrate) || switch_active?(:no_migrate))
-            deploy_options.merge!(migrate_command: option(:migrate)) if option(:migrate)
-            deploy_options.merge!(migrate_command: nil) if switch_active?(:no_migrate)
-          else
-            puts "missing migrate option (--migrate or --no-migrate), checking latest deploy...".yellow
-            latest_deploy ||= environment.latest_deploy(app)
-            if latest_deploy
-              deploy_options.merge!(migrate_command: (latest_deploy.migrate && latest_deploy.migrate_command) || nil)
-            else
-              raise "either --migrate or --no-migrate needs to be specified"
-            end
-          end
-          request = environment.deploy(app, deploy_options)
-
-          puts <<-EOF
-Deploy started to environment: #{environment.name} with application: #{app.name}
-Request ID: #{request.id}
-EOF
-          ap request
-          ap request.resource
-          if switch_active?(:no_wait)
-            puts("Deploy started".green + " (use status command with --tail to view output)")
-          else
-            stream_deploy_log(request)
-          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 Deploy < Subcommand
+        include Ey::Core::Cli::Helpers::LogStreaming
+        title "deploy"
+        summary "Deploy your application"
+
+        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 :ref,
+          short: "r",
+          long: "ref",
+          description: "A git reference to deploy.",
+          argument: "ref"
+
+        option :migrate,
+          short: "m",
+          long: "migrate",
+          description: "The migration command to run.  This option has a 50 character limit.",
+          argument: "migrate"
+        option :serverside_version,
+          short: "S",
+          long: "serverside_version",
+          description: "Override the default version of engineyard-serverside. The version must match a released version. Use with care.",
+          argument: "serverside_version"
+
+        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 :no_wait,
+          long: "no-wait",
+          description: "Don't wait for deploy to finish, exit after deploy is started"
+
+        switch :verbose,
+          short: "v",
+          long: "verbose",
+          description: "Stream deploy output to this console. Alias to stream for backwards compatibility."
+
+        switch :no_migrate,
+          long: "no-migrate",
+          description: "Skip migration."
+
+        def handle
+          operator, environment = core_operator_and_environment_for(self.options)
+          if operator.is_a?(Ey::Core::Client::Account)
+            abort <<-EOF
+Found account #{operator.name} but requested account #{option(:account)}.
+Use the ID of the account instead of the name.
+This can be retrieved by running "ey-core accounts".
+EOF
+            .red unless operator.name == option(:account) || operator.id == option(:account)
+          end
+
+          unless environment
+            abort "Unable to locate environment #{option[:environment]} in #{operator.name}".red
+          end
+
+          unless option(:account)
+            self.options.merge!(environment: environment)
+          end
+
+          app = core_application_for(environment, self.options)
+
+          deploy_options = {verbose: switch_active?(:verbose), cli_args: ARGV}
+          latest_deploy = nil
+	  if options[:serverside_version]
+            deploy_options.merge!(serverside_version: option(:serverside_version))
+          end
+          if options[:ref]
+            deploy_options.merge!(ref: option(:ref))
+          else
+            puts "--ref not provided, checking latest deploy...".yellow
+            latest_deploy ||= environment.latest_deploy(app)
+            if latest_deploy && latest_deploy.ref
+              deploy_options[:ref] = latest_deploy.ref
+            else
+              raise "--ref is required (HEAD is the typical choice)"
+            end
+          end
+          if (option(:migrate) || switch_active?(:no_migrate))
+            deploy_options.merge!(migrate_command: option(:migrate)) if option(:migrate)
+            deploy_options.merge!(migrate_command: nil) if switch_active?(:no_migrate)
+          else
+            puts "missing migrate option (--migrate or --no-migrate), checking latest deploy...".yellow
+            latest_deploy ||= environment.latest_deploy(app)
+            if latest_deploy
+              deploy_options.merge!(migrate_command: (latest_deploy.migrate && latest_deploy.migrate_command) || nil)
+            else
+              raise "either --migrate or --no-migrate needs to be specified"
+            end
+          end
+          request = environment.deploy(app, deploy_options)
+
+          puts <<-EOF
+Deploy started to environment: #{environment.name} with application: #{app.name}
+Request ID: #{request.id}
+EOF
+          ap request
+          ap request.resource
+          if switch_active?(:no_wait)
+            puts("Deploy started".green + " (use status command with --tail to view output)")
+          else
+            stream_deploy_log(request)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,29 +1,29 @@
-require 'ey-core/cli/subcommand'
-
-module Ey
-  module Core
-    module Cli
-      class DockerRegistryLogin < Subcommand
-        title "get-docker-registry-login"
-        summary "Prints the docker login command to authorize the Docker Engine with the AWS ECR registry"
-
-        option :account,
-               short:       'c',
-               long:        'account',
-               description: 'Name or ID of the account that the environment resides in.',
-               argument:    'Account name or id'
-
-        option :location,
-               short:       'l',
-               long:        'location',
-               description: 'ECR availability regions',
-               argument:    'Location name'
-
-        def handle
-          credentials = core_account.retrieve_docker_registry_credentials(option(:location))
-          stdout.puts "docker login -u #{credentials.username} -p #{credentials.password} #{credentials.registry_endpoint}"
-        end
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      class DockerRegistryLogin < Subcommand
+        title "get-docker-registry-login"
+        summary "Prints the docker login command to authorize the Docker Engine with the AWS ECR registry"
+
+        option :account,
+               short:       'c',
+               long:        'account',
+               description: 'Name or ID of the account that the environment resides in.',
+               argument:    'Account name or id'
+
+        option :location,
+               short:       'l',
+               long:        'location',
+               description: 'ECR availability regions',
+               argument:    'Location name'
+
+        def handle
+          credentials = core_account.retrieve_docker_registry_credentials(option(:location))
+          stdout.puts "docker login -u #{credentials.username} -p #{credentials.password} #{credentials.registry_endpoint}"
+        end
+      end
+    end
+  end
+end

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

@@ -1,71 +1,71 @@
-require 'ey-core/cli/subcommand'
-require 'ey-core/cli/helpers/stream_printer'
-
-module Ey
-  module Core
-    module Cli
-      class EnvironmentVariables < Subcommand
-        MASK = '****'.freeze
-        SYMBOLS_TO_DISPLAY = 4
-        MAX_LENGTH_TO_DISPLAY = 30
-
-        include Ey::Core::Cli::Helpers::StreamPrinter
-
-        title "environment_variables"
-        summary "Retrieve a list of Engine Yard environment variables for environments that you have access to."
-
-        option :environment,
-          short: 'e',
-          long: 'environment',
-          description: 'Filter by environmeent name or id',
-          argument: 'Environment'
-
-        option :application,
-          short: 'a',
-          long: 'application',
-          description: 'Filter by application name or id',
-          argument: 'Application'
-
-        switch :display_sensitive,
-          short: 's',
-          long: 'display_sensitive',
-          description: 'Determines whether values of sensitive variables should be printed',
-          argument: 'Display Sensitive'
-
-        def handle
-          environment_variables = if option(:application)
-                                    core_applications(option(:application)).flat_map(&:environment_variables)
-                                  elsif option(:environment)
-                                    core_environments(option(:environment)).flat_map(&:environment_variables)
-                                  else
-                                    core_environment_variables
-                                  end
-
-          stream_print("ID" => 10, "Name" => 30, "Value" => 50, "Environment" => 30, "Application" => 30) do |printer|
-            environment_variables.each_entry do |ev|
-              printer.print(ev.id, ev.name, print_variable_value(ev), ev.environment_name, ev.application_name)
-            end
-          end
-        end
-
-        private
-
-        def print_variable_value(environment_variable)
-          if environment_variable.sensitive && !switch_active?(:display_sensitive)
-            hide_sensitive_data(environment_variable.value)
-          else
-            environment_variable.value
-          end
-        end
-
-        def hide_sensitive_data(value)
-          if value.length > SYMBOLS_TO_DISPLAY
-            MASK + value[-SYMBOLS_TO_DISPLAY, SYMBOLS_TO_DISPLAY]
-          else
-            MASK
-          end
-        end
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/stream_printer'
+
+module Ey
+  module Core
+    module Cli
+      class EnvironmentVariables < Subcommand
+        MASK = '****'.freeze
+        SYMBOLS_TO_DISPLAY = 4
+        MAX_LENGTH_TO_DISPLAY = 30
+
+        include Ey::Core::Cli::Helpers::StreamPrinter
+
+        title "environment_variables"
+        summary "Retrieve a list of Engine Yard environment variables for environments that you have access to."
+
+        option :environment,
+          short: 'e',
+          long: 'environment',
+          description: 'Filter by environmeent name or id',
+          argument: 'Environment'
+
+        option :application,
+          short: 'a',
+          long: 'application',
+          description: 'Filter by application name or id',
+          argument: 'Application'
+
+        switch :display_sensitive,
+          short: 's',
+          long: 'display_sensitive',
+          description: 'Determines whether values of sensitive variables should be printed',
+          argument: 'Display Sensitive'
+
+        def handle
+          environment_variables = if option(:application)
+                                    core_applications(option(:application)).flat_map(&:environment_variables)
+                                  elsif option(:environment)
+                                    core_environments(option(:environment)).flat_map(&:environment_variables)
+                                  else
+                                    core_environment_variables
+                                  end
+
+          stream_print("ID" => 10, "Name" => 30, "Value" => 50, "Environment" => 30, "Application" => 30) do |printer|
+            environment_variables.each_entry do |ev|
+              printer.print(ev.id, ev.name, print_variable_value(ev), ev.environment_name, ev.application_name)
+            end
+          end
+        end
+
+        private
+
+        def print_variable_value(environment_variable)
+          if environment_variable.sensitive && !switch_active?(:display_sensitive)
+            hide_sensitive_data(environment_variable.value)
+          else
+            environment_variable.value
+          end
+        end
+
+        def hide_sensitive_data(value)
+          if value.length > SYMBOLS_TO_DISPLAY
+            MASK + value[-SYMBOLS_TO_DISPLAY, SYMBOLS_TO_DISPLAY]
+          else
+            MASK
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,39 +1,39 @@
-require 'ey-core/cli/subcommand'
-require 'ey-core/cli/helpers/stream_printer'
-
-module Ey
-  module Core
-    module Cli
-      class Environments < Subcommand
-        include Ey::Core::Cli::Helpers::StreamPrinter
-        title "environments"
-        summary "Retrieve a list of Engine Yard environments that you have access to."
-
-        option :account,
-          short: 'c',
-          long: 'account',
-          description: 'Filter by account name or id',
-          argument: 'Account'
-
-        def handle
-          if option(:account)
-            stream_print("ID" => 10, "Name" => 50) do |printer|
-              core_account.environments.each_entry do |env|
-                printer.print(env.id, env.name)
-              end
-            end
-          else
-            stream_print("ID" => 10, "Name" => 50, "Account" => 50) do |printer|
-              core_accounts.each_entry do |account|
-                account.environments.each_entry do |env|
-                  printer.print(env.id, env.name, account.name)
-                end
-              end
-            end
-          end
-        end
-
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/stream_printer'
+
+module Ey
+  module Core
+    module Cli
+      class Environments < Subcommand
+        include Ey::Core::Cli::Helpers::StreamPrinter
+        title "environments"
+        summary "Retrieve a list of Engine Yard environments that you have access to."
+
+        option :account,
+          short: 'c',
+          long: 'account',
+          description: 'Filter by account name or id',
+          argument: 'Account'
+
+        def handle
+          if option(:account)
+            stream_print("ID" => 10, "Name" => 50) do |printer|
+              core_account.environments.each_entry do |env|
+                printer.print(env.id, env.name)
+              end
+            end
+          else
+            stream_print("ID" => 10, "Name" => 50, "Account" => 50) do |printer|
+              core_accounts.each_entry do |account|
+                account.environments.each_entry do |env|
+                  printer.print(env.id, env.name, account.name)
+                end
+              end
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,11 +1,11 @@
-module Ey
-  module Core
-    module Cli
-      RecipesNotFound = Class.new(ArgumentError)
-      NoCommand       = Class.new(ArgumentError)
-      NoRepository    = Class.new(ArgumentError)
-      RecipesExist    = Class.new(ArgumentError)
-      AmbiguousSearch = Class.new(ArgumentError)
-    end
-  end
-end
+module Ey
+  module Core
+    module Cli
+      RecipesNotFound = Class.new(ArgumentError)
+      NoCommand       = Class.new(ArgumentError)
+      NoRepository    = Class.new(ArgumentError)
+      RecipesExist    = Class.new(ArgumentError)
+      AmbiguousSearch = Class.new(ArgumentError)
+    end
+  end
+end

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

@@ -1,30 +1,30 @@
-require 'belafonte'
-
-module Ey
-  module Core
-    module Cli
-      class Help < Belafonte::App
-        title 'help'
-        summary 'Print out the help docs'
-
-        arg :command_line,
-          times: :unlimited
-
-        def handle
-          Main.new(
-            command_line.unshift('-h'),
-            stdin,
-            stdout,
-            stderr,
-            kernel
-          ).execute!
-        end
-
-        private
-        def command_line
-          arg(:command_line)
-        end
-      end
-    end
-  end
-end
+require 'belafonte'
+
+module Ey
+  module Core
+    module Cli
+      class Help < Belafonte::App
+        title 'help'
+        summary 'Print out the help docs'
+
+        arg :command_line,
+          times: :unlimited
+
+        def handle
+          Main.new(
+            command_line.unshift('-h'),
+            stdin,
+            stdout,
+            stderr,
+            kernel
+          ).execute!
+        end
+
+        private
+        def command_line
+          arg(:command_line)
+        end
+      end
+    end
+  end
+end