ey-core 3.1.2 → 3.1.3

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

@@ -1,20 +1,60 @@
-class Ey::Core::Cli::Status < Ey::Core::Cli::Subcommand
-  title "status"
-  summary "Show the deployment status of the app"
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/log_streaming'
 
-  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"
+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
 
-  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"
 
-  def handle
-    operator, environment = core_operator_and_environment_for(self.options)
-    app                   = core_application_for(self.options)
-    deployments           = core_client.deployments.all(environment_id: environment.id, application_id: app.id)
+        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'
 
-    ap deployments.first
+        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,113 +1,52 @@
-class Ey::Core::Cli::Subcommand < Belafonte::App
-  def self.descendants
-    ObjectSpace.each_object(Class).select { |klass| klass < self }
-  end
-
-  class << self
-    attr_accessor :core_file
-
-    def core_file
-      @core_file ||= File.expand_path("~/.ey-core")
-    end
-
-    def eyrc
-      @eyrc ||= File.expand_path("~/.eyrc")
-    end
-  end
-
-  def unauthenticated_core_client
-    @unauthenticated_core_client ||= Ey::Core::Client.new(token: nil, url: core_url)
-  end
-
-  def core_client
-    @core_client ||= Ey::Core::Client.new(url: core_url, config_file: self.class.core_file)
-  rescue RuntimeError => e
-    if legacy_token = e.message.match(/missing token/i) && eyrc_yaml["api_token"]
-      puts "Found legacy .eyrc token.  Migrating to core file".green
-      write_core_yaml(legacy_token)
-      retry
-    elsif e.message.match(/missing token/i)
-      abort "Missing credentials: Run 'ey login' to retrieve your Engine Yard Cloud API token.".yellow
-    else
-      raise e
-    end
-  end
-
-  def core_url
-    env_url = ENV["CORE_URL"] || ENV["CLOUD_URL"]
-    (env_url && File.join(env_url, '/')) || "https://api.engineyard.com/"
-  end
-
-  def current_accounts
-    core_client.users.current.accounts
-  end
-
-  def longest_length_by_name(collection)
-    collection.map(&:name).group_by(&:size).max.last.length
-  end
-
-  def write_core_yaml(token=nil)
-    core_yaml[core_url] = token if token
-    File.open(self.class.core_file, "w") { |f| f.puts core_yaml.to_yaml }
-  end
-
-  def eyrc_yaml
-    @eyrc_yaml ||= YAML.load_file(self.class.eyrc) || {}
-  rescue Errno::ENOENT => e # we don't really care if this doesn't exist
-    {}
-  end
-
-  def core_yaml
-    @core_yaml ||= YAML.load_file(self.class.core_file) || {}
-  rescue Errno::ENOENT => e
-    puts "Creating #{self.class.core_file}".yellow
-    FileUtils.touch(self.class.core_file)
-    retry
-  end
-
-  def core_account_for(options={})
-    @core_account ||= core_client.accounts.get(options[:account])
-    @core_account ||= core_client.users.current.accounts.first(name: options[:account])
-  end
-
-  def operator(options)
-    options[:account] ? core_account_for(options) : core_client
-  end
-
-  def core_operator_and_environment_for(options={})
-    operator = operator(options)
-    environment = operator.environments.get(options[:environment]) || operator.environments.first(name: options[:environment])
-    [operator, environment]
-  end
-
-  def core_environment_for(options={})
-    core_client.environments.get(options[:environment]) || core_client.environments.first(name: options[:environment])
-  end
-
-  def core_server_for(options={})
-    operator = options.fetch(:operator, core_client)
-    operator.servers.get(options[:server]) || operator.servers.first(provisioned_id: options[:server])
-  end
-
-  def core_application_for(options={})
-    return nil unless options[:app]
-
-    app = begin
-            Integer(options[:app])
-          rescue
-            options[:app]
+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
 
-    actor = options[:environment].is_a?(Ey::Core::Client::Environment) ? options[:environment].account : operator(options)
-
-    if app.is_a?(Integer)
-      actor.applications.get(app)
-    else
-      applications = actor.applications.all(name: app)
-      if applications.count == 1
-        applications.first
-      else
-        raise Ey::Core::Cli::AmbiguousSearch.new("Found multiple applications that matched that search.  Please be more specific by specifying the account, environment, and application name.")
       end
     end
   end

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

@@ -1,28 +1,58 @@
-class Ey::Core::Cli::TimeoutDeploy < Ey::Core::Cli::Subcommand
-  title "timeout-deploy"
-  summary "Fail a stuck unfinished deployment"
-  description <<-DESC
-    NOTICE: Timing out a deploy does not stop currently running deploy
-    processes.
-
-    The latest running deployment will be marked as failed, allowing a
-    new deployment to be run. It is possible to mark a potentially successful
-    deployment as failed. Only run this when a deployment is known to be
-    wrongly unfinished/stuck and when further deployments are blocked.
-  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"
-  option :message,     short: "m", long: "message",     description: "Custom message for why the deploy is timed out", argument: "message"
-
-  def handle
-    operator, environment = core_operator_and_environment_for(self.options)
-    app                   = core_application_for(self.options)
-    deployment            = core_client.deployments.first(environment_id: environment.id, application_id: app.id)
-
-    puts "Timing out the most recent deployment (deploy started at: #{deployment.started_at})".green
-    deployment.timeout(option(:message))
-    ap deployment
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      class TimeoutDeploy < Subcommand
+        title "timeout-deploy"
+        summary "Fail a stuck unfinished deployment"
+        description <<-DESC
+NOTICE: Timing out a deploy does not stop currently running deploy
+processes.
+
+The latest running deployment will be marked as failed, allowing a
+new deployment to be run. It is possible to mark a potentially successful
+deployment as failed. Only run this when a deployment is known to be
+wrongly unfinished/stuck and when further deployments are blocked.
+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"
+
+        option :message,
+          short: "m",
+          long: "message",
+          description: "Custom message for why the deploy is timed out",
+          argument: "message"
+
+        def handle
+          operator, environment = core_operator_and_environment_for(self.options)
+          app                   = core_application_for(environment, options)
+          deployment = core_client.
+            deployments.
+            first(environment_id: environment.id, application_id: app.id)
+
+          puts "Timing out the most recent deployment (deploy started at: #{deployment.started_at})".green
+
+          deployment.timeout(option(:message))
+          ap deployment
+        end
+      end
+    end
   end
 end

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

@@ -1,8 +1,16 @@
-class Ey::Core::Cli::Version < Ey::Core::Cli::Subcommand
-  title "version"
-  summary "Print the version of the gem"
+require 'ey-core/cli/subcommand'
 
-  def handle
-    puts Ey::Core::VERSION
+module Ey
+  module Core
+    module Cli
+      class Version < Subcommand
+        title "version"
+        summary "Print the version of the gem"
+
+        def handle
+          puts Ey::Core::VERSION
+        end
+      end
+    end
   end
 end

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

@@ -1,10 +1,10 @@
-class Ey::Core::Cli::Web < Ey::Core::Cli::Subcommand
-  title "web"
-  summary "Web related commands"
+require 'ey-core/cli/web/main'
 
-  Dir[File.dirname(__FILE__) + "/web/*.rb"].each { |file| load file }
-
-  Ey::Core::Cli::Web.descendants.each do |d|
-    mount d
+module Ey
+  module Core
+    module Cli
+      module Web
+      end
+    end
   end
 end

data/lib/ey-core/cli/web/disable.rb

@@ -1,23 +1,49 @@
-class Ey::Core::Cli::Web::Disable < Ey::Core::Cli::Web
-  title "disable"
-  summary "Put up the maintenance page for this application in the given environment."
-
-  option :app,         short: "a", long: "app",         description: "Name or id of the application whose maintenance page will be put up", argument: "app"
-  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.', argument: 'Account name or id'
-
-  def handle
-    operator, environment = core_operator_and_environment_for(self.options)
-    application           = core_application_for(self.options)
-
-    puts "Enabling maintenance page for #{application.name} on #{environment.name}".green
-    request = environment.maintenance(application, "enable")
-    request.wait_for { |r| r.ready? }
-    if request.successful
-      puts "Successfully put up maintenance page".green
-    else
-      puts "Enabling maintenance mode was not successful".red
-      ap request
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      module Web
+        class Disable < Ey::Core::Cli::Subcommand
+          title "disable"
+          summary "Put up the maintenance page for this application in the given environment."
+
+          option :app,
+            short: "a",
+            long: "app",
+            description: "Name or id of the application whose maintenance page will be put up",
+            argument: "app"
+
+          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.',
+            argument: 'Account name or id'
+
+          def handle
+            operator, environment = core_operator_and_environment_for(self.options)
+            application           = core_application_for(environment, self.options)
+
+            puts "Enabling maintenance page for #{application.name} on #{environment.name}".green
+
+            request = environment.maintenance(application, "enable")
+            request.wait_for { |r| r.ready? }
+
+            if request.successful
+              puts "Successfully put up maintenance page".green
+            else
+              puts "Enabling maintenance mode was not successful".red
+              ap request
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/ey-core/cli/web/enable.rb

@@ -1,23 +1,46 @@
-class Ey::Core::Cli::Web::Enable < Ey::Core::Cli::Web
-  title "enable"
-  summary "Remove the maintenance page for this application in the given environment."
+require 'ey-core/cli/subcommand'
 
-  option :app,         short: "a", long: "app",         description: "Name or id of the application whose maintenance page will be removed", argument: "app"
-  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.', argument: 'account'
+module Ey
+  module Core
+    module Cli
+      module Web
+        class Enable < Ey::Core::Cli::Subcommand
+          title "enable"
+          summary "Remove the maintenance page for this application in the given environment."
 
-  def handle
-    operator, environment = core_operator_and_environment_for(self.options)
-    application           = core_application_for(self.options)
+          option :app,
+            short: "a",
+            long: "app",
+            description: "Name or id of the application whose maintenance page will be removed",
+            argument: "app"
 
-    puts "Disabling maintenance for #{application.name} on #{environment.name}".green
-    request = environment.maintenance(application, "disable")
-    request.wait_for { |r| r.ready? }
-    if request.successful
-      puts "Successfully disabled maintenance page".green
-    else
-      puts "Disabling maintenance mode was not successful".red
-      ap request
+          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.',
+            argument: 'account'
+
+          def handle
+            operator, environment = core_operator_and_environment_for(self.options)
+            application           = core_application_for(environment, options)
+            puts "Disabling maintenance for #{application.name} on #{environment.name}".green
+            request = environment.maintenance(application, "disable")
+            request.wait_for { |r| r.ready? }
+            if request.successful
+              puts "Successfully disabled maintenance page".green
+            else
+              puts "Disabling maintenance mode was not successful".red
+              ap request
+            end
+          end
+        end
+      end
     end
   end
 end