ey-core 3.1.2 → 3.1.3

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

@@ -1,26 +1,52 @@
-class Ey::Core::Cli::Recipes::Download < Ey::Core::Cli::Recipes
-  title "download"
-  summary "Download a copy of the custom chef recipes from this environment into the current directory"
-  description <<-DESC
-    The recipes will be unpacked into a directory called "cookbooks" in the
-    current directory. This is the opposite of 'recipes upload'.
-
-    If the cookbooks directory already exists, an error will be raised.
-  DESC
-
-  option :environment, short: "e", long: "environment", description: "Environment that will receive the recipes.", argument: "environment"
-  option :account,     short: "c", long: "account",     description: "Name of the account in which the environment can be found.", argument: "account"
-
-  def handle
-    if File.exist?("cookbooks")
-      raise Ey::Core::Clie::RecipesExist.new("Cannot download recipes, cookbooks directory already exists.")
-    end
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/archive'
+
+module Ey
+  module Core
+    module Cli
+      module Recipes
+        class Download < Ey::Core::Cli::Subcommand
+          include Ey::Core::Cli::Helpers::Archive
+
+          title "download"
+          summary "Download a copy of the custom chef recipes from this environment into the current directory"
+
+          description <<-DESC
+The recipes will be unpacked into a directory called "cookbooks" in the
+current directory. This is the opposite of 'recipes upload'.
+
+If the cookbooks directory already exists, an error will be raised.
+DESC
 
-    operator, environment = core_operator_and_environment_for(options)
-    puts "Downloading recipes".green
-    recipes     = environment.download_recipes
+          option :environment,
+            short: "e",
+            long: "environment",
+            description: "Environment that will receive the recipes.",
+            argument: "environment"
 
-    puts "Extracting recipes to 'cookbooks/'".green
-    untar(ungzip(recipes), './')
+          option :account,
+            short: "c",
+            long: "account",
+            description: "Name of the account in which the environment can be found.",
+            argument: "account"
+
+          def handle
+            if File.exist?("cookbooks")
+              raise Ey::Core::Cli::RecipesExist.new(
+                "Cannot download recipes, cookbooks directory already exists."
+              )
+            end
+
+            operator, environment = core_operator_and_environment_for(options)
+            
+            puts "Downloading recipes".green
+            recipes = environment.download_recipes
+
+            puts "Extracting recipes to 'cookbooks/'".green
+            untar(ungzip(recipes), './')
+          end
+        end
+      end
+    end
   end
 end

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

@@ -0,0 +1,21 @@
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/recipes/apply'
+require 'ey-core/cli/recipes/download'
+require 'ey-core/cli/recipes/upload'
+
+module Ey
+  module Core
+    module Cli
+      module Recipes
+        class Main < Ey::Core::Cli::Subcommand
+          title "recipes"
+          summary "Chef specific commands"
+
+          mount Ey::Core::Cli::Recipes::Apply
+          mount Ey::Core::Cli::Recipes::Download
+          mount Ey::Core::Cli::Recipes::Upload
+        end
+      end
+    end
+  end
+end

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

@@ -1,27 +1,60 @@
-class Ey::Core::Cli::Recipes::Upload < Ey::Core::Cli::Recipes
-  title "upload"
-  summary "Upload custom recipes to an environment"
-  option :environment, short: "e", long: "environment", description: "Environment that will receive the recipes.", argument: "environment"
-  option :account,     short: "c", long: "account",     description: "Name of the account in which the environment can be found.", argument: "account"
-  option :file,        short: "f", long: "file",        description: "Path to recipes", argument: "path"
-
-  switch :apply, short: "a", long: "apply", description: "Apply the recipes immediately after they are uploaded"
-
-  def handle
-    operator, environment = core_operator_and_environment_for(options)
-    path = option(:file) || "cookbooks/"
-
-    puts "Uploading custom recipes for #{environment.name}".green
-    begin
-      upload_recipes(environment, path)
-      puts "Uploading custom recipes complete".green
-    rescue => e
-      abort "There was a problem uploading the recipes".red
-      puts e.inspect
-    end
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/chef'
+require 'ey-core/cli/helpers/archive'
+
+module Ey
+  module Core
+    module Cli
+      module Recipes
+        class Upload < Ey::Core::Cli::Subcommand
+          include Ey::Core::Cli::Helpers::Archive
+          include Ey::Core::Cli::Helpers::Chef
+
+          title "upload"
+          summary "Upload custom recipes to an environment"
+
+          option :environment,
+            short: "e",
+            long: "environment",
+            description: "Environment that will receive the recipes.",
+            argument: "environment"
+
+          option :account,
+            short: "c",
+            long: "account",
+            description: "Name of the account in which the environment can be found.",
+            argument: "account"
+
+          option :file,
+            short: "f",
+            long: "file",
+            description: "Path to recipes",
+            argument: "path"
+
+          switch :apply,
+            short: "a",
+            long: "apply",
+            description: "Apply the recipes immediately after they are uploaded"
+
+          def handle
+            operator, environment = core_operator_and_environment_for(options)
+            path = option(:file) || "cookbooks/"
+
+            puts "Uploading custom recipes for #{environment.name}".green
+
+            begin
+              upload_recipes(environment, path)
+              puts "Uploading custom recipes complete".green
+            rescue => e
+              abort "There was a problem uploading the recipes".red
+            end
 
