eb-docker-deploy 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67b183671bb59c1df4a045ea9c85fb88d3ca4556
-  data.tar.gz: db28728d203c093b528cb4409f83223b9f63acf8
+  metadata.gz: eed93a0acab6577a0c2ec4ffe056644a36de2e6d
+  data.tar.gz: d50a5f73fd7e3b3c40bbab5f33847733a6dac0e2
 SHA512:
-  metadata.gz: 21a1b760b2c9d75f561ecb477512bbc7e0085877900f789d00e7245feba37e7101806408a089ca68d404eea770993ef89e4d300fa39a3de05fef65bf2d2c2bca
-  data.tar.gz: 5b0465af2ebb7557b8c98a0c215318b0da85b32c26681f861b5880665f036841f010626b21609adebb2ffe7f80015fa7df927f9236c21158b296f22d09446ad5
+  metadata.gz: ac1a831ea453c9d7cd235308a8e3a24fe778e711bf7a6a10bc2f0ffc9affa7d46f0026c85fc791b05c374074e674c8c89abfafb8b2fa597e23c931b8ba312d90
+  data.tar.gz: 3ea019cc915720d1b0c433fde05db652c5fbf2bf8456f838a987d60d8a42adfddfa552a992df341fdea229276f759d05824823de6e3c786d566824485309336f

data/lib/deploy/deployer.rb

@@ -16,24 +16,26 @@ module Deploy
         f.puts "aws_access_key_id = #{key}"
         f.puts "aws_secret_access_key = #{secret}"
       end
-      (shout('AWS creds successfully configured at ~/.aws/config.'); exit(0)) if File.exist?(File.expand_path('~/.aws/config'))
+      shout('AWS creds successfully configured at ~/.aws/config.') if File.exist?(File.expand_path('~/.aws/config'))
     end
 
     method_option :version, aliases: '-v', desc: 'Version'
+    method_option :environment, aliases: '-e', desc: 'Environment'
     method_option :build, aliases: '-b', desc: 'Build Image'
     desc 'deploy', 'deploy'
     def deploy
       check_setup
 
+      environment = options[:environment]
       build = options[:build]
 
       version = options[:version]
       (shout('You must pass a version with -v'); exit(1)) unless version
 
       repo = ENV['DOCKER_REPO']
-      
+
       if build
-        notifier('', { color: '#6080C0', title: "Deployment started with build", text: "Deploying version #{version}" })
+        announce({ color: '#6080C0', title: "Deployment started with build", text: "Deploying version #{version} to #{environment || 'stage'}" })
         build_image(repo, version)
 
         tag_image_as_latest(repo, version)
@@ -41,24 +43,26 @@ module Deploy
         push_image(repo, version)
         push_image(repo, 'latest')
       else
-        notifier('', { color: '#6080C0', title: "Deployment started without build", text: "Deploying version #{version}" })
+        announce({ color: '#6080C0', title: "Deployment started without build", text: "Deploying version #{version} to #{environment || 'stage'}" })
       end
 
-      run_deploy(version)
-      notifier('', { color: 'good', title: 'Deployment Succeeded!!', text: "The current version is #{version}" })
+      run_deploy(version, environment)
+      announce({ color: 'good', title: 'Deployment Succeeded!!', text: "The current version of #{environment || 'stage'} is #{version}" })
     end
 
     method_option :version, aliases: '-v', desc: 'Version'
+    method_option :environment, aliases: '-e', desc: 'Environment'
     desc 'rollback', 'rollback'
     def rollback
       check_setup
 
+      environment = options[:environment]
       version = options[:version]
       (shout('You must pass a version with -v'); exit(1)) unless version
 
       repo = ENV['DOCKER_REPO']
 
-      notifier('', { color: '#6080C0', title: "Rollback started", text: "Rolling back to version #{version}" })
+      announce({ color: '#6080C0', title: "Rollback started", text: "Rolling back to #{version} on #{environment || 'stage'}" })
 
       pull_image(repo, version)
 
@@ -66,8 +70,8 @@ module Deploy
 
       push_image(repo, 'latest')
 
-      run_rollback(version)
-      notifier('', { color: 'good', title: 'Rollback Succeeded!!', text: "The current version is #{version}" })
+      run_rollback(version, environment)
+      announce({ color: 'good', title: 'Rollback Succeeded!!', text: "The current version of #{environment || 'stage'} is #{version}" })
     end
 
     desc 'send test notification', 'send test notification'
@@ -77,6 +81,11 @@ module Deploy
 
     no_commands do
 
+      def announce(attachments)
+        shout("#{attachments[:title]} - #{attachments[:text]}")
+        notifier('', attachments)
+      end
+
       def notifier(message, attachments)
         if ENV['SLACK_WEBHOOK']
           @notifier ||= Slack::Notifier.new(ENV['SLACK_WEBHOOK'])
@@ -112,15 +121,15 @@ module Deploy
         exit(1) unless system(command)
       end
 
-      def run_deploy(version)
-        shout "deploying #{version} to elastic beanstalk"
-        command = "eb deploy --label #{version}"
+      def run_deploy(version, environment=nil)
+        command = environment ? "eb deploy #{environment} --label #{version}" : "eb deploy --label #{version}"
+        shout "deploying #{version} to elastic beanstalk with command: #{command}"
         exit(1) unless system(command)
       end
 
-      def run_rollback(version)
-        shout "deploying #{version} to elastic beanstalk"
-        command = "eb deploy --version #{version}"
+      def run_rollback(version, environment=nil)
+        command = environment ? "eb deploy #{environment} --version #{version}" : "eb deploy --version #{version}"
+        shout "deploying #{version} to elastic beanstalk with command: #{command}"
         exit(1) unless system(command)
       end
 

data/lib/deploy/version.rb

@@ -1,3 +1,3 @@
 module Deploy
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eb-docker-deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler