ey-core 3.0.5 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dc4da29698ad9bb948ca751e854c4efb134aab9
-  data.tar.gz: 89e4e06dfeee04459768395059a892ce38865f2c
+  metadata.gz: fc84632655feed3d40115fdf1417d1a2e203877e
+  data.tar.gz: 92b68a9e1c740d0ad32148486f8d9516976722f8
 SHA512:
-  metadata.gz: 5bea713bee5a23c8e5371eac1c4138e4d6cc240fb9bf96ba4995c84e923c01ec1fbdc3fe0100827d4182578bca59feb894301d76d867482d25e7def36e8812ca
-  data.tar.gz: af636f6e784f5371f79e9f9ddd300a171cfa76c6ee1ac976d81d0b163850e307a36c4063ef5fe642f8b4cd8278bab42a810c5b84aa262f88d0aa73529eebbd02
+  metadata.gz: 4e58ade18e6f14500f8f47446d20829777a438a44d89ed653a705d31edd5cabfbb5b8ec1955f7e798b4a1bbce6ce4c6cc4958148e32e82039fb948c39db54c7a
+  data.tar.gz: 6e24dfeaaa4781fa782f8cca1b6b44f0b95347c33a387c9a9a66c7a341ada2055eb88caa887f617062fd6d6bb4bf3e2d75b52b2e908b0fe3c669d4bc490054ee

data/Gemfile

@@ -3,12 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ey-core.gemspec
 gemspec
 
-gem 'awesome_print', '~> 1.0'
-gem 'faye', '~> 1.1'
-gem 'oj'
-gem 'oj_mimic_json'
-gem 'pry-nav'
-
 group :doc do
   gem 'yard'
   gem 'redcarpet'
@@ -21,7 +15,6 @@ group :test do
   gem 'guard-rspec', '~> 4.2', require: false
   gem 'hashie'
   gem 'rack-test'
-  gem 'rake'
   gem 'rspec', '~> 3.1'
   gem 'simplecov'
   gem 'timecop'

data/bin/ey-core

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require File.expand_path('../../lib/ey-core/cli', __FILE__)
 
-Ey::Core::Cli.new(ARGV).run
+Ey::Core::Cli.new(ARGV).execute!

data/ey-core.gemspec

@@ -19,10 +19,24 @@ Gem::Specification.new do |gem|
   gem.licenses      = ["MIT"]
 
   gem.add_dependency "addressable", "~> 2.2"
+  gem.add_dependency "awesome_print"
+  gem.add_dependency "belafonte"
   gem.add_dependency "cistern", "~> 0.12"
+  gem.add_dependency "colorize"
   gem.add_dependency "ey-hmac", "~> 2.0"
-  gem.add_dependency "sshkey",  "~> 1.6"
+  gem.add_dependency "escape"
   gem.add_dependency "faraday", "~> 0.9"
   gem.add_dependency "faraday_middleware", "~> 0.9"
+  gem.add_dependency "faye"
   gem.add_dependency "mime-types", "~> 2.99" #maintain ruby 1.9 compatibility
+  gem.add_dependency "oj"
+  gem.add_dependency "oj_mimic_json"
+  gem.add_dependency "pry"
+  gem.add_dependency "sshkey",  "~> 1.6"
+  gem.add_dependency "table_print"
+
+  gem.add_development_dependency "pry-nav"
+  gem.add_development_dependency "rspec", "~> 3.0"
+  gem.add_development_dependency "ffaker"
+  gem.add_development_dependency "rake"
 end

data/lib/ey-core/cli.rb

@@ -3,124 +3,22 @@ require 'ostruct'
 require 'ey-core'
 require 'awesome_print'
 require 'pry'
+require 'belafonte'
+require 'table_print'
+require 'rubygems/package'
+require 'escape'
 
 Cistern.formatter = Cistern::Formatter::AwesomePrint
 
-class Ey::Core::Cli
 
-  def self.stdout
-    @stdout ||= STDOUT
-  end
-
-  def self.say(*args)
-    self.stdout.puts(*args)
-  end
-
-  attr_reader :options, :action, :resource, :client
-
-  def initialize(args=ARGV)
-    @action, @options = parse(args)
-  end
-
-  def parse(args)
-    options = {}
-
-    action, resource_name, resource_id = OptionParser.new do |opts|
-      opts.banner = "Usage: ey-core ACTION RESOURCE RESOURCE_ID [options]"
-
-      opts.separator ""
-      opts.separator "Specific options:"
-
-      opts.on("-t", "--token [TOKEN]",
-              "Use specific token. Defaults to core url entry in ~/.ey-core yaml file") do |token|
-        options[:token] = token
-      end
-
-      opts.on("-u", "--url [URL]",
-              "Use specific core URL. Defaults to 'https://api.engineyard.com'") do |url|
-        options[:url] = url
-      end
-
-      opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-        options[:logger] = v ? Logger.new(STDOUT) : Logger.new(nil)
-      end
-
-      opts.on("-e", "--execute-command [COMMAND]", "Execute Command") do |c|
-        @execute_command = c
-      end
-
-      opts.separator ""
-      opts.separator "Common options:"
-
-      # No argument, shows at tail.  This will print an options summary.
-      # Try it and see!
-      opts.on_tail("-h", "--help", "Show this message") do
-        puts opts
-        exit
-      end
-
-      # Another typical switch to print the version.
-      opts.on_tail("--version", "Show version") do
-        puts Ey::Core::VERSION
-        exit
-      end
-    end.parse!(args)
-
-    set_client(options)
-
-    set_resource(action, resource_name, resource_id) if resource_name && resource_id
-
-    [action, (options.to_hash || {})]
-  end
-
-  def run
-    public_send(action)
-  end
-
-  def console
-    if @execute_command
-      @client.instance_eval(@execute_command)
-    else
-      Pry.config.prompt = proc { |obj, nest_level, _| "ey-core:> " }
-      @client.pry
-    end
-  end
-
-  def show
-    Ey::Core::Cli.say(resource.ai)
-  end
-
-  def destroy
-    response = resource.destroy!
-
-    if response.is_a?(Ey::Core::Client::Request)
-      response.wait_for!(response.service.timeout, response.service.poll_interval) do |request|
-        Ey::Core::Cli.say "Waiting ... #{Time.now}"
-        Ey::Core::Cli.say(response.ai) unless request.ready?
-        request.ready?
-      end
-    end
-
-    Ey::Core::Cli.say(response.ai)
-  end
-
-  def current_user
-    @current_user ||= @client.users.current
-  end
-
-  def set_client(options)
-    @client ||= Ey::Core::Client.new(options)
-  end
-
-  def set_resource(action, resource_name, resource_id)
-    action = 'show' if action == 'console'
-    action || raise(ArgumentError.new("Missing action"))
-    Ey::Core::Client.models.find { |m,_| m.to_s == resource_name } || raise(ArgumentError.new("Unknown resource: #{resource_name}"))
-    %w[show destroy].include?(action) || raise(ArgumentError.new("Unknown action: #{action}"))
+class Ey::Core::Cli < Belafonte::App
+  title "Engineyard CLI"
+  summary "Successor to the engineyard gem"
 
-    # TODO: irregular inflections and all that
-    collection = "#{resource_name.to_s}s"
+  require_relative "cli/subcommand"
+  Dir[File.dirname(__FILE__) + '/cli/*.rb'].each {|file| load file }
 
-    @resource = client.public_send(collection).get!(resource_id)
+  Ey::Core::Cli::Subcommand.descendants.each do |d|
+    mount d
   end
-end  # class Ey::Core::Cli
+end

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

@@ -0,0 +1,9 @@
+class Ey::Core::Cli::Accounts < Ey::Core::Cli::Subcommand
+  title "accounts"
+  summary "Retrieve a list of Engine Yard accounts that you have access to."
+
+  def handle
+    table_data = TablePrint::Printer.new(current_accounts, [{id: {width: 36}}, :name])
+    puts table_data.table_print
+  end
+end

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

@@ -0,0 +1,16 @@
+class Ey::Core::Cli::Applications < Ey::Core::Cli::Subcommand
+  title "applications"
+  summary "Retrieve a list of Engine Yard applications that you have access to."
+  option :account, short: 'c', long: 'account', description: 'Filter by account name or id', argument: 'Account'
+
+  def handle
+    applications = if option(:account)
+                     core_account_for(options).applications.all
+                   else
+                     current_accounts.map(&:applications).flatten.sort_by(&:id)
+                   end
+
+    table_data = TablePrint::Printer.new(applications, [{id: {width: 10}}, :name])
+    puts table_data.table_print
+  end
+end

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

@@ -0,0 +1,14 @@
+class Ey::Core::Cli::Console < Ey::Core::Cli::Subcommand
+  title "console"
+  summary "Start an interactive console"
+  option :execute_command, short: "e", long: "command", description: "Command to execute", argument: "command"
+
+  def handle
+    if command = option(:execute_command)
+      core_client.instance_eval(command)
+    else
+      Pry.config.prompt = proc { |obj, nest_level, _| "ey-core:> " }
+      core_client.pry
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+class Ey::Core::Cli::CurrentUser < Ey::Core::Cli::Subcommand
+  title "current_user"
+  summary "Print the current user information"
+
+  def handle
+    ap core_client.users.current
+  end
+end

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

@@ -0,0 +1,65 @@
+class Ey::Core::Cli::Deploy < Ey::Core::Cli::Subcommand
+  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 :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 :stream, long: "stream",     description: "Stream deploy output to this console."
+  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
+    %w(environment app).each { |option| raise "--#{option} is required" unless options[option.to_sym] }
+    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 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(self.options)
+
+    deploy_options = {}
+    deploy_options.merge!(ref: option(:ref)) if option(:ref)
+    deploy_options.merge!(migrate_command: option(:migrate)) if option(:migrate)
+    deploy_options.merge!(migrate_command: '') if switch_active?(:no_migrate)
+    request = environment.deploy(app, deploy_options)
+
+    puts <<-EOF
+Deploy started to environment: #{environment.name} with application: #{app.name}
+Request ID: #{request.id}
+    EOF
+    if switch_active?(:stream) || switch_active?(:verbose)
+      request.subscribe { |m| print m["message"] if m.is_a?(Hash) }
+      puts "" # fix console output from stream
+    else
+      request.wait_for { |r| r.ready? } # dont raise from ready!
+    end
+
+    if request.successful
+      puts "Deploy successful!".green
+    else
+      abort <<-EOF
+Deploy failed!
+Request output:
+#{request.message}
+      EOF
+      .red
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+class Ey::Core::Cli::Environments < Ey::Core::Cli::Subcommand
+  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
+    environments = if option(:account)
+                     core_account_for(options).environments.all
+                   else
+                     current_accounts.map(&:environments).flatten.sort_by(&:id)
+                   end
+
+
+    table_data = TablePrint::Printer.new(environments, [{id: {width: 10}}, :name])
+    puts table_data.table_print
+  end
+end

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

@@ -0,0 +1,7 @@
+class Ey::Core::Cli::Errors
+  ::Ey::Core::Cli::RecipesNotFound = Class.new(ArgumentError)
+  ::Ey::Core::Cli::NoCommand       = Class.new(ArgumentError)
+  ::Ey::Core::Cli::NoRepository    = Class.new(ArgumentError)
+  ::Ey::Core::Cli::RecipesExist    = Class.new(ArgumentError)
+  ::Ey::Core::Cli::AmbiguousSearch = Class.new(ArgumentError)
+end

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

@@ -0,0 +1,11 @@
+class Ey::Core::Cli::Init < Ey::Core::Cli::Subcommand
+  title "init"
+  summary "Deprecated"
+  description <<-DESC
+   The init command has been deprecated.  We apologize for any inconvenience.
+  DESC
+
+  def handle
+    abort "This command is deprecated".red
+  end
+end

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

@@ -0,0 +1,26 @@
+class Ey::Core::Cli::Login < Ey::Core::Cli::Subcommand
+  title "login"
+  summary "Retrieve API token from Engine Yard Cloud"
+
+  def handle
+    email    = ENV["EMAIL"]    || ask("Email:")
+    password = ENV["PASSWORD"] || ask("Password:", 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

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

@@ -0,0 +1,14 @@
+class Ey::Core::Cli::Logout < Ey::Core::Cli::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

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

@@ -0,0 +1,40 @@
+class Ey::Core::Cli::Logs < Ey::Core::Cli::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)
+                [environment.servers.get(option(:server))] || environment.servers.all(provisioned_id: option(:server))
+              else
+                environment.servers.all
+              end
+
+    abort "No servers found".red if servers.empty?
+
+    servers.each do |server|
+      name = server.name ? "#{server.name} (#{server.role})" : server.role
+
+      if log = server.latest_main_log
+        puts "Main logs for #{name}:".green
+        puts log.contents
+      end
+
+      if log = server.latest_custom_log
+        puts "Custom logs for #{name}:".green
+        puts log.contents
+      end
+    end
+  end
+end