gantree 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5d55367e0c3dd995df31bbd401fd051c25e6500
-  data.tar.gz: a24bb95258212aecd709f6392fb5d3b5391b6819
+  metadata.gz: ff66472c33546db57fb72859e6c1d0d914d45aec
+  data.tar.gz: a239a2c814966bfe9978291d219449d3352ba51f
 SHA512:
-  metadata.gz: c06a362bb8800bcca198aaa4bcb4eda33a04175d30185746499e8030b8acabcd9c8aab1dcd6cbc45ad2cc7cb2fa144fd35022d07639f62c9a89d2a1f1e1d9281
-  data.tar.gz: efafabd1655dd1ebfd35a2a86180a57e48484e5d50e00f1526f9a2a14a47298de0e45bbcd4bb26eba40416f91bd33a4b0d8411b931e9d4ae2730538ddb7ece3b
+  metadata.gz: bedf8c651dc799fd32d75f7ccbde70cb496d783b15f68013ad60c90c7f15c34eb0bb7e705d4098472e7119a3aa53417bb63bcd5517453c53555b2496c025279d
+  data.tar.gz: f4ed2f47b20d2177669d6516ed85ef5a9c51ab78a47aad295828a7ebc69ae519d1c4abe8d8bb44b663f594d7c84924b6a030aba384bb3a46653abefaf9099fe1

data/Gemfile

@@ -17,6 +17,4 @@ gem "highline"
 gem "pry"
 gem "vcr"
 gem "fakeweb"
-gem "colorize"
-
-
+gem "colorize"

data/lib/gantree/base.rb

@@ -25,6 +25,13 @@ module Gantree
     def eb
       @eb ||= AWS::ElasticBeanstalk::Client.new
     end
+
+    def tag
+      origin = `git remote show origin | grep "Push" | cut -f1 -d"/" | cut -d":" -f3`.strip
+      branch = `git rev-parse --abbrev-ref HEAD`.strip
+      hash = `git rev-parse --verify --short #{branch}`.strip
+      "#{origin}-#{branch}-#{hash}"
+    end
   end
 end
 

data/lib/gantree/cli.rb

@@ -9,7 +9,6 @@ module Gantree
     desc "deploy APP", "deploy specified APP"
     option :branch, :desc => 'branch to deploy'
     method_option :tag, :aliases => "-t", :desc => "set docker tag to deploy"
-    method_option :env, :aliases => "-e", :desc => "elastic beanstalk environment"
     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"
@@ -60,6 +59,7 @@ module Gantree
     end
 
     desc "build", "build and tag a docker application"
+    option :tag, :aliases => "-t", :desc => "set docker tag to build"
     option :hub, :aliases => "-h", :desc => "hub (docker|quay)"
     def build
       Gantree::Docker.new(merge_defaults(options)).build
@@ -67,6 +67,7 @@ module Gantree
 
     desc "push", "build and tag a docker application"
     option :hub, :aliases => "-h", :desc => "hub (docker|quay)"
+    option :tag, :aliases => "-t", :desc => "set docker tag to push"
     def push
       Gantree::Docker.new(merge_defaults(options)).push
     end
@@ -76,6 +77,22 @@ module Gantree
       puts Gantree::Docker.new(merge_defaults(options)).tag
     end
 
+    desc "shipit", "tag a docker application"
+    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 :hub, :aliases => "-h", :desc => "hub (docker|quay)"
+    option :hush, :desc => "quite puts messages", :default => true
+    def shipit server
+      docker = Gantree::Docker.new(merge_defaults(options))
+      docker.build
+      docker.push
+      Gantree::Deploy.new(server, merge_defaults(options)).run
+    end
+
     protected
 
     def merge_defaults(options={})

data/lib/gantree/deploy.rb

@@ -68,6 +68,7 @@ module Gantree
         return true
       end
     end
+
     def deploy(envs)
       print_options
       check_dir_name(envs) unless @options[:force]
@@ -83,6 +84,7 @@ module Gantree
         Notification.new(@options[:slack]).say(msg) unless @options[:silent]
       end
     end
+
     def upload_to_s3
       key = File.basename(@packaged_version)
       check_version_bucket

data/lib/gantree/docker.rb

@@ -9,40 +9,36 @@ module Gantree
       @options = options
       @hub = @options[:hub]
       raise "Please provide a hub name in your .gantreecfg ex { hub : 'bleacher' }" unless @hub
-      @origin = `git remote show origin | grep "Push" | cut -f1 -d"/" | cut -d":" -f3`.strip
       @repo = `basename $(git rev-parse --show-toplevel)`.strip
-      @branch = `git rev-parse --abbrev-ref HEAD`.strip
-      @hash = `git rev-parse --verify --short #{@branch}`.strip
+      @tag = @options[:tag] ||= tag
     end
 
     def build 
       puts "Building..."
-      output = `docker build -t #{@hub}/#{@repo}:#{@origin}-#{@branch}-#{@hash} .`
+      output = `docker build -t #{@hub}/#{@repo}:#{@tag} .`
       if $?.success?
-        puts "Image Built: #{@hub}/#{@repo}:#{tag}".green 
-        puts "docker push #{@hub}/#{@repo}:#{tag}"
-        puts "gantree deploy app_name -t #{tag}"
+        puts "Image Built: #{@hub}/#{@repo}:#{@tag}".green 
+        puts "docker push #{@hub}/#{@repo}:#{@tag}" unless @options[:hush]
+        puts "gantree deploy app_name -t #{@tag}" unless @options[:hush]
       else
         puts "Error: Image was not built successfully".red
         puts "#{output}"
+        exit 1
       end
     end
 
     def push 
       puts "Pushing..."
-      output = `docker push #{@hub}/#{@repo}:#{tag}`
+      output = `docker push #{@hub}/#{@repo}:#{@tag}`
       if $?.success?
-        puts "Image Pushed: #{@hub}/#{@repo}:#{tag}".green 
-        puts "gantree deploy app_name -t #{tag}"
+        puts "Image Pushed: #{@hub}/#{@repo}:#{@tag}".green 
+        puts "gantree deploy app_name -t #{@tag}" unless @options[:hush]
       else
         puts "Error: Image was not pushed successfully".red
         puts "#{output}"
+        exit 1
       end
     end
-
-    def tag
-      "#{@origin}-#{@branch}-#{@hash}"
-    end
   end
 end
 

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

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