gantree 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3b0df61434de815c1b8c0bec26a34cd9825a8d
-  data.tar.gz: c5184888c18fd79d0333b1d1181e97c927589550
+  metadata.gz: b4eeaa7b24460976ccace19ae646dd0931d636ec
+  data.tar.gz: fb5b8c1c4a71871ff27a7e00198cc87e39ff08db
 SHA512:
-  metadata.gz: 9487ce2f6d98c478e8dc84d2f90961ef29ff39e12f2af3ccd635e2ac92fb2619e25b04eb566d66d2e5631e630e2b3aa73074846e3eff284c115a12a171dc8c5a
-  data.tar.gz: 4b84e2ace1c8d72f0b22afd6a21ed8dc34327050ab698eb31ecaf086c1cf684c1500ac1e09a459ebb3a8f1edd0029c965018a7fc06c2c9831b5d35e4910106c4
+  metadata.gz: 89d1fb7dcd07039ef35cae14cf9e714f8eafaee4fc1355f1f402fcace8d38b5ff555f7ef0d80087521ba929c4fbbcab187f7513ca7884c857d7c2249e7668a8a
+  data.tar.gz: 12e419db24780d79c26608f1206e325b75df28aefa66fa2be0e429bc4f92a7aa9ca92081bf650a5f55ed47c1d2e3f1dfdb2fbae3201146218ff2eaa6b23d7b05

data/Gemfile

@@ -12,3 +12,5 @@ gem "webmock"
 gem "cloudformation-ruby-dsl"
 gem "archive-zip"
 gem "json"
+gem "slackr"
+gem "highline"

data/Gemfile.lock

@@ -33,6 +33,7 @@ GEM
     guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
+    highline (1.6.21)
     io-like (0.3.0)
     json (1.8.1)
     listen (2.7.9)
@@ -43,6 +44,7 @@ GEM
     method_source (0.8.2)
     mini_portile (0.6.0)
     multi_json (1.10.1)
+    multipart-post (2.0.0)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     pry (0.10.1)
@@ -71,6 +73,8 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
+    slackr (0.0.6)
+      multipart-post (~> 2.0.0)
     slop (3.6.0)
     thor (0.19.1)
     timers (1.1.0)
@@ -89,7 +93,9 @@ DEPENDENCIES
   guard
   guard-bundler
   guard-rspec
+  highline
   json
   rake
   rspec
+  slackr
   webmock

data/gantree.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cloudformation-ruby-dsl"
   spec.add_dependency "archive-zip"
   spec.add_dependency "json"
+  spec.add_dependency "slackr"
+  spec.add_dependency "highline"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/gantree/cfn.rb

@@ -1,4 +1,5 @@
 require 'cloudformation-ruby-dsl'
+require "highline/import"
 require_relative 'cfn/master'
 require_relative 'cfn/beanstalk'
 require_relative 'cfn/resources'
@@ -31,7 +32,6 @@ module Gantree
         env_type: env_type,
       }
       @options = options.merge(additional_options)
-      @options[:rds_enabled] = rds_enabled?
     end
 
     def check_credentials
@@ -40,20 +40,66 @@ module Gantree
     end
 
     def create
+      @options[:rds_enabled] = rds_enabled? if @options[:rds] 
       create_cfn_if_needed
-      generate("master", MasterTemplate.new(@options).create)
-      generate("beanstalk", BeanstalkTemplate.new(@options).create)
-      generate("resources", ResourcesTemplate.new(@options).create)
-      puts "All templates created"
-      puts "*** OPTIONS + ADDITIONAL pt 2"
-      puts @options
-      create_aws_cfn_stack if @options[:dry_run].nil?
+      create_all_templates
+      upload_templates unless @options[:dry_run]
+      create_aws_cfn_stack unless @options[:dry_run]
+    end
+
+    def update
+      puts "Updating stack from local cfn repo"
+      unless @options[:dry_run] then
+        upload_templates 
+        template = AWS::S3.new.buckets["#{@options[:cfn_bucket]}/#{@env}"].objects["#{@env}-master.cfn.json"]
+        @cfm.stacks[@options[:stack_name]].update(:template => template) 
+      end
+    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
 
     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]
+        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")
+          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)
+        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 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`
@@ -62,20 +108,26 @@ module Gantree
       IO.write("cfn/#{template_file_name}", json)
       puts "Created #{template_file_name} in the cfn directory"
       FileUtils.rm("cfn/#{template_name}.rb")
-      upload_template_to_s3("cfn/#{template_file_name}")
     end
 
-    def upload_template_to_s3(filename)
-      begin
-        puts "uploading cfn template to #{@options[:cfn_bucket]}/#{@env}"
+    def upload_templates
+      check_template_bucket
+      templates = ['master','resources','beanstalk']
+      templates.each do |template|
+        filename = "cfn/#{@env}-#{template}.cfn.json"
         key = File.basename(filename)
         @s3.buckets["#{@options[:cfn_bucket]}/#{@env}"].objects[key].write(:file => filename)
-      rescue AWS::S3::Errors::NoSuchBucket
-        puts "bucket didn't exist...creating"
-        bucket = @s3.buckets.create("#{@options[:cfn_bucket]}/#{@env}")
-        retry
-      rescue AWS::S3::Errors::AccessDenied
-        puts "Your key is not configured for s3 access, please let your operations team know"
+      end
+      puts "templates uploaded"
+    end
+
+    def check_template_bucket
+      bucket_name = "#{@options[:cfn_bucket]}/#{@env}"
+      if @s3.buckets[bucket_name].exists?
+        puts "uploading cfn templates to #{@options[:cfn_bucket]}/#{@env}"
+      else
+        puts "creating bucket #{@options[:cfn_bucket]}/#{@env} to upload templates"
+        @s3.buckets.create(bucket_name) 
       end
     end
 

data/lib/gantree/cli.rb

@@ -11,6 +11,7 @@ module Gantree
     method_option :env, :aliases => "-e", :desc => "elastic beanstalk environment"
     method_option :ext, :aliases => "-x", :desc => "ebextensions folder/repo"
     option :dry_run, :aliases => "-d", :desc => "do not actually deploy the app"
+    option :silent, :aliases => "-s", :desc => "mute notifications"
     def deploy app
       Gantree::Deploy.new(app, merge_defaults(options)).run
     end
@@ -22,16 +23,30 @@ module Gantree
       Gantree::Init.new(image,options).run
     end
 
-    desc "create APP", "create or update a cfn stack"
+    desc "create APP", "create a cfn stack"
     method_option :env, :aliases => "-e", :desc => "(optional) environment name"
     method_option :instance_size, :aliases => "-i", :desc => "(optional) set instance size"
     method_option :rds, :aliases => "-r", :desc => "(optional) set database type [pg,mysql]"
     option :dry_run, :aliases => "-d", :desc => "do not actually create the stack"
     option :docker_version, :desc => "set the version of docker to use as solution stack"
+    option :dupe, :desc => "use a local cfn folder"
     def create app
       Gantree::Stack.new(app, merge_defaults(options)).create
     end
 
+    desc "update APP", "update a cfn stack"
+    option :dry_run, :aliases => "-d", :desc => "do not actually create the stack"
+    def update app
+      Gantree::Stack.new(app, merge_defaults(options)).update
+    end
+
+    desc "delete APP", "delete a cfn stack"
+    option :force, :desc => "do not prompt"
+    option :dry_run, :aliases => "-d", :desc => "do not actually create the stack"
+    def delete app
+      Gantree::Stack.new(app, merge_defaults(options)).delete
+    end
+
     protected
 
     def merge_defaults(options={})

data/lib/gantree/deploy.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'archive/zip'
+require_relative 'notification'
 
 module Gantree
   class Deploy
@@ -23,6 +24,9 @@ module Gantree
       clean_up
       create_eb_version if @options[:dry_run].nil?
       update_application if @options[:dry_run].nil?
+      if @options[:slack]
+        Notification.new(@options[:slack]).say("hello") unless @options[:silent]
+      end
     end
 
     private
@@ -145,7 +149,7 @@ module Gantree
     end
 
     def clean_up
-      FileUtils.rm(@packeged_version)
+      FileUtils.rm_rf(@packeged_version)
       `git checkout Dockerrun.aws.json` # reverts back to original Dockerrun.aws.json
       `rm -rf .ebextensions/` if ext?
     end

data/lib/gantree/notification.rb

@@ -0,0 +1,16 @@
+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"]
+    })
+  end
+
+  def say(msg)
+    @slack.say(msg)
+  end
+
+end

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/lib/cli_spec.rb

@@ -32,15 +32,19 @@ describe Gantree::CLI do
 
   describe "deploy" do
     it "should deploy images" do
-      out = execute("bin/gantree deploy #{@env} --dry-run")
+      out = execute("bin/gantree deploy #{@env} --dry-run --silent")
       expect(out).to include("Deploying")
     end
     it "should deploy images with remote extensions" do
-      out = execute("bin/gantree deploy #{@env} -x 'git@github.com:br/.ebextensions' --dry-run")
+      out = execute("bin/gantree deploy #{@env} -x 'git@github.com:br/.ebextensions' --dry-run --silent")
       expect(out).to include("Deploying")
     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")
+      out = execute("bin/gantree deploy #{@env} -x 'git@github.com:br/.ebextensions:basic' --dry-run --silent")
+      expect(out).to include("Deploying")
+    end
+    it "should notify slack of deploys" do 
+      out = execute("bin/gantree deploy #{@env} --dry-run")
       expect(out).to include("Deploying")
     end
   end
@@ -50,20 +54,45 @@ describe Gantree::CLI do
       out = execute("bin/gantree create #{@env} --dry-run")
       beanstalk = JSON.parse(IO.read("cfn/#{@app}-beanstalk.cfn.json"))["Resources"]["ConfigurationTemplate"]["Properties"]["SolutionStackName"]
       expect(beanstalk).to include "Docker 1.2.0"
-      expect(out).to include "All templates created"
-      expect(out).to include "RDS is not enabled, no DB created"
+      expect(out).to include "Generating"
+      expect_all_templates_created(out)
     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'")
       beanstalk = JSON.parse(IO.read("cfn/#{@app}-beanstalk.cfn.json"))["Resources"]["ConfigurationTemplate"]["Properties"]["SolutionStackName"]
       expect(beanstalk).to include "Docker 1.0.0"
-      expect(out).to include "All templates created"
+      expect_all_templates_created(out)
     end
 
     it "should create clusters with databases" do
-      out = execute("bin/gantree create stag-knarr-app-s7 --dry-run --rds pg")
+      out = execute("bin/gantree create #{@env} --dry-run --rds pg")
       expect(out).to_not include "RDS is not enabled, no DB created"
     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 "Duplicating"
+    end
+  end
+
+  describe "update" do
+    it "should update existing clusters" do
+      out = execute("bin/gantree update #{@env} --dry-run")
+      expect(out).to include "Updating"
+    end
   end
+
+  describe "delete" do
+    it "should update existing clusters" do
+      out = execute("bin/gantree delete #{@env} --dry-run --force")
+      expect(out).to include "Deleting"
+    end
+  end
+
+  def expect_all_templates_created(out)
+    expect(out).to include "#{@app}-master.cfn.json"
+    expect(out).to include "#{@app}-beanstalk.cfn.json"
+    expect(out).to include "#{@app}-resources.cfn.json"
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Felix
@@ -122,6 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slackr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +248,7 @@ files:
 - lib/gantree/cli/help.rb
 - lib/gantree/deploy.rb
 - lib/gantree/init.rb
+- lib/gantree/notification.rb
 - lib/gantree/version.rb
 - spec/lib/cli_spec.rb
 - spec/lib/deploy_spec.rb