dpl 1.7.12.travis.797.4 → 1.7.12.travis.807.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGFjMzAxNGUxOGZlYTAxMzUzZmJhYWM2MDU4NWFmZTlhODk0YzUzOA==
+    OWUzZTBjY2I0ZDZkMmYyYWU1MDYzMzcxMDg5OTY4OTk1OTJiZmFhMw==
   data.tar.gz: !binary |-
-    YjI1OGFlMTIwYWU2MTgyZDk4ZjZiYzZjYWRjMTg0OTk3YmRlMzRmOA==
+    ZDRlYjYzNTliM2ZkYWY5OGRjNTFjMWEyZGFiYzFlODhiYzBhNTJjNw==
 SHA512:
   metadata.gz: !binary |-
-    Y2MxNGNiNmI3NmU2N2U0YTE4MmE3MWU5NTEzZTQwYmI3MWY5ZjA5MWEyMjU5
-    YmZmNzQ0M2QxZWZkNTBhNzJmODY3MDZhMTNlMzZhZDI1Yjc5YjIzMGU3NmM2
-    ODIwNTFmYTUwZmNkNDc3NjgxYTQ1OTE2OTBlOTE3NjhiMmQ3OWQ=
+    NjE5NjYwNGYxMmI3M2JmYzNhNDg4YTk5MmZkM2IzNDg4NjI4ZDI1NDUzYTVk
+    YjZiODMyNTVjOTA2YTI1OWM1Yjk1MWZiZDc0ZWY4Njc4ZmEzMDE0OWJjZTg3
+    NzQxYWE2NjQzMGU2NWI0ZjUzOTRiYjhmZWU5NDI0Y2FmNWU1NDg=
   data.tar.gz: !binary |-
-    NWYwZTIyZGIxNzc4MTk4ZjgyZjdmMjU5YmUyM2Q2MjkwYjQzZWE4ZDJmYjc5
-    YjE3MDM3NmZjOGVmY2ViNTVlZDY2ZDZhMDJiYjY2NzZjZjJmYmY0MTc2MGM2
-    ZjVkNWVhYzMyZTM0YjE0N2FkYWI0NmViZjFmM2YzZDJjNjFkNDg=
+    OTdjY2QwYTJmOWNmYzllNDdlZTViNjVhNmZmZTRiMzg3YzRiNjZlNmU2ZTYz
+    MmExZTU5OTZiNTU4YTYxYzUzMjJiNDkxMzY3Y2ZmN2M3Y2Y5NmIzZWI2YTY3
+    ZGY1YjhmMTMwMGZlMjk2YWI0MWNlYzAwYjlhZTMxZTE5Y2EyMzA=

data/README.md

@@ -551,7 +551,8 @@ and your testers can start testing your app.
 * **commit_id**: Commit ID in case of GitHub.
 * **repository**: Repository Name in case of GitHub.
 * **region**: AWS Availability Zone.
+* **wait-until-deployed**: Wait until the app is deployed and return the deployment status (Optional, Default false).
 
 #### Examples:
 
-    dpl --provider=codedeploy --access-key-id=<aws access key> --secret_access_key=<aws secret access key> --application=<application name> --deployment_group=<deployment group> --revision_type=<s3/github> --commit_id=<commit ID> --repository=<repo name> --region=<AWS availability zone>
+    dpl --provider=codedeploy --access-key-id=<aws access key> --secret_access_key=<aws secret access key> --application=<application name> --deployment_group=<deployment group> --revision_type=<s3/github> --commit_id=<commit ID> --repository=<repo name> --region=<AWS availability zone> --wait-until-deployed=<true>

data/lib/dpl/provider/code_deploy.rb

@@ -53,17 +53,38 @@ module DPL
       end
 
       def push_app
-        deployment = code_deploy.create_deployment({
+        data = code_deploy.create_deployment({
           revision:               revision,
           application_name:       options[:application]      || option(:application_name),
           deployment_group_name:  options[:deployment_group] || option(:deployment_group_name),
           description:            options[:description]      || default_description
         })
-        log "Triggered deployment #{deployment.deployment_id.inspect}."
+        log "Triggered deployment #{data.deployment_id.inspect}."
+        return unless options[:wait_until_deployed]
+        print "Deploying "
+        deployment = wait_until_deployed(data[:deployment_id])
+        print "\n"
+        if deployment[:status] == 'Succeeded'
+          log "Deployment successful."
+        else
+          error "Deployment failed."
+        end
       rescue Aws::CodeDeploy::Errors::DeploymentLimitExceededException => exception
         error(exception.message)
       end
 
+      def wait_until_deployed(deployment_id)
+        deployment = {}
+        loop do
+          result = code_deploy.get_deployment(deployment_id: deployment_id)
+          deployment = result[:deployment_info]
+          break if deployment[:status] == "Succeeded" || deployment[:status] == "Failed" || deployment[:status] == "Stopped"
+          print "."
+          sleep 5
+        end
+        deployment
+      end
+
       def bundle_type
         if s3_key =~ /\.(tar|tgz|zip)$/
           options[:bundle_type] || $1

data/spec/provider/code_deploy_spec.rb

@@ -255,6 +255,24 @@ describe DPL::Provider::CodeDeploy do
         expect(provider).to receive(:log).with(/Triggered deployment \"#{deployment_id}\"\./)
         provider.push_app
       end
+
+       before do
+        allow(provider.code_deploy).to receive(:get_deployment).and_return(
+          {:deployment_info => {:status => "Created"}},
+          {:deployment_info => {:status => "Queued"}},
+          {:deployment_info => {:status => "InProgress"}},
+          {:deployment_info => {:status => "Succeeded"}})
+      end
+
+      example 'with :wait_until_deployed' do
+        old_options = provider.options
+        provider.stub(:options) {old_options.merge({
+          app_id: 'app-id',
+          wait_until_deployed: true})}
+        expect(provider).to receive(:log).with(/Triggered deployment \"#{deployment_id}\"\./)
+        expect(provider).to receive(:log).with(/Deployment successful./)
+        provider.push_app
+      end
     end
 
     context 'with an error' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.12.travis.797.4
+  version: 1.7.12.travis.807.4
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec