elastic_beans 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '058ffb4aa22e205e19470449420643bc3e55298f'
-  data.tar.gz: 5dcd342a6962c0ee82dd672c2ee07a32fc7b1562
+  metadata.gz: eaa8b4c3e65d502798c78492a575fd8f2977b5ef
+  data.tar.gz: 4f01b3ca52c88736e1d9c38ac0cfae93e13a65f2
 SHA512:
-  metadata.gz: 40f88906d991227878c85386c3fd79fba38e14bbddddfbb26c9101e3c4b1e01d7996f9dafef8cb1b0e3035f59548a664f41c4de94f46d0010a7bd9b653c517d8
-  data.tar.gz: 3aeebfe162e590b106c6e253af178aef7c447ef4d005179ed197e34c4357a5a350bcc864a1e8eed51ef9c1d9e425a6617fe6a06df4a540e2b7aea8470f79829c
+  metadata.gz: f7b3adc0fd44ad475de17d6c846ff5cace585ed29a07715676bd31509f75f4cc44c7284e0ca88660ebbf7724ec0ca7dccc79a3d81ed1a55278a40025766ea52f
+  data.tar.gz: 5f248ed95c125b1bde81186bf6d69157cb52129ea376dcf8618904a3b3ac33a301707ac219e559847ec875b4e99b1a3f7a379aedff264e94dd619ea87f735beb

data/lib/elastic_beans/cli.rb

@@ -113,6 +113,24 @@ class ElasticBeans::CLI < Thor
     error(e)
   end
 
+  desc ElasticBeans::Command::Restart::USAGE, ElasticBeans::Command::Restart::DESC
+  long_desc ElasticBeans::Command::Restart::LONG_DESC
+  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
+  option :queue, aliases: %w(-q), desc: "The name of the queue to identify the worker environment to restart, e.g. `default`"
+  def restart(environment = nil)
+    @verbose = options[:verbose]
+    ElasticBeans::Command::Restart.new(
+      application: application(
+        name: options[:application],
+      ),
+      queue: options[:queue],
+      elastic_beanstalk: elastic_beanstalk_client,
+      ui: ui,
+    ).run(environment)
+  rescue StandardError => e
+    error(e)
+  end
+
   desc ElasticBeans::Command::Scale::USAGE, ElasticBeans::Command::Scale::DESC
   long_desc ElasticBeans::Command::Scale::LONG_DESC
   option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC

data/lib/elastic_beans/command.rb

@@ -3,6 +3,7 @@ require "elastic_beans/command/create"
 require "elastic_beans/command/deploy"
 require "elastic_beans/command/exec"
 require "elastic_beans/command/ps"
+require "elastic_beans/command/restart"
 require "elastic_beans/command/scale"
 require "elastic_beans/command/get_env"
 require "elastic_beans/command/set_env"

data/lib/elastic_beans/command/create.rb

@@ -13,6 +13,7 @@ module ElasticBeans
       LONG_DESC = <<-LONG_DESC
 Create a new environment in Elastic Beanstalk and attach it to relevant resources.
 The environment type must be one of the recognized types: webserver, worker, exec, or scheduled.
+Use `-q` for worker environments to clarify which worker environment to create, e.g. `create worker -q default`.
 
 A new environment will use the same deployed version as all other environments.
 If this is the first environment, a new version will be created from the HEAD git commit of the working directory.

data/lib/elastic_beans/command/restart.rb

@@ -0,0 +1,88 @@
+require "ruby-progressbar"
+require "elastic_beans/error"
+require "elastic_beans/error/environments_not_ready"
+
+module ElasticBeans
+  module Command
+    # :nodoc: all
+    class Restart
+      USAGE = "restart [ENVIRONMENT]"
+      DESC = "Restart one or all environments in the Elastic Beanstalk application"
+      LONG_DESC = <<-LONG_DESC
+Given no arguments, restarts all servers for the application.
+Given an environment name, restarts only the servers for that environment, e.g. `restart webserver`.
+Use `-q` for worker environments to clarify which worker environment to restart, e.g. `restart worker -q default`.
+
+Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY.
+      LONG_DESC
+
+      def initialize(application:, queue:, elastic_beanstalk:, ui:)
+        @application = application
+        @queue = queue
+        @elastic_beanstalk = elastic_beanstalk
+        @ui = ui
+      end
+
+      def run(environment_type = nil)
+        environments = []
+        if environment_type
+          environment = ElasticBeans::Environment.new_by_type(
+            environment_type,
+            queue: queue,
+            application: application,
+            elastic_beanstalk: elastic_beanstalk,
+          )
+          environments << environment
+          if environment.status != "Ready"
+            raise EnvironmentsNotReady.new(environments: environments)
+          end
+        else
+          environments = application.environments
+          if environments.empty?
+            raise NoEnvironmentsError
+          end
+          unready_environments = environments.select { |environment| environment.status != "Ready" }
+          if unready_environments.any?
+            raise EnvironmentsNotReady.new(environments: unready_environments)
+          end
+        end
+
+        progressbar = ProgressBar.create(title: "Restarting", total: nil, output: ui.stdout)
+
+        threads = environments.map { |environment|
+          progressbar.log("Restarting `#{environment.name}'...")
+          thread = Thread.new do
+            environment.restart
+          end
+          progressbar.increment
+          thread
+        }
+
+        loop do
+          sleep 0.5
+          progressbar.increment
+          if threads.none?(&:alive?)
+            progressbar.total = progressbar.progress
+            break
+          end
+        end
+
+        threads.each(&:join)
+      end
+
+      private
+
+      attr_reader :application, :queue, :elastic_beanstalk, :ui
+
+      class NoEnvironmentsError < ElasticBeans::Error
+        def message
+          <<-MESSAGE
+There are no environments to restart! Please create some using `beans create`.
+
+#{command_help "create"}
+          MESSAGE
+        end
+      end
+    end
+  end
+end

data/lib/elastic_beans/command/scale.rb

@@ -9,6 +9,7 @@ module ElasticBeans
       DESC = "Change the autoscaling minimum and maximum for the given environment"
       LONG_DESC = <<-LONG_DESC
 Change the autoscaling minimum and maximum for the given environment.
+Use `-q` for worker environments to clarify which worker environment to scale, e.g. `scale worker -q default -i 1 -m 2`.
 
 Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY.
       LONG_DESC

data/lib/elastic_beans/environment.rb

@@ -157,6 +157,8 @@ module ElasticBeans
     rescue ::Aws::ElasticBeanstalk::Errors::Throttling
       sleep 5
       retry
+    rescue ::Aws::ElasticBeanstalk::Errors::InvalidParameterValue
+      raise MissingEnvironmentError.new(environment: self, application: application)
     end
 
     # Updates the environment configuration to change the minimum and maximum size of the autoscaling group.

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -183,6 +183,7 @@ files:
 - lib/elastic_beans/command/exec.rb
 - lib/elastic_beans/command/get_env.rb
 - lib/elastic_beans/command/ps.rb
+- lib/elastic_beans/command/restart.rb
 - lib/elastic_beans/command/scale.rb
 - lib/elastic_beans/command/set_env.rb
 - lib/elastic_beans/command/talk.rb