ey-core 3.4.5 → 3.6.0.autoscaling1

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

@@ -1,65 +1,67 @@
-#require 'optparse'
-#require 'ostruct'
-#require 'ey-core'
-require 'ey-core/cli'
-require 'awesome_print'
-require 'belafonte'
-require 'rubygems/package'
-require 'escape'
-require 'highline/import'
-
-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
-
-
-module Ey
-  module Core
-    module Cli
-      class Main < Belafonte::App
-        title "Engineyard CLI"
-        summary "Successor to the engineyard gem"
-
-        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
+#require 'optparse'
+#require 'ostruct'
+#require 'ey-core'
+require 'ey-core/cli'
+require 'awesome_print'
+require 'belafonte'
+require 'rubygems/package'
+require 'escape'
+require 'highline/import'
+
+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/environment_variables'
+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
+
+
+module Ey
+  module Core
+    module Cli
+      class Main < Belafonte::App
+        title "Engineyard CLI"
+        summary "Successor to the engineyard gem"
+
+        mount Accounts
+        mount Applications
+        mount Console
+        mount CurrentUser
+        mount Deploy
+        mount Environments
+        mount EnvironmentVariables
+        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/apply.rb

@@ -1,65 +1,65 @@
-require 'ey-core/cli/subcommand'
-require 'ey-core/cli/helpers/chef'
-
-module Ey
-  module Core
-    module Cli
-      module Recipes
-        class Apply < Subcommand
-          include Helpers::Chef
-
-          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"
-
-          switch :quick,
-            short: "q",
-            long: "quick",
-            description: "Quick chef run (if not specified, will run main chef run)"
-
-          switch :verbose,
-            long: "verbose",
-            description: "verbose chef run (include chef setup and stack traces)"
-
-          switch :no_wait,
-            long: "no-wait",
-            description: "Don't wait for apply to finish, exit after started"
-
-          option :watch,
-            long: "watch",
-            description: "Specify an instance amazon_id or server role to watch chef logs (defaults to app_master)",
-            argument: "instance"
-
-          def handle
-            operator, environment = core_operator_and_environment_for(options)
-            raise "Unable to find matching environment" unless environment
-
-            opts = {}
-            opts[:no_wait] = switch_active?(:no_wait)
-            opts[:verbose] = switch_active?(:verbose)
-            opts[:watch]   = option(:watch)
-            run_chef(run_type, environment, opts)
-          end
-
-          private
-
-          def run_type
-            (switch_active?(:quick) && "quick") || "main"
-          end
-
-        end
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/chef'
+
+module Ey
+  module Core
+    module Cli
+      module Recipes
+        class Apply < Subcommand
+          include Helpers::Chef
+
+          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"
+
+          switch :quick,
+            short: "q",
+            long: "quick",
+            description: "Quick chef run (if not specified, will run main chef run)"
+
+          switch :verbose,
+            long: "verbose",
+            description: "verbose chef run (include chef setup and stack traces)"
+
+          switch :no_wait,
+            long: "no-wait",
+            description: "Don't wait for apply to finish, exit after started"
+
+          option :watch,
+            long: "watch",
+            description: "Specify an instance amazon_id or server role to watch chef logs (defaults to app_master)",
+            argument: "instance"
+
+          def handle
+            operator, environment = core_operator_and_environment_for(options)
+            raise "Unable to find matching environment" unless environment
+
+            opts = {}
+            opts[:no_wait] = switch_active?(:no_wait)
+            opts[:verbose] = switch_active?(:verbose)
+            opts[:watch]   = option(:watch)
+            run_chef(run_type, environment, opts)
+          end
+
+          private
+
+          def run_type
+            (switch_active?(:quick) && "quick") || "main"
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -1,52 +1,52 @@
-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
-
-          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::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
+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
+
+          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::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

@@ -1,21 +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
+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,78 +1,78 @@
-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"
-
-          switch :verbose,
-            long: "verbose",
-            description: "(used in conjunction with --apply) verbose chef run (include chef setup and stack traces)"
-
-          switch :no_wait,
-            long: "no-wait",
-            description: "(used in conjunction with --apply) Don't wait for apply to finish, exit after started"
-
-          option :watch,
-            long: "watch",
-            description: "Specify an instance amazon_id or server role to watch chef logs (defaults to app_master)",
-            argument: "instance"
-
-          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
-              puts e.message
-              abort "There was a problem uploading the recipes".red
-            end
-
-            if switch_active?(:apply)
-              opts = {}
-              opts[:no_wait] = switch_active?(:no_wait)
-              opts[:verbose] = switch_active?(:verbose)
-              opts[:watch]   = option(:watch)
-              run_chef("main", environment, opts)
-            end
-          end
-        end
-      end
-    end
-  end
-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"
+
+          switch :verbose,
+            long: "verbose",
+            description: "(used in conjunction with --apply) verbose chef run (include chef setup and stack traces)"
+
+          switch :no_wait,
+            long: "no-wait",
+            description: "(used in conjunction with --apply) Don't wait for apply to finish, exit after started"
+
+          option :watch,
+            long: "watch",
+            description: "Specify an instance amazon_id or server role to watch chef logs (defaults to app_master)",
+            argument: "instance"
+
+          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
+              puts e.message
+              abort "There was a problem uploading the recipes".red
+            end
+
+            if switch_active?(:apply)
+              opts = {}
+              opts[:no_wait] = switch_active?(:no_wait)
+              opts[:verbose] = switch_active?(:verbose)
+              opts[:watch]   = option(:watch)
+              run_chef("main", environment, opts)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,10 @@
-require 'ey-core/cli/recipes/main'
-
-module Ey
-  module Core
-    module Cli
-      module Recipes
-      end
-    end
-  end
-end
+require 'ey-core/cli/recipes/main'
+
+module Ey
+  module Core
+    module Cli
+      module Recipes
+      end
+    end
+  end
+end

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

@@ -1,14 +1,14 @@
-require 'ey-core/cli/subcommand'
-require 'ey-core/cli/helpers/deprecated'
-
-module Ey
-  module Core
-    module Cli
-      class Scp < Subcommand
-        include Helpers::Deprecated
-
-        deprecate('scp')
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/deprecated'
+
+module Ey
+  module Core
+    module Cli
+      class Scp < Subcommand
+        include Helpers::Deprecated
+
+        deprecate('scp')
+      end
+    end
+  end
+end