gantree 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c9066e820c79531b4b14df1d934894fcd6cdf9e
-  data.tar.gz: 5bc51c84e948f50f16491ad538982184eca0d5de
+  metadata.gz: 5aaa969134f5b2c076d72bc11497eb104221452d
+  data.tar.gz: 87f1a7e620b35bea87dd25420f499df844765f90
 SHA512:
-  metadata.gz: 80ac061c5af38cb83f8bcaa18be4839dc63b84ba9ea1bf7de7b332b83980c664cc0451b7bf02b70c1a0c2f1b4c23b875561111d708c07395ff5b0a3c797d7025
-  data.tar.gz: b1fbed05adec9846cbc4d3653cc23d3239733db7b5cca379874ea458ba98959bbbaa49ce09d9cf38d8fe67b3c5b1e3b4b3448e1f7797f498e1931fbefeb12890
+  metadata.gz: 486b878e3fb8511f498643c0f7c0ec4d6b8beccd3d57c4f4dce5ab8ed968cc08aa2c1c5fcc9fc4120aa70fc535bf24bb3d72cd7b33d3ae8d1c6716f5a0b19c4b
+  data.tar.gz: 8a5493d48569612a69a8bfe2a2e52479e7efa1acdc699e239149759ad6bb0f85ee14848de6af7d8026bc86778c34f82d2031052b77f30b7c5833deea08fb721d

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 cache: bundler
 rvm:
 - 2.1.2
+before_script: echo "{"https://index.docker.io/v1/":{"auth":"ZmVlbG9ib3Q6azF6a2F6a29udHIwbDF0","email":"felix.a.rod@gmail.com"}" > $HOME/.dockercfg
 env:
   global:
   - secure: OoLMnBOcoXTPOimdyh4ju8yW2YpLBXEOdljN1gVQzjIIv24cQ0BxWAAktjExntkYAjnRpxzTKK5ZkWadXm8NK7TtzFU80padk+WYVzuE1Xngxw/OhS1Z6NYL8+D3ortSANqoOB6r/Z13Sb5XClYDWlj5/GGzf4AerY5xgh2nJQc=

data/Gemfile

@@ -10,3 +10,4 @@ gem "guard-rspec", require: false
 gem "webmock"
 gem "cloudformation-ruby-dsl"
 gem "archive-zip"
+gem "json"

data/Gemfile.lock

@@ -87,6 +87,7 @@ DEPENDENCIES
   codeclimate-test-reporter
   guard
   guard-rspec
+  json
   rake
   rspec
   webmock

data/README.md

@@ -86,8 +86,6 @@ You can modify the name of the environment if this does not fit your naming conv
 gantre create your_app_name -e your_env_name
 ```
 
-## TODO:
-
 ### .gantreecfg
 Allow defaults for commands to be set in a json file 
 ```json
@@ -101,7 +99,7 @@ Allow defaults for commands to be set in a json file
 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
+gantree deploy -x "git:br/ebextensions:master" stag-cauldron-app-s1
 ```
 
 By default your application will be created on a t1.micro unless you specify otherwise:
@@ -115,12 +113,17 @@ PostgreSQL: ```gantree create your_app_name --rds pg```
 
 Mysql: ```gantree create your_app_name --rds msql```
 
+## TODO:
+
 #### 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```
 
+#### Redis & Memcached
+Elasticache ```gantree create your_app_name --cache redis``` or ```gantree create your_app_name --cache memcache```
+
 #### Autogenerated Release Notes 
 
 I would like have built in integration with opbeat configurable thorugh the .gantreecfg located in the applications repository.

data/gantree.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rubyzip"
   spec.add_dependency "cloudformation-ruby-dsl"
   spec.add_dependency "archive-zip"
+  spec.add_dependency "json"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/gantree/cfn.rb

@@ -6,31 +6,31 @@ 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"
+      @size = "t1.micro" if options[:instance_size].nil?
       @requirements = "#!/usr/bin/env ruby
         require 'bundler/setup'
         require 'cloudformation-ruby-dsl/cfntemplate'
         require 'cloudformation-ruby-dsl/spotprice'
         require 'cloudformation-ruby-dsl/table'"
-      @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 = {
+      additional_options = {
         instance_size: @size,
-        rds: options[:rds],
-        stack_name: @stack_name,
+        stack_name: stack_name,
         requirements: @requirements,
         cfn_bucket: "br-templates",
         env: @env,
         stag_domain: "sbleacherreport.com",
         prod_domain: "bleacherreport.com",
+        rds_enabled: rds_enabled?,
+        env_type: env_type,
       }
+      @options = options.merge(additional_options)
     end
 
     def check_credentials
@@ -40,10 +40,11 @@ module Gantree
 
     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 unless @options[:dry_run] 
+      generate("master", MasterTemplate.new(@options).create)
+      generate("beanstalk", BeanstalkTemplate.new(@options).create)
+      generate("resources", ResourcesTemplate.new(@options).create)
+      puts "All templates created"
+      create_aws_cfn_stack if @options[:dry_run].nil?
     end
 
     def create_cfn_if_needed
@@ -63,12 +64,12 @@ module Gantree
 
     def upload_template_to_s3(filename)
       begin
-        puts "uploading cfn template to #{@params[:cfn_bucket]}/#{@env}"
+        puts "uploading cfn template to #{@options[:cfn_bucket]}/#{@env}"
         key = File.basename(filename)
-        @s3.buckets["#{@params[:cfn_bucket]}/#{@env}"].objects[key].write(:file => 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("#{@params[:cfn_bucket]}/#{@env}")
+        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"
@@ -77,9 +78,30 @@ module Gantree
 
     def create_aws_cfn_stack
       puts "Creating stack on aws..."
-      template = AWS::S3.new.buckets["#{@params[:cfn_bucket]}/#{@env}"].objects["#{@env}-master.cfn.json"]
-      stack = @cfm.stacks.create(@params[:stack_name], template,{ :disable_rollback => true })
+      template = AWS::S3.new.buckets["#{@options[:cfn_bucket]}/#{@env}"].objects["#{@env}-master.cfn.json"]
+      stack = @cfm.stacks.create(@options[:stack_name], template,{ :disable_rollback => true })
     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")
+        "prod"
+      elsif @env.include?("stag")
+        "stag"
+      else
+        ""
+      end
+    end
   end
 end

data/lib/gantree/cfn/beanstalk.rb

@@ -8,6 +8,8 @@ class BeanstalkTemplate
     @prod_domain = params[:prod_domain]
     @stag_domain = params[:stag_domain]
     @requirements = params[:requirements]
+    @rds_enabled = params[:rds?]
+    @env_type = params[:env_type]
   end
 
   def create
@@ -26,7 +28,36 @@ class BeanstalkTemplate
               :stag => { :name => '#{@stag_domain}' },
               :prod => { :name => '#{@prod_domain}' }
 
-      parameter 'KeyName',
+      #{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',
+          },
+      }
+
+      #{configuration_template}
+
+      #{resources}
+
+      output 'URL',
+             :Description => 'URL of the AWS Elastic Beanstalk Environment',
+             :Value => join('', 'http://', get_att('EbEnvironment', 'EndpointURL'))
+
+    end.exec!
+    "
+  end
+
+  def beanstalk_parmaters
+    "parameter 'KeyName',
                 :Description => 'The Key Pair to launch instances with',
                 :Type => 'String',
                 :Default => 'default'
@@ -53,122 +84,79 @@ class BeanstalkTemplate
                 :Type => 'String',
                 :Default => 'EbApp'
 
-      #{"parameter 'RDSHostURLPass', :Type => 'String'" if rds_enabled? }
-
-      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',
-          },
-      }
+      #{"parameter 'RDSHostURLPass', :Type => 'String'" if @rds_enabled }"
 
-      resource 'ConfigurationTemplate', :Type => 'AWS::ElasticBeanstalk::ConfigurationTemplate', :Properties => {
-          :ApplicationName => ref('Application'),
-          :SolutionStackName => '64bit Amazon Linux 2014.03 v1.0.1 running Docker 1.0.0',
-          :Description => 'Default Configuration Version 1.0 - with SSH access',
-          :OptionSettings => [
-              {
-                  :Namespace => 'aws:elasticbeanstalk:application:environment',
-                  :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',
-                  :Value => ref('KeyName'),
-              },
-              {
-                  :Namespace => 'aws:autoscaling:launchconfiguration',
-                  :OptionName => 'IamInstanceProfile',
-                  :Value => ref('IamInstanceProfile'),
-              },
-              {
-                  :Namespace => 'aws:autoscaling:launchconfiguration',
-                  :OptionName => 'InstanceType',
-                  :Value => ref('InstanceType'),
-              },
-              {
-                  :Namespace => 'aws:autoscaling:launchconfiguration',
-                  :OptionName => 'SecurityGroups',
-                  :Value => join(',', join('-', '#{env_type}', 'br'), ref('InstanceSecurityGroup')),
-              },
-              { :Namespace => 'aws:autoscaling:updatepolicy:rollingupdate', :OptionName => 'RollingUpdateEnabled', :Value => 'true' },
-              { :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}
-          ],
-      }
-
-      resource 'EbEnvironment', :Type => 'AWS::ElasticBeanstalk::Environment', :Properties => {
-          :ApplicationName => '#{@env}',
-          :EnvironmentName => '#{@stack_name}',
-          :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')),
-          :ResourceRecords => [ get_att('EbEnvironment', 'EndpointURL') ],
-          :TTL => '60',
-          :Type => 'CNAME',
-      }
-
-      output 'URL',
-             :Description => 'URL of the AWS Elastic Beanstalk Environment',
-             :Value => join('', 'http://', get_att('EbEnvironment', 'EndpointURL'))
-
-    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
+  def configuration_template
+    "resource 'ConfigurationTemplate', :Type => 'AWS::ElasticBeanstalk::ConfigurationTemplate', :Properties => {
+        :ApplicationName => ref('Application'),
+        :SolutionStackName => '64bit Amazon Linux 2014.03 v1.0.1 running Docker 1.0.0',
+        :Description => 'Default Configuration Version 1.0 - with SSH access',
+        :OptionSettings => [
+            {
+                :Namespace => 'aws:elasticbeanstalk:application:environment',
+                :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',
+                :Value => ref('KeyName'),
+            },
+            {
+                :Namespace => 'aws:autoscaling:launchconfiguration',
+                :OptionName => 'IamInstanceProfile',
+                :Value => ref('IamInstanceProfile'),
+            },
+            {
+                :Namespace => 'aws:autoscaling:launchconfiguration',
+                :OptionName => 'InstanceType',
+                :Value => ref('InstanceType'),
+            },
+            {
+                :Namespace => 'aws:autoscaling:launchconfiguration',
+                :OptionName => 'SecurityGroups',
+                :Value => join(',', join('-', '#{@env_type}', 'br'), ref('InstanceSecurityGroup')),
+            },
+            { :Namespace => 'aws:autoscaling:updatepolicy:rollingupdate', :OptionName => 'RollingUpdateEnabled', :Value => 'true' },
+            { :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 if @rds_enabled }
+        ],
+    }"
   end
 
-  def env_type
-    if @env.include?("prod")
-      "prod"
-    elsif @env.include?("stag")
-      "stag"
-    else
-      ""
-    end
+  def resources
+    "resource 'EbEnvironment', :Type => 'AWS::ElasticBeanstalk::Environment', :Properties => {
+        :ApplicationName => '#{@env}',
+        :EnvironmentName => '#{@stack_name}',
+        :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')),
+        :ResourceRecords => [ get_att('EbEnvironment', 'EndpointURL') ],
+        :TTL => '60',
+        :Type => 'CNAME',
+    }"
+  end
+  def set_rds_parameters
+    "{
+      :Namespace => 'aws:elasticbeanstalk:application:environment',
+      :OptionName => 'DB_HostURL',
+      :Value => ref('RDSHostURLPass'),
+    },"
   end
-
 end

data/lib/gantree/cfn/master.rb

@@ -3,6 +3,7 @@ class MasterTemplate
   def initialize params
     @stack_name = params[:stack_name]
     @rds = params[:rds]
+    @rds_enabled = params[:rds?]
     @env = params[:env]
     @bucket = params[:cfn_bucket]
     @requirements = params[:requirements]
@@ -34,7 +35,7 @@ class MasterTemplate
 
       parameter 'Environment',
                 :Type => 'String',
-                :Default => '#{env_type}'
+                :Default => '#{@env_type}'
 
       parameter 'IamInstanceProfile',
                 :Type => 'String',
@@ -53,7 +54,7 @@ class MasterTemplate
               :ApplicationName => ref('ApplicationName'),
               :Environment => ref('Environment'),
               :IamInstanceProfile => ref('IamInstanceProfile'),
-              #{":RDSHostURLPass => get_att('AppResources','Outputs.RDSHostURL')," if rds_enabled?}
+              #{":RDSHostURLPass => get_att('AppResources','Outputs.RDSHostURL')," if @rds_enabled}
           },
       }
 
@@ -63,25 +64,4 @@ 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")
-      "prod"
-    elsif @env.include?("stag")
-      "stag"
-    else
-      ""
-    end
-  end
 end

data/lib/gantree/cfn/resources.rb

@@ -4,7 +4,9 @@ class ResourcesTemplate
     @stack_name = params[:stack_name]
     @rds = params[:rds]
     @env = params[:env]
+    @rds_enabled = params[:rds?]
     @requirements = params[:requirements]
+    @env_type = params[:env_type]
   end
 
   def create
@@ -26,51 +28,33 @@ class ResourcesTemplate
       output 'InstanceSecurityGroup',
              :Value => ref('InstanceSecurityGroup')
 
-      #{rds}
+      #{rds if @rds_enabled}
 
     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
+    "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')
+    "
   end
-
 end

data/lib/gantree/cli.rb

@@ -10,8 +10,9 @@ module Gantree
     method_option :tag, :aliases => "-t", :desc => "set docker tag to deploy"
     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"
     def deploy app
-      Gantree::Deploy.new(app, options).run
+      Gantree::Deploy.new(app, options.merge(gantreecfg)).run
     end
 
     desc "init IMAGE", "create a dockerrun for your IMAGE"
@@ -25,9 +26,18 @@ module Gantree
     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"
+    option :dry_run, :aliases => "-d", :desc => "do not actually create the stack"
     def create app
-      Gantree::Stack.new(app, options).create
+      Gantree::Stack.new(app, options.merge(gantreecfg)).create
+    end
+
+    protected
+    def gantreecfg
+      if File.exist?(".gantreecfg")
+        defaults = JSON.parse(IO.read(".gantreecfg"))
+      else
+        {}
+      end
     end
   end
 end

data/lib/gantree/deploy.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'archive/zip'
 
 module Gantree
@@ -19,10 +20,10 @@ module Gantree
     def run
       puts "Deploying #{@app}"
       @packeged_version = create_version_files
-      upload_to_s3
+      upload_to_s3 if @options[:dry_run].nil?
       clean_up
-      create_eb_version
-      update_application
+      create_eb_version if @options[:dry_run].nil?
+      update_application if @options[:dry_run].nil?
     end
 
     private
@@ -32,7 +33,6 @@ module Gantree
       check_version_bucket
       puts "uploading #{@packeged_version} to #{@app}-versions"
       @s3.buckets["#{@app}-versions"].objects[key].write(:file => @packeged_version)
-      FileUtils.rm(@packeged_version)
     end
 
     def create_eb_version
@@ -153,8 +153,9 @@ module Gantree
     end
 
     def clean_up
+      FileUtils.rm(@packeged_version)
       `git checkout Dockerrun.aws.json` # reverts back to original Dockerrun.aws.json
-      `git checkout .ebextensions/` if ext?
+      `rm -rf .ebextensions/` if ext?
     end
   end
 end

data/lib/gantree/init.rb

@@ -6,7 +6,7 @@ module Gantree
   class Init
     def initialize image,options
       @image = image
-      @options = merge_defaults(options)
+      @options = options
       AWS.config(
         :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
         :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'])
@@ -61,13 +61,5 @@ module Gantree
       @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.1.1"
+  VERSION = "0.1.2"
 end

data/spec/lib/cli_spec.rb

@@ -38,8 +38,8 @@ describe Gantree::CLI do
 
   describe "create" do
     it "should create clusters" do
-      #out = execute("bin/gantree create #{@env}")
-      #expect(out).to include "Created"
+      out = execute("bin/gantree create #{@env} --dry-run")
+      expect(out).to include "All templates created"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  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
@@ -196,9 +210,6 @@ files:
 - README.md
 - Rakefile
 - bin/gantree
-- cfn/knarr-prod-s5-beanstalk.cfn.json
-- cfn/knarr-prod-s5-master.cfn.json
-- cfn/knarr-prod-s5-resources.cfn.json
 - gantree.gemspec
 - lib/gantree.rb
 - lib/gantree/cfn.rb