ebfly 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c89ec5eb6ba42bccb9da25f1ee5cdaaa319c7af5
-  data.tar.gz: 0f491907d37f7a4b2a60591b96893067d23d411f
+  metadata.gz: 8e8a96e5ccb8ced1ef344f6c7143f36d0b15ad1f
+  data.tar.gz: 3e00a03a3538a793353f9468f164097ca283ddff
 SHA512:
-  metadata.gz: 9f24ac352294b6b5a9dc1a5bc87b7f04e73b4444bcd29ef06075cd2c63975883c2269299861bb79c9fbca34206c1c804455b0572639afd237d1d1b2478835bfb
-  data.tar.gz: f7c7f7a1c29141fe421a2b4aa6260e9b0b16071b627c1053844a816fea775855d79e72a647d8bd7e5435c04399c021e04d8f57b8e1b5f63c69bd9fed3c0a0fd1
+  metadata.gz: ff0ba53d8bec8b3edfb94a1b6d65abec6a2079392fa86c19ddc572c113a5d1b41f2329202bd6fddfd465d9d9bb728fd564994d65044b9eb09280a51828575a89
+  data.tar.gz: 3bae350983e6ff4e6cd195a51775e4cfab323156476ebeb0618c3334b2191949c11f68d10640101d336c9e08aa9eab04fdc809ede288dd87015d86c9e36c7bb3

data/docs/env.md

@@ -6,6 +6,7 @@
 
 - [create](#create)
 - [delete](#delete)
+- [update](#update)
 - [info](#info)
 - [open](#open)
 - [push](#push)
@@ -16,7 +17,7 @@
 Create an environment.
 
 ```
-ebfly env create [name] -a [app] -s [stack] -t [tier] -l [label] -d [desc]
+ebfly env create [name] -a [app] -s [stack] -t [tier] -l [label] -o [namespace-key=value ...] -d [desc]
 ```
 
 #### Options
@@ -27,6 +28,7 @@ ebfly env create [name] -a [app] -s [stack] -t [tier] -l [label] -d [desc]
 | -s   | The Solution stack name to create. Some [predefined values](#predefined_values) are available. | Yes      |
 | -t   | Tier type, value must be `web` or `worker`. Default value is `web`                             | No       |
 | -l   | The name of the application version to deploy                                                  | No       |
+| -o   | ElasticBeanstalk option values. For detail see [Option Values](#option_values) section         | No       |
 | -d   | The description of the application.                                                            | No       |
 
 #### Examples
@@ -37,10 +39,10 @@ Create Ruby 1.9 web environment.
 ebfly env create envname -a app -s ruby19 -t web
 ```
 
-Create Python 2.7 worker environment.
+Create Python 2.7 worker environment with option values.
 
 ```
-ebfly env create envname -a app -s python27 -t worker
+ebfly env create envname -a app -s python27 -t worker -o -o sqsd-MimeType="text/plain" sqsd-HttpPath="/enqueue"
 ```
 
 <a name="predefined_values"></a>
@@ -73,6 +75,24 @@ ebfly env delete [name] -a [app]
 | ---- | ------------------------------------------- | -------- |
 | -a   | The application name to create environment. | Yes      |
 
+<a name="update"></a>
+### update
+
+Update an environment.
+
+```
+ebfly env update [name] -a [app] -l [label] -o [namespace-key=value ...] -d [desc]
+```
+
+#### Options
+
+| Name | Description                                                                                    | Required |
+| ---- | ---------------------------------------------------------------------------------------------- | -------- |
+| -a   | The application name to create environment.                                                    | Yes      |
+| -l   | The name of the application version to deploy                                                  | No       |
+| -o   | ElasticBeanstalk option values. For detail see [Option Values](#option_values) section         | No       |
+| -d   | The description of the application.                                                            | No       |
+
 <a name="info"></a>
 ### info
 
@@ -130,3 +150,38 @@ Push specified commit `66c598c` to the environment.
 ```
 ebfly env push envname 66c598c -a app
 ```
+
+<a href="option_values"></a>
+## Option Values
+
+Option values format is `namespace-key=value` style.
+Which `namespace`, `key` and `value` can be used is describe at [AWS Elastic Beanstalk official document](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html).
+
+You can use short `namespace` as followings.
+
+| Short namespace      | Real namespace                              |
+| -------------------- | ------------------------------------------- |
+| asg                  | aws:autoscaling:asg                         |
+| launchconfiguration  | aws:autoscaling:launchconfiguration         |
+| trigger              | aws:autoscaling:trigger                     |
+| rollingupdate        | aws:autoscaling:updatepolicy:rollingupdate  |
+| vpc                  | aws:ec2:vpc                                 |
+| application          | aws:elasticbeanstalk:application            |
+| command              | aws:elasticbeanstalk:command                |
+| environment          | aws:elasticbeanstalk:environment            |
+| monitoring           | aws:elasticbeanstalk:monitoring             |
+| topics               | aws:elasticbeanstalk:sns:topics             |
+| sqsd                 | aws:elasticbeanstalk:sqsd                   |
+| healthcheck          | aws:elb:healthcheck                         |
+| loadbalancer         | aws:elb:loadbalancer                        |
+| policies             | aws:elb:policies                            |
+| dbinstance           | aws:rds:dbinstance                          |
+| hostmanager          | aws:elasticbeanstalk:hostmanager            |
+
+### Example
+
+Set `InstanceType` of `aws:autoscaling:launchconfiguration` to `m1.small`
+
+```
+ebfly env update name -a app -o launchconfiguration-InstanceType="m1.small"
+```

data/lib/ebfly/cli.rb

@@ -3,6 +3,7 @@ require "aws-sdk"
 
 require_relative 'ebfly'
 require_relative 'version'
+require_relative 'options'
 require_relative 'command/app'
 require_relative 'command/env'
 require_relative 'command/config'

data/lib/ebfly/command/env.rb

@@ -1,6 +1,7 @@
 module Ebfly
   class Environment < Thor
     include Command
+    include Options
 
     desc "create <name>", "Create an environment named <name>"
     option :a, :required => true, :banner => "<app>", :desc => "Application name"
@@ -8,6 +9,7 @@ module Ebfly
     option :t, :banner => "<tier>", :default => "web", :desc => "Tier type (web|worker)"
     option :d, :banner => "<description>", :desc => "Describes the environment"
     option :l, :banner => "<label>", :desc => "The name of the application version to deploy"
+    option :o, :banner => "<namespace:key=value ...>", :type => :array, :desc => "ElasticBeanstalk option values. See http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html"
     def create(name)
       app = options[:a]
       puts "Create environment: #{env_name(app, name)} ..."
@@ -18,7 +20,8 @@ module Ebfly
         tier: tier(options[:t])
       }
       opts.merge!(description: options[:d]) if options[:d]
-      opts.merge!(version_label: options[:v]) if options[:v]
+      opts.merge!(version_label: options[:l]) if options[:l]
+      opts.merge!(option_settings: parse_option_values(options[:o])) if options[:o] and !options[:o].empty?
       
       debug opts
       ret = run { eb.create_environment(opts) }
@@ -37,6 +40,26 @@ module Ebfly
       puts "Done"
     end
 
+    desc "update <name>", "Update the specified environment"
+    option :a, :required => true, :banner => "<app>", :desc => "Application name"
+    option :d, :banner => "<description>", :desc => "Describes the environment"
+    option :l, :banner => "<label>", :desc => "The name of the application version to deploy"
+    option :o, :banner => "<namespace:key=value ...>", :type => :array, :desc => "ElasticBeanstalk option values. See http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html"
+    def update(name)
+      app = options[:a]
+      puts "Update environment: #{env_name(app, name)} ..."
+      opts = {
+        environment_name: env_name(app, name)
+      }
+      opts.merge!(description: options[:d]) if options[:d]
+      opts.merge!(version_label: options[:l]) if options[:l]
+      opts.merge!(option_settings: parse_option_values(options[:o])) if options[:o] and !options[:o].empty?
+
+      debug(opts)
+      ret = run { eb.update_environment(opts) }
+      show_env_info(ret)
+    end
+
     desc "info <name>", "Show the specified environment information."
     option :a, :required => true, :banner => "<app>", :desc => "Application name"
     option :r, :default => false, :desc => "Show environment resources"

data/lib/ebfly/options.rb

@@ -0,0 +1,45 @@
+# Hndle Option values.
+#
+# http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html
+
+module Ebfly
+  module Options
+    NAMESPACES = {
+      "asg" => "aws:autoscaling:asg",
+      "launchconfiguration" => "aws:autoscaling:launchconfiguration",
+      "trigger" => "aws:autoscaling:trigger",
+      "rollingupdate" => "aws:autoscaling:updatepolicy:rollingupdate",
+      "vpc" => "aws:ec2:vpc",
+      "application" => "aws:elasticbeanstalk:application",
+      "command" => "aws:elasticbeanstalk:command",
+      "environment" => "aws:elasticbeanstalk:environment",
+      "monitoring" => "aws:elasticbeanstalk:monitoring",
+      "topics" => "aws:elasticbeanstalk:sns:topics",
+      "sqsd" => "aws:elasticbeanstalk:sqsd",
+      "healthcheck" => "aws:elb:healthcheck",
+      "loadbalancer" => "aws:elb:loadbalancer",
+      "policies" => "aws:elb:policies",
+      "dbinstance" => "aws:rds:dbinstance",
+      "hostmanager" => "aws:elasticbeanstalk:hostmanager"
+    }
+
+    def parse_option_values(option_values)
+      ret = []
+      option_values.each do |ov|
+        k, value = ov.split('=')
+        next if value.nil?
+      
+        ns, key = k.split('-')
+        namespace = NAMESPACES[ns.strip]
+        namespace = ns unless namespace
+      
+        ret << {
+          namespace: namespace,
+          option_name: key.strip,
+          value: value.strip
+        }
+      end
+      ret
+    end
+  end
+end

data/lib/ebfly/version.rb

@@ -1,3 +1,3 @@
 module Ebfly
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebfly
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kazuyuki Honda
@@ -60,6 +60,7 @@ files:
 - lib/ebfly/command/config.rb
 - lib/ebfly/command/env.rb
 - lib/ebfly/ebfly.rb
+- lib/ebfly/options.rb
 - lib/ebfly/version.rb
 homepage: https://github.com/hakobera/ebifly
 licenses: