gantree 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 105df92d42b890051d4acf32555d20832af5f372
-  data.tar.gz: b1c8e885c8ee28fb706ab4d22147e3b35f873c92
+  metadata.gz: 631cf886a62106175b5fddc1e056f59f1c787f13
+  data.tar.gz: 5f16f10ae56e2f76c00ed90840a8ab52bfbd009c
 SHA512:
-  metadata.gz: ca3735235ea23c4651da588e23e0ced09833b734a8eb72d3919cab030085700d8025e0a0f06b70727042f70800231859a6ea31d033f338bb29bb56a69340a4f2
-  data.tar.gz: f863665d286ffee0207e1df22c9e0fda17ae4926b5532c47ea1180676b9969a6b64021ef9920f5b54d274fb2bdb76e93ed6a1ce8100054e64fc567687c58583e
+  metadata.gz: ece56a23faa0cd4eebe290a30462c154d71b6dd0c45e6a868e5bedd779d03deeb682730672d5dc70e937cb317a809feae3992c761699cbd8baec0ae534dd72d0
+  data.tar.gz: 9d307e4a969733e07147fcbe17deef944873832b4e6fc82863057b2e7f15ecb5f4852ccf5f8e9f252525ce1f85dcaf651937c94cbb812ffef0c66481f6ccf69c

data/Gemfile.lock

@@ -7,11 +7,11 @@ GEM
     aws-sdk-v1 (1.55.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
     cloudformation-ruby-dsl (0.4.6)
       detabulator
-    codeclimate-test-reporter (0.4.0)
+    codeclimate-test-reporter (0.4.2)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     colorize (0.7.3)
@@ -21,9 +21,9 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     fakeweb (1.3.0)
-    ffi (1.9.3)
+    ffi (1.9.6)
     formatador (0.2.5)
-    guard (2.6.1)
+    guard (2.10.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -36,52 +36,54 @@ GEM
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     highline (1.6.21)
+    hitimes (1.2.2)
     io-like (0.3.0)
     json (1.8.1)
-    listen (2.7.9)
+    listen (2.8.3)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
-    mini_portile (0.6.0)
+    mini_portile (0.6.1)
     multi_json (1.10.1)
     multipart-post (2.0.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.3.2)
+    rake (10.4.0)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
-    safe_yaml (1.0.3)
-    simplecov (0.9.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    safe_yaml (1.0.4)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slackr (0.0.6)
       multipart-post (~> 2.0.0)
     slop (3.6.0)
     thor (0.19.1)
-    timers (1.1.0)
+    timers (4.0.1)
+      hitimes
     vcr (2.9.3)
-    webmock (1.18.0)
+    webmock (1.20.4)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
 

data/lib/gantree/cfn/beanstalk.rb

@@ -3,7 +3,7 @@ class BeanstalkTemplate
   def initialize params
     @stack_name = params[:stack_name]
     @docker_version = params[:docker_version] 
-    @docker_version ||= "64bit Amazon Linux 2014.09 v1.0.9 running Docker 1.2.0"
+    @docker_version ||= "64bit Amazon Linux 2014.09 v1.0.10 running Docker 1.3.2"
     @size = params[:instance_size]
     @rds = params[:rds]
     @env = params[:env]

data/lib/gantree/cli.rb

@@ -41,6 +41,7 @@ module Gantree
 
     desc "update APP", "update a cfn stack"
     option :dry_run, :aliases => "-d", :desc => "do not actually create the stack"
+    option :role, :aliases => "-r", :desc => "add an app role (worker|listner|scheduler)"
     def update app
       Gantree::Stack.new(app, merge_defaults(options)).update
     end

data/lib/gantree/stack.rb

@@ -41,8 +41,9 @@ module Gantree
 
     def update
       puts "Updating stack from local cfn repo"
+      add_role @options[:role] if @options[:role]
       unless @options[:dry_run] then
-        upload_templates 
+        upload_templates
         @cfm.stacks[@options[:stack_name]].update(:template => stack_template) 
       end
     end
@@ -153,6 +154,35 @@ module Gantree
         ""
       end
     end
+
+    def add_role name
+      stack_name = @options[:stack_name].sub('app', name)
+      beanstalk = JSON.parse(IO.read("cfn/#{@env}-beanstalk.cfn.json"))
+      unless beanstalk["Resources"][name] then
+        role = {
+          "Type" => "AWS::ElasticBeanstalk::Environment",
+          "Properties"=> {
+            "ApplicationName" => "#{@env}",
+            "EnvironmentName" => "#{stack_name}",
+            "Description" => "#{name} Environment",
+            "VersionLabel" => {
+              "Ref" => "ApplicationVersion"
+            },
+            "TemplateName" => {
+              "Ref" => "ConfigurationTemplate"
+            },
+            "OptionSettings" => []
+          }
+        }
+        #puts JSON.pretty_generate role
+        beanstalk["Resources"]["#{name}".to_sym] = role
+        IO.write("cfn/#{@env}-beanstalk.cfn.json", JSON.pretty_generate(beanstalk)) unless @options[:dry_run]
+        puts JSON.pretty_generate(beanstalk["Resources"].to_a.last) if @options[:dry_run]
+        puts "Added new #{name} role".green
+      else 
+        puts "Role already exists".red
+      end
+    end
   end
 end
 

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor