elastic_beans 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10462aa38d3834422bab9795d785bcc62918f1a9
-  data.tar.gz: 976eab44cd9ef0562106c9438df39fb3936ffc28
+  metadata.gz: 07dcf92670f011c2715d0ffd754bc856803f1434
+  data.tar.gz: 8b483d5a53cb03898d44f8de16fcf4c5e180aa25
 SHA512:
-  metadata.gz: 88a3f198fd40582742329016941ea9c672b45dc7e0ef548e9c5c2766c1bbf735ad4dbccb74cce15efd6eb338cfe9cc21cf56900eb38ff957fb9edd208a4bb89d
-  data.tar.gz: ab100cd37d28544b0e1d1b853e3d0fca05ac922ac77fffe00d48ba831a98e5d06eb420bcd9bff914d251c8b744ee466fd50aee2fd43e1724a565cfdc7994ee0b
+  metadata.gz: c2758059cb4a7351e4c6ebb1492d5211c2098b351d4e7fbd584f96e0ce266d085bb4d7633cf4aa8a8f34695585adf4581b34150ab4350d3eef958927f9cb99c1
+  data.tar.gz: 2c2e12f9ee533a77d60b82b888b80bc708615ad12ae3f60b13c96b66b5ce89daecf5767c05770a65a9c3416a8e1b0b157a83cdc0f6487d77339653ec52d2035f

data/lib/elastic_beans/cli.rb

@@ -101,21 +101,6 @@ class ElasticBeans::CLI < Thor
     error(e)
   end
 
-  desc ElasticBeans::Command::GetEnv::USAGE, ElasticBeans::Command::GetEnv::DESC
-  long_desc ElasticBeans::Command::GetEnv::LONG_DESC
-  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
-  def getenv(*env_vars)
-    @verbose = options[:verbose]
-    ElasticBeans::Command::GetEnv.new(
-      application: application(
-        name: options[:application],
-      ),
-      ui: ui,
-    ).run(*env_vars)
-  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
@@ -138,6 +123,21 @@ class ElasticBeans::CLI < Thor
     error(e)
   end
 
+  desc ElasticBeans::Command::GetEnv::USAGE, ElasticBeans::Command::GetEnv::DESC
+  long_desc ElasticBeans::Command::GetEnv::LONG_DESC
+  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
+  def getenv(*env_vars)
+    @verbose = options[:verbose]
+    ElasticBeans::Command::GetEnv.new(
+      application: application(
+        name: options[:application],
+      ),
+      ui: ui,
+    ).run(*env_vars)
+  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
@@ -153,6 +153,23 @@ class ElasticBeans::CLI < Thor
     error(e)
   end
 
+  desc ElasticBeans::Command::UnsetEnv::USAGE, ElasticBeans::Command::UnsetEnv::DESC
+  long_desc ElasticBeans::Command::UnsetEnv::LONG_DESC
+  option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
+  def unsetenv(*env_keys)
+    @verbose = options[:verbose]
+    ElasticBeans::Command::UnsetEnv.new(
+      application: application(
+        name: options[:application],
+      ),
+      ui: ui,
+    ).run(*env_keys)
+  rescue StandardError => e
+    error(e)
+  end
+
+  map ["delvar", "rmvar"] => "unsetenv"
+
   desc "talk", ""
   def talk
     ElasticBeans::Command::Talk.new(ui: ui).run

data/lib/elastic_beans/command/set_env.rb

@@ -10,7 +10,7 @@ module ElasticBeans
       LONG_DESC = <<-LONG_DESC
 Update environment variables in the Elastic Beanstalk application.
 These are stored in S3 to avoid the 4096-byte limit on environment variables in Elastic Beanstalk.
-Restarts all running environments so they load the updated environment.
+Restarts all running environments so they load the updated environment vars.
 
 Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY.
       LONG_DESC
@@ -33,7 +33,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         progressbar = ProgressBar.create(title: "Updating", total: nil, output: ui.stdout)
 
         progressbar.log("Updating configuration in #{application.name}...")
-        application.env_vars.update(env_vars)
+        application.env_vars.upsert(env_vars)
         progressbar.increment
 
         threads += environments.map { |environment|

data/lib/elastic_beans/command/unset_env.rb

@@ -0,0 +1,65 @@
+require "ruby-progressbar"
+require "elastic_beans/error/environments_not_ready"
+
+module ElasticBeans
+  module Command
+    # :nodoc: all
+    class UnsetEnv
+      USAGE = "unsetenv KEY [KEY]... | delvar | rmvar"
+      DESC = "Delete environment variables in the Elastic Beanstalk application"
+      LONG_DESC = <<-LONG_DESC
+Delete environment variables in the Elastic Beanstalk application.
+These are stored in S3 to avoid the 4096-byte limit on environment variables in Elastic Beanstalk.
+Restarts all running environments so they load the updated environment vars.
+
+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:, ui:)
+        @application = application
+        @ui = ui
+      end
+
+      def run(*env_keys)
+        environments = application.environments
+        unready_environments = environments.select { |environment| environment.status != "Ready" }
+        if unready_environments.any?
+          raise EnvironmentsNotReady.new(environments: unready_environments)
+        end
+
+        threads = []
+
+        progressbar = ProgressBar.create(title: "Updating", total: nil, output: ui.stdout)
+
+        progressbar.log("Updating configuration in #{application.name}...")
+        application.env_vars.del(env_keys)
+        progressbar.increment
+
+        threads += environments.map { |environment|
+          progressbar.log("Deleting env vars from `#{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, :ui
+
+    end
+  end
+end

data/lib/elastic_beans/command.rb

@@ -2,9 +2,10 @@ require "elastic_beans/command/configure"
 require "elastic_beans/command/create"
 require "elastic_beans/command/deploy"
 require "elastic_beans/command/exec"
-require "elastic_beans/command/get_env"
 require "elastic_beans/command/scale"
+require "elastic_beans/command/get_env"
 require "elastic_beans/command/set_env"
+require "elastic_beans/command/unset_env"
 require "elastic_beans/command/talk"
 require "elastic_beans/command/version"
 

data/lib/elastic_beans/env_vars.rb

@@ -28,11 +28,22 @@ module ElasticBeans
     end
 
     # Updates the environment variables stored in S3 by merging it with the given +env_hash+.
-    def update(env_hash)
+    def upsert(env_hash)
       body = env_script(to_h.merge(env_hash))
       s3.put_object(bucket: application.bucket_name, key: s3_key, body: body)
     end
 
+    # Deletes the specified +env_keys+ environment variables stored in S3.
+    def del(env_keys)
+      json_hash = to_h
+      env_keys.each { |key|
+        json_hash.delete(key)
+      }
+
+      body = env_script(json_hash)
+      s3.put_object(bucket: application.bucket_name, key: s3_key, body: body)
+    end
+
     private
 
     attr_reader :application, :s3

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -171,6 +171,7 @@ files:
 - lib/elastic_beans/command/scale.rb
 - lib/elastic_beans/command/set_env.rb
 - lib/elastic_beans/command/talk.rb
+- lib/elastic_beans/command/unset_env.rb
 - lib/elastic_beans/command/version.rb
 - lib/elastic_beans/configuration_template.rb
 - lib/elastic_beans/configuration_template/base.rb
@@ -217,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Elastic Beanstalk environment orchestration for a Rails app