gantree 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 631cf886a62106175b5fddc1e056f59f1c787f13
-  data.tar.gz: 5f16f10ae56e2f76c00ed90840a8ab52bfbd009c
+  metadata.gz: bcd4152a7017bb63886767f845cab9f55fa9c95f
+  data.tar.gz: ee160c2c05ed886d3bafdf6d3a4ee35a352498c3
 SHA512:
-  metadata.gz: ece56a23faa0cd4eebe290a30462c154d71b6dd0c45e6a868e5bedd779d03deeb682730672d5dc70e937cb317a809feae3992c761699cbd8baec0ae534dd72d0
-  data.tar.gz: 9d307e4a969733e07147fcbe17deef944873832b4e6fc82863057b2e7f15ecb5f4852ccf5f8e9f252525ce1f85dcaf651937c94cbb812ffef0c66481f6ccf69c
+  metadata.gz: 86e476ccbf5e6245ddb10b75313f4602f37edf3ff469c8de576c549349bae890f027752f692819a7f1c085c1c410c4318e73b79db09af3e6180c1523a9a88fc6
+  data.tar.gz: 025ef21b34b2a48a5697e8d67c3241e0edc965cb04640387f1c12ae80e8ee0640dc09df23878325d549fd7c62179bc53bb7c2adad096ed7dce25ed0c9242b875

data/README.md

@@ -14,12 +14,9 @@ This tool is intended to help you setup a Dockerrun.aws.json which allows you to
 
 ## Installation
 
+### Prerequisites 
 You need to have your AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables set in order to use the tool as well as the proper aws permissions for Elastic Beanstalk, and S3 access. 
 
