ey-core 3.1.2 → 3.1.3

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

@@ -0,0 +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

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

@@ -1,11 +1,14 @@
-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
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/deprecated'
 
-  def handle
-    abort "This command is deprecated".red
+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,26 +1,38 @@
-class Ey::Core::Cli::Login < Ey::Core::Cli::Subcommand
-  title "login"
-  summary "Retrieve API token from Engine Yard Cloud"
+require 'ey-core/cli/subcommand'
 
-  def handle
-    email    = ENV["EMAIL"]    || ask("Email: ")
-    password = ENV["PASSWORD"] || ask("Password: ") { |q| q.echo = false }
+module Ey
+  module Core
+    module Cli
+      class Login < Subcommand
+        title "login"
+        summary "Retrieve API token from Engine Yard Cloud"
 
-    token = unauthenticated_core_client.get_api_token(email, password).body["api_token"]
+        def handle
+          email    = ENV["EMAIL"]    || ask("Email: ")
+          password = ENV["PASSWORD"] || ask("Password: ") { |q| q.echo = false }
 
-    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
+          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,14 +1,22 @@
-class Ey::Core::Cli::Logout < Ey::Core::Cli::Subcommand
-  title "logout"
-  summary "Remove your Engine Yard API token"
+require 'ey-core/cli/subcommand'
 
-  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
+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,39 +1,61 @@
-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
+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)
+                      [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
+            if log = server.latest_custom_log
+              puts "Custom logs for #{name}:".green
+              puts log.contents
+            end
+          end
+        end
       end
     end
   end

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

@@ -1,28 +1,65 @@
-require 'optparse'
-require 'ostruct'
-require 'ey-core'
+#require 'optparse'
+#require 'ostruct'
+#require 'ey-core'
 require 'ey-core/cli'
 require 'awesome_print'
-require 'pry'
 require 'belafonte'
-require 'table_print'
 require 'rubygems/package'
 require 'escape'
 require 'highline/import'
 
-Cistern.formatter = Cistern::Formatter::AwesomePrint
+require 'ey-core/cli/accounts'
+require 'ey-core/cli/applications'
+require 'ey-core/cli/console'
+require 'ey-core/cli/current_user'
+require 'ey-core/cli/deploy'
+require 'ey-core/cli/environments'
+require 'ey-core/cli/help'
+require 'ey-core/cli/init'
+require 'ey-core/cli/login'
+require 'ey-core/cli/logout'
+require 'ey-core/cli/logs'
+require 'ey-core/cli/recipes'
+require 'ey-core/cli/scp'
+require 'ey-core/cli/servers'
+require 'ey-core/cli/ssh'
+require 'ey-core/cli/status'
+require 'ey-core/cli/timeout_deploy'
+require 'ey-core/cli/version'
+require 'ey-core/cli/web'
+require 'ey-core/cli/whoami'
 
+Cistern.formatter = Cistern::Formatter::AwesomePrint
 
-class Ey::Core::Cli::Main < Belafonte::App
-  title "Engineyard CLI"
-  summary "Successor to the engineyard gem"
 
-  require_relative "subcommand"
-  Dir[File.dirname(__FILE__) + '/*.rb'].
-    reject {|file| file =~ /.*\/main\.rb$/}.
-    each {|file| load file }
+module Ey
+  module Core
+    module Cli
+      class Main < Belafonte::App
+        title "Engineyard CLI"
+        summary "Successor to the engineyard gem"
 
-  Ey::Core::Cli::Subcommand.descendants.each do |d|
-    mount d
+        mount Accounts
+        mount Applications
+        mount Console
+        mount CurrentUser
+        mount Deploy
+        mount Environments
+        mount Help
+        mount Init
+        mount Login
+        mount Logout
+        mount Logs
+        mount Recipes::Main
+        mount Scp
+        mount Servers
+        mount Ssh
+        mount Status
+        mount TimeoutDeploy
+        mount Version
+        mount Web::Main
+        mount Whoami
+      end
+    end
   end
 end

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

@@ -1,91 +1,9 @@
-class Ey::Core::Cli::Recipes < Ey::Core::Cli::Subcommand
-  title "recipes"
-  summary "Chef specific commands"
+require 'ey-core/cli/recipes/main'
 
-  Dir[File.dirname(__FILE__) + "/recipes/*.rb"].each { |file| load file }
-
-  Ey::Core::Cli::Recipes.descendants.each do |d|
-    mount d
-  end
-
-  def run_chef(type, environment)
-    request = environment.apply(type)
-    puts "Started #{type} chef run".green
-    request.wait_for { |r| r.ready? }
-    if request.successful
-      puts "#{type.capitalize} chef run completed".green
-    else
-      puts "#{type.capitalize} chef run failed".red
-      ap request
-    end
-  end
-
-  def gzip(tarfile)
-    gz = StringIO.new("")
-    z = Zlib::GzipWriter.new(gz)
-    z.write tarfile.string
-    z.close # this is necessary!
-
-    # z was closed to write the gzip footer, so
-    # now we need a new StringIO
-    StringIO.new gz.string
-  end
-
-  def archive_directory(path)
-    tarfile = StringIO.new("")
-    Gem::Package::TarWriter.new(tarfile) do |tar|
-      Dir[File.join(path, "**/*")].each do |file|
-        mode          = File.stat(file).mode
-        relative_file = "cookbooks/#{file.sub(/^#{Regexp::escape path}\/?/, '')}"
-
-        if File.directory?(file)
-          tar.mkdir relative_file, mode
-        else
-          tar.add_file relative_file, mode do |tf|
-            File.open(file, "rb") { |f| tf.write f.read }
-          end
-        end
-      end
-    end
-
-    tarfile.rewind
-    gzip(tarfile)
-  end
-
-  def upload_recipes(environment, path="cookbooks/")
-    recipes_path = Pathname.new(path)
-
-    if recipes_path.exist? && recipes_path.to_s.match(/\.(tgz|tar\.gz)/)
-      environment.upload_recipes(recipes_path)
-    elsif recipes_path.exist?
-      environment.upload_recipes(archive_directory(path))
-    else
-      raise Ey::Core::Cli::RecipesNotFound, "Recipes file not found: #{recipes_path}"
-    end
-  end
-
-  def ungzip(tarfile)
-    z = Zlib::GzipReader.new(tarfile)
-    unzipped = StringIO.new(z.read)
-    z.close
-    unzipped
-  end
-
-
-  def untar(io, destination)
-    Gem::Package::TarReader.new io do |tar|
-      tar.each do |tarfile|
-        destination_file = File.join destination, tarfile.full_name
-
-        if tarfile.directory?
-          FileUtils.mkdir_p destination_file
-        else
-          destination_directory = File.dirname(destination_file)
-          FileUtils.mkdir_p destination_directory unless File.directory?(destination_directory)
-          File.open destination_file, "wb" do |f|
-            f.print tarfile.read
-          end
-        end
+module Ey
+  module Core
+    module Cli
+      module Recipes
       end
     end
   end

data/lib/ey-core/cli/recipes/apply.rb

@@ -1,56 +1,96 @@
-class Ey::Core::Cli::Recipes::Apply < Ey::Core::Cli::Recipes
-  title "apply"
-  summary "Apply changes to an environment"
-  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"
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/chef'
 
-  switch :main, short: "m", long: "main", description: "Apply main recipes only"
-  switch :custom, short: "u", long: "custom", description: "Apply custom recipes only"
-  switch :quick, short: "q", long: "quick", description: "Quick chef run"
-  switch :full, short: "f", long: "full", description: "Run main and custom chef"
+module Ey
+  module Core
+    module Cli
+      module Recipes
+        class Apply < Subcommand
+          include Helpers::Chef
 
-  def handle
-    validate_run_type_flags
+          title "apply"
+          summary "Apply changes to an environment"
 
-    operator, environment = core_operator_and_environment_for(options)
-    raise "Unable to find matching environment" unless environment
+          option :account,
+            short: "c",
+            long: "account",
+            description: "Name or id of account",
+            argument: "account"
 
-    run_chef(run_type, environment)
+          option :environment,
+            short: "e",
+            long: "environment",
+            description: "Name or id of environment",
+            argument: "environment"
 
-    if switch_active?(:full)
-      run_chef("custom", environment)
-    end
-  end
+          switch :main,
+            short: "m",
+            long: "main",
+            description: "Apply main recipes only"
 
-  private
-  def validate_run_type_flags
-    if active_run_type_flags.length > 1
-      kernel.abort(
-        'Only one of --main, --custom, --quick, and --full may be specified.'
-      )
-    end
-  end
+          switch :custom,
+            short: "u",
+            long: "custom",
+            description: "Apply custom recipes only"
 
-  def run_type
-    secondary_run_types[active_run_type] || default_run_type
-  end
+          switch :quick,
+            short: "q",
+            long: "quick",
+            description: "Quick chef run"
 
-  def active_run_type
-    active_run_type_flags.first
-  end
+          switch :full,
+            short: "f",
+            long: "full",
+            description: "Run main and custom chef"
 
-  def active_run_type_flags
-    [:main, :custom, :quick, :full].select {|switch| switch_active?(switch)}
-  end
+          def handle
+            validate_run_type_flags
 
-  def secondary_run_types
-    {
-      custom: 'custom',
-      quick: 'quick'
-    }
-  end
+            operator, environment = core_operator_and_environment_for(options)
+            raise "Unable to find matching environment" unless environment
 
-  def default_run_type
-    'main'
+            run_chef(run_type, environment)
+
+            if switch_active?(:full)
+              run_chef("custom", environment)
+            end
+          end
+
+          private
+          def validate_run_type_flags
+            if active_run_type_flags.length > 1
+              kernel.abort(
+                'Only one of --main, --custom, --quick, and --full may be specified.'
+              )
+            end
+          end
+
+          def run_type
+            secondary_run_types[active_run_type] || default_run_type
+          end
+
+          def active_run_type
+            active_run_type_flags.first
+          end
+
+          def active_run_type_flags
+            [:main, :custom, :quick, :full].select {|switch|
+              switch_active?(switch)
+            }
+          end
+
+          def secondary_run_types
+            {
+              custom: 'custom',
+              quick: 'quick'
+            }
+          end
+
+          def default_run_type
+            'main'
+          end
+        end
+      end
+    end
   end
 end