-    if switch_active?(:apply)
-      run_chef("custom", environment)
+            if switch_active?(:apply)
+              run_chef("custom", environment)
+            end
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,11 +1,14 @@
-class Ey::Core::Cli::Scp < Ey::Core::Cli::Subcommand
-  title "scp"
-  summary "This command is deprecated"
-  description <<-DESC
-    The scp 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 Scp < Subcommand
+        include Helpers::Deprecated
+
+        deprecate('scp')
+      end
+    end
   end
 end

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

@@ -1,19 +1,41 @@
-class Ey::Core::Cli::Servers < Ey::Core::Cli::Subcommand
-  title "servers"
-  summary "List servers you have access to"
-  option :account, short: 'c', long: 'account', description: 'Filter by account name or id', argument: 'Account'
-  option :environment, short: "-e", long: "environment", description: "Filter by environment.", argument: "environment"
+require 'ey-core/cli/subcommand'
 
-  def handle
-    servers = if option(:account)
-                account = core_account_for(options)
-                core_client.servers.all(account: account)
-              elsif environment = option(:environment)
-                (core_client.environments.get(environment) || core_client.environments.first(name: environment)).servers.all
-              else
-                core_client.servers.all
-              end
+module Ey
+  module Core
+    module Cli
+      class Servers < Subcommand
+        title "servers"
+        summary "List servers you have access to"
 
-    puts TablePrint::Printer.new(servers, [{id: {width: 10}}, :role, :provisioned_id]).table_print
+        option :account,
+          short: 'c',
+          long: 'account',
+          description: 'Filter by account name or id',
+          argument: 'Account'
+
+        option :environment,
+          short: "-e",
+          long: "environment",
+          description: "Filter by environment.",
+          argument: "environment"
+
+        def handle
+          puts TablePrint::Printer.
+            new(servers, [{id: {width: 10}}, :role, :provisioned_id]).
+            table_print
+        end
+
+        private
+        def servers
+          if option(:account)
+            core_client.servers.all(account: core_account)
+          elsif environment = option(:environment)
+            (core_client.environments.get(environment) || core_client.environments.first(name: environment)).servers.all
+          else
+            core_client.servers.all
+          end
+        end
+      end
+    end
   end
 end

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

@@ -1,81 +1,138 @@
 require 'ey-core/cli/helpers/server_sieve'
+require 'ey-core/cli/subcommand'
 
-class Ey::Core::Cli::Ssh < Ey::Core::Cli::Subcommand
-  title "ssh"
-  summary "Open an SSH session to the environment's application master"
-  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"
-  option :server, short: 's', long: "server", description: "Specific server to ssh into. Id or amazon id (i-12345)", argument: "server"
-  option :utilities, long: "utilities", description: "Run command on the utility servers with the given names. Specify all to run the command on all utility servers.", argument: "'all,resque,redis,etc'"
-  option :command, long: "command", description: "Command to run", argument: "'command with args'"
-  option :shell, short: 's', long: "shell", description: "Run command in a shell other than bash", argument: "shell"
-  option :bind_address, long: "bind_address", description: "When no command is specified, pass -L to ssh", argument: "bind address"
-
-  switch :all,         long: "all",         description: "Run command on all servers"
-  switch :app_servers, long: "app_servers", description: "Run command on all application servers"
-  switch :db_servers,  long: "db_servers",  description: "Run command on all database servers"
-  switch :db_master,   long: "db_master",   description: "Run command on database master"
-  switch :db_slaves,   long: "db_slaves",   description: "Run command on database slaves"
-  switch :tty, short: 't', long: "tty",     description: "Allocated a tty for the command"
-
-  def handle
-    operator, environment = core_operator_and_environment_for(options)
-    abort "Unable to find matching environment".red unless environment
-
-    cmd      = option(:command)
-    ssh_opts = []
-    ssh_cmd  = ["ssh"]
-    exits    = []
-    user     = environment.username
-    servers  = []
-
-    if option(:command)
-      if shell = option(:shell)
-        cmd = Escape.shell_command([shell,'-lc',cmd])
-      end
+module Ey
+  module Core
+    module Cli
+      class Ssh < Subcommand
+        title "ssh"
+        summary "Open an SSH session to the environment's application master"
 
-      if switch_active?(:tty)
-        ssh_opts << "-t"
-      elsif cmd.match(/sudo/)
-        puts "sudo commands often need a tty to run correctly. Use -t option to spawn a tty.".yellow
-      end
+        option :account,
+          short: "c",
+          long: "account",
+          description: "Name or id of account",
+          argument: "account"
 
-      servers += Ey::Core::Cli::Helpers::ServerSieve.filter(
-        environment.servers,
-        all: switch_active?(:all),
-        app_servers: switch_active?(:app_servers),
-        db_servers: switch_active?(:db_servers),
-        db_master: switch_active?(:db_master),
-        utilities: option(:utilities)
-      )
-    else
-      if option(:bind_address)
-        ssh_opts += ["-L", option(:bind_address)]
-      end
+        option :environment,
+          short: "e",
+          long: "environment",
+          description: "Name or id of environment",
+          argument: "environment"
 
-      if option(:server)
-        servers += [core_server_for(server: option[:server], operator: environment)]
-      else
-        servers += (environment.servers.all(role: "app_master") + environment.servers.all(role: "solo")).to_a
-      end
-    end
+        option :server,
+          short: 's',
+          long: "server",
+          description: "Specific server to ssh into. Id or amazon id (i-12345)",
+          argument: "server"
 
-    if servers.empty?
-      abort "Unable to find any matching servers. Aborting.".red
-    end
+        option :utilities,
+          long: "utilities",
+          description: "Run command on the utility servers with the given names. Specify all to run the command on all utility servers.",
+          argument: "'all,resque,redis,etc'"
 
-    servers.uniq!
+        option :command,
+          long: "command",
+          description: "Command to run",
+          argument: "'command with args'"
 
-    servers.each do |server|
-      host = server.public_hostname
-      name = server.name ? "#{server.role} (#{server.name})" : server.role
-      puts "\nConnecting to #{name} #{host}".green
-      sshcmd = Escape.shell_command((ssh_cmd + ["#{user}@#{host}"] + [cmd]).compact)
-      puts "Running command: #{sshcmd}".green
-      system sshcmd
-      exits << $?.exitstatus
-    end
+        option :shell,
+          short: 's',
+          long: "shell",
+          description: "Run command in a shell other than bash",
+          argument: "shell"
+
+        option :bind_address,
+          long: "bind_address",
+          description: "When no command is specified, pass -L to ssh",
+          argument: "bind address"
+
+        switch :all,
+          long: "all",
+          description: "Run command on all servers"
+
+        switch :app_servers,
+          long: "app_servers",
+          description: "Run command on all application servers"
+
+        switch :db_servers,
+          long: "db_servers",
+          description: "Run command on all database servers"
+
+        switch :db_master,
+          long: "db_master",
+          description: "Run command on database master"
+
+        switch :db_slaves,
+          long: "db_slaves",
+          description: "Run command on database slaves"
 
-    exit exits.detect {|status| status != 0 } || 0
+        switch :tty,
+          short: 't',
+          long: "tty",
+          description: "Allocated a tty for the command"
+
+        def handle
+          operator, environment = core_operator_and_environment_for(options)
+          abort "Unable to find matching environment".red unless environment
+
+          cmd      = option(:command)
+          ssh_opts = []
+          ssh_cmd  = ["ssh"]
+          exits    = []
+          user     = environment.username
+          servers  = []
+
+          if option(:command)
+            if shell = option(:shell)
+              cmd = Escape.shell_command([shell,'-lc',cmd])
+            end
+
+            if switch_active?(:tty)
+              ssh_opts << "-t"
+            elsif cmd.match(/sudo/)
+              puts "sudo commands often need a tty to run correctly. Use -t option to spawn a tty.".yellow
+            end
+
+            servers += Ey::Core::Cli::Helpers::ServerSieve.filter(
+              environment.servers,
+              all: switch_active?(:all),
+              app_servers: switch_active?(:app_servers),
+              db_servers: switch_active?(:db_servers),
+              db_master: switch_active?(:db_master),
+              utilities: option(:utilities)
+            )
+          else
+            if option(:bind_address)
+              ssh_opts += ["-L", option(:bind_address)]
+            end
+
+            if option(:server)
+              servers += [core_server_for(server: option[:server], operator: environment)]
+            else
+              servers += (environment.servers.all(role: "app_master") + environment.servers.all(role: "solo")).to_a
+            end
+          end
+
+          if servers.empty?
+            abort "Unable to find any matching servers. Aborting.".red
+          end
+
+          servers.uniq!
+
+          servers.each do |server|
+            host = server.public_hostname
+            name = server.name ? "#{server.role} (#{server.name})" : server.role
+            puts "\nConnecting to #{name} #{host}".green
+            sshcmd = Escape.shell_command((ssh_cmd + ["#{user}@#{host}"] + [cmd]).compact)
+            puts "Running command: #{sshcmd}".green
+            system sshcmd
+            exits << $?.exitstatus
+          end
+
+          exit exits.detect {|status| status != 0 } || 0
+        end
+      end
+    end
   end
 end