dpl 1.5.3.travis.259.1 → 1.5.3.travis.261.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQ3ZWZiMzZiNzkyZTgyZjIyYzJjN2Q5OGMyNjdmNDM4YzljOGVmMg==
+    YzdkNDEyOGEyNDY0NjVmYWUwZDU5MDJhZTQ5YzI2Yjg3NzIyNzg4Mw==
   data.tar.gz: !binary |-
-    OTExMmM4YTgzODk4NWRlYTc5YWE4NTNiOWFlYWZkMGVhNzZiZjJhMw==
-!binary "U0hBNTEy":
+    OWJhYThkZGUyODQ2NjllMWM3ZjZlMGRkZjRiMjdiOTc0NDE5ZDkxMA==
+SHA512:
   metadata.gz: !binary |-
-    MTIyZjE4ZThkNzE5ZTAzMGU5MDI5YmIwMjhhNzRkOWI1ZjU5YmI1YjBhZDUy
-    OGMxMGJjMGZhYzYyY2M0ZDhkYjM5YzYxNmVlYzZlMGYxZmQ4NzhhNWM5NTQ3
-    YTY4MmY3NTM2NTliN2M5ZWIzYjcwY2U4ZTNlOTA5Y2M1OTU3NGE=
+    NzM3MTU5Mzk2MTFmYmUzMmVhZmZhM2FmMGNmOWFmYWZlNTNmYThhYTA5MzE1
+    YzM4YzNkYzQxZGE5NzgzNTAwYTZiZGJjODFlMDI3MzM0ZjkzYTlmYjEyYjUw
+    ZDk3NTYxZDEyZWU4YTBiZTY4YWM3NDdjZDkzYmJiNTU4YTk5MjM=
   data.tar.gz: !binary |-
-    MDgwOWE0NzQ0Mjk4NTQxNDAyNmMyYmJlYjg4NzAzZjMxZTA5Nzk4YzIwMDc2
-    OTEzNjU5ZDFlZjE3ZWIzNjg4MDJjZjQxN2FiMmI1ZWE2NTRhYjc3ZDBhNDc3
-    OGNmOGFmNDcwNjA3OWI4YTlmMjBmNzgzYjRjZjQxNmM5NGJjMzg=
+    MzE3ZTViMTY5M2RkZjAxMjU4NDJlNmZkMzc1NjU4ZDQ0MGFhZmFlMDczN2Rm
+    YmMzNzQzN2MzOTFkZmNiMTE3NDc2MTQ4Y2Q5MWJkYTFlNjJkZDU3YjhjOTM2
+    ZjBkM2ZhMjc0OTEzNmM0ODBhNDQ5YTUxMmVkNTdlZTkzNjk5YWU=

data/README.md

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

data/lib/dpl/provider/ops_works.rb

@@ -8,6 +8,10 @@ module DPL
         @api ||= AWS::OpsWorks.new
       end
 
+      def client
+        @client ||= api.client
+      end
+
       def needs_key?
         false
       end
@@ -25,8 +29,48 @@ module DPL
         log "Logging in with Access Key: #{option(:access_key_id)[-4..-1].rjust(20, '*')}"
       end
 
+      def custom_json
+        {
+          deploy: {
+            ops_works_app[:shortname] => {
+              migrate: !!options[:migrate],
+              scm: {
+                revision: current_sha
+              }
+            }
+          }
+        }
+      end
+
+      def current_sha
+        @current_sha ||= `git rev-parse HEAD`.chomp
+      end
+
+      def ops_works_app
+        @ops_works_app ||= fetch_ops_works_app
+      end
+
+      def fetch_ops_works_app
+        data = client.describe_apps(app_ids: [option(:app_id)])
+        unless data[:apps] && data[:apps].count == 1
+          raise Error, "App #{option(:app_id)} not found.", error.backtrace
+        end
+        data[:apps].first
+      end
+
       def push_app
-        api.client.create_deployment(stack_id: option(:stack_id), app_id: option(:app_id), command: {name: 'deploy'})
+        data = client.create_deployment(
+          stack_id: ops_works_app[:stack_id],
+          app_id: option(:app_id),
+          command: {name: 'deploy'},
+          comment: travis_deploy_comment,
+          custom_json: custom_json.to_json
+        )
+        log "Deployment created: #{data[:deployment_id]}"
+      end
+
+      def travis_deploy_comment
+        "Deploy #{ENV['TRAVIS_COMMIT'] || current_sha} via Travis CI"
       end
 
       def deploy

data/spec/provider/ops_works_spec.rb

@@ -16,7 +16,7 @@ describe DPL::Provider::OpsWorks do
   describe :check_auth do
     example do
       provider.should_receive(:setup_auth)
-      provider.should_receive(:log).with("Logging in with Access Key: ****************jklz")
+      provider.should_receive(:log).with('Logging in with Access Key: ****************jklz')
       provider.check_auth
     end
   end
@@ -36,10 +36,31 @@ describe DPL::Provider::OpsWorks do
 
   describe :push_app do
     let(:client) { double(:ops_works_client) }
-    example do
-      provider.options.update(stack_id: 'stack-id', app_id: 'app-id')
+    let(:ops_works_app) { {shortname: 'app', stack_id: 'stack-id'} }
+    before do
+      provider.should_receive(:current_sha).and_return('sha')
       provider.api.should_receive(:client).and_return(client)
-      client.should_receive(:create_deployment).with(stack_id: 'stack-id', app_id: 'app-id', command: {name: "deploy"})
+      ENV.should_receive(:[]).with('TRAVIS_COMMIT').and_return('123')
+    end
+
+    let(:custom_json) { "{\"deploy\":{\"app\":{\"migrate\":false,\"scm\":{\"revision\":\"sha\"}}}}" }
+    example 'without :migrate option' do
+      provider.options.update(app_id: 'app-id')
+      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
+      ).and_return({})
+      provider.push_app
+    end
+
+    let(:custom_json_with_migrate) { "{\"deploy\":{\"app\":{\"migrate\":true,\"scm\":{\"revision\":\"sha\"}}}}" }
+    example 'with :migrate option' 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
+      ).and_return({})
       provider.push_app
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.3.travis.259.1
+  version: 1.5.3.travis.261.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: deploy tool