gantree 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b338332d981a5b7f9fdf5481a6586ab2b9f8bed
-  data.tar.gz: db5516035b15ed2d4cbc653caed83dea5ddb5057
+  metadata.gz: 708602c71b4d2127bfe9f5d4208e61b07a42d372
+  data.tar.gz: 8c8d70dd8489294006bb77bebb60feccda1363fd
 SHA512:
-  metadata.gz: 70ef9e1a8f769ca67e3f260a1cf4eec77a8600c1a0b5f425f44755e17c79a92efd55a23ff62d61861032c9b5427ffb1db4cd82be2cf70301834b9ed386353d91
-  data.tar.gz: 328ebe29c9e08162c0ec4a5a798b9fdd874aa36317a9ff384e18b5858910a25da7a2fa0ebb74fb50e379101ef4fee3154977b8480081af46bfbfcb0a8e9cef1f
+  metadata.gz: e4b417f896a2d39ea17d173e558c04e57dadd3cbdb95fbb1c8cb23cc9fcb1a0e8a42d120fd77fed798b93d4429725077ba32bb8ccf7450558e445c4d2ceb506e
+  data.tar.gz: f8ec809fd5da2d4b7809360352c125c01f556b03ac1940a9c37e8d8ac127aee444266b9b702ba01a107bce40060bde48e6eebb7fd717ea7d7e7012e74396bb16

data/README.md

@@ -89,7 +89,7 @@ gantre create your_app_name -e your_env_name
 Allow defaults for commands to be set in a json file 
 ```json
 {
-  "ebextensions" : "configs/.ebextensions",
+  "ebextensions" : "git@github.com:br/.ebextensions.git",
   "default_instance_size" : "m3.medium"
 }
 ```

data/lib/gantree.rb

@@ -1,4 +1,5 @@
 $:.unshift(File.expand_path("../", __FILE__))
+require "gantree/base"
 require "gantree/version"
 require "gantree/deploy"
 require "gantree/init"
@@ -6,4 +7,4 @@ require "gantree/cfn"
 
 module Gantree
   autoload :CLI, 'gantree/cli'
-end
+end

data/lib/gantree/base.rb

@@ -0,0 +1,10 @@
+module Gantree
+  class Base
+    def print_options
+      @options.each do |param, value|
+        puts "#{param}: #{value}"
+      end
+    end
+  end
+end
+

data/lib/gantree/cfn.rb

@@ -5,7 +5,7 @@ require_relative 'cfn/beanstalk'
 require_relative 'cfn/resources'
 
 module Gantree
-  class Stack
+  class Stack < Base
     def initialize stack_name,options
       check_credentials
       AWS.config(
@@ -40,6 +40,7 @@ module Gantree
 
     def create
       @options[:rds_enabled] = rds_enabled? if @options[:rds] 
+      print_options
       create_cfn_if_needed
       create_all_templates
       upload_templates unless @options[:dry_run]

data/lib/gantree/cli.rb

@@ -18,10 +18,12 @@ module Gantree
     end
 
     desc "init IMAGE", "create a dockerrun for your IMAGE"
-    method_option :user, :aliases => "-u", :desc => "user credentials for private repo"
-    method_option :port, :aliases => "-p", :desc => "port of running application"
+    method_option :user   , :aliases => "-u", :desc => "user credentials for private repo"
+    method_option :port   , :aliases => "-p", :desc => "port of running application"
+    method_option :bucket , :aliases => "-b", :desc => "set bucket name, default is 'docker-cfgs'"
+    option :dry_run, :aliases => "-d", :desc => "do not actually upload to s3 bucket"
     def init image
-      Gantree::Init.new(image,options).run
+      Gantree::Init.new(image, options).run
     end
 
     desc "create APP", "create a cfn stack"

data/lib/gantree/deploy.rb

@@ -3,7 +3,7 @@ require 'archive/zip'
 require_relative 'notification'
 
 module Gantree
-  class Deploy
+  class Deploy < Base
 
     def initialize app,options
       @options = options
@@ -19,7 +19,9 @@ module Gantree
     end
 
     def run
-      puts "Deploying #{@app}"
+      puts "Deploying #{@env} on #{@app}"
+      print_options
+      return if @options[:dry_run]
       @packeged_version = create_version_files
       upload_to_s3 if @options[:dry_run].nil?
       clean_up
@@ -32,7 +34,6 @@ module Gantree
     end
 
     private
-
     def upload_to_s3
       key = File.basename(@packeged_version)
       check_version_bucket

data/lib/gantree/init.rb

@@ -3,10 +3,12 @@ require 'aws-sdk-v1'
 
 module Gantree
 
-  class Init
+  class Init < Base
     def initialize image,options
-      @image = image
-      @options = options
+      @image        = image
+      @options      = options
+      @bucket_name  = @options.bucket || "docker-cfgs"
+
       AWS.config(
         :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
         :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'])
@@ -15,15 +17,16 @@ module Gantree
 
     def run
       puts "initialize image #{@image}"
-      puts "with user #{@options.user}" if @options.user
+      print_options
+
       FileUtils.rm("Dockerrun.aws.json") if File.exist?("Dockerrun.aws.json")
-      create_docker_config_folder
+      create_docker_config_folder unless @options.dry_run?
       create_dockerrun
-      upload_docker_config if @options.user
+      upload_docker_config if @options.user && !@options.dry_run?
     end
 
     def create_docker_config_folder
-      bucket = @s3.buckets.create("docker-cfgs")
+      bucket = @s3.buckets.create(@bucket_name) unless @s3.buckets[@bucket_name].exists?
     end
 
     def dockerrun_object
@@ -42,7 +45,7 @@ module Gantree
       }
       if @options.user
         docker["Authentication"] = {
-          Bucket: "docker-cfgs",
+          Bucket: @bucket_name,
           Key: "#{@options.user}.dockercfg"
         }
       end
@@ -58,8 +61,8 @@ module Gantree
       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)
+      @s3.buckets[@bucket_name].objects[key].write(:file => filename)
     end
-
   end
 end
+

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/lib/cli_spec.rb

@@ -17,32 +17,49 @@ describe Gantree::CLI 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}")
+      out = execute("bin/gantree init -u #{@user} #{@owner}/#{@repo}:#{@tag} --dry-run")
       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}")
+      out = execute("bin/gantree init #{@owner}/#{@repo}:#{@tag} --dry-run")
       expect(out).to include "initialize image"
       expect(File.exist?("Dockerrun.aws.json")).to be true
     end
+
+    it "specifies the bucket" do
+      out = execute("bin/gantree init -u #{@user} -b my_bucket #{@owner}/#{@repo}:#{@tag} --dry-run")
+      expect(out).to include "bucket: my_bucket"
+    end
   end
 
   describe "deploy" do
     it "should deploy images" do
+      execute("bin/gantree init #{@owner}/#{@repo}:#{@tag} --dry-run")
       out = execute("bin/gantree deploy #{@env} --dry-run --silent")
-      expect(out).to include("Deploying")
+      expect(out).to include("Deploying stag-knarr-app-s1 on knarr-stag-s1")
+      expect(out).to include("dry_run: dry_run")
+      expect(out).to include("silent: silent")
     end
+
     it "should deploy images with remote extensions" do
       out = execute("bin/gantree deploy #{@env} -x 'git@github.com:br/.ebextensions' --dry-run --silent")
-      expect(out).to include("Deploying")
+      expect(out).to include("Deploying stag-knarr-app-s1 on knarr-stag-s1")
+      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
+
     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 --silent")
-      expect(out).to include("Deploying")
+      expect(out).to include("Deploying stag-knarr-app-s1 on knarr-stag-s1")
+      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
+
     it "should notify slack of deploys" do 
       out = execute("bin/gantree deploy #{@env} --dry-run")
       expect(out).to include("Deploying")
@@ -52,27 +69,29 @@ describe Gantree::CLI do
   describe "create" do
     it "should create clusters" 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 "Generating"
-      expect_all_templates_created(out)
+      expect(out).to include "instance_size: t1.micro"
+      expect(out).to include "stack_name: stag-knarr-app-s1"
+      expect(out).to include "cfn_bucket: br-templates"
+      expect(out).to include "env: knarr-stag-s1"
+      expect(out).to include "env_type: stag"
+      expect(out).to include "stag_domain: sbleacherreport.com"
+      expect(out).to include "prod_domain: bleacherreport.com"
     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_all_templates_created(out)
+      expect(out).to include "docker_version: 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")
-      expect(out).to_not include "RDS is not enabled, no DB created"
+      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 stag-knarr-app-s2 --dupe #{@env} --dry-run")
-      expect(out).to include "Duplicating"
+      expect(out).to include "dupe: stag-knarr-app-s1"
     end
   end
 
@@ -89,10 +108,5 @@ describe Gantree::CLI do
       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
+

data/spec/lib/deploy_spec.rb

@@ -29,11 +29,8 @@ describe "#Deploy" do
   describe ".auto_detect_app_role" do
     it "sets app roles if enabled" do
       options = { autodetect_app_role: true}
-      Dir.mkdir("roles") unless Dir.exist?("roles")
-      IO.write("roles/listener", "bundle exec rake:listener")
       deploy = Gantree::Deploy.new("stag-knarr-listener-s1",options)
-      puts deploy.instance_eval { auto_detect_app_role }
-      FileUtils.rm_r "roles"
+      puts deploy.instance_eval { autodetect_app_role }
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,9 @@
 ENV['VCR'] ? ENV['VCR'] : ENV['VCR'] = '1'
 ENV['TEST'] = '1'
 ENV['CODECLIMATE_REPO_TOKEN'] = ENV['CODECLIMATE_GANTREE_TOKEN']
+ENV['AWS_SECRET_ACCESS_KEY'] = 'asdfasdf2394230434'
+ENV['AWS_ACCESS_KEY_ID'] = 'adsfasdf984443df'
+
 
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
@@ -40,6 +43,10 @@ RSpec.configure do |c|
   #    example.run
   #  end if ENV['VCR'] == '1'
   #end
+  c.after(:all) do
+    FileUtils.rm_rf("Dockerrun.aws.json")
+    FileUtils.rm_rf("*.zip")
+  end
 end
 
 #VCR.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -240,6 +240,7 @@ files:
 - bin/gantree
 - gantree.gemspec
 - lib/gantree.rb
+- lib/gantree/base.rb
 - lib/gantree/cfn.rb
 - lib/gantree/cfn/beanstalk.rb
 - lib/gantree/cfn/master.rb