gantree 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4322cf9bfdbb4500943c035883b9c3f09a4d4775
-  data.tar.gz: c7aaf5c377edcbb73e6a4ab822c05cfcc5be2db7
+  metadata.gz: e6dd186b31072e4741042bc7d9c5a4388a7c391d
+  data.tar.gz: 4c56ecf06781010d285322daaf5d65c77a09b061
 SHA512:
-  metadata.gz: ad0e271bf16392fbad91dc42e4ff064a7166d2c2d95dcea22ef1b80eceb236eae757bae18f0e4f7167a1eef2e7950ef45324a0019a5dae5ab3e93adb8dda3158
-  data.tar.gz: fec5d0e2e380ca032370fe983f16672230563e31b5fa6ffd041286ab56caebae01df00832382a58a45bc77e729aa06c0fe06e2991023e9107b81cedf34e9b480
+  metadata.gz: 6d082baaffe38b7741065e1839a11e120f3ed1813fec06be5dd62bb5498c978ec9035414077276fb2d103f88cfdbd0c1c0882282c6b3323f2b7bdf0c6c5a2852
+  data.tar.gz: 8a8c83091488b7799f148bcb5388e8b56fead36d20f4136a97154723d6e38e731fd0d2b03775c4e297701ebb1b1b7ae882e90fc38ef1c819107937c777db69f3

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.2
+- 2.1.2
+env:
+  global:
+  - secure: OoLMnBOcoXTPOimdyh4ju8yW2YpLBXEOdljN1gVQzjIIv24cQ0BxWAAktjExntkYAjnRpxzTKK5ZkWadXm8NK7TtzFU80padk+WYVzuE1Xngxw/OhS1Z6NYL8+D3ortSANqoOB6r/Z13Sb5XClYDWlj5/GGzf4AerY5xgh2nJQc=
+  - secure: MCPnXXEMJkamb3HuYS0H+YeMDKORYAekCfB8YMrtUeMR3QTSe2yQ6eMaNC/I2D5g8cNw60mRagaMyDMadZ4aVQ4sUK1YOHexs/vPJrVrIJU8ZGFsueQyboJun1NZLGvKAIAok7yAEEfwftCd+svYrtrTtV88fk9deOnBLs4o3gM=

data/README.md

@@ -65,3 +65,67 @@ You can also specify a new image tag to use for the deploy
 ```
 gantree deploy -t latest stag-cauldon-app-s1
 ```
+
+### Create Stacks
+
+Gantree allows you to leverage the power of aws cloud formation to create your entire elastic beanstalk stack, rds, caching layer etc all while maintaining a set naming convention. This does the following: 
+* uses the ruby-cloudformation-dsl to generate nested cloud formation templates inside a cfn folder in your repo
+* uploads them to an s3 bucket
+* uses aws-sdk to communicate with cfn and initiate the stack creation
+
+To generate a basic staging cluster for linguist we would do:
+```
+gantree create stag-linguist-app-s1
+```
+
+In the elastic beanstalk console you will now see an application called 
+**linguist-stag-s1** with an environment called **stag-linguist-app-s1**
+
+You can modify the name of the environment if this does not fit your naming convention:
+```
+gantre create your_app_name -e your_env_name
+```
+
+## TODO:
+
+### .gantreecfg
+Allow defaults for commands to be set in a json file 
+```json
+{
+  "ebextensions" : "configs/.ebextensions",
+  "default_instance_size" : "m3.medium"
+}
+```
+
+#### .ebextension Support
+Elastic Beanstalk cli allows you to create a .ebextension folder that you can package with your deploy to control the host/environment of your application. Deploying only a docker container image referenced in Dockerrun.aws.json has the unfortunate side effect of losing this extreamly powerful feature. To allow this feature to be included in gantree and make it even better you can select either to package a local .ebextension folder with your deploy, package a remote .ebextension folder hosted in github (with branch support) or even create a .gantreecfg file to make either of these type of deploys a default.
+
+```
+gantree deploy --ext "git:br/ebextensions:master" stag-cauldron-app-s1
+```
+
+By default your application will be created on a t1.micro unless you specify otherwise:
+```
+gantree ceate your_app_name -i m3.medium
+```
+
+#### What if you need a database? Here enters the beauty of RDS
+
+PostgreSQL: ```gantree create your_app_name --rds pg```
+
+Mysql: ```gantree create your_app_name --rds msql```
+
+#### What if you want a cdn behind each of your generated applications
+
+Fastly: ```gantree create your_app_name --cdn fastly```
+
+CloudFront: ```gantree create yoour_app_name --cdn cloudfront```
+
+#### Autogenerated Release Notes 
+
+I would like have built in integration with opbeat configurable thorugh the .gantreecfg located in the applications repository.
+
+
+***Notes:***
+
+Also if the cloud formation template that is generated doesn't match your needs (which it might now) you can edit the .rb files in the repo's cfn folder, build your own gem and use it how you like.

data/lib/gantree/cfn.rb

@@ -6,11 +6,14 @@ require_relative 'cfn/resources'
 module Gantree
   class Stack
     def initialize stack_name,options
+      @options = options
+      check_credentials
       AWS.config(
         :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
         :secret_access_key => ENV['AWS_SECRET_ACCES_KEY'])
       @s3 = AWS::S3.new
       @cfm = AWS::CloudFormation.new
+      @size = options[:instance_size] ||= "t1.micro"
       @requirements = "#!/usr/bin/env ruby
         require 'bundler/setup'
         require 'cloudformation-ruby-dsl/cfntemplate'
@@ -19,20 +22,32 @@ module Gantree
       @stack_name = stack_name
       @env = options[:env] || stack_name.match(/^[a-zA-Z]*\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1] + "-" + stack_name.match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1] + '-' + stack_name.match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[3]
       @params = {
+        instance_size: @size,
+        rds: options[:rds],
         stack_name: @stack_name,
         requirements: @requirements,
         cfn_bucket: "br-templates",
         env: @env,
         stag_domain: "sbleacherreport.com",
-        prod_domain: "bleacherreport.com"
+        prod_domain: "bleacherreport.com",
       }
     end
 
+    def check_credentials
+      raise "Please set your AWS Environment Variables" if ENV['AWS_SECRET_ACCESS_KEY'] == nil
+      raise "Please set your AWS Environment Variables" if ENV['AWS_ACCESS_KEY_ID'] == nil
+    end
+
     def create
+      create_cfn_if_needed
       generate("master", MasterTemplate.new(@params).create)
       generate("beanstalk", BeanstalkTemplate.new(@params).create)
       generate("resources", ResourcesTemplate.new(@params).create)
-      create_aws_cfn_stack
+      create_aws_cfn_stack unless @options[:dry_run] 
+    end
+
+    def create_cfn_if_needed
+      Dir.mkdir 'cfn' unless File.directory?("cfn")
     end
 
     def generate(template_name, template)

data/lib/gantree/cfn/beanstalk.rb

@@ -2,6 +2,8 @@ class BeanstalkTemplate
 
   def initialize params
     @stack_name = params[:stack_name]
+    @size = params[:instance_size]
+    @rds = params[:rds]
     @env = params[:env]
     @prod_domain = params[:prod_domain]
     @stag_domain = params[:stag_domain]
@@ -36,7 +38,7 @@ class BeanstalkTemplate
                 :Description => 'EC2 Instance Type',
                 :Type => 'String',
                 :AllowedValues => %w(t1.micro m1.small m3.medium m3.large m3.xlarge m3.2xlarge c3.large c3.xlarge c3.2xlarge c3.4xlarge c3.8xlarge),
-                :Default => 'm3.large'
+                :Default => '#{@size}'
 
       parameter 'ApplicationName',
                 :Description => 'The name of the Elastic Beanstalk Application',
@@ -51,6 +53,8 @@ class BeanstalkTemplate
                 :Type => 'String',
                 :Default => 'EbApp'
 
+      #{"parameter 'RDSHostURLPass', :Type => 'String'" if rds_enabled? }
+
       resource 'Application', :Type => 'AWS::ElasticBeanstalk::Application', :Properties => {
           :Description => '#{@env}',
           :ApplicationName => '#{@env}',
@@ -104,6 +108,7 @@ class BeanstalkTemplate
               { :Namespace => 'aws:autoscaling:updatepolicy:rollingupdate', :OptionName => 'MaxBatchSize', :Value => '1' },
               { :Namespace => 'aws:autoscaling:updatepolicy:rollingupdate', :OptionName => 'MinInstancesInService', :Value => '2' },
               { :Namespace => 'aws:elasticbeanstalk:hostmanager', :OptionName => 'LogPublicationControl', :Value => 'true' },
+              #{set_rds_parameters}
           ],
       }
 
@@ -132,6 +137,29 @@ class BeanstalkTemplate
     end.exec!
     "
   end
+  def set_rds_parameters
+    if rds_enabled?
+      "{
+        :Namespace => 'aws:elasticbeanstalk:application:environment',
+        :OptionName => 'DB_HostURL',
+        :Value => ref('RDSHostURLPass'),
+      },"
+    else
+      nil
+    end
+  end
+
+  def rds_enabled?
+    if @rds == nil
+      puts "RDS is not enabled, no DB created"
+      false
+    elsif @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 @env.include?("prod")

data/lib/gantree/cfn/master.rb

@@ -2,6 +2,7 @@ class MasterTemplate
 
   def initialize params
     @stack_name = params[:stack_name]
+    @rds = params[:rds]
     @env = params[:env]
     @bucket = params[:cfn_bucket]
     @requirements = params[:requirements]
@@ -27,10 +28,6 @@ class MasterTemplate
                 :Type => 'String',
                 :Default => 'default'
 
-      parameter 'InstanceType',
-                :Type => 'String',
-                :Default => 't1.micro'
-
       parameter 'ApplicationName',
                 :Type => 'String',
                 :Default => '#{@env}'
@@ -53,10 +50,10 @@ class MasterTemplate
           :Parameters => {
               :KeyName => ref('KeyName'),
               :InstanceSecurityGroup => get_att('AppResources', 'Outputs.InstanceSecurityGroup'),
-              :InstanceType => ref('InstanceType'),
               :ApplicationName => ref('ApplicationName'),
               :Environment => ref('Environment'),
               :IamInstanceProfile => ref('IamInstanceProfile'),
+              #{":RDSHostURLPass => get_att('AppResources','Outputs.RDSHostURL')," if rds_enabled?}
           },
       }
 
@@ -66,6 +63,17 @@ class MasterTemplate
 
     end.exec!"
   end
+  def rds_enabled?
+    if @rds == nil
+      puts "RDS is not enabled, no DB created"
+      false
+    elsif @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 @env.include?("prod")

data/lib/gantree/cfn/resources.rb

@@ -2,6 +2,7 @@ class ResourcesTemplate
 
   def initialize params
     @stack_name = params[:stack_name]
+    @rds = params[:rds]
     @env = params[:env]
     @requirements = params[:requirements]
   end
@@ -25,7 +26,51 @@ class ResourcesTemplate
       output 'InstanceSecurityGroup',
              :Value => ref('InstanceSecurityGroup')
 
+      #{rds}
+
     end.exec!
     "
   end
+
+  def rds
+    if rds_enabled?
+      "
+      resource 'sampleDB', :Type => 'AWS::RDS::DBInstance', :DeletionPolicy => 'Snapshot', :Properties => {
+        :DBName => 'sampledb',
+        :AllocatedStorage => '10',
+        :DBInstanceClass => 'db.m3.large',
+        :DBSecurityGroups => [ ref('DBSecurityGroup') ],
+        :Engine => 'postgres',
+        :EngineVersion => '9.3',
+        :MasterUsername => 'masterUser',
+        :MasterUserPassword => 'masterpassword',
+      }
+
+      resource 'DBSecurityGroup', :Type => 'AWS::RDS::DBSecurityGroup', :Properties => {
+        :DBSecurityGroupIngress => [
+            { :EC2SecurityGroupName => ref('InstanceSecurityGroup') },
+        ],
+        :GroupDescription => 'Allow Beanstalk Instances Access',
+      }
+      
+      output 'RDSHostURL',
+        :Value => get_att('sampleDB', 'Endpoint.Address')
+      "
+    else
+      nil
+    end
+  end
+
+  def rds_enabled?
+    if @rds == nil
+      puts "RDS is not enabled, no DB created"
+      false
+    elsif @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

data/lib/gantree/cli.rb

@@ -22,6 +22,9 @@ module Gantree
 
     desc "create APP", "create or update 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]"
+    method_option :dry_run, :desc => "do not actually create the stack"
     def create app
       Gantree::Stack.new(app, options).create
     end

data/lib/gantree/init.rb

@@ -6,7 +6,7 @@ module Gantree
   class Init
     def initialize image,options
       @image = image
-      @options = options
+      @options = merge_defaults(options)
       AWS.config(
         :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
         :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'])
@@ -54,11 +54,20 @@ module Gantree
     end
 
     def upload_docker_config
+      raise "You need to run 'docker login' to generate a .dockercfg file" if File.exist?("#{ENV['HOME']}/.dockercfg") != true
       filename = "#{ENV['HOME']}/#{@options.user}.dockercfg"
       FileUtils.cp("#{ENV['HOME']}/.dockercfg", "#{ENV['HOME']}/#{@options.user}.dockercfg")
       key = File.basename(filename)
       @s3.buckets["docker-cfgs"].objects[key].write(:file => filename)
     end
 
+    def merge_defaults(options)
+      if File.exist?(".gantreecfg")
+        defaults = JSON.parse(File.open(".gantreecfg").read)
+        defaults.merge(options)
+      else
+        options
+      end
+    end
   end
 end

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/lib/cli_spec.rb

@@ -7,27 +7,39 @@ require 'spec_helper'
 #   $ rake clean:vcr ; time rake
 describe Gantree::CLI do
   before(:all) do
-    @env = "stag-app-br-s1"
+    @env = "stag-app-knarr-s1"
     @owner = "bleacher"
     @repo = "cauldron"
     @tag =  "master"
     @user = "feelobot"
-  end
+  end 
 
-  describe "gantree" do
+  describe "init" do
     it "should create a new dockerrun for a private repo" do 
       out = execute("bin/gantree init -u #{@user} #{@owner}/#{@repo}:#{@tag}")
-      expect(out).to include ""
+      expect(out).to include "initialize image"
+      expect(File.exist?("Dockerrun.aws.json")).to be true
+      expect(IO.read("Dockerrun.aws.json").include? @user)
     end
 
     it "should create a new dockerrun for a public repo" do 
       out = execute("bin/gantree init #{@owner}/#{@repo}:#{@tag}")
-      expect(out).to include ""
+      expect(out).to include "initialize image"
+      expect(File.exist?("Dockerrun.aws.json")).to be true
     end
+  end
 
+  describe "deploy" do
     it "should deploy images" do
       out = execute("bin/gantree deploy #{@env}")
       expect(out).to include("Deploying")
     end
   end
+
+  describe "create" do
+    it "should create clusters" do
+      #out = execute("bin/gantree create #{@env}")
+      #expect(out).to include "Created"
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -19,6 +19,7 @@ module Helpers
   def execute(cmd)
     puts "Running: #{cmd}" if ENV['DEBUG']
     out = `#{cmd}`
+    raise "Stack Trance Found: \n #{out}" if out.include? "Error"
     puts out if ENV['DEBUG']
     out
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor