gantree 0.4.8 → 0.4.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c29f307b0a0953654d60d594c16483af6170d65e
-  data.tar.gz: 99419b8282f4321e4bc03cfda65c5c6fc148b36f
+  metadata.gz: fe5aa1695b2783cb4be4a352319a6edbab122367
+  data.tar.gz: 9c39abc22f8f72d27760890283770dc5985d6d0a
 SHA512:
-  metadata.gz: dd4eb18352ec83074acf1061c824c0ca571cb1f69a49f9f4475fcdbba3641b552cd19885c934aa6202be221fd07169a728ba18435e0aa654a437fcf72fd3fc61
-  data.tar.gz: 345e240f10d6ca87bf48e186540ddce77f39bf0862eef393c679103647fb9723f0f619f6c350ee4809f3af5eea475e27adb51cf0d353fb8b10f9c30b5c84a771
+  metadata.gz: 5ac5e7bbc6d05613ef8d7b2e8085e44cbbeb8015a66069c1085fc9b0d7c5c46bb231cb5b732876ac02f43a5e0f99e19a127a1b02e92766b2abb36dbfdac9304d
+  data.tar.gz: 572c16535102d78a285b8b84a50b2b616377ec9eae2dd7a90478906834de51cf428255cd8cfec0bd8c00e49d59166cdb9c91f4eafd0ce872952e9f4eff2b3bfa

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
 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
 env:
   global:
   - secure: OoLMnBOcoXTPOimdyh4ju8yW2YpLBXEOdljN1gVQzjIIv24cQ0BxWAAktjExntkYAjnRpxzTKK5ZkWadXm8NK7TtzFU80padk+WYVzuE1Xngxw/OhS1Z6NYL8+D3ortSANqoOB6r/Z13Sb5XClYDWlj5/GGzf4AerY5xgh2nJQc=

data/Guardfile

@@ -3,7 +3,7 @@ guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^lib/(.+)\.rb$})      { "spec/cli_spec.rb" }
   watch(%r{^lib/gantree/(.+)\.rb$})  { "spec/cli_spec.rb" }
   watch('spec/spec_helper.rb')   { "spec/gantree_spec.rb" }
-  watch(%r{^lib/gantree/(.+)\.rb$})   { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/gantree/(.+)\.rb$})   { |m| "spec/lib/gantree/#{m[1]}_spec.rb" }
 end
 
 guard 'bundler' do

data/lib/gantree.rb

@@ -3,7 +3,9 @@ require "gantree/base"
 require "gantree/version"
 require "gantree/deploy"
 require "gantree/init"
-require "gantree/stack"
+require "gantree/delete"
+require "gantree/update"
+require "gantree/create"
 require "gantree/app"
 require "gantree/docker"
 

data/lib/gantree/base.rb

@@ -26,12 +26,72 @@ module Gantree
       @eb ||= AWS::ElasticBeanstalk::Client.new
     end
 
+    def cfm
+      @cfm ||= AWS::CloudFormation.new
+    end
+
+
     def tag
       origin = `git config --get remote.origin.url`.match(":(.*)\/")[1]
       branch = `git rev-parse --abbrev-ref HEAD`.strip
       hash = `git rev-parse --verify --short #{branch}`.strip
       "#{origin}-#{branch}-#{hash}"
     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 env_type
+      if @options[:env].include?("prod")
+        "prod"
+      elsif @options[:env].include?("stag")
+        "stag"
+      else
+        ""
+      end
+    end
+
+    def get_latest_docker_solution
+      result = eb.list_available_solution_stacks
+      solutions = result[:solution_stacks]
+      docker_solutions = solutions.select { |s|  s.include? "running Docker"}
+      docker_solutions.first
+    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).
+    end
+
+    def upload_templates
+      check_template_bucket
+      @templates.each do |template|
+        filename = "cfn/#{@options[:stack_name]}-#{template}.cfn.json"
+        key = File.basename(filename)
+        s3.buckets["#{@options[:cfn_bucket]}/#{@options[:stack_name]}"].objects[key].write(:file => filename)
+      end
+      puts "templates uploaded"
+    end
+
+    def check_template_bucket
+      puts "DEBUG: #{@options[:cfn_bucket]}"
+      raise "Set Bucket to Upload Templates with --cfn-bucket" unless @options[:cfn_bucket]
+      bucket_name = "#{@options[:cfn_bucket]}/#{@options[:stack_name]}"
+      if s3.buckets[bucket_name].exists?
+        puts "uploading cfn templates to #{@options[:cfn_bucket]}/#{@options[:stack_name]}"
+      else
+        puts "creating bucket #{@options[:cfn_bucket]}/#{@options[:stack_name]} to upload templates"
+        s3.buckets.create(bucket_name) 
+      end
+    end
+
   end
 end
 

data/lib/gantree/cfn/beanstalk.rb

@@ -2,8 +2,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.10 running Docker 1.3.2"
+    @docker_version = params[:solution] 
     @size = params[:instance_size]
     @rds = params[:rds]
     @env = params[:env]

data/lib/gantree/cli.rb

@@ -6,16 +6,16 @@ require 'gantree/cli/help'
 module Gantree
   class CLI < Thor
 
-    class_option :dry_run, :aliases => "-d", :desc => "dry run mode", :default => false
+    class_option :dry_run, :aliases => "-d", :desc => "dry run mode", :default => false, :type => :boolean
 
     desc "deploy APP", "deploy specified APP"
     long_desc Help.deploy
     option :branch, :desc => 'branch to deploy'
-    method_option :tag, :aliases => "-t", :desc => "set docker tag to deploy"
-    method_option :ext, :aliases => "-x", :desc => "ebextensions folder/repo"
+    option :tag, :aliases => "-t", :desc => "set docker tag to deploy"
+    option :ext, :aliases => "-x", :desc => "ebextensions folder/repo"
     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"
+    option :autodetect_app_role, :desc => "use naming convention to determin role (true|false)", :type => :boolean, :default => true
     def deploy name
       Gantree::Deploy.new(name, merge_defaults(options)).run
     end
@@ -31,28 +31,31 @@ module Gantree
 
     desc "create APP", "create a cfn stack"
     long_desc Help.create
-    method_option :env, :aliases => "-e", :desc => "(optional) environment name"
-    method_option :instance_size, :aliases => "-i", :desc => "(optional) set instance size", :default => "m3.medium"
-    method_option :rds, :aliases => "-r", :desc => "(optional) set database type [pg,mysql]"
-    option :docker_version, :desc => "set the version of docker to use as solution stack"
-    option :dupe, :desc => "copy an existing template into a new template"
-    option :local, :desc => "use a local cfn nested template"
+    option :cfn_bucket, :desc => "s3 bucket to store cfn templates"
+    option :domain, :desc => "route53 domain"
+    option :env, :aliases => "-e", :desc => "(optional) environment name"
+    option :instance_size, :aliases => "-i", :desc => "(optional) set instance size", :default => "m3.medium"
+    option :rds, :aliases => "-r", :desc => "(optional) set database type [pg,mysql]"
+    option :solution, :aliases => "-s", :desc => "change solution stack"
+    option :dupe, :alias => "-d", :desc => "copy an existing template into a new template"
+    option :local, :alias => "-l", :desc => "use a local cfn nested template"
     def create app
-      Gantree::Stack.new(app, merge_defaults(options)).create
+      Gantree::Create.new(app, merge_defaults(options)).run
     end
 
     desc "update APP", "update a cfn stack"
     long_desc Help.update
+    option :cfn_bucket, :desc => "s3 bucket to store cfn templates"
     option :role, :aliases => "-r", :desc => "add an app role (worker|listner|scheduler)"
     option :solution, :aliases => "-s", :desc => "change solution stack"
     def update app
-      Gantree::Stack.new(app, merge_defaults(options)).update
+      Gantree::Update.new(app, merge_defaults(options)).run
     end
 
     desc "delete APP", "delete a cfn stack"
-    option :force, :desc => "do not prompt"
+    option :force, :desc => "do not prompt", :default => false
     def delete app
-      Gantree::Stack.new(app, merge_defaults(options)).delete
+      Gantree::Delete.new(app, merge_defaults(options)).run
     end
 
     desc "restart APP", "restart an eb app"
@@ -88,7 +91,7 @@ module Gantree
     option :tag, :aliases => "-t", :desc => "set docker tag to deploy", :default => Gantree::Base.new.tag
     option :ext, :aliases => "-x", :desc => "ebextensions folder/repo"
     option :silent, :aliases => "-s", :desc => "mute notifications"
-    option :autodetect_app_role, :desc => "use naming convention to determin role"
+    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
     def ship server
@@ -107,14 +110,24 @@ module Gantree
     protected
 
     def merge_defaults(options={})
-       if File.exist?(".gantreecfg")
-         defaults = JSON.parse(File.open(".gantreecfg").read)
-         hash = defaults.merge(options)
-         Hash[hash.map{ |k, v| [k.to_sym, v] }]
-       else
-         Hash[options.map{ |k, v| [k.to_sym, v] }]
-       end
-     end
+      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
+      end
+      Hash[hash.map{ |k, v| [k.to_sym, v] }]
+    end
   end
 end
 

data/lib/gantree/cli/help.rb

@@ -58,13 +58,17 @@ EOL
 Examples:
 
 # Update a cloudformation stack
+
 $ gantree update linguist-stag-s1
 
 # Add an app role to an existing stack
+
 $ gantree update linguist-stag-s1 -r worker
 
 # Update docker solution starck version
+
 $ gantree update linguist-stag-s1 -s latest
+
 $ gantree update linguist-stag-s1 -s "64bit Amazon Linux 2014.09 v1.0.11 running Docker 1.3.3"
 EOL
         end
@@ -76,12 +80,15 @@ Builds and tags a docker application.
 Examples:
 
 # Automatically tag a build
+
 $ gantree build
 
 # Add custom tag to a build 
+
 $ gantree build -t deploy 
 
 # Override image path to point to another hub
+
 $ gantree build -i quay.io/bleacherreport/cms
 
 EOL
@@ -94,12 +101,15 @@ Push docker image tag to hub
 Examples:
 
 # Push automatically tagged build
+
 $ gantree push
 
 # Push custom tagged build
+
 $ gantree push -t deploy 
 
 # Push to another hub/acocunt/repo
+
 $ gantree push -i quay.io/bleacherreport/cms
 EOL
         end
@@ -111,9 +121,11 @@ build, push and deploy docker image to elastic beanstalk
 Examples:
 
 # Automatically tag a build, push that build and deploy to elastic beanstalk
+
 $ gantree ship cms-stag-s1
 
 # Override defaults
+
 $ gantree ship -i bleacher/cms -x "git@github.com:br/.ebextensions.git:master" cms-stag-s1
 
 $ gantree ship -i bleacher/cms -t built -x "git@github.com:br/.ebextensions.git:master" cms-stag-s1

data/lib/gantree/create.rb

@@ -0,0 +1,115 @@
+require 'cloudformation-ruby-dsl'
+require 'highline/import'
+require_relative 'cfn/master'
+require_relative 'cfn/beanstalk'
+require_relative 'cfn/resources'
+
+module Gantree
+  class Create < Base
+    attr_reader :env, :stack_name
+
+    def initialize stack_name,options
+      check_credentials
+      set_aws_keys
+
+      @requirements = "#!/usr/bin/env ruby
+        require 'cloudformation-ruby-dsl/cfntemplate'
+        require 'cloudformation-ruby-dsl/spotprice'
+        require 'cloudformation-ruby-dsl/table'"
+
+      additional_options = {
+        requirements: @requirements,
+        stack_name: stack_name,
+        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
+      @options[:solution] ||= get_latest_docker_solution
+      @templates = ['master','resources','beanstalk']
+    end
+
+    def run
+      @options[:rds_enabled] = rds_enabled? if @options[:rds] 
+      print_options
+      create_cfn_if_needed
+      create_all_templates unless @options[:local]
+      upload_templates unless @options[:dry_run]
+      create_aws_cfn_stack unless @options[:dry_run]
+    end
+
+    def stack_template
+      s3.buckets["#{@options[:cfn_bucket]}/#{@options[:stack_name]}"].objects["#{@options[:stack_name]}-master.cfn.json"]
+    end
+
+    def create_cfn_if_needed
+      Dir.mkdir 'cfn' unless File.directory?("cfn")
+    end
+
+    def create_all_templates
+      @options[:dupe] ? duplicate_stack : generate_all_templates
+    end
+
+    def generate_all_templates
+      puts "Generating templates from gantree"
+      generate("master", MasterTemplate.new(@options).create)
+      generate("beanstalk", BeanstalkTemplate.new(@options).create)
+      generate("resources", ResourcesTemplate.new(@options).create)
+    end
+
+    def duplicate_stack
+      puts "Duplicating cluster"
+      orgin_stack_name = @options[:dupe]
+      @templates.each do |template|
+        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])
+        replace_env_references(file)
+        IO.write("cfn/#{@options[:stack_name]}-#{template}.cfn.json",file)
+      end
+    end
+
+    def replace_env_references file
+      origin_tags = @options[:dupe].split("-")
+      new_tags = @options[:stack_name].split("-")
+      possible_roles = ["app","worker","listener","djay","scheduler","sched","list","lisnr","listnr"]
+      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 generate(template_name, template)
+      IO.write("cfn/#{template_name}.rb", template)
+      json = `ruby cfn/#{template_name}.rb expand`
+      Dir.mkdir 'cfn' rescue Errno::ENOENT
+      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")
+    end
+
+    def create_aws_cfn_stack
+      puts "Creating stack on aws..."
+      stack = cfm.stacks.create(@options[:stack_name], stack_template, { 
+        :disable_rollback => true, 
+        :tags => [
+          { key: "StackName", value: @options[:stack_name] },
+        ]})
+    end
+
+    def rds_enabled?
+      if @options[:rds] == nil
+        puts "RDS is not enabled, no DB created"
+        false
+      elsif @options[:rds] == "pg" || @rds == "mysql"
+        puts "RDS is enabled, creating DB"
+        true
+      else
+        raise "The --rds option you passed is not supported please use 'pg' or 'mysql'"
+      end
+    end
+  end
+end
+

data/lib/gantree/delete.rb

@@ -0,0 +1,27 @@
+require 'highline/import'
+require 'colorize'
+
+module Gantree
+  class Delete < Base
+
+    def initialize stack_name,options
+      check_credentials
+      set_aws_keys
+      @stack_name = stack_name
+      @options = options
+    end
+
+    def run input=""
+      input = "y" if  @options[:force]
+      input ||= ask "Are you sure? (y|n)"
+      if input == "y" || @options[:force]
+        puts "Deleting stack from aws"
+        return if @options[:dry_run]
+        puts "Deleted".green if cfm.stacks[@stack_name].delete
+      else
+        puts "canceling...".yellow
+      end
+    end
+  end
+end
+

data/lib/gantree/deploy.rb

@@ -19,20 +19,11 @@ module Gantree
     def run
       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])
+        @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
@@ -58,6 +49,31 @@ module Gantree
       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 environment?
       results = eb.describe_environments({ environment_names: ["#{@name}"]})[:environments]
       if results.length == 0

data/lib/gantree/update.rb

@@ -0,0 +1,69 @@
+require 'colorize'
+
+module Gantree
+  class Update < Base
+
+    def initialize stack_name,options
+      check_credentials
+      set_aws_keys
+      @options = options
+      @options[:stack_name] = stack_name 
+      @options[:env] ||= create_default_env
+      @options[:env_type] ||= env_type
+      @templates = ['master','resources','beanstalk']
+    end
+
+    def run
+      puts "Updating stack from local cfn repo"
+      add_role @options[:role] if @options[:role]
+      change_solution_stack if @options[:solution]
+      return if @options[:dry_run]
+      upload_templates
+      puts "Stack Updated".green if cfm.stacks[@options[:stack_name]].update(:template => stack_template)
+    end
+
+    def stack_template
+      s3.buckets["#{@options[:cfn_bucket]}/#{@stack_name}"].objects["#{@stack_name}-master.cfn.json"]
+    end
+
+    def change_solution_stack 
+      beanstalk = JSON.parse(IO.read("cfn/#{@options[:stack_name]}-beanstalk.cfn.json"))
+      solution_stack = set_solution_stack
+      beanstalk["Resources"]["ConfigurationTemplate"]["Properties"]["SolutionStackName"] = solution_stack
+      beanstalk["Resources"]["ConfigurationTemplate"]["Properties"]["Description"] = solution_stack
+      IO.write("cfn/#{@options[:stack_name]}-beanstalk.cfn.json",JSON.pretty_generate(beanstalk))
+      puts "Updated solution to #{solution_stack}".green
+    end
+
+    def set_solution_stack
+      @options[:solution] == "latest" ? get_latest_docker_solution : @options[:solution]
+    end
+
+    def add_role name
+      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" => "#{@options[:stack_name]}",
+            "EnvironmentName" => "#{env}",
+            "Description" => "#{name} Environment",
+            "TemplateName" => {
+              "Ref" => "ConfigurationTemplate"
+            },
+            "OptionSettings" => []
+          }
+        }
+        #puts JSON.pretty_generate role
+        beanstalk["Resources"]["#{name}".to_sym] = role
+        IO.write("cfn/#{@options[:stack_name]}-beanstalk.cfn.json", JSON.pretty_generate(beanstalk)) unless @options[:dry_run]
+        puts JSON.pretty_generate(beanstalk["Resources"].to_a.last)
+        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.4.8"
+  VERSION = "0.4.9.2"
 end

data/spec/lib/gantree/cli_spec.rb

@@ -42,7 +42,6 @@ describe Gantree::CLI do
       execute("bin/gantree init #{@owner}/#{@repo}:#{@tag} --dry-run")
       out = execute("bin/gantree deploy #{@env} --dry-run --silent")
       expect(out).to include("Found Application: #{@env}")
-      expect(out).to include("dry_run: dry_run")
       expect(out).to include("silent: silent")
     end
 
@@ -50,7 +49,6 @@ describe Gantree::CLI do
       out = execute("bin/gantree deploy #{@app} -x 'git@github.com:br/.ebextensions' --dry-run --silent")
       expect(out).to include("Found Environment: #{@app}")
       expect(out).to include("ext: git@github.com:br/.ebextensions")
-      expect(out).to include("dry_run: dry_run")
       expect(out).to include("silent: silent")
     end
 
@@ -58,7 +56,6 @@ describe Gantree::CLI do
       out = execute("bin/gantree deploy #{@env} -x 'git@github.com:br/.ebextensions:basic' --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("dry_run: dry_run")
       expect(out).to include("silent: silent")
     end
 
@@ -70,32 +67,32 @@ describe Gantree::CLI do
 
   describe "create" do
     it "should create clusters" do
-      out = execute("bin/gantree create #{@env} --dry-run")
+      out = execute("bin/gantree create #{@env} --dry-run --cfn-bucket templates")
       expect(out).to include "instance_size: m3.medium"
       expect(out).to include "stack_name: #{@env}"
-      expect(out).to include "cfn_bucket: br-templates"
+      expect(out).to include "cfn_bucket: templates"
     end
 
     it "should create clusters with any docker version" do
-      out = execute("bin/gantree create #{@env} --dry-run --docker-version '64bit Amazon Linux 2014.03 v1.0.1 running Docker 1.0.0'")
-      expect(out).to include "docker_version: 64bit Amazon Linux 2014.03 v1.0.1 running Docker 1.0.0"
+      out = execute("bin/gantree create #{@env} --dry-run --solution '64bit Amazon Linux 2014.03 v1.0.1 running Docker 1.0.0' --cfn-bucket template")
+      expect(out).to include "solution: 64bit Amazon Linux 2014.03 v1.0.1 running Docker 1.0.0"
     end
 
     it "should create clusters with databases" do
-      out = execute("bin/gantree create #{@env} --dry-run --rds pg")
+      out = execute("bin/gantree create #{@env} --dry-run --rds pg --cfn-bucket template")
       expect(out).to include "rds: pg"
       expect(out).to include "rds_enabled: true"
     end
 
     it "should create dupliacte clusters from local cfn" do 
-      out = execute("bin/gantree create #{@new_env} --dupe #{@env} --dry-run")
+      out = execute("bin/gantree create #{@new_env} --dupe #{@env} --dry-run --cfn-bucket template")
       expect(out).to include "dupe: #{@env}"
     end
   end
 
   describe "update" do
     it "should update existing clusters" do
-      out = execute("bin/gantree update #{@env} --dry-run")
+      out = execute("bin/gantree update #{@env} --dry-run --cfn-bucket template")
       expect(out).to include "Updating"
     end
   end

data/spec/lib/gantree/create_spec.rb

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,40 @@
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9.2
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -275,17 +275,21 @@ files:
 - lib/gantree/cfn/resources.rb
 - lib/gantree/cli.rb
 - lib/gantree/cli/help.rb
+- lib/gantree/create.rb
+- lib/gantree/delete.rb
 - lib/gantree/deploy.rb
 - lib/gantree/docker.rb
 - lib/gantree/init.rb
 - lib/gantree/notification.rb
-- lib/gantree/stack.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/stack_spec.rb
+- spec/lib/gantree/update_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/feelobot/gantree
 licenses:
@@ -316,8 +320,10 @@ summary: This tool is intended to help you setup a Dockerrun.aws.json which allo
   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/stack_spec.rb
+- spec/lib/gantree/update_spec.rb
 - spec/spec_helper.rb

data/lib/gantree/stack.rb

@@ -1,227 +0,0 @@
-require 'cloudformation-ruby-dsl'
-require 'highline/import'
-require_relative 'cfn/master'
-require_relative 'cfn/beanstalk'
-require_relative 'cfn/resources'
-
-module Gantree
-  class Stack < Base
-    attr_reader :env
-
-    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'"
-
-      additional_options = {
-        stack_name: stack_name,
-        requirements: @requirements,
-        cfn_bucket: "br-templates",
-        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
-      @options[:rds_enabled] = rds_enabled? if @options[:rds] 
-      print_options
-      create_cfn_if_needed
-      create_all_templates unless @options[:local]
-      upload_templates unless @options[:dry_run]
-      create_aws_cfn_stack unless @options[:dry_run]
-    end
-
-    def update
-      puts "Updating stack from local cfn repo"
-      add_role @options[:role] if @options[:role]
-      change_solution_stack if @options[:solution]
-      return if @options[:dry_run]
-      upload_templates
-      puts "Stack Updated".green if @cfm.stacks[@options[:stack_name]].update(:template => stack_template)
-    end
-
-    def delete
-      if @options[:force]
-        input = "y"
-      else
-        input = ask "Are you sure? (y|n)"
-      end
-      if input == "y" || @options[:force]
-        puts "Deleting stack from aws"
-        @cfm.stacks[@options[:stack_name]].delete unless @options[:dry_run]
-      else
-        puts "canceling..."
-      end
-    end
-
-    private
-    def stack_template
-      s3.buckets["#{@options[:cfn_bucket]}/#{@options[:stack_name]}"].objects["#{@options[:stack_name]}-master.cfn.json"]
-    end
-
-    def create_cfn_if_needed
-      Dir.mkdir 'cfn' unless File.directory?("cfn")
-    end
-
-    def create_all_templates
-      if @options[:dupe]
-        puts "Duplicating cluster"
-        orgin_stack_name = @options[:dupe]
-        templates = ['master','resources','beanstalk']
-        templates.each do |template|
-          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])
-          replace_env_references(file)
-          IO.write("cfn/#{@options[:stack_name]}-#{template}.cfn.json",file)
-        end
-      else
-        puts "Generating templates from gantree"
-        generate("master", MasterTemplate.new(@options).create)
-        generate("beanstalk", BeanstalkTemplate.new(@options).create)
-        generate("resources", ResourcesTemplate.new(@options).create)
-      end
-    end
-
-    def replace_env_references file
-      origin_tags = @options[:dupe].split("-")
-      new_tags = @options[:stack_name].split("-")
-      possible_roles = ["app","worker","listener","djay","scheduler","sched"]
-      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).
-    end
-
-    def generate(template_name, template)
-      IO.write("cfn/#{template_name}.rb", template)
-      json = `ruby cfn/#{template_name}.rb expand`
-      Dir.mkdir 'cfn' rescue Errno::ENOENT
-      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")
-    end
-
-    def upload_templates
-      check_template_bucket
-      templates = ['master','resources','beanstalk']
-      templates.each do |template|
-        filename = "cfn/#{@options[:stack_name]}-#{template}.cfn.json"
-        key = File.basename(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]}/#{@options[:stack_name]}"
-      if s3.buckets[bucket_name].exists?
-        puts "uploading cfn templates to #{@options[:cfn_bucket]}/#{@options[:stack_name]}"
-      else
-        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, 
-        :tags => [
-          { key: "StackName", value: @options[:stack_name] },
-        ]})
-    end
-
-    def rds_enabled?
-      if @options[:rds] == nil
-        puts "RDS is not enabled, no DB created"
-        false
-      elsif @options[:rds] == "pg" || @rds == "mysql"
-        puts "RDS is enabled, creating DB"
-        true
-      else
-        raise "The --rds option you passed is not supported please use 'pg' or 'mysql'"
-      end
-    end
-
-    def env_type
-      if @options[:env].include?("prod")
-        "prod"
-      elsif @options[:env].include?("stag")
-        "stag"
-      else
-        ""
-      end
-    end
-
-    def change_solution_stack 
-      beanstalk = JSON.parse(IO.read("cfn/#{@options[:stack_name]}-beanstalk.cfn.json"))
-      solution_stack = set_solution_stack
-      beanstalk["Resources"]["ConfigurationTemplate"]["Properties"]["SolutionStackName"] = solution_stack
-      beanstalk["Resources"]["ConfigurationTemplate"]["Properties"]["Description"] = solution_stack
-      IO.write("cfn/#{@options[:stack_name]}-beanstalk.cfn.json",JSON.pretty_generate(beanstalk))
-    end
-
-    def set_solution_stack
-      @options[:solution] == "latest" ? get_latest_docker_solution : @options[:solution]
-    end
-
-    def get_latest_docker_solution
-      result = eb.list_available_solution_stacks
-      solutions = result[:solution_stacks]
-      docker_solutions = solutions.select { |s|  s.include? "running Docker"}
-      docker_solutions.first
-    end
-
-    def add_role name
-      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" => "#{@options[:stack_name]}",
-            "EnvironmentName" => "#{env}",
-            "Description" => "#{name} Environment",
-            "TemplateName" => {
-              "Ref" => "ConfigurationTemplate"
-            },
-            "OptionSettings" => []
-          }
-        }
-        #puts JSON.pretty_generate role
-        beanstalk["Resources"]["#{name}".to_sym] = role
-        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
-      end
-    end
-  end
-end
-

data/spec/lib/gantree/stack_spec.rb

@@ -1,7 +0,0 @@
-require "spec_helper"
-require "pry"
-
-describe Gantree::Stack do
-  
-end
-