gantree 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daac40fc78c4d167ac70cea2e09855067b8ed912
-  data.tar.gz: 23e44ef2b8b76ca7be0c9dc31bd7041f34411cfa
+  metadata.gz: 0f48e2e22a4ed8c5c3f2bbeae9e2625c3392addb
+  data.tar.gz: 837ccf109dbdb37e60c8bf4ec81f9a3091020e14
 SHA512:
-  metadata.gz: 07af7b7d78fc3efe1da1109526c9b8fe03b5979e244228f98834ef66137d66afde53dcbf7bd0cc2bffddb992abb020db6558a34173219b4a4a89086b3910e3e4
-  data.tar.gz: b26c9f67e3a77550d7bc9c2d36d5fbb0f8d445dd59822a067483c4a42dd50e76cfee0395f490303bd04d0c03478b71cb3756719a17c346af60496b5a6637d729
+  metadata.gz: 7e6e2bf6e3916fa30814bbdf3d0201a95bfc19323014707dba2403eeb1f10064f6415ce3f0e3bbb264a92e9d91275c01aecf90c29365dbfcb7c7b595e22e6a0b
+  data.tar.gz: 2f898c102abe776eb5ab8dbe71bd9ecf1e6a8278b79ca061232a8bf3739147d0459f000c1c54cd0051e318b1c05071d397f97fa26a8e3639b805304ff4764f82

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gem "codeclimate-test-reporter", group: :test, require: nil
 gem "aws-sdk"
 gem "guard", group: :test
+gem "guard-bundler", group: :test
 gem "rspec", group: :test
 gem "rake"
 gem "guard-rspec", require: false

data/Gemfile.lock

@@ -29,6 +29,9 @@ GEM
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
+    guard-bundler (2.0.0)
+      bundler (~> 1.0)
+      guard (~> 2.2)
     guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
@@ -86,6 +89,7 @@ DEPENDENCIES
   cloudformation-ruby-dsl
   codeclimate-test-reporter
   guard
+  guard-bundler
   guard-rspec
   json
   rake

data/Guardfile

@@ -1,7 +1,7 @@
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})      { "spec/gantree_spec.rb" }
-  watch(%r{^lib/gantree/(.+)\.rb$})  { "spec/gantree_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})      { "spec/cli_spec.rb" }
+  watch(%r{^lib/gantree/(.+)\.rb$})  { "spec/cli_spec.rb" }
   watch('spec/spec_helper.rb')   { "spec/gantree_spec.rb" }
   watch(%r{^lib/gantree/(.+)\.rb$})   { |m| "spec/lib/#{m[1]}_spec.rb" }
 end

data/README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/feelobot/gantree.svg)](https://travis-ci.org/feelobot/gantree)
 [![Test Coverage](https://codeclimate.com/github/feelobot/gantree/badges/coverage.svg)](https://codeclimate.com/github/feelobot/gantree)
 [![Code Climate](https://codeclimate.com/github/feelobot/gantree/badges/gpa.svg)](https://codeclimate.com/github/feelobot/gantree)
+[![Gem Version](https://badge.fury.io/rb/gantree.svg)](http://badge.fury.io/rb/gantree)
 ## Why Gantree?
 
 The name is derived from the word gantry which is a large crane used in ports to pick up shipping containers and load them on a ship. Gantry was already taken so I spelled it "tree" because the primary use is for elastic beanstalk and I guess a beanstalk is a form of tree? 

data/lib/gantree/deploy.rb

@@ -14,7 +14,6 @@ module Gantree
       @env = app
       @eb = AWS::ElasticBeanstalk::Client.new
       @s3 = AWS::S3.new
-      @tag = options.tag
     end
 
     def run
@@ -79,7 +78,7 @@ module Gantree
       version = "#{@env}-#{hash}"
       puts "version: #{version}"
       dockerrun = "Dockerrun.aws.json"
-      set_tag_to_deploy(dockerrun) if @tag
+      set_tag_to_deploy(dockerrun) if @options[:tag]
       unless ext?
         new_dockerrun = "#{version}-Dockerrun.aws.json"
         FileUtils.cp("Dockerrun.aws.json", new_dockerrun)
@@ -94,7 +93,7 @@ module Gantree
 
     def set_tag_to_deploy file
       docker = JSON.parse(IO.read(file))
-      docker["Image"]["Name"].gsub!(/:(.*)$/, ":#{@tag}")
+      docker["Image"]["Name"].gsub!(/:(.*)$/, ":#{@options[:tag]}")
       IO.write(file,JSON.pretty_generate(docker))
     end
 
@@ -120,7 +119,7 @@ module Gantree
 
     def get_ext_repo
       if ext_branch?
-        repo = @ext.sub.(get_ext_branch)
+        repo = @ext.sub(":#{get_ext_branch}", '')
       else
         @ext
       end
@@ -135,7 +134,8 @@ module Gantree
     end
 
     def get_ext_branch
-      branch = @ext.match(/:.*(:.*)$/)[0]
+      branch = @ext.match(/:.*(:.*)$/)[1]
+      branch.tr(':','')
     end
 
     def clone_repo

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/lib/cli_spec.rb

@@ -34,6 +34,14 @@ describe Gantree::CLI do
       out = execute("bin/gantree deploy #{@env}")
       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'")
+      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'")
+      expect(out).to include("Deploying")
+    end
   end
 
   describe "create" do
@@ -42,4 +50,4 @@ describe Gantree::CLI do
       expect(out).to include "All templates created"
     end
   end
-end
+end

data/spec/lib/deploy_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require_relative '../../lib/gantree/deploy'
+
+describe "#Deploy" do
+  before(:all) do
+    @env = "stag-app-knarr-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:feature" }
+      deploy = Gantree::Deploy.new(@env,options)
+      expect(deploy.instance_eval { get_ext_branch }).to eq "feature"
+    end
+  end
+  
+  describe ".get_ext_repo" do 
+    it "returns just the repo url" do 
+      options = { ext: "git@github.com:br/.ebextensions:feature" }
+      deploy = Gantree::Deploy.new(@env,options)
+      puts deploy.instance_eval { get_ext_repo } 
+    end
+  end 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Felix
@@ -222,6 +222,7 @@ files:
 - lib/gantree/init.rb
 - lib/gantree/version.rb
 - spec/lib/cli_spec.rb
+- spec/lib/deploy_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/feelobot/gantree
 licenses:
@@ -252,4 +253,5 @@ summary: This tool is intended to help you setup a Dockerrun.aws.json which allo
   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/spec_helper.rb