gantree 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f48e2e22a4ed8c5c3f2bbeae9e2625c3392addb
-  data.tar.gz: 837ccf109dbdb37e60c8bf4ec81f9a3091020e14
+  metadata.gz: 9dbacb4633cc6fef3413dc281e3bd60c3188cda7
+  data.tar.gz: 500a15e1bd209a0c846b8d254a63517b210e5871
 SHA512:
-  metadata.gz: 7e6e2bf6e3916fa30814bbdf3d0201a95bfc19323014707dba2403eeb1f10064f6415ce3f0e3bbb264a92e9d91275c01aecf90c29365dbfcb7c7b595e22e6a0b
-  data.tar.gz: 2f898c102abe776eb5ab8dbe71bd9ecf1e6a8278b79ca061232a8bf3739147d0459f000c1c54cd0051e318b1c05071d397f97fa26a8e3639b805304ff4764f82
+  metadata.gz: f0fc8192cac39d17b53d0d396491974837d3d461a48b70f23698e00ac0338294f608388a7665431863f75194987e929e2f3e262b4546750b2601abe43b1e2ff6
+  data.tar.gz: 49eab4d9bd04ab5cb645e382d7dc65a68997e0dd8a0bd861575b113959227d2599dd70a57f4b9b41806d6e0d27efd5a879608a319c1814a31369085aa6ba945e

data/.travis.yml

@@ -2,8 +2,10 @@ language: ruby
 cache: bundler
 rvm:
 - 2.1.2
-before_script: echo "{"https://index.docker.io/v1/":{"auth":"ZmVlbG9ib3Q6azF6a2F6a29udHIwbDF0","email":"felix.a.rod@gmail.com"}" > $HOME/.dockercfg
+before_script: echo "{"https://index.docker.io/v1/":{"auth":"ZmVlbG9ib3Q6azF6a2F6a29udHIwbDF0","email":"felix.a.rod@gmail.com"}"
+  > $HOME/.dockercfg
 env:
   global:
   - secure: OoLMnBOcoXTPOimdyh4ju8yW2YpLBXEOdljN1gVQzjIIv24cQ0BxWAAktjExntkYAjnRpxzTKK5ZkWadXm8NK7TtzFU80padk+WYVzuE1Xngxw/OhS1Z6NYL8+D3ortSANqoOB6r/Z13Sb5XClYDWlj5/GGzf4AerY5xgh2nJQc=
   - secure: MCPnXXEMJkamb3HuYS0H+YeMDKORYAekCfB8YMrtUeMR3QTSe2yQ6eMaNC/I2D5g8cNw60mRagaMyDMadZ4aVQ4sUK1YOHexs/vPJrVrIJU8ZGFsueQyboJun1NZLGvKAIAok7yAEEfwftCd+svYrtrTtV88fk9deOnBLs4o3gM=
+  - secure: QZ00MAXO+Lblk/6Q0Bi+YQQLJtJYVHqMattxjIi72q5aOPQOSMT8UjDvOhDF2D/Le0wGBqVQxpxbpP/5cSGCLxtAfBijTyIirnkqV2td4hiXNfyQn3a+KnOifquJ8Vmo1tp/vvKGN16PIrLQCi5ARlcTj8QxfOFIihsrpelg9Ik=

data/lib/gantree/cfn/beanstalk.rb

@@ -2,6 +2,8 @@ class BeanstalkTemplate
 
   def initialize params
     @stack_name = params[:stack_name]
+    @docker_version = params[:docker_version] 
+    @docker_version ||= "1.2.0"
     @size = params[:instance_size]
     @rds = params[:rds]
     @env = params[:env]
@@ -91,8 +93,8 @@ class BeanstalkTemplate
   def configuration_template
     "resource 'ConfigurationTemplate', :Type => 'AWS::ElasticBeanstalk::ConfigurationTemplate', :Properties => {
         :ApplicationName => ref('Application'),
-        :SolutionStackName => '64bit Amazon Linux 2014.03 v1.0.1 running Docker 1.0.0',
-        :Description => 'Default Configuration Version 1.0 - with SSH access',
+        :SolutionStackName => '64bit Amazon Linux 2014.03 v1.0.1 running Docker #{@docker_version}',
+        :Description => 'Default Configuration Version #{@docker_version} - with SSH access',
         :OptionSettings => [
             {
                 :Namespace => 'aws:elasticbeanstalk:application:environment',

data/lib/gantree/cli.rb

@@ -27,6 +27,7 @@ module Gantree
     method_option :instance_size, :aliases => "-i", :desc => "(optional) set instance size"
     method_option :rds, :aliases => "-r", :desc => "(optional) set database type [pg,mysql]"
     option :dry_run, :aliases => "-d", :desc => "do not actually create the stack"
+    option :docker_version, :desc => "set the version of docker to use as solution stack"
     def create app
       Gantree::Stack.new(app, options.merge(gantreecfg)).create
     end

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/lib/cli_spec.rb

@@ -7,7 +7,8 @@ require 'spec_helper'
 #   $ rake clean:vcr ; time rake
 describe Gantree::CLI do
   before(:all) do
-    @env = "stag-app-knarr-s1"
+    @env = "stag-knarr-app-s1"
+    @app = "knarr-stag-s1"
     @owner = "bleacher"
     @repo = "cauldron"
     @tag =  "master"
@@ -47,6 +48,15 @@ describe Gantree::CLI do
   describe "create" do
     it "should create clusters" do
       out = execute("bin/gantree create #{@env} --dry-run")
+      beanstalk = IO.read("cfn/#{@app}-beanstalk.cfn.json")
+      expect(beanstalk).to include "Docker 1.2.0"
+      expect(out).to include "All templates created"
+    end
+
+    it "should create clusters with any docker version" do
+      out = execute("bin/gantree create #{@env} --dry-run --docker-version '1.0.0'")
+      beanstalk = IO.read("cfn/#{@app}-beanstalk.cfn.json")
+      expect(beanstalk).to include "Docker 1.0.0"
       expect(out).to include "All templates created"
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor