dpl 1.5.8.travis.328.1 → 1.5.8.travis.330.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDZjYTkwMzBmMzFlODQ2ZjIyYjIxOTdkOGE1YjBjMzdmMWI1YTI0Yw==
+    ZDNiMTY3ZTdmOGZjYzA0YWUzMGNkNTQ0NDFhYjFkOGQ4ZWVkZDRmNQ==
   data.tar.gz: !binary |-
-    NTk0OWVlNzJmYjE2N2E5OGVmZTQxYjcxNGRhM2VmZWVjNWRiOTljOQ==
+    NzY3ZmYyOWUzMTQ0ZGY2OWFmOTFiNGJiMDBmNTQ5ODYxMjQxYTkzYw==
 SHA512:
   metadata.gz: !binary |-
-    YTEwNmYyYzY4OTEwNTc5NmMxNGFjNTIzMWZkNjVkZGE4YzQ0ZDM0ZDQwNWJh
-    MzgxNTIwYTcyNDg0N2U0ODcxYzVmZDc2ODk5MTYxZjA1ZmFkNzBlNjE4NjJh
-    NWVmNzZlYWQ3MWRmNTU3ZmEzYjdiNmFiNzdjNmRhZGRhMmY3YTE=
+    ZDUyMjhiZTFmMWJkM2RhYzQwMmI5M2QxZjY1NzhhYmZmNTZlYjk5YjBjMDhi
+    NzhhMjRkZTlhOTUwNGNjYWRkNGIyZjIxYjgxNmQ0NzMwNmRiODBiOThkZGZi
+    NGNiNGVhMDVkY2IwN2FlNmEwYzhmNDJiMDBhZjQwZTAxZWFlMjU=
   data.tar.gz: !binary |-
-    ZGI0NWRjNzk0MjQ1OWU5MzkwZTA4OGJmM2E3MWE4YTE1MzdhZGNlNzUxNzZk
-    N2EyYjk4OWEyNmQ4ZjQ0OGE4YjdlMTg0MGQzNzhkNjI3MTg5YzUxYmI0Nzg4
-    MjNhYjBjNWU5YTAwMDRiN2FlOWIyMzBjMzdmZTliNTE0MTI0ODU=
+    MzMwYzU2ZGVjZWU3NWQ0MmNlZDQzMTdhMjE0MDhhOTc2MjAzMjgyN2QwZjBk
+    NWFjNzczMjU2NGQxMTZmODg5MTkwYjhmYWE2ODZhMDEwYzg5MmRjMTg0ZWQ2
+    NzkwNDJlZTdiYjkzMzkwZjNmZjEzMzBkNzc3MTQyNDQxM2JhOGI=

data/README.md

@@ -189,10 +189,10 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 * **secret-access-key**: AWS Secret Key. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
 * **app-id**: The app ID.
 * **migrate**: Migrate the database. (Default: false)
-
+* **wait-until-deployed**: Wait until the app is deployed and return the deployment status. (Default: false)
 #### Examples:
 
-    dpl --provider=opsworks --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --app-id=<app-id> --migrate
+    dpl --provider=opsworks --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --app-id=<app-id> --migrate --wait-until-deployed
 
 
 ### Appfog:

data/lib/dpl/provider/ops_works.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 module DPL
   class Provider
     class OpsWorks < Provider
@@ -59,6 +61,14 @@ module DPL
       end
 
       def push_app
+        Timeout::timeout(600) do
+          create_deployment
+        end
+      rescue Timeout::Error
+        error 'Timeout: Could not finish deployment in 10 minutes.'
+      end
+
+      def create_deployment
         data = client.create_deployment(
           stack_id: ops_works_app[:stack_id],
           app_id: option(:app_id),
@@ -67,10 +77,31 @@ module DPL
           custom_json: custom_json.to_json
         )
         log "Deployment created: #{data[:deployment_id]}"
+        return unless options[:wait_until_deployed]
+        print "Deploying "
+        deployment = wait_until_deployed(data[:deployment_id])
+        print "\n"
+        if deployment[:status] == 'successful'
+          log "Deployment successful."
+        else
+          error "Deployment failed."
+        end
+      end
+
+      def wait_until_deployed(deployment_id)
+        deployment = nil
+        loop do
+          result = client.describe_deployments(deployment_ids: [deployment_id])
+          deployment = result[:deployments].first
+          break unless deployment[:status] == "running"
+          print "."
+          sleep 5
+        end
+        deployment
       end
 
       def travis_deploy_comment
-        "Deploy #{ENV['TRAVIS_COMMIT'] || current_sha} via Travis CI"
+        "Deploy build #{ENV['TRAVIS_BUILD_NUMBER'] || current_sha} via Travis CI"
       end
 
       def deploy

data/spec/provider/ops_works_spec.rb

@@ -40,7 +40,7 @@ describe DPL::Provider::OpsWorks do
     before do
       provider.should_receive(:current_sha).and_return('sha')
       provider.api.should_receive(:client).and_return(client)
-      ENV.should_receive(:[]).with('TRAVIS_COMMIT').and_return('123')
+      ENV.should_receive(:[]).with('TRAVIS_BUILD_NUMBER').and_return('123')
     end
 
     let(:custom_json) { "{\"deploy\":{\"app\":{\"migrate\":false,\"scm\":{\"revision\":\"sha\"}}}}" }
@@ -49,7 +49,7 @@ describe DPL::Provider::OpsWorks do
       client.should_receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]}
       )
       client.should_receive(:create_deployment).with(
-        stack_id: 'stack-id', app_id: 'app-id', command: {name: 'deploy'}, comment: 'Deploy 123 via Travis CI', custom_json: custom_json
+        stack_id: 'stack-id', app_id: 'app-id', command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json
       ).and_return({})
       provider.push_app
     end
@@ -59,10 +59,18 @@ describe DPL::Provider::OpsWorks do
       provider.options.update(app_id: 'app-id', migrate: true)
       client.should_receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
       client.should_receive(:create_deployment).with(
-        stack_id: 'stack-id', app_id: 'app-id', command: {name: 'deploy'}, comment: 'Deploy 123 via Travis CI', custom_json: custom_json_with_migrate
+        stack_id: 'stack-id', app_id: 'app-id', command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json_with_migrate
       ).and_return({})
       provider.push_app
     end
+
+    example 'with :wait_until_deployed' do
+      provider.options.update(app_id: 'app-id', wait_until_deployed: true)
+      client.should_receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+      client.should_receive(:create_deployment).and_return({deployment_id: 'deployment_id'})
+      client.should_receive(:describe_deployments).with({deployment_ids: ['deployment_id']}).and_return({deployments: [status: 'running']}, {deployments: [status: 'successful']})
+      provider.push_app
+    end
   end
 
   describe :api do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.8.travis.328.1
+  version: 1.5.8.travis.330.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec