elastic_beans 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b231170798c366604081d7d0800c0c332a386d6
-  data.tar.gz: 661c9aca9b2ae4fdc6402cd02c5b3d37c4f62d76
+  metadata.gz: 661efbe2cb8fd10a68a49a3ebc7899ec3b30b61a
+  data.tar.gz: 6dee6beefb1f0dcd55f5cf7c8f7f73898c9e1432
 SHA512:
-  metadata.gz: 71da843ae45cfac1cf6fa2061df76383849d16cdb359c1ff7145975c25042ca8985d7501b2e57d09d2968d4b8b0246cf40f89ef73d98b6a165b4cb15ae17f8fa
-  data.tar.gz: 928d9e71798950eb693d0a9ad4a9ac720ca48e56de71b8cf074d0fd409e2c957119d2dd83fcc6dd8b757ef122e08bda185ff25fad6dacddedcf5db7d327bbfb0
+  metadata.gz: 63dc0a28f1482b67a2d96fa6edefd65f768acbbe377357acec498bc7b34dafe9242f7ef4c365c82c15d24c80ea6e81a5d6c41cc92e85d3c39002cc969e2f04fc
+  data.tar.gz: ca7b8ffd98f6218a0bb935aea9bfce0cf3d3e804467a709e20d9d0adf83f313ba606ff9057aebffdb2e7dbf80d42e360f2689f0bdc6cc07f8ac5f0ddc6e2de84

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.elasticbeanstalk

data/README.md

@@ -67,8 +67,7 @@ AWS SDK clients must be passed into Elastic Beans constructors.
 ### Periodic tasks
 
 Elastic Beanstalk [supports periodic tasks][periodic] by sending a POST request to an endpoint of your application.
-Elastic Beans includes a middleware that can convert specially-crafted paths into commands and enqueue them for execution.
-The middleware only accepts localhost requests from `aws-sqsd`.
+Elastic Beans includes a middleware that can convert specially-crafted paths into commands and enqueue them for execution. "Specially-crafted" meaning with /exec at the front, as the cron.yaml section below explains. The middleware only accepts localhost requests from `aws-sqsd`.
 
 [periodic]: http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/using-features-managing-env-tiers.html#worker-periodictasks
 

data/exe/beans

@@ -1,228 +1,5 @@
 #!/usr/bin/env ruby
 
-require "aws-sdk"
-require "thor"
-require "elastic_beans"
-require "elastic_beans/error"
-require "elastic_beans/command"
-require "elastic_beans/ui"
-
-class ElasticBeans::CLI < Thor
-  APPLICATION_DESC = "The name of the Elastic Beanstalk application and CloudFormation stack that contains application settings"
-
-  class_option :verbose, type: :boolean, aliases: %w(-v)
-
-  desc ElasticBeans::Command::Configure::USAGE, ElasticBeans::Command::Configure::DESC
-  long_desc ElasticBeans::Command::Configure::LONG_DESC
-  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
-  option :network, aliases: %w(-n), required: true, desc: "The name of the CloudFormation stack that contains networking settings"
-  option :database_url, aliases: %w(-d), desc: "The DATABASE_URL for the Rails application"
-  option :image_id, aliases: %w(-i), desc: "A custom AMI to use instead of the default Ruby Elastic Beanstalk AMI"
-  option :instance_type, aliases: %w(-t), desc: "A default instance type to use for all environments instead of c4.large"
-  option :keypair, aliases: %w(-k), desc: "Required on first run. The EC2 keypair to use for Elastic Beanstalk instances"
-  option :logging_endpoint, aliases: %w(-l), desc: "An HTTP endpoint that can receive logs from one-off commands"
-  option :public_key, aliases: %w(-p), desc: "For end-to-end encryption. The public key of the SSL certificate the ELB will verify to communicate with your Rails app"
-  option :secret_key_base, aliases: %w(-b), desc: "The SECRET_KEY_BASE for the Rails application"
-  option :ssl_certificate_arn, aliases: %w(-s), desc: "The ARN of the SSL server certificate stored in IAM to attach to the ELB"
-  def configure
-    @verbose = options[:verbose]
-    ElasticBeans::Command::Configure.new(
-      database_url: options[:database_url],
-      image_id: options[:image_id],
-      instance_type: options[:instance_type],
-      keypair: options[:keypair],
-      logging_endpoint: options[:logging_endpoint],
-      public_key: options[:public_key],
-      secret_key_base: options[:secret_key_base],
-      ssl_certificate_arn: options[:ssl_certificate_arn],
-      application: application(name: options[:application]),
-      network: network(stack_name: options[:network]),
-      elastic_beanstalk: elastic_beanstalk_client,
-      iam: iam_client,
-      ui: ui,
-    ).run
-  rescue StandardError => e
-    error(e)
-  end
-
-  desc ElasticBeans::Command::Create::USAGE, ElasticBeans::Command::Create::DESC
-  long_desc ElasticBeans::Command::Create::LONG_DESC
-  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
-  option :dns, aliases: %w(-d), desc: "A Route53 DNS entry to create or update for a new webserver environment"
-  option :queue, aliases: %w(-q), desc: "The name of the queue a new worker environment should listen to, e.g. `default`"
-  option :tags, type: :hash, default: {}, desc: "EC2 tags to apply to the new environment as a Hash, e.g. `--tags=Environment:development Team:mine`"
-  def create(environment_type)
-    @verbose = options[:verbose]
-    ElasticBeans::Command::Create.new(
-      environment_type: environment_type,
-      dns: options[:dns],
-      queue: options[:queue],
-      tags: options[:tags],
-      application: application(name: options[:application]),
-      elastic_beanstalk: elastic_beanstalk_client,
-      route53: route53_client,
-      s3: s3_client,
-      ui: ui,
-    ).run
-  rescue StandardError => e
-    error(e)
-  end
-
-  desc ElasticBeans::Command::Deploy::USAGE, ElasticBeans::Command::Deploy::DESC
-  long_desc ElasticBeans::Command::Deploy::LONG_DESC
-  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
-  def deploy
-    @verbose = options[:verbose]
-    ElasticBeans::Command::Deploy.new(
-      application: application(
-        name: options[:application],
-      ),
-      elastic_beanstalk: elastic_beanstalk_client,
-      s3: s3_client,
-      ui: ui,
-    ).run
-  rescue StandardError => e
-    error(e)
-  end
-
-  desc ElasticBeans::Command::Exec::USAGE, ElasticBeans::Command::Exec::DESC
-  long_desc ElasticBeans::Command::Exec::LONG_DESC
-  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
-  def exec(*command_parts)
-    @verbose = options[:verbose]
-    ElasticBeans::Command::Exec.new(
-      application: application(
-        name: options[:application],
-      ),
-      sqs: sqs_client,
-      ui: ui,
-    ).run(*command_parts)
-  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
-  option :minimum, aliases: %w(-i --min), required: true, desc: "The minimum number of healthy instances to keep"
-  option :maximum, aliases: %w(-m --max), required: true, desc: "The maximum number of healthy instances to keep"
-  option :queue, aliases: %w(-q), desc: "The name of the queue to identify the worker environment to scale, e.g. `default`"
-  def scale(environment_type)
-    @verbose = options[:verbose]
-    ElasticBeans::Command::Scale.new(
-      application: application(
-        name: options[:application],
-      ),
-      minimum: options[:minimum],
-      maximum: options[:maximum],
-      queue: options[:queue],
-      elastic_beanstalk: elastic_beanstalk_client,
-      ui: ui,
-    ).run(environment_type)
-  rescue StandardError => e
-    error(e)
-  end
-
-  desc ElasticBeans::Command::SetEnv::USAGE, ElasticBeans::Command::SetEnv::DESC
-  long_desc ElasticBeans::Command::SetEnv::LONG_DESC
-  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
-  def setenv(*env_pairs)
-    @verbose = options[:verbose]
-    ElasticBeans::Command::SetEnv.new(
-      application: application(
-        name: options[:application],
-      ),
-      ui: ui,
-    ).run(*env_pairs)
-  rescue StandardError => e
-    error(e)
-  end
-
-  desc "talk", ""
-  def talk
-    ElasticBeans::Command::Talk.new(ui: ui).run
-  end
-
-  map %w[--version] => :__print_version
-  desc "--version", "Print the version and exit"
-  def __print_version
-    ElasticBeans::Command::Version.new(ui: ui).run
-  end
-
-  private
-
-  def application(
-    name:,
-    cloudformation: cloudformation_client,
-    elastic_beanstalk: elastic_beanstalk_client,
-    s3: s3_client
-  )
-    @application ||= ElasticBeans::Application.new(
-      name: name,
-      cloudformation: cloudformation,
-      elastic_beanstalk: elastic_beanstalk,
-      s3: s3,
-    )
-  end
-
-  def cloudformation_client
-    ::Aws::CloudFormation::Client.new
-  end
-
-  def elastic_beanstalk_client
-    ::Aws::ElasticBeanstalk::Client.new
-  end
-
-  def error(e)
-    ui.debug { e.inspect }
-    ui.debug { e.backtrace }
-
-    case e
-    when ElasticBeans::Error
-      ui.error(e.message)
-    when ::Aws::Errors::MissingCredentialsError
-      ui.error("Missing AWS credentials, please set AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY and try again.")
-    else
-      raise e
-    end
-
-    exit 1
-  end
-
-  def iam_client
-    ::Aws::IAM::Client.new
-  end
-
-  def network(stack_name:, cloudformation: cloudformation_client)
-    @network ||= ElasticBeans::Network.new(
-      stack_name: stack_name,
-      cloudformation: cloudformation,
-    )
-  end
-
-  def route53_client
-    ::Aws::Route53::Client.new
-  end
-
-  def s3_client
-    ::Aws::S3::Client.new
-  end
-
-  def sqs_client
-    ::Aws::SQS::Client.new
-  end
-
-  def ui
-    ElasticBeans::UI.new(verbose: verbose?)
-  end
-
-  def verbose?
-    @verbose
-  end
-
-  def self.exit_on_failure?
-    true
-  end
-end
+require "elastic_beans/cli"
 
 ElasticBeans::CLI.start(ARGV)

data/lib/elastic_beans/cli.rb

@@ -0,0 +1,226 @@
+require "aws-sdk"
+require "thor"
+require "elastic_beans"
+require "elastic_beans/error"
+require "elastic_beans/command"
+require "elastic_beans/ui"
+
+# :nodoc: all
+# @!visibility private
+class ElasticBeans::CLI < Thor
+  APPLICATION_DESC = "The name of the Elastic Beanstalk application and CloudFormation stack that contains application settings"
+
+  class_option :verbose, type: :boolean, aliases: %w(-v)
+
+  desc ElasticBeans::Command::Configure::USAGE, ElasticBeans::Command::Configure::DESC
+  long_desc ElasticBeans::Command::Configure::LONG_DESC
+  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
+  option :network, aliases: %w(-n), required: true, desc: "The name of the CloudFormation stack that contains networking settings"
+  option :database_url, aliases: %w(-d), desc: "The DATABASE_URL for the Rails application"
+  option :image_id, aliases: %w(-i), desc: "A custom AMI to use instead of the default Ruby Elastic Beanstalk AMI"
+  option :instance_type, aliases: %w(-t), desc: "A default instance type to use for all environments instead of c4.large"
+  option :keypair, aliases: %w(-k), desc: "Required on first run. The EC2 keypair to use for Elastic Beanstalk instances"
+  option :logging_endpoint, aliases: %w(-l), desc: "An HTTP endpoint that can receive logs from one-off commands"
+  option :public_key, aliases: %w(-p), desc: "For end-to-end encryption. The public key of the SSL certificate the ELB will verify to communicate with your Rails app"
+  option :secret_key_base, aliases: %w(-b), desc: "The SECRET_KEY_BASE for the Rails application"
+  option :ssl_certificate_arn, aliases: %w(-s), desc: "The ARN of the SSL server certificate stored in IAM to attach to the ELB"
+  def configure
+    @verbose = options[:verbose]
+    ElasticBeans::Command::Configure.new(
+      database_url: options[:database_url],
+      image_id: options[:image_id],
+      instance_type: options[:instance_type],
+      keypair: options[:keypair],
+      logging_endpoint: options[:logging_endpoint],
+      public_key: options[:public_key],
+      secret_key_base: options[:secret_key_base],
+      ssl_certificate_arn: options[:ssl_certificate_arn],
+      application: application(name: options[:application]),
+      network: network(stack_name: options[:network]),
+      elastic_beanstalk: elastic_beanstalk_client,
+      iam: iam_client,
+      ui: ui,
+    ).run
+  rescue StandardError => e
+    error(e)
+  end
+
+  desc ElasticBeans::Command::Create::USAGE, ElasticBeans::Command::Create::DESC
+  long_desc ElasticBeans::Command::Create::LONG_DESC
+  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
+  option :dns, aliases: %w(-d), desc: "A Route53 DNS entry to create or update for a new webserver environment"
+  option :queue, aliases: %w(-q), desc: "The name of the queue a new worker environment should listen to, e.g. `default`"
+  option :tags, type: :hash, default: {}, desc: "EC2 tags to apply to the new environment as a Hash, e.g. `--tags=Environment:development Team:mine`"
+  def create(environment_type)
+    @verbose = options[:verbose]
+    ElasticBeans::Command::Create.new(
+      environment_type: environment_type,
+      dns: options[:dns],
+      queue: options[:queue],
+      tags: options[:tags],
+      application: application(name: options[:application]),
+      elastic_beanstalk: elastic_beanstalk_client,
+      route53: route53_client,
+      s3: s3_client,
+      ui: ui,
+    ).run
+  rescue StandardError => e
+    error(e)
+  end
+
+  desc ElasticBeans::Command::Deploy::USAGE, ElasticBeans::Command::Deploy::DESC
+  long_desc ElasticBeans::Command::Deploy::LONG_DESC
+  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
+  def deploy
+    @verbose = options[:verbose]
+    ElasticBeans::Command::Deploy.new(
+      application: application(
+        name: options[:application],
+      ),
+      elastic_beanstalk: elastic_beanstalk_client,
+      s3: s3_client,
+      ui: ui,
+    ).run
+  rescue StandardError => e
+    error(e)
+  end
+
+  desc ElasticBeans::Command::Exec::USAGE, ElasticBeans::Command::Exec::DESC
+  long_desc ElasticBeans::Command::Exec::LONG_DESC
+  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
+  def exec(*command_parts)
+    @verbose = options[:verbose]
+    ElasticBeans::Command::Exec.new(
+      application: application(
+        name: options[:application],
+      ),
+      sqs: sqs_client,
+      ui: ui,
+    ).run(*command_parts)
+  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
+  option :minimum, aliases: %w(-i --min), required: true, desc: "The minimum number of healthy instances to keep"
+  option :maximum, aliases: %w(-m --max), required: true, desc: "The maximum number of healthy instances to keep"
+  option :queue, aliases: %w(-q), desc: "The name of the queue to identify the worker environment to scale, e.g. `default`"
+  def scale(environment_type)
+    @verbose = options[:verbose]
+    ElasticBeans::Command::Scale.new(
+      application: application(
+        name: options[:application],
+      ),
+      minimum: options[:minimum],
+      maximum: options[:maximum],
+      queue: options[:queue],
+      elastic_beanstalk: elastic_beanstalk_client,
+      ui: ui,
+    ).run(environment_type)
+  rescue StandardError => e
+    error(e)
+  end
+
+  desc ElasticBeans::Command::SetEnv::USAGE, ElasticBeans::Command::SetEnv::DESC
+  long_desc ElasticBeans::Command::SetEnv::LONG_DESC
+  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
+  def setenv(*env_pairs)
+    @verbose = options[:verbose]
+    ElasticBeans::Command::SetEnv.new(
+      application: application(
+        name: options[:application],
+      ),
+      ui: ui,
+    ).run(*env_pairs)
+  rescue StandardError => e
+    error(e)
+  end
+
+  desc "talk", ""
+  def talk
+    ElasticBeans::Command::Talk.new(ui: ui).run
+  end
+
+  map %w[--version] => :__print_version
+  desc "--version", "Print the version and exit"
+  def __print_version
+    ElasticBeans::Command::Version.new(ui: ui).run
+  end
+
+  private
+
+  def application(
+    name:,
+    cloudformation: cloudformation_client,
+    elastic_beanstalk: elastic_beanstalk_client,
+    s3: s3_client
+  )
+    @application ||= ElasticBeans::Application.new(
+      name: name,
+      cloudformation: cloudformation,
+      elastic_beanstalk: elastic_beanstalk,
+      s3: s3,
+    )
+  end
+
+  def cloudformation_client
+    ::Aws::CloudFormation::Client.new
+  end
+
+  def elastic_beanstalk_client
+    ::Aws::ElasticBeanstalk::Client.new
+  end
+
+  def error(e)
+    ui.debug { e.inspect }
+    ui.debug { e.backtrace }
+
+    case e
+    when ElasticBeans::Error
+      ui.error(e.message)
+    when ::Aws::Errors::MissingCredentialsError
+      ui.error("Missing AWS credentials, please set AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY and try again.")
+    else
+      raise e
+    end
+
+    exit 1
+  end
+
+  def iam_client
+    ::Aws::IAM::Client.new
+  end
+
+  def network(stack_name:, cloudformation: cloudformation_client)
+    @network ||= ElasticBeans::Network.new(
+      stack_name: stack_name,
+      cloudformation: cloudformation,
+    )
+  end
+
+  def route53_client
+    ::Aws::Route53::Client.new
+  end
+
+  def s3_client
+    ::Aws::S3::Client.new
+  end
+
+  def sqs_client
+    ::Aws::SQS::Client.new
+  end
+
+  def ui
+    ElasticBeans::UI.new(verbose: verbose?)
+  end
+
+  def verbose?
+    @verbose
+  end
+
+  def self.exit_on_failure?
+    true
+  end
+end

data/lib/elastic_beans/cli/string_shell.rb

@@ -0,0 +1,14 @@
+require "stringio"
+require "elastic_beans/cli"
+
+# :nodoc: all
+# @!visibility private
+class ElasticBeans::CLI::StringShell < Thor::Shell::Basic
+  attr_reader :stdout, :stderr
+
+  def initialize(*args, stdout: StringIO.new, stderr: StringIO.new)
+    super(*args)
+    @stdout = stdout
+    @stderr = stderr
+  end
+end

data/lib/elastic_beans/command/configure.rb

@@ -52,7 +52,8 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
           raise EnvironmentsNotReady.new(environments: unready_environments)
         end
 
-        progressbar = ProgressBar.create(title: "Configuring", total: nil, output: ui.stdout)
+        config_templates = 4 + application.worker_queues.size
+        progressbar = ProgressBar.create(title: "Configuring", total: config_templates, output: ui.stdout)
         progressbar.log("Updating configuration templates in #{application.name}...")
         progressbar.log("Updating base configuration template...")
         base_config = ElasticBeans::ConfigurationTemplate::Base.new(
@@ -135,26 +136,30 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
           )
           progressbar.increment
         end
+        progressbar.finish
 
-        threads = environments.map { |environment|
-          progressbar.log("Updating `#{environment.name}'...")
-          thread = Thread.new do
-            environment.update_configuration
-          end
-          progressbar.increment
-          thread
-        }
+        if environments.any?
+          progressbar = ProgressBar.create(title: "Updating", total: nil, output: ui.stdout)
+          threads = environments.map { |environment|
+            progressbar.log("Updating `#{environment.name}'...")
+            thread = Thread.new do
+              environment.update_configuration
+            end
+            progressbar.increment
+            thread
+          }
 
-        loop do
-          sleep 1
-          progressbar.increment
-          if threads.none?(&:alive?)
-            progressbar.total = progressbar.progress
-            break
+          loop do
+            sleep 0.5
+            progressbar.increment
+            if threads.none?(&:alive?)
+              progressbar.total = progressbar.progress
+              break
+            end
           end
-        end
 
-        threads.each(&:join)
+          threads.each(&:join)
+        end
       end
 
       private

data/lib/elastic_beans/command/create.rb

@@ -76,7 +76,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         end
 
         loop do
-          sleep 1
+          sleep 0.5
           progressbar.increment
           if !environment_thread.alive? && !dns_thread.alive?
             progressbar.total = progressbar.progress

data/lib/elastic_beans/command/deploy.rb

@@ -28,7 +28,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         end
 
         ui.debug { "Creating application version from code at #{Dir.pwd}..." }
-        progressbar = ProgressBar.create(title: "Deploying", total: nil, output: ui.stdout)
+        progressbar = ProgressBar.create(title: "Uploading", total: nil, output: ui.stdout)
         version = nil
         version_thread = Thread.new do
           version = ElasticBeans::ApplicationVersion.create(
@@ -40,7 +40,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         end
 
         loop do
-          sleep 1
+          sleep 0.5
           progressbar.increment
           if !version_thread.alive?
             break
@@ -49,6 +49,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         version_thread.join
 
         progressbar.log("Deploying version #{version} to #{application.name}...")
+        progressbar.title = "Deploying"
         deploy_threads = environments.map { |environment|
           progressbar.log("Deploying version '#{version}' to environment `#{environment.name}'...")
           thread = Thread.new do
@@ -59,7 +60,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         }
 
         loop do
-          sleep 1
+          sleep 0.5
           progressbar.increment
           if deploy_threads.none?(&:alive?)
             progressbar.total = progressbar.progress

data/lib/elastic_beans/command/set_env.rb

@@ -48,7 +48,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         }
 
         loop do
-          sleep 1
+          sleep 0.5
           progressbar.increment
           if threads.none?(&:alive?)
             progressbar.total = progressbar.progress

data/lib/elastic_beans/configuration_template.rb

@@ -172,14 +172,19 @@ module ElasticBeans
       end
 
       def message
-        require "elastic_beans/command/configure"
+        require "elastic_beans/cli"
+        require "elastic_beans/cli/string_shell"
         msg = <<-MESSAGE
 Some configuration is missing and must be set before creating or updating an environment.
         MESSAGE
         if nested
           msg << "The error from AWS was \"#{nested.message}\"\n#{msg}\n"
         else
-          msg << "Please re-run `#{command_as_string "configure"}`.\n\n#{`#{$0} help configure`}"
+          msg << <<-MESSAGE
+Please re-run `#{command_as_string "configure"}`.
+
+#{command_help "configure"}"
+          MESSAGE
         end
         msg
       end

data/lib/elastic_beans/configuration_template/base.rb

@@ -61,7 +61,11 @@ module ElasticBeans
         database_url_setting = template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "DATABASE_URL", override: database_url)
         secret_key_base_setting = template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "SECRET_KEY_BASE", override: secret_key_base)
         if database_url_setting[:value].nil? || secret_key_base_setting[:value].nil? || keypair_setting[:value].nil?
-          raise MissingConfigurationError
+          raise MissingOptionsError.new(
+            database_url: database_url_setting[:value],
+            secret_key_base: secret_key_base_setting[:value],
+            keypair: keypair_setting[:value],
+          )
         end
 
         config_path = "#{application.bucket_name}/#{application.env_vars.s3_key}"
@@ -143,6 +147,38 @@ module ElasticBeans
             " http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/AWSHowTo.iam.html"
         end
       end
+
+      # :nodoc: all
+      # @!visibility private
+      class MissingOptionsError < ElasticBeans::Error
+        def initialize(database_url:, secret_key_base:, keypair:)
+          @database_url = database_url
+          @secret_key_base = secret_key_base
+          @keypair = keypair
+        end
+
+        def message
+          require "elastic_beans/cli"
+          require "elastic_beans/cli/string_shell"
+          msg = "Some required options are missing and must be set when configuring an application:\n\n"
+          if @database_url.nil?
+            msg << "--database-url DATABASE_URL must point to a valid database, and is required for running a Rails application\n"
+          end
+          if @keypair.nil?
+            msg << "--keypair KEYPAIR must be a valid EC2 key pair, and will be used on Elastic Beanstalk instances\n"
+          end
+          if @secret_key_base.nil?
+            msg << "--secret-key-base SECRET_KEY_BASE can be any value, and is required for running a Rails application\n"
+          end
+          msg << <<-MESSAGE
+
+Please re-run `#{command_as_string "configure"}` with these options.
+
+#{command_help "configure"}
+          MESSAGE
+          msg
+        end
+      end
     end
   end
 end

data/lib/elastic_beans/configuration_template/webserver.rb

@@ -50,12 +50,13 @@ module ElasticBeans
       # @!visibility private
       class NoEncryptionSettingsError < ElasticBeans::Error
         def message
-          require "elastic_beans/command/configure"
+          require "elastic_beans/cli"
+          require "elastic_beans/cli/string_shell"
           <<-MESSAGE
 Missing required end-to-end encryption settings.
 Please re-run `#{command_as_string "configure"}` and make sure to specify SSL certificate ARN and internal public key.
 
-#{`#{$0} help configure`}
+#{command_help "configure"}
           MESSAGE
         end
       end

data/lib/elastic_beans/environment.rb

@@ -260,7 +260,7 @@ module ElasticBeans
       status = wait_status[0]
       health = "Grey"
       health_status = wait_health_status[0]
-      Timeout.timeout(1800) do
+      Timeout.timeout(3600) do
         while wait_status.include?(status) || wait_health_status.include?(health_status)
           sleep 5
           environment = environment_description
@@ -302,12 +302,13 @@ module ElasticBeans
     # @!visibility private
     class MissingConfigurationError < ElasticBeans::Error
       def message
-        require "elastic_beans/command/configure"
+        require "elastic_beans/cli"
+        require "elastic_beans/cli/string_shell"
         <<-MESSAGE
 Some configuration is missing and must be set before creating an environment.
 Please re-run `#{command_as_string "configure"}`.
 
-#{`#{$0} help configure`}
+#{command_help "configure"}
         MESSAGE
       end
     end

data/lib/elastic_beans/error.rb

@@ -12,5 +12,14 @@ module ElasticBeans
 
       "beans #{args}"
     end
+
+    def command_help(command)
+      require "elastic_beans/cli"
+      require "elastic_beans/cli/string_shell"
+
+      shell = ElasticBeans::CLI::StringShell.new
+      ElasticBeans::CLI.command_help(shell, command)
+      shell.stdout.string
+    end
   end
 end

data/lib/elastic_beans/exec/init.rb

@@ -14,7 +14,7 @@ class Init
   def self.run(command)
     init = new
     unless init.respond_to?(command)
-      abort "Usage: $0 {start}"
+      abort "Usage: #{$0} {start}"
     end
     init.send(command)
   end

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -160,6 +160,8 @@ files:
 - lib/elastic_beans/application.rb
 - lib/elastic_beans/application_version.rb
 - lib/elastic_beans/aws/cloudformation_stack.rb
+- lib/elastic_beans/cli.rb
+- lib/elastic_beans/cli/string_shell.rb
 - lib/elastic_beans/command.rb
 - lib/elastic_beans/command/configure.rb
 - lib/elastic_beans/command/create.rb