-For the time being you also need to configure your github repo to auto build an image inside of Dockerhub (private or open). In order to do this you need to have a dockerhub account already, login, and select your profile/orginization to add a *Automated Build* to. Select the branch you want to build, location of the docker file and the tag to reference the image that will be built (this will hopefully be automated in the future via dockerhub api).
-
-Once you have your docker image created you will also need to install docker (if you haven't already)
-
 *Install docker for MAC OSX*
 https://docs.docker.com/installation/mac/
 
@@ -27,13 +24,12 @@ Generate your login credentials token:
 ```
 docker login
 ```
-
-Install the gem
+### Setup
 ```
 gem install gantree
 ```
 
-### Initialize
+### Initialize a new Repo
 What this does is create a new Dockerrun.aws.json inside your repository and uploads your docker login credentials to s3 (for private repo access) so you can do deploys. We need the -u to specify a username to rename your .dockercfg and reference it in the Dockerrun.aws.json
 
 ```
@@ -55,7 +51,7 @@ gantree init -u frodgriguez -p 3000 -b hopefully_this_bucket_name_is_available b
 This command renames your Dockerrun.aws.json temporarily to NAME_OF_ENV-GITHUB_HASH-Dockerrun.aws.json, uploads it to a NAME_OF_APP-versions bucket, creates a new elastic beanstalk version, and asks the specified elastic beanstalk environment to update to that new version.
 
 ```
-gantree deploy stag-cauldron-app-s1
+gantree deploy cauldron-stag-s1
 ```
 By default this will check for the environment cauldron-stag-s1 and deploy to the app stag-cauldron-app. You can also specify an environment name directly using -e.
 

data/lib/gantree/base.rb

@@ -22,12 +22,8 @@ module Gantree
       @s3 ||= AWS::S3.new
     end
 
-    def default_name(app)
-      [
-       app.match(/^[a-zA-Z]*\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1],
-       app.match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1],
-       app.match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[3]
-      ].join("-")
+    def eb
+      @eb ||= AWS::ElasticBeanstalk::Client.new
     end
   end
 end

data/lib/gantree/cfn/beanstalk.rb

@@ -7,8 +7,7 @@ class BeanstalkTemplate
     @size = params[:instance_size]
     @rds = params[:rds]
     @env = params[:env]
-    @prod_domain = params[:prod_domain]
-    @stag_domain = params[:stag_domain]
+    @domain = params[:domain]
     @requirements = params[:requirements]
     @rds_enabled = params[:rds?]
     @env_type = params[:env_type]
@@ -20,30 +19,13 @@ class BeanstalkTemplate
 
       value :AWSTemplateFormatVersion => '2010-09-09'
 
-      value :Description => '#{@env} Service Parent Template (2014-08-15)'
-
-      mapping 'LongName',
-              :stag => { :name => 'staging' },
-              :prod => { :name => 'production' }
-
-      mapping 'HostedZoneName',
-              :stag => { :name => '#{@stag_domain}' },
-              :prod => { :name => '#{@prod_domain}' }
+      value :Description => '#{@stack_name} Service Parent Template (2014-08-15)'
 
       #{beanstalk_parmaters}
 
       resource 'Application', :Type => 'AWS::ElasticBeanstalk::Application', :Properties => {
-          :Description => '#{@env}',
-          :ApplicationName => '#{@env}',
-      }
-
-      resource 'ApplicationVersion', :Type => 'AWS::ElasticBeanstalk::ApplicationVersion', :Properties => {
-          :ApplicationName => ref('Application'),
-          :Description => 'Initial Version',
-          :SourceBundle => {
-              :S3Bucket => 'elasticbeanstalk-samples-us-east-1',
-              :S3Key => 'docker-sample.zip',
-          },
+          :Description => '#{@stack_name}',
+          :ApplicationName => '#{@stack_name}',
       }
 
       #{configuration_template}
@@ -75,11 +57,11 @@ class BeanstalkTemplate
       parameter 'ApplicationName',
                 :Description => 'The name of the Elastic Beanstalk Application',
                 :Type => 'String',
-                :Default =>  '#{@env}'
+                :Default =>  '#{@stack_name}'
 
       parameter 'Environment',
                 :Type => 'String',
-                :Default => 'stag'
+                :Default => '#{@env_type}'
 
       parameter 'IamInstanceProfile',
                 :Type => 'String',
@@ -100,11 +82,6 @@ class BeanstalkTemplate
                 :OptionName => 'AWS_REGION',
                 :Value => aws_region,
             },
-            {
-                :Namespace => 'aws:elasticbeanstalk:application:environment',
-                :OptionName => 'RACK_ENV',
-                :Value => find_in_map('LongName', '#{@env_type}', 'name'),
-            },
             {
                 :Namespace => 'aws:autoscaling:launchconfiguration',
                 :OptionName => 'EC2KeyName',
@@ -136,18 +113,17 @@ class BeanstalkTemplate
 
   def resources
     "resource 'EbEnvironment', :Type => 'AWS::ElasticBeanstalk::Environment', :Properties => {
-        :ApplicationName => '#{@env}',
-        :EnvironmentName => '#{@stack_name}',
+        :ApplicationName => '#{@stack_name}',
+        :EnvironmentName => '#{@env}',
         :Description => 'Default Environment',
-        :VersionLabel => ref('ApplicationVersion'),
         :TemplateName => ref('ConfigurationTemplate'),
         :OptionSettings => [],
     }
 
     resource 'HostRecord', :Type => 'AWS::Route53::RecordSet', :Properties => {
         :Comment => 'DNS name for my stack',
-        :HostedZoneName => join('', find_in_map('HostedZoneName', '#{@env_type}', 'name'), '.'),
-        :Name => join('.', ref('ApplicationName'), find_in_map('HostedZoneName', '#{@env_type}', 'name')),
+        :HostedZoneName => '#{@domain}',
+        :Name => join('.', '#{@env}', '#{@domain}'),
         :ResourceRecords => [ get_att('EbEnvironment', 'EndpointURL') ],
         :TTL => '60',
         :Type => 'CNAME',

data/lib/gantree/cfn/master.rb

@@ -18,12 +18,12 @@ class MasterTemplate
       parameter 'ResourcesTemplate',
                 :Description => 'The key of the template for the resources required to run the app',
                 :Type => 'String',
-                :Default => '#{@env}-resources.cfn.json'
+                :Default => '#{@stack_name}-resources.cfn.json'
 
       parameter 'AppTemplate',
                 :Description => 'The key of the template for the EB app/env substack',
                 :Type => 'String',
-                :Default => '#{@env}-beanstalk.cfn.json'
+                :Default => '#{@stack_name}-beanstalk.cfn.json'
 
       parameter 'KeyName',
                 :Type => 'String',
@@ -31,7 +31,7 @@ class MasterTemplate
 
       parameter 'ApplicationName',
                 :Type => 'String',
-                :Default => '#{@env}'
+                :Default => '#{@stack_name}'
 
       parameter 'Environment',
                 :Type => 'String',
@@ -42,12 +42,12 @@ class MasterTemplate
                 :Default => 'EbApp'
 
       resource 'AppResources', :Type => 'AWS::CloudFormation::Stack', :Properties => {
-          :TemplateURL => join('/', 'http://s3.amazonaws.com', '#{@bucket}', '#{@env}', ref('ResourcesTemplate')),
+          :TemplateURL => join('/', 'http://s3.amazonaws.com', '#{@bucket}', '#{@stack_name}', ref('ResourcesTemplate')),
           :Parameters => { :ApplicationName => ref('ApplicationName') },
       }
 
       resource 'App', :Type => 'AWS::CloudFormation::Stack', :Properties => {
-          :TemplateURL => join('/', 'http://s3.amazonaws.com','#{@bucket}', '#{@env}', ref('AppTemplate')),
+          :TemplateURL => join('/', 'http://s3.amazonaws.com','#{@bucket}', '#{@stack_name}', ref('AppTemplate')),
           :Parameters => {
               :KeyName => ref('KeyName'),
               :InstanceSecurityGroup => get_att('AppResources', 'Outputs.InstanceSecurityGroup'),

data/lib/gantree/cfn/resources.rb

@@ -15,14 +15,14 @@ class ResourcesTemplate
 
       value :AWSTemplateFormatVersion => '2010-09-09'
 
-      value :Description => '#{@env} Services Resources (2014-06-30)'
+      value :Description => '#{@stack_name} Services Resources (2014-06-30)'
 
       parameter 'ApplicationName',
                 :Type => 'String',
-                :Default => '#{@env}'
+                :Default => '#{@stack_name}'
 
       resource 'InstanceSecurityGroup', :Type => 'AWS::EC2::SecurityGroup', :Properties => {
-          :GroupDescription => join('', 'an EC2 instance security group created for #{@env}')
+          :GroupDescription => join('', 'an EC2 instance security group created for #{@stack_name}')
       }
 
       output 'InstanceSecurityGroup',

data/lib/gantree/cli.rb

@@ -14,8 +14,8 @@ module Gantree
     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
+    def deploy name
+      Gantree::Deploy.new(name, merge_defaults(options)).run
     end
 
     desc "init IMAGE", "create a dockerrun for your IMAGE"

data/lib/gantree/deploy.rb

@@ -5,40 +5,82 @@ require_relative 'notification'
 
 module Gantree
   class Deploy < Base
-    attr_reader :app, :env
+    attr_reader :name
 
-    def initialize app, options
+    def initialize name, options
       check_credentials
       set_aws_keys
-
+      @name = name
       @options = options
       @ext = @options[:ext]
-      @app = @options[:env] || default_name(app)
-      @env = app
       @dockerrun_file = "Dockerrun.aws.json"
     end
 
     def run
-      check_dir_name unless @options[:force]
-      puts "Deploying #{@env} on #{@app}"
+      if application?
+        puts "Found Application: #{@name}".green
+        environments = eb.describe_environments({ :application_name => @app })[:environments]
+        if environments.length > 1
+          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)
+        elsif environments.length == 1
+          env = environments.first[:environment_name]
+          puts "Found Environment: #{env}".green
+          deploy([env])
+        else
+          puts "ERROR: There are no environments in this application".red
+          exit 1
+        end
+      elsif environment?
+        puts "Found Environment: #{name}".green
+        deploy([name])
+      else
+        puts "You leave me with nothing to deploy".red
+        exit 1
+      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 environment?
+      results = eb.describe_environments({ environment_names: ["#{@name}"]})
+      if results.length == 0
+        puts "ERROR: Environment '#{name}' not found"
+        exit 1
+      else
+        return true
+      end
+    end
+    def deploy(envs)
       print_options
+      check_dir_name(envs) unless @options[:force]
       return if @options[:dry_run]
       @packaged_version = create_version_files
-      upload_to_s3 if @options[:dry_run].nil?
-      clean_up
-      create_eb_version if @options[:dry_run].nil?
-      update_application if @options[:dry_run].nil?
+      upload_to_s3 
+      clean_up 
+      create_eb_version
+      update_application(envs)
       if @options[:slack]
         msg = "#{ENV['USER']} is deploying #{@packaged_version} to #{@app}"
         Notification.new(@options[:slack]).say(msg) unless @options[:silent]
       end
     end
-
-    private
-    def eb
-      @eb ||= AWS::ElasticBeanstalk::Client.new
-    end
-
     def upload_to_s3
       key = File.basename(@packaged_version)
       check_version_bucket
@@ -61,15 +103,18 @@ module Gantree
       end
     end
 
-    def update_application
-      begin
-        eb.update_environment({
-          :environment_name => @env,
-          :version_label => @packaged_version,
-          :option_settings => autodetect_app_role
-        })
-      rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue
-        puts "#{@env} doesn't exist"
+    def update_application(envs)
+      envs.each do |env|
+        begin
+          eb.update_environment({
+            :environment_name => env,
+            :version_label => @packaged_version,
+            :option_settings => autodetect_app_role(env)
+          })
+          puts "Deployed #{@packaged_version} to #{env} on #{@app}".green
+        rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue
+          puts "Error: Something went wrong durring the deploy to #{env}".red
+        end
       end
     end
 
@@ -79,7 +124,7 @@ module Gantree
       puts "branch: #{branch}"
       hash = `git rev-parse --verify --short #{branch}`.strip
       puts "hash #{hash}"
-      version = "#{@env}-#{hash}-#{time_stamp}"
+      version = "#{@app}-#{hash}-#{time_stamp}"
       puts "version: #{version}"
       #auto_detect_app_role if @options[:autodetect_app_role] == true
       set_tag_to_deploy if @options[:tag]
@@ -102,10 +147,10 @@ module Gantree
       IO.write(@dockerrun_file, JSON.pretty_generate(docker))
     end
 
-    def autodetect_app_role
+    def autodetect_app_role env
       enabled = @options[:autodetect_app_role]
       if enabled == true || enabled == "true"
-        role = @env.split('-')[2]
+        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))
@@ -180,10 +225,10 @@ module Gantree
       `rm -rf .ebextensions/` if ext?
     end
 
-    def check_dir_name
+    def check_dir_name envs
       dir_name = File.basename(Dir.getwd)
-      msg = "WARN: You are deploying from a repo that doesn't match #{@env}"
-      puts msg.yellow if @env.include?(dir_name) == false
+      msg = "WARN: You are deploying from a repo that doesn't match #{@app}"
+      puts msg.yellow if envs.any? { |env| env.include?(dir_name) }
     end
   end
 end

data/lib/gantree/stack.rb

@@ -11,23 +11,32 @@ module Gantree
     def initialize stack_name,options
       check_credentials
       set_aws_keys
-
+      
       @cfm = AWS::CloudFormation.new
       @requirements = "#!/usr/bin/env ruby
         require 'cloudformation-ruby-dsl/cfntemplate'
         require 'cloudformation-ruby-dsl/spotprice'
         require 'cloudformation-ruby-dsl/table'"
-      @env = options[:env] || default_name(stack_name)
+
       additional_options = {
         stack_name: stack_name,
         requirements: @requirements,
         cfn_bucket: "br-templates",
-        env: @env,
-        stag_domain: "sbleacherreport.com",
-        prod_domain: "bleacherreport.com",
-        env_type: env_type,
+        domain: "brenv.net.",
+        stack_hash: (0...8).map { (65 + rand(26)).chr }.join
       }
       @options = options.merge(additional_options)
+      @options[:env] ||= create_default_env
+      @options[:env_type] ||= env_type
+    end
+
+    def create_default_env
+      tags = @options[:stack_name].split("-")
+      if tags.length == 3
+        env = [tags[1],tags[0],"app",tags[2]].join('-')
+      else
+        raise "Please Set Envinronment Name with -e"
+      end
     end
 
     def create
@@ -64,7 +73,7 @@ module Gantree
 
     private
     def stack_template
-      s3.buckets["#{@options[:cfn_bucket]}/#{env}"].objects["#{env}-master.cfn.json"]
+      s3.buckets["#{@options[:cfn_bucket]}/#{@options[:stack_name]}"].objects["#{@options[:stack_name]}-master.cfn.json"]
     end
 
     def create_cfn_if_needed
@@ -75,14 +84,13 @@ module Gantree
       if @options[:dupe]
         puts "Duplicating cluster"
         orgin_stack_name = @options[:dupe]
-        origin_env = @options[:dupe].match(/^[a-zA-Z]*\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1] + "-" + env_from_dupe = @options[:dupe].match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1] + '-' + env_from_dupe = @options[:dupe].match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[3]
         templates = ['master','resources','beanstalk']
         templates.each do |template|
-          FileUtils.cp("cfn/#{origin_env}-#{template}.cfn.json", "cfn/#{env}-#{template}.cfn.json")
-          file = IO.read("cfn/#{env}-#{template}.cfn.json")
+          FileUtils.cp("cfn/#{orgin_stack_name}-#{template}.cfn.json", "cfn/#{@options[:stack_name]}-#{template}.cfn.json")
+          file = IO.read("cfn/#{@options[:stack_name]}-#{template}.cfn.json")
           file.gsub!(/#{escape_characters_in_string(orgin_stack_name)}/, @options[:stack_name])
-          file.gsub!(/#{escape_characters_in_string(origin_env)}/, @options[:env])
-          IO.write("cfn/#{env}-#{template}.cfn.json",file)
+          replace_env_references(file)
+          IO.write("cfn/#{@options[:stack_name]}-#{template}.cfn.json",file)
         end
       else
         puts "Generating templates from gantree"
@@ -92,6 +100,17 @@ module Gantree
       end
     end
 
+    def replace_env_references file
+      origin_tags = @options[:dupe].split("-")
+      new_tags = @options[:stack_name].split("-")
+      possible_roles = ["app","worker","listner","djay","scheduler"]
+      possible_roles.each do |role|
+        origin_env = [origin_tags[1],origin_tags[0],role,origin_tags[2]].join('-')
+        new_env = [new_tags[1],new_tags[0],role,new_tags[2]].join('-')
+        file.gsub!(/#{escape_characters_in_string(origin_env)}/, new_env)
+      end
+    end
+
     def escape_characters_in_string(string)
       pattern = /(\'|\"|\.|\*|\/|\-|\\)/
       string.gsub(pattern){|match|"\\"  + match} # <-- Trying to take the currently found match and add a \ before it I have no idea how to do that).
@@ -101,7 +120,7 @@ module Gantree
       IO.write("cfn/#{template_name}.rb", template)
       json = `ruby cfn/#{template_name}.rb expand`
       Dir.mkdir 'cfn' rescue Errno::ENOENT
-      template_file_name = "#{env}-#{template_name}.cfn.json"
+      template_file_name = "#{@options[:stack_name]}-#{template_name}.cfn.json"
       IO.write("cfn/#{template_file_name}", json)
       puts "Created #{template_file_name} in the cfn directory"
       FileUtils.rm("cfn/#{template_name}.rb")
@@ -111,26 +130,30 @@ module Gantree
       check_template_bucket
       templates = ['master','resources','beanstalk']
       templates.each do |template|
-        filename = "cfn/#{env}-#{template}.cfn.json"
+        filename = "cfn/#{@options[:stack_name]}-#{template}.cfn.json"
         key = File.basename(filename)
-        s3.buckets["#{@options[:cfn_bucket]}/#{env}"].objects[key].write(:file => filename)
+        s3.buckets["#{@options[:cfn_bucket]}/#{@options[:stack_name]}"].objects[key].write(:file => filename)
       end
       puts "templates uploaded"
     end
 
     def check_template_bucket
-      bucket_name = "#{@options[:cfn_bucket]}/#{env}"
+      bucket_name = "#{@options[:cfn_bucket]}/#{@options[:stack_name]}"
       if s3.buckets[bucket_name].exists?
-        puts "uploading cfn templates to #{@options[:cfn_bucket]}/#{env}"
+        puts "uploading cfn templates to #{@options[:cfn_bucket]}/#{@options[:stack_name]}"
       else
-        puts "creating bucket #{@options[:cfn_bucket]}/#{env} to upload templates"
+        puts "creating bucket #{@options[:cfn_bucket]}/#{@options[:stack_name]} to upload templates"
         s3.buckets.create(bucket_name) 
       end
     end
 
     def create_aws_cfn_stack
       puts "Creating stack on aws..."
-      stack = @cfm.stacks.create(@options[:stack_name], stack_template, :disable_rollback => true)
+      stack = @cfm.stacks.create(@options[:stack_name], stack_template, { 
+        :disable_rollback => true, 
+        :tags => [
+          { key: "StackName", value: @options[:stack_name] },
+        ]})
     end
 
     def rds_enabled?
@@ -146,9 +169,9 @@ module Gantree
     end
 
     def env_type
-      if env.include?("prod")
+      if @options[:env].include?("prod")
         "prod"
-      elsif env.include?("stag")
+      elsif @options[:env].include?("stag")
         "stag"
       else
         ""
@@ -156,14 +179,14 @@ module Gantree
     end
 
     def add_role name
-      stack_name = @options[:stack_name].sub('app', name)
-      beanstalk = JSON.parse(IO.read("cfn/#{@env}-beanstalk.cfn.json"))
+      env = @options[:env].sub('app', name)
+      beanstalk = JSON.parse(IO.read("cfn/#{@options[:stack_name]}-beanstalk.cfn.json"))
       unless beanstalk["Resources"][name] then
         role = {
           "Type" => "AWS::ElasticBeanstalk::Environment",
           "Properties"=> {
-            "ApplicationName" => "#{@env}",
-            "EnvironmentName" => "#{stack_name}",
+            "ApplicationName" => "#{env}",
+            "EnvironmentName" => "#{@options[:stack_name]}",
             "Description" => "#{name} Environment",
             "VersionLabel" => {
               "Ref" => "ApplicationVersion"
@@ -176,8 +199,8 @@ module Gantree
         }
         #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]
+        IO.write("cfn/#{@options[:stack_name]}-beanstalk.cfn.json", JSON.pretty_generate(beanstalk))
+        puts JSON.pretty_generate(beanstalk["Resources"].to_a.last)
         puts "Added new #{name} role".green
       else 
         puts "Role already exists".red

data/lib/gantree/version.rb

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

data/spec/lib/gantree/cli_spec.rb

@@ -7,11 +7,9 @@ require 'spec_helper'
 #   $ rake clean:vcr ; time rake
 describe Gantree::CLI do
   before(:all) do
-    ENV['AWS_ACCESS_KEY_ID'] = 'FAKE_AWS_ACCESS_KEY'
-    ENV['AWS_SECRET_ACCESS_KEY'] = 'FAKE_AWS_SECRET_ACCESS_KEY'
 
-    @env = "stag-knarr-app-s1"
-    @app = "knarr-stag-s1"
+    @app = "stag-knarr-app-s1"
+    @env = "knarr-stag-s1"
     @owner = "bleacher"
     @repo = "cauldron"
     @tag =  "master"
@@ -42,14 +40,14 @@ describe Gantree::CLI do
     it "should deploy images" do
       execute("bin/gantree init #{@owner}/#{@repo}:#{@tag} --dry-run")
       out = execute("bin/gantree deploy #{@env} --dry-run --silent")
-      expect(out).to include("Deploying stag-knarr-app-s1 on knarr-stag-s1")
+      expect(out).to include("Found Environment: knarr-stag-s1")
       expect(out).to include("dry_run: dry_run")
       expect(out).to include("silent: silent")
     end
 
     it "should deploy images with remote extensions" do
-      out = execute("bin/gantree deploy #{@env} -x 'git@github.com:br/.ebextensions' --dry-run --silent")
-      expect(out).to include("Deploying stag-knarr-app-s1 on knarr-stag-s1")
+      out = execute("bin/gantree deploy #{@app} -x 'git@github.com:br/.ebextensions' --dry-run --silent")
+      expect(out).to include("Found Environment: stag-knarr-app-s1")
       expect(out).to include("ext: git@github.com:br/.ebextensions")
       expect(out).to include("dry_run: dry_run")
       expect(out).to include("silent: silent")
@@ -57,7 +55,7 @@ describe Gantree::CLI do
 
     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")
-      expect(out).to include("Deploying stag-knarr-app-s1 on knarr-stag-s1")
+      expect(out).to include("Found Environment: knarr-stag-s1")
       expect(out).to include("ext: git@github.com:br/.ebextensions:basic")
       expect(out).to include("dry_run: dry_run")
       expect(out).to include("silent: silent")
@@ -65,7 +63,7 @@ describe Gantree::CLI do
 
     it "should notify slack of deploys" do 
       out = execute("bin/gantree deploy #{@env} --dry-run")
-      expect(out).to include("Deploying")
+      expect(out).to include("Found Environment: knarr-stag-s1")
     end
   end
 
@@ -73,12 +71,8 @@ describe Gantree::CLI do
     it "should create clusters" do
       out = execute("bin/gantree create #{@env} --dry-run")
       expect(out).to include "instance_size: m3.medium"
-      expect(out).to include "stack_name: stag-knarr-app-s1"
+      expect(out).to include "stack_name: knarr-stag-s1"
       expect(out).to include "cfn_bucket: br-templates"
-      expect(out).to include "env: knarr-stag-s1"
-      expect(out).to include "env_type: stag"
-      expect(out).to include "stag_domain: sbleacherreport.com"
-      expect(out).to include "prod_domain: bleacherreport.com"
     end
 
     it "should create clusters with any docker version" do
@@ -93,8 +87,8 @@ describe Gantree::CLI do
     end
 
     it "should create dupliacte clusters from local cfn" do 
-      out = execute("bin/gantree create stag-knarr-app-s2 --dupe #{@env} --dry-run")
-      expect(out).to include "dupe: stag-knarr-app-s1"
+      out = execute("bin/gantree create knarr-stag-s2 --dupe #{@env} --dry-run")
+      expect(out).to include "dupe: knarr-stag-s1"
     end
   end
 

data/spec/lib/gantree/deploy_spec.rb

@@ -6,6 +6,7 @@ describe Gantree::Deploy 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"
@@ -28,7 +29,7 @@ describe Gantree::Deploy do
   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)).to eq([{:option_name=>"ROLE", :value=>"listener", :namespace=>"aws:elasticbeanstalk:application:environment"}])
+    expect(deploy.send(:autodetect_app_role, "stag-knarr-listener-s1")).to eq([{:option_name=>"ROLE", :value=>"listener", :namespace=>"aws:elasticbeanstalk:application:environment"}])
   end
 
   it "AWS gets the correct keys" do
@@ -43,24 +44,6 @@ describe Gantree::Deploy do
     gd.set_aws_keys
   end
 
-  it "parses env option" do
-    gd = Gantree::Deploy.new(
-      "stag-cauldron-app-s1",
-       :env => "cauldron-stag-s1"
-    )
-    expect(gd.app).to eq("cauldron-stag-s1")
-    expect(gd.env).to eq("stag-cauldron-app-s1")
-  end
-
-  it "parses default env" do
-    gd = Gantree::Deploy.new(
-      "stag-cauldron-app-s1",
-      {}
-    )
-    expect(gd.app).to eq("cauldron-stag-s1")
-    expect(gd.env).to eq("stag-cauldron-app-s1")
-  end
-
   it "raises an error when no aws keys in ENV" do
     ENV['AWS_ACCESS_KEY_ID'] = nil
     ENV['AWS_SECRET_ACCESS_KEY'] = nil

data/spec/lib/gantree/stack_spec.rb

@@ -2,22 +2,6 @@ require "spec_helper"
 require "pry"
 
 describe Gantree::Stack do
-  it "parses the env from env options" do
-    gs = Gantree::Stack.new(
-      "stag-linguist-app-s1",
-       :env => "linguist-stag-s1"
-    )
-    
-    expect(gs.env).to eq("linguist-stag-s1")
-  end
-
-  it "parses the env from stack_name" do
-    gs = Gantree::Stack.new(
-      "stag-linguist-app-s1",
-      {}
-    )
-
-    expect(gs.env).to eq("linguist-stag-s1")
-  end
+  
 end
 

metadata

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