gantree 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 375f0ba44dd429bb2dac4ec8d9d7487cb799f22b
-  data.tar.gz: b71597843a51ddaf68838f4b339e9d6359bb5cf6
+  metadata.gz: c29f307b0a0953654d60d594c16483af6170d65e
+  data.tar.gz: 99419b8282f4321e4bc03cfda65c5c6fc148b36f
 SHA512:
-  metadata.gz: 7cd977a7179d2b9b09df0313809284e95567f1633e8cdaf4c4143cdf6a4691ef18a3b07817b5afa30054c2fd2cfe821997deacd4ec44144e7f6b984c0ff44556
-  data.tar.gz: 6be3ab8f036c1bdaf56421482f5aa8fc6c0d2a95907092d9eb6c8c91cfd7c409e47e6ee13cd2e82436baa60ffa66f55a2de7c2f5ff1c7fa302cfe4cc5179d93a
+  metadata.gz: dd4eb18352ec83074acf1061c824c0ca571cb1f69a49f9f4475fcdbba3641b552cd19885c934aa6202be221fd07169a728ba18435e0aa654a437fcf72fd3fc61
+  data.tar.gz: 345e240f10d6ca87bf48e186540ddce77f39bf0862eef393c679103647fb9723f0f619f6c350ee4809f3af5eea475e27adb51cf0d353fb8b10f9c30b5c84a771

data/lib/gantree/base.rb

@@ -27,7 +27,7 @@ module Gantree
     end
 
     def tag
-      origin = `git remote show origin | grep "Push" | cut -f1 -d"/" | cut -d":" -f3`.strip
+      origin = `git config --get remote.origin.url`.match(":(.*)\/")[1]
       branch = `git rev-parse --abbrev-ref HEAD`.strip
       hash = `git rev-parse --verify --short #{branch}`.strip
       "#{origin}-#{branch}-#{hash}"

data/lib/gantree/cli.rb

@@ -6,11 +6,13 @@ require 'gantree/cli/help'
 module Gantree
   class CLI < Thor
 
+    class_option :dry_run, :aliases => "-d", :desc => "dry run mode", :default => false
+
     desc "deploy APP", "deploy specified APP"
+    long_desc Help.deploy
     option :branch, :desc => 'branch to deploy'
     method_option :tag, :aliases => "-t", :desc => "set docker tag to deploy"
     method_option :ext, :aliases => "-x", :desc => "ebextensions folder/repo"
-    option :dry_run, :aliases => "-d", :desc => "do not actually deploy the app"
     option :silent, :aliases => "-s", :desc => "mute notifications"
     option :image_path, :aliases => "-i", :desc => "docker hub image path ex. (bleacher/cms | quay.io/bleacherreport/cms)"
     option :autodetect_app_role, :desc => "use naming convention to determin role"
@@ -19,19 +21,19 @@ module Gantree
     end
 
     desc "init IMAGE", "create a dockerrun for your IMAGE"
+    long_desc Help.init
     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 '<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
     end
 
     desc "create APP", "create a cfn stack"
+    long_desc Help.create
     method_option :env, :aliases => "-e", :desc => "(optional) environment name"
     method_option :instance_size, :aliases => "-i", :desc => "(optional) set instance size", :default => "m3.medium"
     method_option :rds, :aliases => "-r", :desc => "(optional) set database type [pg,mysql]"
-    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"
     option :dupe, :desc => "copy an existing template into a new template"
     option :local, :desc => "use a local cfn nested template"
@@ -40,26 +42,26 @@ module Gantree
     end
 
     desc "update APP", "update a cfn stack"
-    option :dry_run, :aliases => "-d", :desc => "do not actually create the stack"
+    long_desc Help.update
     option :role, :aliases => "-r", :desc => "add an app role (worker|listner|scheduler)"
+    option :solution, :aliases => "-s", :desc => "change solution stack"
     def update app
       Gantree::Stack.new(app, merge_defaults(options)).update
     end
 
     desc "delete APP", "delete a cfn stack"
     option :force, :desc => "do not prompt"
-    option :dry_run, :aliases => "-d", :desc => "do not actually create the stack"
     def delete app
       Gantree::Stack.new(app, merge_defaults(options)).delete
     end
 
     desc "restart APP", "restart an eb app"
-    option :dry_run, :aliases => "-d", :desc => "do not actually restart"
     def restart app
       Gantree::App.new(app, merge_defaults(options)).restart
     end
 
     desc "build", "build and tag a docker application"
+    long_desc Help.build
     option :image_path, :aliases => "-i", :desc => "docker hub image path ex. (bleacher/cms | quay.io/bleacherreport/cms)"
     option :tag, :aliases => "-t", :desc => "set docker tag to build"
     def build
@@ -67,6 +69,8 @@ module Gantree
     end
 
     desc "push", "build and tag a docker application"
+    long_desc Help.push
+    option :hub, :aliases => "-h", :desc => "hub (docker|quay)"
     option :image_path, :aliases => "-i", :desc => "docker hub image path ex. (bleacher/cms | quay.io/bleacherreport/cms)"
     option :tag, :aliases => "-t", :desc => "set docker tag to push"
     def push
@@ -78,11 +82,11 @@ module Gantree
       puts Gantree::Docker.new(merge_defaults(options)).tag
     end
 
-    desc "ship", "tag a docker application"
+    desc "ship", "build, push and deploy docker container to elastic beanstalk"
+    long_desc Help.ship
     option :branch, :desc => 'branch to deploy'
     option :tag, :aliases => "-t", :desc => "set docker tag to deploy", :default => Gantree::Base.new.tag
     option :ext, :aliases => "-x", :desc => "ebextensions folder/repo"
-    option :dry_run, :aliases => "-d", :desc => "do not actually deploy the app"
     option :silent, :aliases => "-s", :desc => "mute notifications"
     option :autodetect_app_role, :desc => "use naming convention to determin role"
     option :image_path, :aliases => "-i", :desc => "hub image path ex. (bleacher/cms | quay.io/bleacherreport/cms)"
@@ -94,6 +98,12 @@ module Gantree
       Gantree::Deploy.new(server, merge_defaults(options)).run
     end
 
+    map "-v" => :version
+    desc "version", "gantree version"
+    def version
+      puts VERSION
+    end
+
     protected
 
     def merge_defaults(options={})

data/lib/gantree/cli/help.rb

@@ -2,9 +2,131 @@ module Gantree
   class CLI < Thor
     class Help
       class << self
-        def hello(action)
+        def init
 <<-EOL
-Adds a remote named <name> for the repository at <url>. The command git fetch <name> can then be used to create and update
+Examples:
+
+$ gantree init -u USERNAME -p PORT HANDLE/REPO:TAG
+
+$ gantree init -u frodriguez -p 3000 bleacher/cauldron:master
+EOL
+        end
+
+        def deploy
+<<-EOL
+Examples:
+
+$ gantree deploy -t TAG ENVIRONMENT
+
+$ gantree deploy -t latest stag-cauldon-app-s1
+
+# to deploy to all environments to within the same application
+
+$ gantree deploy -t TAG APPLICATION
+
+$ gantree deploy -t TAG cauldron-stag-s1
+
+# add remote .ebextensions
+
+$ gantree deploy -t TAG stag-cauldron-s1 -x "git@github.com:br/.ebextensions.git"
+
+# add remote .ebextensions branch
+
+$ gantree deploy -t TAG stag-cauldron-s1 -x "git@github.com:br/.ebextensions:feature_branch"
+
+EOL
+        end
+
+        def create
+<<-EOL
+Examples:
+
+$ gantree create APPLICATION
+
+$ gantree create linguist-stag-s1
+
+$ gantree create APPLICATION -e ENVIRONMENT
+
+$ gantree create linguist-stag-s1 -e linguist-stag-app-s1
+
+$ gantree create --dupe=rails-stag-s1 rails-stag-s3 
+EOL
+        end
+
+        def update
+<<-EOL
+Examples:
+
+# Update a cloudformation stack
+$ gantree update linguist-stag-s1
+
+# Add an app role to an existing stack
+$ gantree update linguist-stag-s1 -r worker
+
+# Update docker solution starck version
+$ gantree update linguist-stag-s1 -s latest
+$ gantree update linguist-stag-s1 -s "64bit Amazon Linux 2014.09 v1.0.11 running Docker 1.3.3"
+EOL
+        end
+
+        def build
+<<-EOL
+Builds and tags a docker application.
+
+Examples:
+
+# Automatically tag a build
+$ gantree build
+
+# Add custom tag to a build 
+$ gantree build -t deploy 
+
+# Override image path to point to another hub
+$ gantree build -i quay.io/bleacherreport/cms
+
+EOL
+        end
+
+        def push
+<<-EOL
+Push docker image tag to hub
+
+Examples:
+
+# Push automatically tagged build
+$ gantree push
+
+# Push custom tagged build
+$ gantree push -t deploy 
+
+# Push to another hub/acocunt/repo
+$ gantree push -i quay.io/bleacherreport/cms
+EOL
+        end
+
+        def ship
+<<-EOL
+build, push and deploy docker image to elastic beanstalk
+
+Examples:
+
+# Automatically tag a build, push that build and deploy to elastic beanstalk
+$ gantree ship cms-stag-s1
+
+# Override defaults
+$ gantree ship -i bleacher/cms -x "git@github.com:br/.ebextensions.git:master" cms-stag-s1
+
+$ gantree ship -i bleacher/cms -t built -x "git@github.com:br/.ebextensions.git:master" cms-stag-s1
+EOL
+        end
+
+        def restart
+<<-EOL
+Restart docker environment
+
+Examples:
+
+$ gantree restart stag-rails-app-s1
 EOL
         end
       end

data/lib/gantree/deploy.rb

@@ -116,8 +116,9 @@ module Gantree
             :option_settings => autodetect_app_role(env)
           })
           puts "Deployed #{@packaged_version} to #{env} on #{@app}".green
-        rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue
+        rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue => e
           puts "Error: Something went wrong during the deploy to #{env}".red
+          puts "#{e.message}"
         end
       end
     end

data/lib/gantree/stack.rb

@@ -51,10 +51,10 @@ module Gantree
     def update
       puts "Updating stack from local cfn repo"
       add_role @options[:role] if @options[:role]
-      unless @options[:dry_run] then
-        upload_templates
-        @cfm.stacks[@options[:stack_name]].update(:template => stack_template)
-      end
+      change_solution_stack if @options[:solution]
+      return if @options[:dry_run]
+      upload_templates
+      puts "Stack Updated".green if @cfm.stacks[@options[:stack_name]].update(:template => stack_template)
     end
 
     def delete
@@ -178,6 +178,25 @@ module Gantree
       end
     end
 
+    def change_solution_stack 
+      beanstalk = JSON.parse(IO.read("cfn/#{@options[:stack_name]}-beanstalk.cfn.json"))
+      solution_stack = set_solution_stack
+      beanstalk["Resources"]["ConfigurationTemplate"]["Properties"]["SolutionStackName"] = solution_stack
+      beanstalk["Resources"]["ConfigurationTemplate"]["Properties"]["Description"] = solution_stack
+      IO.write("cfn/#{@options[:stack_name]}-beanstalk.cfn.json",JSON.pretty_generate(beanstalk))
+    end
+
+    def set_solution_stack
+      @options[:solution] == "latest" ? get_latest_docker_solution : @options[:solution]
+    end
+
+    def get_latest_docker_solution
+      result = eb.list_available_solution_stacks
+      solutions = result[:solution_stacks]
+      docker_solutions = solutions.select { |s|  s.include? "running Docker"}
+      docker_solutions.first
+    end
+
     def add_role name
       env = @options[:env].sub('app', name)
       beanstalk = JSON.parse(IO.read("cfn/#{@options[:stack_name]}-beanstalk.cfn.json"))

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/spec/lib/gantree/cli_spec.rb

@@ -106,5 +106,17 @@ describe Gantree::CLI do
       expect(out).to include "Deleting"
     end
   end
+
+  describe "#version" do
+    it "should output gantree version" do
+      out = execute("bin/gantree version")
+      expect(out).to match /\d\.\d\.\d/
+    end
+
+    it "should output gantree version using alias" do
+      out = execute("bin/gantree -v")
+      expect(out).to match /\d\.\d\.\d/
+    end
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor