ey-core 3.4.4 → 3.4.5

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

@@ -1,123 +1,123 @@
-require 'ey-core/cli/subcommand'
-require 'ey-core/cli/helpers/log_streaming'
-
-module Ey
-  module Core
-    module Cli
-      class Deploy < Subcommand
-        include Ey::Core::Cli::Helpers::LogStreaming
-        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 :no_wait,
-          long: "no-wait",
-          description: "Don't wait for deploy to finish, exit after deploy is started"
-
-        switch :verbose,
-          short: "v",
-          long: "verbose",
-          description: "Deploy with verbose output"
-
-        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
-          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(environment, self.options)
-
-          deploy_options = {verbose: options[:verbose], cli_args: ARGV}
-          latest_deploy = nil
-          if options[:ref]
-            deploy_options.merge!(ref: option(:ref))
-          else
-            puts "--ref not provided, checking latest deploy...".yellow
-            latest_deploy ||= environment.latest_deploy(app)
-            if latest_deploy && latest_deploy.ref
-              deploy_options[:ref] = latest_deploy.ref
-            else
-              raise "--ref is required (HEAD is the typical choice)"
-            end
-          end
-          if (option(:migrate) || switch_active?(:no_migrate))
-            deploy_options.merge!(migrate_command: option(:migrate)) if option(:migrate)
-            deploy_options.merge!(migrate_command: '') if switch_active?(:no_migrate)
-          else
-            puts "missing migrate option (--migrate or --no-migrate), checking latest deploy...".yellow
-            latest_deploy ||= environment.latest_deploy(app)
-            if latest_deploy
-              deploy_options.merge!(migrate_command: (latest_deploy.migrate && latest_deploy.migrate_command) || '')
-            else
-              raise "either --migrate or --no-migrate needs to be specified"
-            end
-          end
-          request = environment.deploy(app, deploy_options)
-
-          puts <<-EOF
-Deploy started to environment: #{environment.name} with application: #{app.name}
-Request ID: #{request.id}
-EOF
-          ap request
-          ap request.resource
-          if switch_active?(:no_wait)
-            puts("Deploy started".green + " (use status command with --tail to view output)")
-          else
-            stream_deploy_log(request)
-          end
-        end
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/log_streaming'
+
+module Ey
+  module Core
+    module Cli
+      class Deploy < Subcommand
+        include Ey::Core::Cli::Helpers::LogStreaming
+        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 :no_wait,
+          long: "no-wait",
+          description: "Don't wait for deploy to finish, exit after deploy is started"
+
+        switch :verbose,
+          short: "v",
+          long: "verbose",
+          description: "Deploy with verbose output"
+
+        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
+          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(environment, self.options)
+
+          deploy_options = {verbose: options[:verbose], cli_args: ARGV}
+          latest_deploy = nil
+          if options[:ref]
+            deploy_options.merge!(ref: option(:ref))
+          else
+            puts "--ref not provided, checking latest deploy...".yellow
+            latest_deploy ||= environment.latest_deploy(app)
+            if latest_deploy && latest_deploy.ref
+              deploy_options[:ref] = latest_deploy.ref
+            else
+              raise "--ref is required (HEAD is the typical choice)"
+            end
+          end
+          if (option(:migrate) || switch_active?(:no_migrate))
+            deploy_options.merge!(migrate_command: option(:migrate)) if option(:migrate)
+            deploy_options.merge!(migrate_command: '') if switch_active?(:no_migrate)
+          else
+            puts "missing migrate option (--migrate or --no-migrate), checking latest deploy...".yellow
+            latest_deploy ||= environment.latest_deploy(app)
+            if latest_deploy
+              deploy_options.merge!(migrate_command: (latest_deploy.migrate && latest_deploy.migrate_command) || '')
+            else
+              raise "either --migrate or --no-migrate needs to be specified"
+            end
+          end
+          request = environment.deploy(app, deploy_options)
+
+          puts <<-EOF
+Deploy started to environment: #{environment.name} with application: #{app.name}
+Request ID: #{request.id}
+EOF
+          ap request
+          ap request.resource
+          if switch_active?(:no_wait)
+            puts("Deploy started".green + " (use status command with --tail to view output)")
+          else
+            stream_deploy_log(request)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,39 +1,39 @@
-require 'ey-core/cli/subcommand'
-require 'ey-core/cli/helpers/stream_printer'
-
-module Ey
-  module Core
-    module Cli
-      class Environments < Subcommand
-        include Ey::Core::Cli::Helpers::StreamPrinter
-        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
-          if option(:account)
-            stream_print("ID" => 10, "Name" => 50) do |printer|
-              core_account.environments.each_entry do |env|
-                printer.print(env.id, env.name)
-              end
-            end
-          else
-            stream_print("ID" => 10, "Name" => 50, "Account" => 50) do |printer|
-              core_accounts.each_entry do |account|
-                account.environments.each_entry do |env|
-                  printer.print(env.id, env.name, account.name)
-                end
-              end
-            end
-          end
-        end
-
-      end
-    end
-  end
-end
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/stream_printer'
+
+module Ey
+  module Core
+    module Cli
+      class Environments < Subcommand
+        include Ey::Core::Cli::Helpers::StreamPrinter
+        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
+          if option(:account)
+            stream_print("ID" => 10, "Name" => 50) do |printer|
+              core_account.environments.each_entry do |env|
+                printer.print(env.id, env.name)
+              end
+            end
+          else
+            stream_print("ID" => 10, "Name" => 50, "Account" => 50) do |printer|
+              core_accounts.each_entry do |account|
+                account.environments.each_entry do |env|
+                  printer.print(env.id, env.name, account.name)
+                end
+              end
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,11 +1,11 @@
-module Ey
-  module Core
-    module Cli
-      RecipesNotFound = Class.new(ArgumentError)
-      NoCommand       = Class.new(ArgumentError)
-      NoRepository    = Class.new(ArgumentError)
-      RecipesExist    = Class.new(ArgumentError)
-      AmbiguousSearch = Class.new(ArgumentError)
-    end
-  end
-end
+module Ey
+  module Core
+    module Cli
+      RecipesNotFound = Class.new(ArgumentError)
+      NoCommand       = Class.new(ArgumentError)
+      NoRepository    = Class.new(ArgumentError)
+      RecipesExist    = Class.new(ArgumentError)
+      AmbiguousSearch = Class.new(ArgumentError)
+    end
+  end
+end

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

