gantree 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 989d5b1c7d4cf9dc43ea5878da05220175efd519
-  data.tar.gz: 77b5026d514ad52ecba27300a29b823fd7658154
+  metadata.gz: cce358ed6f7b1f92b6cf7e154bd20485153ef893
+  data.tar.gz: e3553dedfb9b4d7464b8ce3651b88382e9c12df4
 SHA512:
-  metadata.gz: b9ef6e67aa0f145b87158ddabd93bb56f44824bf76176e45ac27b0199bb5364552515ea401e2b4b85f1bd64e197b364b99474eb08ab8438fa9c1651fa25bdb89
-  data.tar.gz: 53b49e2886b4d5fe4cd6bd0d6a39770c8d25407ac9da4e82c2e672af66f465426ed120a2ce04656f913aa3853e8b72b740f3a1013ed8d3b34fb7f67619aa3599
+  metadata.gz: d3b793e7936d386df9306277c279804f131c1dd338bc66a3b5300bd1803abb10b9683b03000db2cfb0e7bd8d2993f13cfcbeff932b688c04ff8dbf08eaed3253
+  data.tar.gz: f5ab580a8933cb291db0c557b0defd08428a203a167dd66eda27a34cedf6d9de5b1e80f429d8c9f40122a946c5f885a59ed5714d27c970104eff915f8001a9b5

data/lib/gantree/cfn.rb

@@ -6,6 +6,8 @@ require_relative 'cfn/resources'
 module Gantree
   class Stack
     def initialize stack_name,options
+      puts "*** CREATE OPTIONS"
+      puts options
       check_credentials
       AWS.config(
         :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
@@ -28,10 +30,10 @@ module Gantree
         env: @env,
         stag_domain: "sbleacherreport.com",
         prod_domain: "bleacherreport.com",
-        rds_enabled: rds_enabled?,
         env_type: env_type,
       }
       @options = options.merge(additional_options)
+      @options[:rds_enabled] = rds_enabled?
     end
 
     def check_credentials
@@ -45,6 +47,8 @@ module Gantree
       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?
     end
 
@@ -84,10 +88,10 @@ module Gantree
     end
 
     def rds_enabled?
-      if @rds == nil
+      if @options[:rds] == nil
         puts "RDS is not enabled, no DB created"
         false
-      elsif @rds == "pg" || @rds == "mysql"
+      elsif @options[:rds] == "pg" || @rds == "mysql"
         puts "RDS is enabled, creating DB"
         true
       else

data/lib/gantree/cli.rb

@@ -12,7 +12,7 @@ module Gantree
     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.merge(gantreecfg)).run
+      Gantree::Deploy.new(app, merge_defaults(options)).run
     end
 
     desc "init IMAGE", "create a dockerrun for your IMAGE"
@@ -29,16 +29,19 @@ module Gantree
     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"
     def create app
-      Gantree::Stack.new(app, options.merge(gantreecfg)).create
+      Gantree::Stack.new(app, merge_defaults(options)).create
     end
 
     protected
-    def gantreecfg
-      if File.exist?(".gantreecfg")
-        defaults = JSON.parse(IO.read(".gantreecfg"))
-      else
-        {}
-      end
-    end
+
+    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
   end
 end

data/lib/gantree/deploy.rb

@@ -35,27 +35,17 @@ module Gantree
     end
 
     def create_eb_version
-      begin
-        @eb.create_application_version({
-          :application_name => @app,
-          :version_label => @packeged_version,
-          :source_bundle => {
-            :s3_bucket => "#{@app}-versions",
-            :s3_key => @packeged_version
-          }
-        })
-      rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue
-        puts "Version already exists, recreating..."
-        begin 
-          @eb.delete_application_version({
-            :application_name => @app,
-            :version_label => @packeged_version,
-            :delete_source_bundle => false
-          })
-          retry
-        rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue
-          puts "No Application named #{@app} found"
-        end
+    begin
+      @eb.create_application_version({
+        :application_name => @app,
+        :version_label => @packeged_version,
+        :source_bundle => {
+          :s3_bucket => "#{@app}-versions",
+          :s3_key => @packeged_version
+        }
+      })
+      rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue => e
+        puts "No Application named #{@app} found #{e}"
       end
     end
 
@@ -71,11 +61,12 @@ module Gantree
     end
 
     def create_version_files
+      unique_hash = (0...8).map { (65 + rand(26)).chr }.join
       branch = `git rev-parse --abbrev-ref HEAD`
       puts "branch: #{branch}"
       hash = `git rev-parse --verify --short #{branch}`.strip
       puts "hash #{hash}"
-      version = "#{@env}-#{hash}"
+      version = "#{@env}-#{hash}-#{unique_hash}"
       puts "version: #{version}"
       dockerrun = "Dockerrun.aws.json"
       set_tag_to_deploy(dockerrun) if @options[:tag]
@@ -107,6 +98,7 @@ module Gantree
 
     def repo?
       if @ext.include? "github"
+        puts "Cloning: #{@ext}..."
         true
       else
         false

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/lib/cli_spec.rb

@@ -32,15 +32,15 @@ describe Gantree::CLI do
 
   describe "deploy" do
     it "should deploy images" do
-      out = execute("bin/gantree deploy #{@env}")
+      out = execute("bin/gantree deploy #{@env} --dry-run")
       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'")
+      out = execute("bin/gantree deploy #{@env} -x 'git@github.com:br/.ebextensions' --dry-run")
       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:feature'")
+      out = execute("bin/gantree deploy #{@env} -x 'git@github.com:br/.ebextensions:basic' --dry-run")
       expect(out).to include("Deploying")
     end
   end
@@ -48,16 +48,22 @@ describe Gantree::CLI do
   describe "create" do
     it "should create clusters" do
       out = execute("bin/gantree create #{@env} --dry-run")
-      beanstalk = IO.read("cfn/#{@app}-beanstalk.cfn.json")
+      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"
     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 = IO.read("cfn/#{@app}-beanstalk.cfn.json")
+      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"
     end
+
+    it "should create clusters with databases" do
+      out = execute("bin/gantree create stag-knarr-app-s7 --dry-run --rds pg")
+      expect(out).to_not include "RDS is not enabled, no DB created"
+    end
   end
 end

data/spec/lib/deploy_spec.rb

@@ -3,7 +3,7 @@ require_relative '../../lib/gantree/deploy'
 
 describe "#Deploy" do
   before(:all) do
-    @env = "stag-app-knarr-s1"
+    @env = "stag-knarr-app-s1"
     @owner = "bleacher"
     @repo = "cauldron"
     @tag =  "master"
@@ -12,17 +12,19 @@ describe "#Deploy" do
 
   describe ".get_ext_branch" do
     it "returns branch name of repo url" do
-      options = { ext: "git@github.com:br/.ebextensions:feature" }
+      options = { ext: "git@github.com:br/.ebextensions:basic" }
       deploy = Gantree::Deploy.new(@env,options)
-      expect(deploy.instance_eval { get_ext_branch }).to eq "feature"
+      expect(deploy.instance_eval { get_ext_branch }).to eq "basic"
     end
   end
   
   describe ".get_ext_repo" do 
     it "returns just the repo url" do 
-      options = { ext: "git@github.com:br/.ebextensions:feature" }
+      options = { ext: "git@github.com:br/.ebextensions:basic" }
       deploy = Gantree::Deploy.new(@env,options)
       puts deploy.instance_eval { get_ext_repo } 
     end
-  end 
+  end
+
+  describe ".create_"
 end

metadata

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