gantree 0.4.9.3 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e885b83834412d374c592d09e2ccb605318ca4ba
+  data.tar.gz: 0be2e35ba2997c67e9730d40acf02d654b4a0e0f
+SHA512:
+  metadata.gz: 06fdbee2f644bb2f890402b4195a12a1677ee97da4e14827ef9cae93d5ba89352d7c91a70d33fed98b4a451e5644e33e89191ee4882c87f82b03daec6c2d76b5
+  data.tar.gz: c36e0db768daf3a64ab4aa84bb2ec67afb6556bc98c0eda9a04754d43dffd22ad1caf2f6320b1204db4650d2d962b177e50ff5c81751b020c1634bca2a6051e6

data/.gitignore

@@ -1,3 +1,5 @@
+*.swp
+*.swo
 *.gem
 *.rbc
 .bundle

data/.travis.yml

@@ -1,11 +1,10 @@
 language: ruby
 cache: bundler
 rvm:
-- 2.1.3
+  - 2.1.3
 before_script:
-- echo "{"https://index.docker.io/v1/":{"auth":"$DOCKER_TOKEN","email":"$DOCKER_EMAIL"}"
-  > $HOME/.dockercfg
-- echo "{'cfn_bucket' : 'br-templates', 'domain' : 'brenv.net'}" > $HOME/.gantreecfg
+  - echo "{"https://index.docker.io/v1/":{"auth":"$DOCKER_TOKEN","email":"$DOCKER_EMAIL"}" > $HOME/.dockercfg
+  - wget -P /$HOME/  http://bleacher-report.d.pr/1jaEC.gantreecfg 
 env:
   global:
   - secure: OoLMnBOcoXTPOimdyh4ju8yW2YpLBXEOdljN1gVQzjIIv24cQ0BxWAAktjExntkYAjnRpxzTKK5ZkWadXm8NK7TtzFU80padk+WYVzuE1Xngxw/OhS1Z6NYL8+D3ortSANqoOB6r/Z13Sb5XClYDWlj5/GGzf4AerY5xgh2nJQc=

data/circle.yml

@@ -0,0 +1,13 @@
+machine:
+  ruby:
+    version: 2.1.3
+  services:
+    - docker
+dependencies:
+  pre:
+    - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+    - wget -P $HOME/gantree/  http://bleacher-report.d.pr/1jaEC.gantreecfg
+    - mv $HOME/gantree/1jaEC.gantreecfg $HOME/gantree/.gantreecfg
+test:
+  override:
+    - bundle exec rake

data/lib/gantree.rb

@@ -2,6 +2,8 @@ $:.unshift(File.expand_path("../", __FILE__))
 require "gantree/base"
 require "gantree/version"
 require "gantree/deploy"
+require "gantree/deploy_applications"
+require "gantree/deploy_version"
 require "gantree/init"
 require "gantree/delete"
 require "gantree/update"

data/lib/gantree/base.rb

@@ -1,3 +1,4 @@
+require "colorize"
 module Gantree
   class Base
     def check_credentials
@@ -32,7 +33,7 @@ module Gantree
 
 
     def tag
-      origin = `git config --get remote.origin.url`.match(":(.*)\/")[1]
+      origin = `git config --get remote.origin.url`.match("com(.*)\/")[1].gsub(":","").gsub("/","").strip
       branch = `git rev-parse --abbrev-ref HEAD`.gsub("/", "_").strip
       hash = `git rev-parse --verify --short #{branch}`.strip
       "#{origin}-#{branch}-#{hash}"
@@ -41,7 +42,7 @@ module Gantree
     def create_default_env
       tags = @options[:stack_name].split("-")
       if tags.length == 3
-        env = [tags[1],tags[0],"app",tags[2]].join('-')
+        [tags[1],tags[0],"app",tags[2]].join('-')
       else
         raise "Please Set Envinronment Name with -e"
       end