@@ -1,30 +1,30 @@
-require 'belafonte'
-
-module Ey
-  module Core
-    module Cli
-      class Help < Belafonte::App
-        title 'help'
-        summary 'Print out the help docs'
-
-        arg :command_line,
-          times: :unlimited
-
-        def handle
-          Main.new(
-            command_line.unshift('-h'),
-            stdin,
-            stdout,
-            stderr,
-            kernel
-          ).execute!
-        end
-
-        private
-        def command_line
-          arg(:command_line)
-        end
-      end
-    end
-  end
-end
+require 'belafonte'
+
+module Ey
+  module Core
+    module Cli
+      class Help < Belafonte::App
+        title 'help'
+        summary 'Print out the help docs'
+
+        arg :command_line,
+          times: :unlimited
+
+        def handle
+          Main.new(
+            command_line.unshift('-h'),
+            stdin,
+            stdout,
+            stderr,
+            kernel
+          ).execute!
+        end
+
+        private
+        def command_line
+          arg(:command_line)
+        end
+      end
+    end
+  end
+end

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

@@ -1,70 +1,70 @@
-require 'stringio'
-require 'rubygems/package'
-require 'zlib'
-
-module Ey
-  module Core
-    module Cli
-      module Helpers
-        module Archive
-          def gzip(tarfile)
-            gz = StringIO.new("")
-            zipper = Zlib::GzipWriter.new(gz)
-            zipper.write tarfile.string
-            zipper.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 ungzip(tarfile)
-            zipped = Zlib::GzipReader.new(tarfile)
-            unzipped = StringIO.new(zipped.read)
-            zipped.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 |file|
-                    file.print tarfile.read
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+require 'stringio'
+require 'rubygems/package'
+require 'zlib'
+
+module Ey
+  module Core
+    module Cli
+      module Helpers
+        module Archive
+          def gzip(tarfile)
+            gz = StringIO.new("")
+            zipper = Zlib::GzipWriter.new(gz)
+            zipper.write tarfile.string
+            zipper.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 ungzip(tarfile)
+            zipped = Zlib::GzipReader.new(tarfile)
+            unzipped = StringIO.new(zipped.read)
+            zipped.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 |file|
+                    file.print tarfile.read
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,51 +1,51 @@
-require 'ey-core/cli/errors'
-
-module Ey
-  module Core
-    module Cli
-      module Helpers
-        module Chef
-          def run_chef(type, environment, options = {})
-            no_wait = options.delete(:no_wait)
-            options[:streaming] = true unless no_wait
-            request = environment.apply(type, options)
-            puts "Started #{type} chef run".green
-            if no_wait
-              return
-            end
-            streamable_instance_update = nil
-            if request.read_channel
-              request.subscribe do |m|
-                print m["message"] if m.is_a?(Hash)
-              end
-              puts "" # fix console output from stream
-            else
-              request.wait_for { |r| r.ready? }
-            end
-            if request.successful
-              puts "#{type.capitalize} chef run completed".green
-            else
-              puts "#{type.capitalize} chef run failed".red
-              ap request
-              if server = environment.servers.first
-                puts "For logs try `ey logs --server #{server.provisioned_id}` --environment #{environment.name}"
-              end
-            end
-          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 RecipesNotFound, "Recipes not found, expected to find chef recipes in: #{File.expand_path(recipes_path)}, use --file to specify a different path"
-            end
-          end
-        end
-      end
-    end
-  end
-end
+require 'ey-core/cli/errors'
+
+module Ey
+  module Core
+    module Cli
+      module Helpers
+        module Chef
+          def run_chef(type, environment, options = {})
+            no_wait = options.delete(:no_wait)
+            options[:streaming] = true unless no_wait
+            request = environment.apply(type, options)
+            puts "Started #{type} chef run".green
+            if no_wait
+              return
+            end
+            streamable_instance_update = nil
+            if request.read_channel
+              request.subscribe do |m|
+                print m["message"] if m.is_a?(Hash)
+              end
+              puts "" # fix console output from stream
+            else
+              request.wait_for { |r| r.ready? }
+            end
+            if request.successful
+              puts "#{type.capitalize} chef run completed".green
+            else
+              puts "#{type.capitalize} chef run failed".red
+              ap request
+              if server = environment.servers.first
+                puts "For logs try `ey logs --server #{server.provisioned_id}` --environment #{environment.name}"
+              end
+            end
+          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 RecipesNotFound, "Recipes not found, expected to find chef recipes in: #{File.expand_path(recipes_path)}, use --file to specify a different path"
+            end
+          end
+        end
+      end
+    end
+  end
+end