gantree 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d82d6a047ef518d49f7ae47631cfbe94dda93c7
-  data.tar.gz: 214ebfd440d7ca4a7e4e1beb113abcc509f498c2
+  metadata.gz: c734667f4339044811f141d76836129103f7c2ac
+  data.tar.gz: 34709e12e3ac11f7d952bc4708bb5df84dbea6c6
 SHA512:
-  metadata.gz: 8d7207313e3324499889bafe5e324d617a41c10a63c5c7ec8f6a71b4cdeebc456b48341a41139035101441f775ad3e8327505a1681501435373ea54282c1309c
-  data.tar.gz: 200ade0101bce354214b37cbda53aae23cce24ec7e8d9beab3eda44071c8513076a5f8526b164bc8d9cbdcf8dab6831cc383aea3a7a552fffcc63649c3287003
+  metadata.gz: d4acf1fd2c8e4f94ac98c157f364c72dd883ab65554ab9a6ca4096aabbf777fdbea07f270f710017676acede0592830e5dc717b8007218173bb32a05c8185a9f
+  data.tar.gz: a1d4efdc55c637decaf16f87d13f6854efbb5bfc3c344fdbb4291372f49e4350031bf32172180f526013739228573df133abf2d7d9d92d877fccaf779e35e7c7

data/lib/gantree/cli.rb

@@ -12,6 +12,7 @@ module Gantree
     method_option :ext, :aliases => "-x", :desc => "ebextensions folder/repo"
     option :dry_run, :aliases => "-d", :desc => "do not actually deploy the app"
     option :silent, :aliases => "-s", :desc => "mute notifications"
+    option :autodetect_app_role, :desc => "use naming convention to determin role"
     def deploy app
       Gantree::Deploy.new(app, merge_defaults(options)).run
     end

data/lib/gantree/deploy.rb

@@ -15,6 +15,7 @@ module Gantree
       @env = app
       @eb = AWS::ElasticBeanstalk::Client.new
       @s3 = AWS::S3.new
+      @dockerrun_file = "Dockerrun.aws.json"
     end
 
     def run
@@ -73,8 +74,8 @@ module Gantree
       puts "hash #{hash}"
       version = "#{@env}-#{hash}-#{unique_hash}"
       puts "version: #{version}"
-      dockerrun = "Dockerrun.aws.json"
-      set_tag_to_deploy(dockerrun) if @options[:tag]
+      auto_detect_app_role if @options[:autodetect_app_role] == true
+      set_tag_to_deploy if @options[:tag]
       unless ext?
         new_dockerrun = "#{version}-Dockerrun.aws.json"
         FileUtils.cp("Dockerrun.aws.json", new_dockerrun)
@@ -82,15 +83,28 @@ module Gantree
       else
         zip = "#{version}.zip"
         clone_repo if repo?
-        Archive::Zip.archive(zip, ['.ebextensions/', dockerrun])
+        Archive::Zip.archive(zip, ['.ebextensions/', @dockerrun_file])
         zip
       end
     end
 
-    def set_tag_to_deploy file
-      docker = JSON.parse(IO.read(file))
-      docker["Image"]["Name"].gsub!(/:(.*)$/, ":#{@options[:tag]}")
-      IO.write(file,JSON.pretty_generate(docker))
+    def set_tag_to_deploy
+      docker = JSON.parse(IO.read(@dockerrun_file))
+      image = docker["Image"]["Name"]
+      image.gsub!(/:(.*)$/, ":#{@options[:tag]}")
+      IO.write(@dockerrun_file,JSON.pretty_generate(docker))
+    end
+
+    def auto_detect_app_role
+      role = @env.split('-')[2]
+      unless role == "app"
+        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}'"
+      end
     end
 
     def ext?

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/lib/deploy_spec.rb

@@ -22,7 +22,18 @@ describe "#Deploy" do
     it "returns just the repo url" do 
       options = { ext: "git@github.com:br/.ebextensions:basic" }
       deploy = Gantree::Deploy.new(@env,options)
-      puts deploy.instance_eval { get_ext_repo } 
+      expect(deploy.instance_eval { get_ext_repo }).to eq "git@github.com:br/.ebextensions"
+    end
+  end
+
+  describe ".auto_detect_app_role" do
+    it "sets app roles if enabled" do
+      options = { autodetect_app_role: true}
+      Dir.mkdir("roles") unless Dir.exist?("roles")
+      IO.write("roles/listener", "bundle exec rake:listener")
+      deploy = Gantree::Deploy.new("stag-knarr-listener-s1",options)
+      puts deploy.instance_eval { auto_detect_app_role }
+      FileUtils.rm_r "roles"
     end
   end
 end

metadata

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