@@ -92,6 +93,10 @@ module Gantree
       end
     end
 
+    def error_msg msg
+      puts msg.red
+      exit 1
+    end
   end
 end
 

data/lib/gantree/cli.rb

@@ -16,6 +16,7 @@ module Gantree
     option :silent, :aliases => "-s", :desc => "mute notifications"
     option :image_path, :aliases => "-i", :desc => "docker hub image path ex. (bleacher/cms | quay.io/bleacherreport/cms)"
     option :autodetect_app_role, :desc => "use naming convention to determin role (true|false)", :type => :boolean, :default => true
+    option :eb_bucket, :desc => "bucket to store elastic beanstalk versions"
     def deploy name
       Gantree::Deploy.new(name, merge_defaults(options)).run
     end
@@ -94,6 +95,7 @@ module Gantree
     option :autodetect_app_role, :desc => "use naming convention to determin role (true|flase)", :type => :boolean
     option :image_path, :aliases => "-i", :desc => "hub image path ex. (bleacher/cms | quay.io/bleacherreport/cms)"
     option :hush, :desc => "quite puts messages", :default => true
+    option :eb_bucket, :desc => "bucket to store elastic beanstalk versions"
     def ship server
       docker = Gantree::Docker.new(merge_defaults(options))
       docker.build
@@ -110,23 +112,21 @@ module Gantree
     protected
 
     def merge_defaults(options={})
-      home_cfg = "#{ENV['HOME']}/.gantreecfg"
-      local_cfg = ".gantreecfg"
-      if File.exist?(home_cfg) && File.exist?(local_cfg)
-        home_opts = JSON.parse(File.open(home_cfg).read)
-        local_opts = JSON.parse(File.open(local_cfg).read)
-        defaults = home_opts.merge(local_opts)
-        hash = defaults.merge(options)
-      elsif File.exist?(local_cfg)
-        defaults = JSON.parse(File.open(local_cfg).read)
-        hash = defaults.merge(options)
-      elsif File.exist?(home_cfg)
-        defaults = JSON.parse(File.open(home_cfg).read)
-        hash = defaults.merge(options)
-      else
-        hash = options
+      configs = ["#{ENV['HOME']}/.gantreecfg",".gantreecfg"]
+      hash = {}
+      configs.each do |config|
+        hash.merge!(merge_config(options,config)) if config_exists?(config)
       end
       Hash[hash.map{ |k, v| [k.to_sym, v] }]
+    end 
+    
+    def merge_config options, config
+      defaults = JSON.parse(File.open(config).read) 
+      defaults.merge(options)
+    end 
+
+    def config_exists? config
+      File.exist? config
     end
   end
 end

data/lib/gantree/deploy.rb

@@ -14,66 +14,37 @@ module Gantree
       @options = options
       @ext = @options[:ext]
       @dockerrun_file = "Dockerrun.aws.json"
+      print_options
     end
 
     def run
+      check_eb_bucket
       if application?
-        puts "Found Application: #{@name}".green
-        @environments = eb.describe_environments({ :application_name => @app })[:environments]
-        if multiple_environments?
-          deploy_to_all
-        elsif environment_found?
-          deploy_to_one
-        else
-          puts "ERROR: There are no environments in this application".red
-          exit 1
-        end
+        DeployApplication.new(@name,@options).run
       elsif environment?
         puts "Found Environment: #{name}".green
         deploy([name])
       else
-        puts "You leave me with nothing to deploy".red
-        exit 1
+        error_msg "You leave me with nothing to deploy".red
       end
     end
 
-    def application?
-      results = eb.describe_applications({ application_names: ["#{@name}"]})
-      if results[:applications].length > 1
-        raise "There are more than 1 matching application names"
-      elsif results[:applications].length == 0
-        return false
-      else 
-        @app = results[:applications][0][:application_name]
-        return true
-      end
-    end
-
-    def multiple_environments?
-      @environments.length > 1 ? true : false
-    end
-
     def environment_found?
       @environments.length >=1 ? true : false
     end
 
-    def deploy_to_all
-      puts "WARN: Deploying to All Environments in the Application: #{@name}".yellow
-      sleep 3
-      envs = []
-      @environments.each do |env|
-        envs << env[:environment_name]
-      end
-      puts "envs: #{envs}"
-      deploy(envs)
-    end
-
     def deploy_to_one
       env = @environments.first[:environment_name]
       puts "Found Environment: #{env}".green
       deploy([env])
     end
 
+    def application?
+      results = eb.describe_applications({ application_names: ["#{@name}"]})
+      results[:applications].length == 1 ? true : false
+    end
+
+
     def environment?
       results = eb.describe_environments({ environment_names: ["#{@name}"]})[:environments]
       if results.length == 0
@@ -86,12 +57,12 @@ module Gantree
     end
 
     def deploy(envs)
-      print_options
       check_dir_name(envs) unless @options[:force]
       return if @options[:dry_run]
-      @packaged_version = create_version_files
+      version = DeployVersion.new(@options)
+      @packaged_version = version.run
       upload_to_s3 
-      clean_up 
+      version.clean_up 
       create_eb_version
       update_application(envs)
       if @options[:slack]
@@ -102,22 +73,20 @@ module Gantree
     end
 
     def upload_to_s3
-      key = File.basename(@packaged_version)
-      check_version_bucket
-      puts "uploading #{@packaged_version} to #{@app}-versions"
-      s3.buckets["#{@app}-versions"].objects[key].write(:file => @packaged_version)
+      puts "uploading #{@packaged_version} to #{set_bucket}"
+      s3.buckets["#{set_bucket}"].objects["#{@app}-#{@packaged_version}"].write(:file => @packaged_version)
     end
 
     def create_eb_version
-    begin
-      eb.create_application_version({
-        :application_name => @app,
-        :version_label => @packaged_version,
-        :source_bundle => {
-          :s3_bucket => "#{@app}-versions",
-          :s3_key => @packaged_version
-        }
-      })
+      begin
+        eb.create_application_version({
+          :application_name => "#{@app}",
+          :version_label => "#{@packaged_version}",
+          :source_bundle => {
+            :s3_bucket => "#{set_bucket}",
+            :s3_key => "#{@app}-#{@packaged_version}"
+          }
+        })
       rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue => e
         puts "No Application named #{@app} found #{e}"
       end
@@ -128,8 +97,7 @@ module Gantree
         begin
           eb.update_environment({
             :environment_name => env,
-            :version_label => @packaged_version,
-            :option_settings => autodetect_app_role(env)
+            :version_label => @packaged_version
           })
           puts "Deployed #{@packaged_version} to #{env} on #{@app}".green
         rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue => e
@@ -139,122 +107,30 @@ module Gantree
       end
     end
 
-    def create_version_files
-      time_stamp = Time.now.to_i
-      branch = `git rev-parse --abbrev-ref HEAD`
-      puts "branch: #{branch}"
-      hash = `git rev-parse --verify --short #{branch}`.strip
-      puts "hash #{hash}"
-      version = "#{@app}-#{hash}-#{time_stamp}"
-      puts "version: #{version}"
-      #auto_detect_app_role if @options[:autodetect_app_role] == true
-      set_image_path if @options[:image_path]
-      set_tag_to_deploy if @options[:tag]
-      unless ext?
-        new_dockerrun = "#{version}-Dockerrun.aws.json"
-        FileUtils.cp("Dockerrun.aws.json", new_dockerrun)
-        new_dockerrun
-      else
-        zip = "#{version}.zip"
-        clone_repo if repo?
-        Archive::Zip.archive(zip, ['.ebextensions/', @dockerrun_file])
-        zip
-      end
-    end
-
-    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 set_image_path
-      docker = JSON.parse(IO.read(@dockerrun_file))
-      image = docker["Image"]["Name"]
-      image.gsub!(/(.*):/, "#{@options[:image_path]}:")
-      IO.write(@dockerrun_file, JSON.pretty_generate(docker))
-      image
-    end
-
-    def autodetect_app_role env
-      enabled = @options[:autodetect_app_role]
-      if enabled == true || enabled == "true"
-        role = env.split('-')[2]
-        puts "Deploying app as a #{role}"
-        [{:option_name => "ROLE", :value => role, :namespace => "aws:elasticbeanstalk:application:environment" }]
-      else 
-        []
-      end
-    end
-
-    def ext?
-      if @ext
-        true
-      else
-        false
-      end
-    end
-
-    def repo?
-      if @ext.include? "github"
-        puts "Cloning: #{@ext}..."
-        true
-      else
-        false
-      end
-    end
-
-    def local?
-      File.directory?(@ext)
-    end
-
-    def get_ext_repo
-      if ext_branch?
-        repo = @ext.sub(":#{get_ext_branch}", '')
-      else
-        @ext
-      end
-    end
-
-    def ext_branch?
-      if @ext.count(":") == 2
-        true
-      else
-        false
-      end
+    def check_dir_name envs
+      dir_name = File.basename(Dir.getwd)
+      msg = "WARN: You are deploying from a repo that doesn't match #{@app}"
+      puts msg.yellow if envs.any? { |env| env.include?(dir_name) } == false
     end
 
-    def get_ext_branch
-      branch = @ext.match(/:.*(:.*)$/)[1]
-      branch.tr(':','')
+    def check_eb_bucket
+      bucket = set_bucket
+      s3.buckets.create(bucket) unless s3.buckets[bucket].exists?
     end
 
-    def clone_repo
-      if ext_branch?
-        `git clone -b #{get_ext_branch} #{get_ext_repo}`
+    def set_bucket
+      if @options[:eb_bucket]
+        bucket = @options[:eb_bucket]
       else
-        `git clone #{get_ext_repo}`
+        bucket = generate_eb_bucket
       end
     end
-
-    def check_version_bucket
-      name = "#{@app}-versions"
-      bucket = s3.buckets[name] # makes no request
-      s3.buckets.create(name) unless bucket.exists?
-    end
-
-    def clean_up
-      FileUtils.rm_rf(@packaged_version)
-      `git checkout Dockerrun.aws.json` # reverts back to original Dockerrun.aws.json
-      `rm -rf .ebextensions/` if ext?
+    
+    def generate_eb_bucket 
+      unique_hash = Digest::SHA1.hexdigest ENV['AWS_ACCESS_KEY_ID']
+      "eb-bucket-#{unique_hash}"
     end
 
-    def check_dir_name envs
-      dir_name = File.basename(Dir.getwd)
-      msg = "WARN: You are deploying from a repo that doesn't match #{@app}"
-      puts msg.yellow if envs.any? { |env| env.include?(dir_name) } == false
-    end
   end
 end
 

data/lib/gantree/deploy_applications.rb

@@ -0,0 +1,47 @@
+require 'json'
+require 'archive/zip'
+require 'colorize'
+require_relative 'notification'
+
+module Gantree
+  class DeployApplication < Deploy
+    attr_accessor :options
+
+    def initialize name, options
+      @options = options
+      @name = name
+      puts "Found Application: #{@name}".green
+      @environments = eb.describe_environments({ :application_name => @name })[:environments]
+    end
+
+    def run
+      if multiple_environments?
+        deploy_to_all
+      elsif environment_found?
+        deploy_to_one
+      else
+        error_msg "ERROR: There are no environments in this application"
+      end
+    end
+
+    def multiple_environments?
+      @environments.length > 1 ? true : false
+    end
+
+    def environment_found?
+      @environments.length >=1 ? true : false
+    end
+
+    def deploy_to_all
+      puts "WARN: Deploying to All Environments in the Application: #{@name}".yellow
+      sleep 3
+      envs = []
+      @environments.each do |env|
+        envs << env[:environment_name]
+      end
+      puts "envs: #{envs}"
+      deploy(envs)
+    end
+  end
+end
+

data/lib/gantree/deploy_version.rb

@@ -0,0 +1,108 @@
+require 'json'
+require 'archive/zip'
+require 'colorize'
+require_relative 'notification'
+
+module Gantree
+  class DeployVersion < Deploy
+
+    def initialize options
+      @options = options
+      @ext = @options[:ext]
+      @dockerrun_file = "Dockerrun.aws.json"
+    end
+
+    def run
+      @packaged_version = create_version_files
+    end
+
+    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 set_image_path
+      docker = JSON.parse(IO.read(@dockerrun_file))
+      image = docker["Image"]["Name"]
+      image.gsub!(/(.*):/, "#{@options[:image_path]}:")
+      IO.write(@dockerrun_file, JSON.pretty_generate(docker))
+      image
+    end
+
+    def create_version_files
+      version = "#{tag}-#{Time.now.strftime("%b-%d-%Y-%a-%H-%M-%S")}"
+      puts "version: #{version}"
+      set_image_path if @options[:image_path]
+      set_tag_to_deploy if @options[:tag]
+      unless ext?
+        new_dockerrun = "#{version}-Dockerrun.aws.json"
+        FileUtils.cp("Dockerrun.aws.json", new_dockerrun)
+        new_dockerrun
+      else
+        zip = "#{version}.zip"
+        clone_repo if repo?
+        Archive::Zip.archive(zip, ['.ebextensions/', @dockerrun_file])
+        zip
+      end
+    end
+
+    def ext?
+      if @ext
+        true
+      else
+        false
+      end
+    end
+
+    def repo?
+      if @ext.include? "github"
+        puts "Cloning: #{@ext}..."
+        true
+      else
+        false
+      end
+    end
+
+    def local?
+      File.directory?(@ext)
+    end
+
+    def get_ext_repo
+      if ext_branch?
+        @ext.sub(":#{get_ext_branch}", '')
+      else
+        @ext
+      end
+    end
+
+    def ext_branch?
+      if @ext.count(":") == 2
+        true
+      else
+        false
+      end
+    end
+
+    def get_ext_branch
+      branch = @ext.match(/:.*(:.*)$/)[1]
+      branch.tr(':','')
+    end
+
+    def clone_repo
+      if ext_branch?
+        `git clone -b #{get_ext_branch} #{get_ext_repo}`
+      else
+        `git clone #{get_ext_repo}`
+      end
+    end
+
+    def clean_up
+      FileUtils.rm_rf(@packaged_version)
+      `git checkout Dockerrun.aws.json` # reverts back to original Dockerrun.aws.json
+      `rm -rf .ebextensions/` if ext?
+    end
+  end
+end
+

data/lib/gantree/docker.rb

@@ -12,11 +12,11 @@ module Gantree
       @tag = @options[:tag] ||= tag
     end
 
-    def build 
+    def build
       puts "Building..."
-      output = `docker build -t #{@image_path}:#{@tag} .`
-      if $?.success?
-        puts "Image Built: #{@image_path}:#{@tag}".green 
+      build_status = system("docker build -t #{@image_path}:#{@tag} .")
+      if build_status.success?
+        puts "Image Built: #{@image_path}:#{@tag}".green
         puts "gantree push --image-path #{@image_path} -t #{@tag}" unless @options[:hush]
         puts "gantree deploy app_name -t #{@tag}" unless @options[:hush]
       else
@@ -26,11 +26,11 @@ module Gantree
       end
     end
 
-    def push 
+    def push
       puts "Pushing to #{@image_path}:#{@tag} ..."
-      output = `docker push #{@image_path}:#{@tag}`
-      if $?.success?
-        puts "Image Pushed: #{@image_path}:#{@tag}".green 
+      push_status = "docker push #{@image_path}:#{@tag}"
+      if push_status.success?
+        puts "Image Pushed: #{@image_path}:#{@tag}".green
         puts "gantree deploy app_name -t #{@tag}" unless @options[:hush]
       else
         puts "Error: Image was not pushed successfully".red

data/lib/gantree/notification.rb

@@ -2,11 +2,7 @@ require 'slackr'
 class Notification
 
   def initialize(options={})
-    @slack = Slackr.connect(options["team"], options["token"], {
-      "channel" => options["channel"], 
-      "username" => options["username"], 
-      "icon_url" => options["icon_url"]
-    })
+    @slack = Slackr.connect(options["team"], options["token"])
   end
 
   def say(msg)

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.4.9.3"
+  VERSION = "0.5.0"
 end

data/spec/lib/gantree/cli_spec.rb

@@ -8,13 +8,12 @@ require 'spec_helper'
 describe Gantree::CLI do
   before(:all) do
 
-    @app = "stag-cms-app-s2"
-    @env = "cms-stag-s2"
+    @app = "stag-carburetor-app-s2"
+    @env = "carburetor"
     @owner = "bleacher"
     @repo = "cauldron"
     @tag =  "master"
     @user = "feelobot"
-    @new_env = "cms-stag-s3"
   end 
 
   describe "init" do
@@ -32,39 +31,39 @@ describe Gantree::CLI do
     end
 
     it "specifies the bucket" do
-      out = execute("bin/gantree init -u #{@user} -b my_bucket #{@owner}/#{@repo}:#{@tag} --dry-run")
-      expect(out).to include "bucket: my_bucket"
+      out = execute("bin/gantree init -u #{@user} -b docker-cfgs #{@owner}/#{@repo}:#{@tag} --dry-run")
+      expect(out).to include "bucket: docker-cfgs"
     end
   end
 
   describe "deploy" do
     it "should deploy images" do
       execute("bin/gantree init #{@owner}/#{@repo}:#{@tag} --dry-run")
-      out = execute("bin/gantree deploy #{@env} --dry-run --silent")
+      out = execute("bin/gantree deploy #{@env} --dry-run  --eb-bucket br-eb-versions --silent")
       expect(out).to include("Found Application: #{@env}")
       expect(out).to include("silent: silent")
     end
 
     it "should deploy images with remote extensions" do
-      out = execute("bin/gantree deploy #{@app} -x 'git@github.com:br/.ebextensions' --dry-run --silent")
+      out = execute("bin/gantree deploy #{@app} -x 'git@github.com:br/.ebextensions' --eb-bucket br-eb-versions --dry-run --silent")
       expect(out).to include("Found Environment: #{@app}")
-      expect(out).to include("ext: git@github.com:br/.ebextensions")
+      expect(out).to include(".ebextensions")
       expect(out).to include("silent: silent")
     end
 
     it "should deploy images with remote extensions on a branch" do
-      out = execute("bin/gantree deploy #{@env} -x 'git@github.com:br/.ebextensions:basic' --dry-run --silent")
+      out = execute("bin/gantree deploy #{@env} -x 'git@github.com:br/.ebextensions:basic' --eb-bucket br_eb_versions --dry-run --silent")
       expect(out).to include("Found Application: #{@env}")
-      expect(out).to include("ext: git@github.com:br/.ebextensions:basic")
+      expect(out).to include(".ebextensions:basic")
       expect(out).to include("silent: silent")
     end
 
     it "should notify slack of deploys" do 
-      out = execute("bin/gantree deploy #{@env} --dry-run")
+      out = execute("bin/gantree deploy #{@env} --eb-bucket br_eb_versions  --dry-run")
       expect(out).to include("Found Application: #{@env}")
     end
   end
-
+=begin
   describe "create" do
     it "should create clusters" do
       out = execute("bin/gantree create #{@env} --dry-run --cfn-bucket templates")
@@ -103,7 +102,7 @@ describe Gantree::CLI do
       expect(out).to include "Deleting"
     end
   end
-
+=end
   describe "#version" do
     it "should output gantree version" do
       out = execute("bin/gantree version")

data/spec/lib/gantree/deploy_spec.rb

@@ -16,20 +16,12 @@ describe Gantree::Deploy do
 
   it "returns branch name of repo url" do
     options = { ext: "git@github.com:br/.ebextensions:basic" }
-    deploy = Gantree::Deploy.new(@env, options)
-    expect(deploy.send(:get_ext_branch)).to eq "basic"
+    expect(Gantree::DeployVersion.new(options).send(:get_ext_branch)).to eq "basic"
   end
 
   it "returns just the repo url" do 
     options = { ext: "git@github.com:br/.ebextensions:basic" }
-    deploy = Gantree::Deploy.new(@env,options)
-    expect(deploy.send(:get_ext_repo)).to eq "git@github.com:br/.ebextensions"
-  end
-
-  it "sets app roles if enabled" do
-    options = { autodetect_app_role: true}
-    deploy = Gantree::Deploy.new("stag-knarr-listener-s1", options)
-    expect(deploy.send(:autodetect_app_role, "stag-knarr-listener-s1")).to eq([{:option_name=>"ROLE", :value=>"listener", :namespace=>"aws:elasticbeanstalk:application:environment"}])
+    expect(Gantree::DeployVersion.new(options).send(:get_ext_repo)).to eq "git@github.com:br/.ebextensions"
   end
 
   it "AWS gets the correct keys" do
@@ -77,4 +69,4 @@ def dockerrun
   ]
 }
 '
-end
+end

metadata

@@ -1,100 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.4.9.3
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.55.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.55.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cloudformation-ruby-dsl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -110,39 +97,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slackr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -158,129 +139,113 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: cli tool for automating docker deploys to elastic beanstalk
@@ -291,9 +256,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -301,6 +266,7 @@ files:
 - README.md
 - Rakefile
 - bin/gantree
+- circle.yml
 - gantree.gemspec
 - lib/gantree.rb
 - lib/gantree/app.rb
@@ -313,53 +279,48 @@ files:
 - lib/gantree/create.rb
 - lib/gantree/delete.rb
 - lib/gantree/deploy.rb
+- lib/gantree/deploy_applications.rb
+- lib/gantree/deploy_version.rb
 - lib/gantree/docker.rb
 - lib/gantree/init.rb
 - lib/gantree/notification.rb
 - lib/gantree/update.rb
 - lib/gantree/version.rb
 - spec/lib/gantree/cli_spec.rb
-- spec/lib/gantree/create_spec.rb
-- spec/lib/gantree/delete_spec.rb
 - spec/lib/gantree/deploy_spec.rb
 - spec/lib/gantree/docker_spec.rb
 - spec/lib/gantree/init_spec.rb
-- spec/lib/gantree/update_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/feelobot/gantree
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This tool is intended to help you setup a Dockerrun.aws.json which allows
   you to deploy a prebuilt image of your application to Elastic Beanstalk. This also
   allows you to do versioned deploys to your Elastic Beanstalk application and create
   an archive of every versioned Dockerrun.aws.json in amazons s3 bucket service.
 test_files:
 - spec/lib/gantree/cli_spec.rb
-- spec/lib/gantree/create_spec.rb
-- spec/lib/gantree/delete_spec.rb
 - spec/lib/gantree/deploy_spec.rb
 - spec/lib/gantree/docker_spec.rb
 - spec/lib/gantree/init_spec.rb
-- spec/lib/gantree/update_spec.rb
 - spec/spec_helper.rb

data/spec/lib/gantree/create_spec.rb

@@ -1,21 +0,0 @@
-require "spec_helper"
-require "pry"
-
-describe Gantree::Update do
-  before(:all) do
-    ENV['AWS_ACCESS_KEY_ID'] = 'FAKE_AWS_ACCESS_KEY'
-    ENV['AWS_SECRET_ACCESS_KEY'] = 'FAKE_AWS_SECRET_ACCESS_KEY'
-
-    @stack_name = "knarr-stag-s1"
-    @env = "stag-knarr-app-s1"
-    @owner = "bleacher"
-    @repo = "cauldron"
-    @tag =  "master"
-    @user = "feelobot"
-  end
-
-  it "performs a cloudformation stack create"
-  it "can add an application role to the stack template"
-  it "can update to a specific solution stack"
-  it "can update to the latest solution stack automatically"
-end

data/spec/lib/gantree/delete_spec.rb

@@ -1,20 +0,0 @@
-require "spec_helper"
-require "pry"
-
-describe Gantree::Delete do
-  before(:all) do
-    AWS.stub!
-    ENV['AWS_ACCESS_KEY_ID'] = 'FAKE_AWS_ACCESS_KEY'
-    ENV['AWS_SECRET_ACCESS_KEY'] = 'FAKE_AWS_SECRET_ACCESS_KEY'
-    @stack_name = "knarr-stag-s1"
-  end
-
-  it "prompts for confirmation"
-  it "prompt requires 'y' to delete"
-  it "prompt is canceled on any other input"
-  let(:delete) { Gantree::Delete.new(@stack_name,{:force => true})}
-  it "prompt can be overrided with --force" do
-    expect { delete.run}.to output("Deleting stack from aws\n").to_stdout
-  end
-
-end

data/spec/lib/gantree/update_spec.rb

@@ -1,40 +0,0 @@
-require "spec_helper"
-require "pry"
-
-describe Gantree::Update do
-  before(:all) do
-    AWS.stub!
-    ENV['AWS_ACCESS_KEY_ID'] = 'FAKE_AWS_ACCESS_KEY'
-    ENV['AWS_SECRET_ACCESS_KEY'] = 'FAKE_AWS_SECRET_ACCESS_KEY'
-
-    @stack_name = "cms-stag-s2"
-    @env = "stag-cms-app-s1"
-    @owner = "bleacher"
-    @repo = "cauldron"
-    @tag =  "master"
-    @user = "feelobot"
-  end
-
-  let(:update) { Gantree::Update.new(@stack_name,{:dry_run => true}).run}
-  it "performs a cloudformation stack update" do
-    expect { update }.to output("Updating stack from local cfn repo\n").to_stdout
-  end
-
-  describe "change_solution_stack" do
-    let!(:update) { Gantree::Update.new(@stack_name,{:dry_run => true,:solution => "64bit Amazon Linux 2014.09 v1.0.10 running Docker 1.3.2"})}
-    it "can update to a specific solution stack using --role 'solution name'" do
-      expect { update.change_solution_stack }.to output("\e[0;32;49mUpdated solution to 64bit Amazon Linux 2014.09 v1.0.10 running Docker 1.3.2\e[0m\n").to_stdout
-    end
-    let!(:update) { Gantree::Update.new(@stack_name,{:dry_run => true,:solution => "64bit Amazon Linux 2014.09 v1.0.10 running Docker 1.3.2"})}
-    it "can update to the latest solution stack automatically using --role latest" do
-      #expect { update.get_latest_docker_solution }.to output("asda").to_stdout
-    end
-  end
-
-  describe "add_role" do
-    let(:update) { Gantree::Update.new(@stack_name,{:role => "worker", :dry_run => true})}
-    it "can add an worker role to the stack template with --role" do
-      expect{ update.add_role "worker"}.to_not output("\e[0;31;49mRole already exists\e[0m\n").to_stdout 
-    end
-  end
-end