gantree 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ee447acf88f5cb72f17884a5083bd4851c76411
-  data.tar.gz: 90247293b2a1bda2dedb9a79672434f15ef1d79d
+  metadata.gz: 1b338332d981a5b7f9fdf5481a6586ab2b9f8bed
+  data.tar.gz: db5516035b15ed2d4cbc653caed83dea5ddb5057
 SHA512:
-  metadata.gz: 4c0d0931b964537a666f3164a2215942842c8cbc5b72d9ca5dfd749c1c611922afb141bd3d848b6f060cccd125aefd21382ef677ec3a8f7cffc6321bb85d3890
-  data.tar.gz: d76a3deda1e34621f937c3c43e4cbc2af888de7cb5eee20e3d00dd49e3cb4ac5b2d709098eb6ac97b7bbc5441de2dd1ef5c0879791952415487c29f0b4dc14f8
+  metadata.gz: 70ef9e1a8f769ca67e3f260a1cf4eec77a8600c1a0b5f425f44755e17c79a92efd55a23ff62d61861032c9b5427ffb1db4cd82be2cf70301834b9ed386353d91
+  data.tar.gz: 328ebe29c9e08162c0ec4a5a798b9fdd874aa36317a9ff384e18b5858910a25da7a2fa0ebb74fb50e379101ef4fee3154977b8480081af46bfbfcb0a8e9cef1f

data/lib/gantree/deploy.rb

@@ -59,7 +59,8 @@ module Gantree
       begin
         @eb.update_environment({
           :environment_name => @env,
-          :version_label => @packeged_version
+          :version_label => @packeged_version,
+          :option_settings => autodetect_app_role
         })
       rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue
         puts "#{@env} doesn't exist"
@@ -95,15 +96,19 @@ module Gantree
       IO.write(@dockerrun_file,JSON.pretty_generate(docker))
     end
 
-    def auto_detect_app_role
-      role = @env.split('-')[2]
-      unless role == "app"
+    def autodetect_app_role
+      enabled = @options[:autodetect_app_role]
+      if enabled == true || enabled == "true"
+        role = @env.split('-')[2]
         puts "Deploying app as a #{role}"
-        role_cmd = IO.read("roles/#{role}").gsub("\n",'')
-        docker = JSON.parse(IO.read(@dockerrun_file))
-        docker["Cmd"] = role_cmd
-        IO.write(@dockerrun_file,JSON.pretty_generate(docker))
-        puts "Setting role cmd to '#{role_cmd}'"
+        #role_cmd = IO.read("roles/#{role}").gsub("\n",'')
+        #docker = JSON.parse(IO.read(@dockerrun_file))
+        #docker["Cmd"] = role_cmd
+        #IO.write(@dockerrun_file,JSON.pretty_generate(docker))
+        #puts "Setting role cmd to '#{role_cmd}'"
+        [{:option_name => "ROLE", :value => role, :namespace => "aws:elasticbeanstalk:application:environment" }]
+      else 
+        []
       end
     end
 

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

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