gantree 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 708602c71b4d2127bfe9f5d4208e61b07a42d372
-  data.tar.gz: 8c8d70dd8489294006bb77bebb60feccda1363fd
+  metadata.gz: 3a0d7adf5bc5062c5e4a37f37f097f04f96c73d4
+  data.tar.gz: 46a5a976386359a4acba7ded4c19cf7e7640fea4
 SHA512:
-  metadata.gz: e4b417f896a2d39ea17d173e558c04e57dadd3cbdb95fbb1c8cb23cc9fcb1a0e8a42d120fd77fed798b93d4429725077ba32bb8ccf7450558e445c4d2ceb506e
-  data.tar.gz: f8ec809fd5da2d4b7809360352c125c01f556b03ac1940a9c37e8d8ac127aee444266b9b702ba01a107bce40060bde48e6eebb7fd717ea7d7e7012e74396bb16
+  metadata.gz: 91399ef827763928ac3f922876ae86b90137a76ca7d3172419671e37cb7693d63b3af8668baaf4631792e737b0f9eb411c87ac6179f306506ceaa1f3c5876b2b
+  data.tar.gz: f62e5b8a8fe21c2abc213ce10c75913c76750cb516ec3c750a6a44d059833567f0a905a2fa74b199ed4e5ac913f43bb99855726948ba1ec82431db666cd21421

data/.gitignore

@@ -15,3 +15,4 @@ test/tmp
 test/version_tmp
 tmp
 cfn/*
+tmp.txt

data/Gemfile

@@ -14,3 +14,8 @@ gem "archive-zip"
 gem "json"
 gem "slackr"
 gem "highline"
+gem "pry"
+gem "vcr"
+gem "fakeweb"
+
+

data/Gemfile.lock

@@ -19,6 +19,7 @@ GEM
     detabulator (0.1.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    fakeweb (1.3.0)
     ffi (1.9.3)
     formatador (0.2.5)
     guard (2.6.1)
@@ -78,6 +79,7 @@ GEM
     slop (3.6.0)
     thor (0.19.1)
     timers (1.1.0)
+    vcr (2.9.3)
     webmock (1.18.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -90,12 +92,15 @@ DEPENDENCIES
   aws-sdk-v1
   cloudformation-ruby-dsl
   codeclimate-test-reporter
+  fakeweb
   guard
   guard-bundler
   guard-rspec
   highline
   json
+  pry
   rake
   rspec
   slackr
+  vcr
   webmock

data/README.md

@@ -34,16 +34,20 @@ gem install gantree
 ```
 
 ### Initialize
-
 What this does is create a new Dockerrun.aws.json inside your repository and uploads your docker login credentials to s3 (for private repo access) so you can do deploys. We need the -u to specify a username to rename your .dockercfg and reference it in the Dockerrun.aws.json
 
-For a public repo
 ```
-gantree init -p 3000 bleacher/cauldron:master
+# the username here is your docker.hub login
+gantree init -u frodriguez -p 3000 bleacher/cauldron:master
+# this will upload your docker config files to a bucket called "frodrigeuz-docker-cgfs"
 ```
-For a private repo
+If you don't have a docker.hub account, you can still use gantree without the `-u` flag, but you will have to explicitly specify the bucket for S3 storage since the default S3 bucket name is generated from the docker.hub login.
+
+##### Specify the bucket for to S3 store docker configuration
 ```
-gantree init -u frodriguez -p 3000 bleacher/cauldron:master
+# Since S3 bucket names are globally namespaced, the default bucket may be taken and unavailable
+# Gantree gives you the option to specify an S3 bucket name of your choice
+gantree init -u frodgriguez -p 3000 -b hopefully_this_bucket_name_is_available bleacher/cauldron:master
 ```
 
 ### Deploy

data/gantree.gemspec

@@ -34,4 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-bundler"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "vcr"
 end
+

data/lib/gantree.rb

@@ -3,8 +3,9 @@ require "gantree/base"
 require "gantree/version"
 require "gantree/deploy"
 require "gantree/init"
-require "gantree/cfn"
+require "gantree/stack"
 
 module Gantree
   autoload :CLI, 'gantree/cli'
 end
+

data/lib/gantree/base.rb

@@ -1,10 +1,34 @@
 module Gantree
   class Base
+    def check_credentials
+      raise "Please set your AWS Environment Variables" unless ENV['AWS_SECRET_ACCESS_KEY']
+      raise "Please set your AWS Environment Variables" unless ENV['AWS_ACCESS_KEY_ID']
+    end
+
     def print_options
       @options.each do |param, value|
         puts "#{param}: #{value}"
       end
     end
+
+    def set_aws_keys
+      AWS.config(
+        :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
+        :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY']
+      )
+    end
+
+    def s3
+      @s3 ||= AWS::S3.new
+    end
+
+    def default_name(app)
+      [
+       app.match(/^[a-zA-Z]*\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1],
+       app.match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1],
+       app.match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[3]
+      ].join("-")
+    end
   end
 end
 

data/lib/gantree/cli.rb

@@ -1,3 +1,4 @@
+require "pry"
 require 'thor'
 require 'aws-sdk-v1'
 require 'gantree/cli/help'
@@ -18,9 +19,9 @@ 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 :user   , :aliases => "-u", :desc => "user credentials for private dockerhub repo"
     method_option :port   , :aliases => "-p", :desc => "port of running application"
-    method_option :bucket , :aliases => "-b", :desc => "set bucket name, default is 'docker-cfgs'"
+    method_option :bucket , :aliases => "-b", :desc => "set bucket name, default is '<user>-docker-cfgs'"
     option :dry_run, :aliases => "-d", :desc => "do not actually upload to s3 bucket"
     def init image
       Gantree::Init.new(image, options).run
@@ -63,3 +64,4 @@ module Gantree
      end
   end
 end
+

data/lib/gantree/deploy.rb

@@ -4,17 +4,16 @@ require_relative 'notification'
 
 module Gantree
   class Deploy < Base
+    attr_reader :app, :env
+
+    def initialize app, options
+      check_credentials
+      set_aws_keys
 
-    def initialize app,options
       @options = options
       @ext = @options[:ext]
-      AWS.config(
-        :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
-        :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'])
-      @app = @options[:env] || app.match(/^[a-zA-Z]*\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1] + "-" + app.match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1] + '-' + app.match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[3]
+      @app = @options[:env] || default_name(app)
       @env = app
-      @eb = AWS::ElasticBeanstalk::Client.new
-      @s3 = AWS::S3.new
       @dockerrun_file = "Dockerrun.aws.json"
     end
 
@@ -22,33 +21,37 @@ module Gantree
       puts "Deploying #{@env} on #{@app}"
       print_options
       return if @options[:dry_run]
-      @packeged_version = create_version_files
+      @packaged_version = create_version_files
       upload_to_s3 if @options[:dry_run].nil?
       clean_up
       create_eb_version if @options[:dry_run].nil?
       update_application if @options[:dry_run].nil?
       if @options[:slack]
-        msg = "#{ENV['USER']} is deploying #{@packeged_version} to #{@app}"
+        msg = "#{ENV['USER']} is deploying #{@packaged_version} to #{@app}"
         Notification.new(@options[:slack]).say(msg) unless @options[:silent]
       end
     end
 
     private
+    def eb
+      @eb ||= AWS::ElasticBeanstalk::Client.new
+    end
+
     def upload_to_s3
-      key = File.basename(@packeged_version)
+      key = File.basename(@packaged_version)
       check_version_bucket
-      puts "uploading #{@packeged_version} to #{@app}-versions"
-      @s3.buckets["#{@app}-versions"].objects[key].write(:file => @packeged_version)
+      puts "uploading #{@packaged_version} to #{@app}-versions"
+      s3.buckets["#{@app}-versions"].objects[key].write(:file => @packaged_version)
     end
 
     def create_eb_version
     begin
-      @eb.create_application_version({
+      eb.create_application_version({
         :application_name => @app,
-        :version_label => @packeged_version,
+        :version_label => @packaged_version,
         :source_bundle => {
           :s3_bucket => "#{@app}-versions",
-          :s3_key => @packeged_version
+          :s3_key => @packaged_version
         }
       })
       rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue => e
@@ -58,9 +61,9 @@ module Gantree
 
     def update_application
       begin
-        @eb.update_environment({
+        eb.update_environment({
           :environment_name => @env,
-          :version_label => @packeged_version,
+          :version_label => @packaged_version,
           :option_settings => autodetect_app_role
         })
       rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue
@@ -69,12 +72,12 @@ module Gantree
     end
 
     def create_version_files
-      unique_hash = (0...8).map { (65 + rand(26)).chr }.join
+      time_stamp = Time.now.to_i
       branch = `git rev-parse --abbrev-ref HEAD`
       puts "branch: #{branch}"
       hash = `git rev-parse --verify --short #{branch}`.strip
       puts "hash #{hash}"
-      version = "#{@env}-#{hash}-#{unique_hash}"
+      version = "#{@env}-#{hash}-#{time_stamp}"
       puts "version: #{version}"
       #auto_detect_app_role if @options[:autodetect_app_role] == true
       set_tag_to_deploy if @options[:tag]
@@ -94,7 +97,7 @@ module Gantree
       docker = JSON.parse(IO.read(@dockerrun_file))
       image = docker["Image"]["Name"]
       image.gsub!(/:(.*)$/, ":#{@options[:tag]}")
-      IO.write(@dockerrun_file,JSON.pretty_generate(docker))
+      IO.write(@dockerrun_file, JSON.pretty_generate(docker))
     end
 
     def autodetect_app_role
@@ -165,14 +168,15 @@ module Gantree
 
     def check_version_bucket
       name = "#{@app}-versions"
-      bucket = @s3.buckets[name] # makes no request
-      @s3.buckets.create(name) unless bucket.exists?
+      bucket = s3.buckets[name] # makes no request
+      s3.buckets.create(name) unless bucket.exists?
     end
 
     def clean_up
-      FileUtils.rm_rf(@packeged_version)
+      FileUtils.rm_rf(@packaged_version)
       `git checkout Dockerrun.aws.json` # reverts back to original Dockerrun.aws.json
       `rm -rf .ebextensions/` if ext?
     end
   end
 end
+

data/lib/gantree/init.rb

@@ -2,17 +2,16 @@ require 'thor'
 require 'aws-sdk-v1'
 
 module Gantree
-
   class Init < Base
-    def initialize image,options
-      @image        = image
-      @options      = options
-      @bucket_name  = @options.bucket || "docker-cfgs"
+    attr_reader :image, :options, :bucket_name
+
+    def initialize image, options
+      check_credentials
+      set_aws_keys
 
-      AWS.config(
-        :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
-        :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'])
-      @s3 = AWS::S3.new
+      @image = image
+      @options = options
+      @bucket_name  = @options.bucket || default_bucket_name
     end
 
     def run
@@ -20,48 +19,57 @@ module Gantree
       print_options
 
       FileUtils.rm("Dockerrun.aws.json") if File.exist?("Dockerrun.aws.json")
-      create_docker_config_folder unless @options.dry_run?
+      create_docker_config_s3_bucket unless options[:dry_run]
       create_dockerrun
-      upload_docker_config if @options.user && !@options.dry_run?
+      upload_docker_config if options.user && !options[:dry_run]
+    end
+
+    private
+    def default_bucket_name
+      [@options.user, "docker", "cfgs"].compact.join("-")
     end
 
-    def create_docker_config_folder
-      bucket = @s3.buckets.create(@bucket_name) unless @s3.buckets[@bucket_name].exists?
+    def create_docker_config_s3_bucket
+      bucket = s3.buckets.create(bucket_name) unless s3.buckets[bucket_name].exists?
     end
 
     def dockerrun_object
       docker = {
         AWSEBDockerrunVersion: "1",
         Image: {
-          Name: @image,
+          Name: image,
           Update: true
         },
         Logging: "/var/log/nginx",
         Ports: [
           {
-            ContainerPort: @options.port
+            ContainerPort: options.port
           }
         ]
       }
-      if @options.user
+      if options.user
         docker["Authentication"] = {
-          Bucket: @bucket_name,
-          Key: "#{@options.user}.dockercfg"
+          Bucket: bucket_name,
+          Key: "#{options.user}.dockercfg"
         }
       end
       docker
     end
 
     def create_dockerrun
-      IO.write("Dockerrun.aws.json",JSON.pretty_generate(dockerrun_object))
+      IO.write("Dockerrun.aws.json", JSON.pretty_generate(dockerrun_object))
     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")
+      raise "You need to run 'docker login' to generate a .dockercfg file" unless dockercfg_file_exist?
+      filename = "#{ENV['HOME']}/#{options.user}.dockercfg"
+      FileUtils.cp("#{ENV['HOME']}/.dockercfg", "#{ENV['HOME']}/#{options.user}.dockercfg")
       key = File.basename(filename)
-      @s3.buckets[@bucket_name].objects[key].write(:file => filename)
+      s3.buckets[bucket_name].objects[key].write(:file => filename)
+    end
+
+    def dockercfg_file_exist?
+      File.exist?("#{ENV['HOME']}/.dockercfg")
     end
   end
 end

data/lib/gantree/notification.rb

@@ -12,5 +12,5 @@ class Notification
   def say(msg)
     @slack.say(msg)
   end
+end
 
-end

data/lib/gantree/{cfn.rb → stack.rb}

@@ -6,12 +6,12 @@ require_relative 'cfn/resources'
 
 module Gantree
   class Stack < Base
+    attr_reader :env
+
     def initialize stack_name,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
+      set_aws_keys
+
       @cfm = AWS::CloudFormation.new
       @size = options[:instance_size]
       @size ||= "t1.micro"
@@ -19,7 +19,7 @@ module Gantree
         require 'cloudformation-ruby-dsl/cfntemplate'
         require 'cloudformation-ruby-dsl/spotprice'
         require 'cloudformation-ruby-dsl/table'"
-      @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]
+      @env = options[:env] || default_name(stack_name)
       additional_options = {
         instance_size: @size,
         stack_name: stack_name,
@@ -33,11 +33,6 @@ module Gantree
       @options = options.merge(additional_options)
     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
       @options[:rds_enabled] = rds_enabled? if @options[:rds] 
       print_options
@@ -51,8 +46,7 @@ module Gantree
       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) 
+        @cfm.stacks[@options[:stack_name]].update(:template => stack_template) 
       end
     end
 
@@ -70,6 +64,11 @@ module Gantree
       end
     end
 
+    private
+    def stack_template
+      s3.buckets["#{@options[:cfn_bucket]}/#{env}"].objects["#{env}-master.cfn.json"]
+    end
+
     def create_cfn_if_needed
       Dir.mkdir 'cfn' unless File.directory?("cfn")
     end
@@ -81,11 +80,11 @@ module Gantree
         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")
+          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)
+          IO.write("cfn/#{env}-#{template}.cfn.json",file)
         end
       else
         puts "Generating templates from gantree"
@@ -104,7 +103,7 @@ module Gantree
       IO.write("cfn/#{template_name}.rb", template)
       json = `ruby cfn/#{template_name}.rb expand`
       Dir.mkdir 'cfn' rescue Errno::ENOENT
-      template_file_name = "#{@env}-#{template_name}.cfn.json"
+      template_file_name = "#{env}-#{template_name}.cfn.json"
       IO.write("cfn/#{template_file_name}", json)
       puts "Created #{template_file_name} in the cfn directory"
       FileUtils.rm("cfn/#{template_name}.rb")
@@ -114,27 +113,26 @@ module Gantree
       check_template_bucket
       templates = ['master','resources','beanstalk']
       templates.each do |template|
-        filename = "cfn/#{@env}-#{template}.cfn.json"
+        filename = "cfn/#{env}-#{template}.cfn.json"
         key = File.basename(filename)
-        @s3.buckets["#{@options[:cfn_bucket]}/#{@env}"].objects[key].write(:file => filename)
+        s3.buckets["#{@options[:cfn_bucket]}/#{env}"].objects[key].write(:file => filename)
       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}"
+      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) 
+        puts "creating bucket #{@options[:cfn_bucket]}/#{env} to upload templates"
+        s3.buckets.create(bucket_name) 
       end
     end
 
     def create_aws_cfn_stack
       puts "Creating stack on aws..."
-      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 })
+      stack = @cfm.stacks.create(@options[:stack_name], stack_template, :disable_rollback => true)
     end
 
     def rds_enabled?
@@ -150,9 +148,9 @@ module Gantree
     end
 
     def env_type
-      if @env.include?("prod")
+      if env.include?("prod")
         "prod"
-      elsif @env.include?("stag")
+      elsif env.include?("stag")
         "stag"
       else
         ""
@@ -160,3 +158,4 @@ module Gantree
     end
   end
 end
+

data/lib/gantree/version.rb

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

data/spec/lib/{cli_spec.rb → gantree/cli_spec.rb}

@@ -7,6 +7,9 @@ require 'spec_helper'
 #   $ rake clean:vcr ; time rake
 describe Gantree::CLI do
   before(:all) do
+    ENV['AWS_ACCESS_KEY_ID'] = 'FAKE_AWS_ACCESS_KEY'
+    ENV['AWS_SECRET_ACCESS_KEY'] = 'FAKE_AWS_SECRET_ACCESS_KEY'
+
     @env = "stag-knarr-app-s1"
     @app = "knarr-stag-s1"
     @owner = "bleacher"

data/spec/lib/gantree/deploy_spec.rb

@@ -0,0 +1,73 @@
+require "spec_helper"
+require "pry"
+
+describe Gantree::Deploy do
+  before(:all) do
+    ENV['AWS_ACCESS_KEY_ID'] = 'FAKE_AWS_ACCESS_KEY'
+    ENV['AWS_SECRET_ACCESS_KEY'] = 'FAKE_AWS_SECRET_ACCESS_KEY'
+
+    @env = "stag-knarr-app-s1"
+    @owner = "bleacher"
+    @repo = "cauldron"
+    @tag =  "master"
+    @user = "feelobot"
+  end
+
+  it "returns branch name of repo url" do
+    options = { ext: "git@github.com:br/.ebextensions:basic" }
+    deploy = Gantree::Deploy.new(@env, options)
+    expect(deploy.send(:get_ext_branch)).to eq "basic"
+  end
+
+  it "returns just the repo url" do 
+    options = { ext: "git@github.com:br/.ebextensions:basic" }
+    deploy = Gantree::Deploy.new(@env,options)
+    expect(deploy.send(:get_ext_repo)).to eq "git@github.com:br/.ebextensions"
+  end
+
+  it "sets app roles if enabled" do
+    options = { autodetect_app_role: true}
+    deploy = Gantree::Deploy.new("stag-knarr-listener-s1", options)
+    expect(deploy.send(:autodetect_app_role)).to eq([{:option_name=>"ROLE", :value=>"listener", :namespace=>"aws:elasticbeanstalk:application:environment"}])
+  end
+
+  it "AWS gets the correct keys" do
+    gd = Gantree::Deploy.new(
+      "image_name",
+       :env => "cauldron-stag-s1"
+    )
+    expect(AWS).to receive(:config).with(
+        :access_key_id => 'FAKE_AWS_ACCESS_KEY',
+        :secret_access_key => 'FAKE_AWS_SECRET_ACCESS_KEY' 
+    )
+    gd.set_aws_keys
+  end
+
+  it "parses env option" do
+    gd = Gantree::Deploy.new(
+      "stag-cauldron-app-s1",
+       :env => "cauldron-stag-s1"
+    )
+    expect(gd.app).to eq("cauldron-stag-s1")
+    expect(gd.env).to eq("stag-cauldron-app-s1")
+  end
+
+  it "parses default env" do
+    gd = Gantree::Deploy.new(
+      "stag-cauldron-app-s1",
+      {}
+    )
+    expect(gd.app).to eq("cauldron-stag-s1")
+    expect(gd.env).to eq("stag-cauldron-app-s1")
+  end
+
+  it "raises an error when no aws keys in ENV" do
+    ENV['AWS_ACCESS_KEY_ID'] = nil
+    ENV['AWS_SECRET_ACCESS_KEY'] = nil
+    expect{gd = Gantree::Deploy.new(
+      "image_name",
+       :env => "cauldron-stag-s1"
+    )}.to raise_error(RuntimeError)
+  end
+end
+

data/spec/lib/gantree/init_spec.rb

@@ -0,0 +1,95 @@
+require "spec_helper"
+require "pry"
+
+describe Gantree::Init do
+  before(:all) do
+    ENV['AWS_ACCESS_KEY_ID'] = 'FAKE_AWS_ACCESS_KEY'
+    ENV['AWS_SECRET_ACCESS_KEY'] = 'FAKE_AWS_SECRET_ACCESS_KEY'
+
+    ENV["HOME"] = "/Users/gantree_user"
+
+    @options = Thor::CoreExt::HashWithIndifferentAccess.new(
+      "port" => "3000",
+      "user" => "gantree_user",
+      "bucket" => "bucket314159"
+    )
+
+    @s3_bucket = AWS::S3::Bucket.new("bucket314159")
+  end
+
+ it "initializes the variables properly" do
+   gi = Gantree::Init.new("bleacher/cauldron:master", @options)
+
+    expect(gi.image).to eq("bleacher/cauldron:master")
+    expect(gi.options.port).to eq("3000")
+  end
+
+  it "AWS gets the correct keys" do
+    gi = Gantree::Init.new("image_name", @options)
+    expect(AWS).to receive(:config).with(
+        :access_key_id => 'FAKE_AWS_ACCESS_KEY',
+        :secret_access_key => 'FAKE_AWS_SECRET_ACCESS_KEY'
+    )
+    gi.set_aws_keys
+  end
+
+  it "uses default bucket_name" do
+    options_no_bucket_name = Thor::CoreExt::HashWithIndifferentAccess.new(
+      "port" => "3000",
+      "user" => "gantree_user"
+    )
+    gi = Gantree::Init.new("image_name", options_no_bucket_name)
+    expect(gi.bucket_name).to eq("gantree_user-docker-cfgs")
+
+    options_no_bucket_name_or_user = Thor::CoreExt::HashWithIndifferentAccess.new(
+      "port" => "3000"
+    )
+    gi2 = Gantree::Init.new("image_name", options_no_bucket_name_or_user)
+    expect(gi2.bucket_name).to eq("docker-cfgs")
+  end
+
+  it "generates a dockerrun object" do
+    gi = Gantree::Init.new("bleacher/cauldron:master", @options)
+
+    dro = gi.send(:dockerrun_object)
+    expect(dro).to eq(
+      :AWSEBDockerrunVersion=>"1",
+      :Image=>{:Name=>"bleacher/cauldron:master", :Update=>true},
+      :Logging=>"/var/log/nginx",
+      :Ports=>[{:ContainerPort=>"3000"}],
+      "Authentication"=>{:Bucket=>"bucket314159", :Key=>"gantree_user.dockercfg"}
+    )
+  end
+
+  it "creates docker config folder when s3 bucket already exists" do
+    gi = Gantree::Init.new("bleacher/cauldron:master", @options)
+    AWS::S3::BucketCollection.any_instance.stub(:[]).with(anything()) {Existence}
+    AWS::S3::BucketCollection.stub(:create) {"OK"}
+
+    expect(gi.send(:create_docker_config_s3_bucket)).to eq(nil)
+  end
+
+  it "creates docker config folder when s3 bucket doesnt not exist" do
+    gi = Gantree::Init.new("bleacher/cauldron:master", @options)
+    AWS::S3::BucketCollection.any_instance.stub(:[]).with(anything()) {NonExistence}
+    AWS::S3::BucketCollection.any_instance.stub(:create).with(@options.bucket) {@s3_bucket}
+
+    expect(gi.send(:create_docker_config_s3_bucket)).to eq(@s3_bucket)
+  end
+
+  it "uploads docker config to s3" do
+    gi = Gantree::Init.new("bleacher/cauldron:master", @options)
+
+    Gantree::Init.any_instance.stub(:dockercfg_file_exist?) { true }
+    FileUtils.stub(:cp).with(
+      "/Users/gantree_user/.dockercfg", 
+      "/Users/gantree_user/gantree_user.dockercfg"
+    ) {"OK"}
+    AWS::S3::S3Object.any_instance.stub(:write).with(
+      :file => "/Users/gantree_user/gantree_user.dockercfg"
+    ) {"OK"}
+
+    expect(gi.send(:upload_docker_config)).to eq("OK")
+  end
+end
+

data/spec/lib/gantree/stack_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+require "pry"
+
+describe Gantree::Stack do
+  it "parses the env from env options" do
+    gs = Gantree::Stack.new(
+      "stag-linguist-app-s1",
+       :env => "linguist-stag-s1"
+    )
+    
+    expect(gs.env).to eq("linguist-stag-s1")
+  end
+
+  it "parses the env from stack_name" do
+    gs = Gantree::Stack.new(
+      "stag-linguist-app-s1",
+      {}
+    )
+
+    expect(gs.env).to eq("linguist-stag-s1")
+  end
+end
+

data/spec/spec_helper.rb

@@ -6,14 +6,12 @@
 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
 
 require "pp"
+require "vcr"
  
 root = File.expand_path('../../', __FILE__)
 require "#{root}/lib/gantree"
@@ -48,7 +46,26 @@ RSpec.configure do |c|
     FileUtils.rm_rf("*.zip")
   end
 end
-
+#
 #VCR.configure do |config|
-#  config.ignore_hosts 'codeclimate.com'
-#end if ENV['VCR'] == '1'
+#  config.cassette_library_dir = "spec/fixtures/vcr"  
+#  config.hook_into :fakeweb
+#  config.default_cassette_options = {:record => :once}
+#  config.ignore_hosts "codeclimate.com"
+#end
+#
+#
+
+class Existence
+  def self.exists?
+    true
+  end
+end
+
+class NonExistence
+  def self.exists?
+    false
+  end
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -220,6 +220,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: cli tool for automating docker deploys to elastic beanstalk
 email:
 - felix.a.rod@gmail.com
@@ -241,7 +269,6 @@ files:
 - gantree.gemspec
 - lib/gantree.rb
 - lib/gantree/base.rb
-- lib/gantree/cfn.rb
 - lib/gantree/cfn/beanstalk.rb
 - lib/gantree/cfn/master.rb
 - lib/gantree/cfn/resources.rb
@@ -250,9 +277,12 @@ files:
 - lib/gantree/deploy.rb
 - lib/gantree/init.rb
 - lib/gantree/notification.rb
+- lib/gantree/stack.rb
 - lib/gantree/version.rb
-- spec/lib/cli_spec.rb
-- spec/lib/deploy_spec.rb
+- spec/lib/gantree/cli_spec.rb
+- spec/lib/gantree/deploy_spec.rb
+- spec/lib/gantree/init_spec.rb
+- spec/lib/gantree/stack_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/feelobot/gantree
 licenses:
@@ -282,6 +312,8 @@ summary: This tool is intended to help you setup a Dockerrun.aws.json which allo
   allows you to do versioned deploys to your Elastic Beanstalk application and create
   an archive of every versioned Dockerrun.aws.json in amazons s3 bucket service.
 test_files:
-- spec/lib/cli_spec.rb
-- spec/lib/deploy_spec.rb
+- spec/lib/gantree/cli_spec.rb
+- spec/lib/gantree/deploy_spec.rb
+- spec/lib/gantree/init_spec.rb
+- spec/lib/gantree/stack_spec.rb
 - spec/spec_helper.rb

data/spec/lib/deploy_spec.rb

@@ -1,36 +0,0 @@
-require 'spec_helper'
-require_relative '../../lib/gantree/deploy'
-
-describe "#Deploy" do
-  before(:all) do
-    @env = "stag-knarr-app-s1"
-    @owner = "bleacher"
-    @repo = "cauldron"
-    @tag =  "master"
-    @user = "feelobot"
-  end 
-
-  describe ".get_ext_branch" do
-    it "returns branch name of repo url" do
-      options = { ext: "git@github.com:br/.ebextensions:basic" }
-      deploy = Gantree::Deploy.new(@env,options)
-      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:basic" }
-      deploy = Gantree::Deploy.new(@env,options)
-      expect(deploy.instance_eval { get_ext_repo }).to eq "git@github.com:br/.ebextensions"
-    end
-  end
-
-  describe ".auto_detect_app_role" do
-    it "sets app roles if enabled" do
-      options = { autodetect_app_role: true}
-      deploy = Gantree::Deploy.new("stag-knarr-listener-s1",options)
-      puts deploy.instance_eval { autodetect_app_role }
-    end
-  end
-end