dpl 1.7.7.travis.626.1 → 1.7.7.travis.633.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWM1Mzk0ZDQ0NTk3MGNjMjc2NWU3YjRkMjg0YTgyZWMxOTkyMjE0NA==
+    NDg4ZDExZTk2ZTM5Y2I1YzAyMjFhMWMzZjE2ODJlNDA4NjRkZTkwYQ==
   data.tar.gz: !binary |-
-    NDk1YzAzOGEyOTNjMWFhMDNiNDIwNGEzZGJmNWNiMWZiZGU2MWQ1Zg==
+    ZGRlODM3NzM4Y2IzNTMxYTZkN2YwZGI2YmJhYWU5YjlhNWFlZmI2NA==
 SHA512:
   metadata.gz: !binary |-
-    OTU2NjVmN2RmYmRlZWQwZGVlYjk4M2Y5ZDNkNjVkNWEyZTY3MWRkOWViOWZl
-    MmM3ZmM4YzgwMzcxYmY5ZWMxNzRhNTc2MjYzYTEyYjI4N2I2Yjg0YTI5ZmMw
-    ODIxMTgxYzk5YTMzYjNkYjhhNThhMDUzMGUzZTExYTVlNzEyNzk=
+    YjRmZDE5MTAyMGE2MGMyMjY2ZDg3YmM1YTA2NjNjNzBmMmZlNGYxOTk5OGE1
+    OTYzZWVjYjIyOTExODMyNzE0MGU1Y2FjYjdjNzFiNWM1MGMyNmM5ZDQ2NTY0
+    ZWNkZThhYTJhMzgxZTRjNTBlMTU5Y2M1NzI5OGRjNTU2MjgzYmI=
   data.tar.gz: !binary |-
-    YTczYjk0MTkwZDcwNDIxNWExOWM3ZmFjNTg4OGEwMmRmYzhmYmJjNTM2MWYz
-    ODBlZWU1ZDFkYWYxZTIzMWNmZTA4NDY1YmNkN2E0NTVjMGZkZDk3NDFhNzBj
-    NzFkYzRmMDNkMTgwMmJlNzcxYTg4Y2RkM2I2MDZmOTI1YzJiNWQ=
+    Y2I5NjYxMTAyYjk5OWI2YjYyN2JkYjJhZjVkZTY3OWI1YjMxNDliNzAxYWE4
+    MmViNjY4NjQ4NmM2ZjY4Y2ZlZTAxNGQ2YWRlYTlhYTY5MTIxYTQxMjEwNDhl
+    YzU1NGUxMjZlNDEyNGU4ODVhYjczNjkyMDNkNTE3YmQyNDFlOWU=

data/Gemfile

@@ -21,10 +21,14 @@ group :rubygems do
 end
 
 group :sss do
-  gem 'aws-sdk'
+  gem 'aws-sdk-v1'
   gem 'mime-types'
 end
 
+group :code_deploy do
+  gem 'aws-sdk', '2.0.10.pre'
+end
+
 group :cloud_files do
   gem 'fog'
 end
@@ -48,7 +52,7 @@ end
 
 group :elastic_beanstalk do
   gem 'rubyzip'
-  gem 'aws-sdk'
+  gem 'aws-sdk-v1'
 end
 
 group :bitballoon do

data/lib/dpl/provider/code_deploy.rb

@@ -3,7 +3,7 @@ require 'json'
 module DPL
   class Provider
     class CodeDeploy < Provider
-      requires 'aws-sdk-core', pre: true
+      requires 'aws-sdk'
 
       def code_deploy
         @code_deploy ||= begin

data/lib/dpl/provider/elastic_beanstalk.rb

@@ -3,7 +3,7 @@ module DPL
     class ElasticBeanstalk < Provider
       experimental 'AWS Elastic Beanstalk'
 
-      requires 'aws-sdk'
+      requires 'aws-sdk-v1'
       requires 'rubyzip', :load => 'zip'
 
       DEFAULT_REGION = 'us-east-1'

data/lib/dpl/provider/ops_works.rb

@@ -3,7 +3,7 @@ require 'timeout'
 module DPL
   class Provider
     class OpsWorks < Provider
-      requires 'aws-sdk'
+      requires 'aws-sdk-v1'
       experimental 'AWS OpsWorks'
 
       def api

data/lib/dpl/provider/s3.rb

@@ -3,7 +3,7 @@ require 'json'
 module DPL
   class Provider
     class S3 < Provider
-      requires 'aws-sdk'
+      requires 'aws-sdk-v1'
       requires 'mime-types'
 
       def api

data/spec/provider/code_deploy_spec.rb

@@ -0,0 +1,342 @@
+require 'spec_helper'
+require 'aws-sdk'
+require 'dpl/error'
+require 'dpl/provider'
+require 'dpl/provider/code_deploy'
+
+describe DPL::Provider::CodeDeploy do
+
+  subject :provider do
+    described_class.new(DummyContext.new, :access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz')
+  end
+
+  describe '#code_deploy_options' do
+    context 'without region' do
+      example do
+        options = provider.code_deploy_options
+        expect(options[:region]).to eq('us-east-1')
+      end
+    end
+
+    context 'with region' do
+      example do
+        region = 'us-west-1'
+        provider.options.update(:region => region)
+        options = provider.code_deploy_options
+        expect(options[:region]).to eq(region)
+      end
+    end
+
+    context 'without endpoint' do
+      example do
+        options = provider.code_deploy_options
+        expect(options[:endpoint]).to eq(nil)
+      end
+    end
+
+    context 'with endpoint' do
+      example do
+        endpoint = 's3test.com.s3-website-us-west-2.amazonaws.com'
+        provider.options.update(:endpoint => endpoint)
+        options = provider.code_deploy_options
+        expect(options[:endpoint]).to eq(endpoint)
+      end
+    end
+  end
+end
+
+describe DPL::Provider::CodeDeploy do
+  access_key_id = 'someaccesskey'
+  secret_access_key = 'somesecretaccesskey'
+  application = 'app'
+  deployment_group = 'group'
+  description = 'description'
+  revision = '23jkljkl'
+  client_options = {
+    :stub_responses => true,
+    :region => 'us-east-1',
+    :credentials => Aws::Credentials.new(access_key_id, secret_access_key),
+    :endpoint => 'https://codedeploy.us-east-1.amazonaws.com'
+  }
+
+  subject :provider do
+    described_class.new(DummyContext.new, {
+      :access_key_id => access_key_id,
+      :secret_access_key => secret_access_key
+    })
+  end
+
+  before :each do
+    provider.stub(:code_deploy_options).and_return(client_options)
+  end
+
+  describe '#code_deploy' do
+    example do
+      expect(Aws::CodeDeploy::Client).to receive(:new).with(client_options).once
+      provider.code_deploy
+    end
+  end
+
+  describe '#needs_key?' do
+    example do
+      expect(provider.needs_key?).to eq(false)
+    end
+  end
+
+  describe '#revision' do
+    expected_s3_revision = {
+      revision_type: 'S3',
+      s3_location: {
+        bucket:      'bucket',
+        bundle_type: 'tar',
+        key:         'key'
+      }
+    }
+
+    expected_github_revision = {
+      revision_type: 'GitHub',
+      git_hub_location: {
+        commit_id:  '2lk3j4k2j3k4j23k4j',
+        repository: 'travis-ci/dpl'
+      }
+    }
+
+    before(:each) do
+      provider.stub(:s3_revision).and_return(expected_s3_revision)
+      provider.stub(:github_revision).and_return(expected_github_revision)
+    end
+
+    context 'when s3' do
+      before do
+        provider.options.update(:revision_type => :s3)
+      end
+
+      example do
+        expect(provider.revision).to eq(expected_s3_revision)
+      end
+    end
+
+    context 'when github' do
+      before do
+        provider.options.update(:revision_type => :github)
+      end
+
+      example do
+        expect(provider.revision).to eq(expected_github_revision)
+      end
+    end
+
+    context 'when not specified' do
+      before do
+        provider.options.update(:bucket => 'bucket')
+      end
+
+      example do
+        expect(provider.revision).to eq(expected_s3_revision)
+      end
+    end
+
+    context 'when revision and bucket are not specified' do
+      example do
+        expect(provider.revision).to eq(expected_github_revision)
+      end
+    end
+
+    context 'when not a known revision type' do
+      type = :bad
+
+      before do
+        provider.options.update(:revision_type => type)
+      end
+
+      example do
+        expect(provider).to receive(:error).with(/unknown revision type :#{type}/)
+        provider.revision
+      end
+    end
+  end
+
+  describe '#s3_revision' do
+    bucket = 'bucket'
+    bundle_type = 'tar'
+    key = "/some/key.#{bundle_type}"
+
+    before(:each) do
+      expect(provider).to receive(:option).with(:bucket).and_return(bucket)
+      expect(provider).to receive(:bundle_type).and_return(bundle_type)
+      expect(provider).to receive(:s3_key).and_return(key)
+    end
+
+    example do
+      expect(provider.s3_revision).to eq({
+        revision_type: 'S3',
+        s3_location: {
+          bucket: bucket,
+          bundle_type: bundle_type,
+          key: key
+        }
+      })
+    end
+  end
+
+  describe '#github_revision' do
+    commit_id = '432s35s3'
+    repository = 'git@github.com/org/repo.git'
+
+    context 'with options set' do
+      before(:each) do
+        expect(provider.options).to receive(:[]).with(:commit_id).and_return(commit_id)
+        expect(provider.options).to receive(:[]).with(:repository).and_return(repository)
+      end
+
+      example do
+        expect(provider.github_revision).to eq({
+          revision_type: 'GitHub',
+          git_hub_location: {
+            commit_id: commit_id,
+            repository: repository
+          }
+        })
+      end
+    end
+
+    context 'with environment variables' do
+      before(:each) do
+        expect(provider.options).to receive(:[]).with(:commit_id).and_return(nil)
+        expect(provider.options).to receive(:[]).with(:repository).and_return(nil)
+        expect(provider.context.env).to receive(:[]).with('TRAVIS_COMMIT').and_return(commit_id)
+        expect(provider.context.env).to receive(:[]).with('TRAVIS_REPO_SLUG').and_return(repository)
+      end
+
+      example do
+        expect(provider.github_revision).to eq({
+          revision_type: 'GitHub',
+          git_hub_location: {
+            commit_id: commit_id,
+            repository: repository
+          }
+        })
+      end
+    end
+
+    context 'without required options' do
+      before(:each) do
+        expect(provider.options).to receive(:[]).with(:commit_id).and_return(nil)
+        provider.options.stub(:[]).with(:repository) { nil }
+        expect(provider.context.env).to receive(:[]).with('TRAVIS_COMMIT').and_return(nil)
+        expect(provider.context.env).to receive(:[]).with('TRAVIS_REPO_SLUG').and_return(nil)
+      end
+
+      example do
+        expect{provider.github_revision}.to raise_error(DPL::Error)
+      end
+    end
+  end
+
+  describe '#push_app' do
+    before(:each) do
+      old_options = provider.options
+      provider.stub(:options) {old_options.merge({
+        :application_name => application,
+        :deployment_group_name => deployment_group,
+        :description => description,
+        :repository => 'git@github.com:travis-ci/dpl.git'
+      })}
+    end
+
+    context 'without an error' do
+      deployment_id = 'some-deployment-id'
+
+      before do
+        provider.code_deploy.stub_responses(:create_deployment, :deployment_id => deployment_id)
+      end
+
+      example do
+        expect(provider).to receive(:log).with(/Triggered deployment \"#{deployment_id}\"\./)
+        provider.push_app
+      end
+    end
+
+    context 'with an error' do
+      before do
+        provider.code_deploy.stub_responses(:create_deployment, 'DeploymentLimitExceededException')
+      end
+
+      example do
+        expect(provider).to receive(:error).once
+        provider.push_app
+      end
+    end
+  end
+
+  describe '#bundle_type' do
+    context 'with s3_key' do
+      format = 'zip'
+      s3_key = "/some/key/name.#{format}"
+
+      before(:each) do
+        expect(provider).to receive(:s3_key).and_return(s3_key)
+      end
+
+      example do
+        expect(provider.bundle_type).to eq(format)
+      end
+    end
+
+    context 'without s3_key' do
+      bundle_type = 'tar'
+      
+      before do
+        expect(provider).to receive(:s3_key).and_return('')
+        expect(provider).to receive(:option).with(:bundle_type).and_return(bundle_type)
+      end
+
+      example do
+        expect(provider.bundle_type).to eq(bundle_type)
+      end
+    end
+  end
+
+  describe '#s3_key' do
+    key = '/some/key/name.zip'
+
+    context 'with key option' do
+      before do
+        expect(provider.options).to receive(:[]).with(:key).and_return(key)
+      end
+
+      example do
+        expect(provider.s3_key).to eq(key)
+      end
+    end
+
+    context 'with s3_key option' do
+      before do
+        expect(provider).to receive(:option).with(:s3_key).and_return(key)
+      end
+
+      example do
+        expect(provider.s3_key).to eq(key)
+      end
+    end
+  end
+
+  describe '#default_description' do
+    build_number = 2
+
+    before do
+      provider.context.env.stub(:[]).with('TRAVIS_BUILD_NUMBER').and_return(build_number)
+    end
+
+    example do
+      expect(provider.default_description).to eq("Deploy build #{build_number} via Travis CI")
+    end
+  end
+
+  describe '#check_auth' do
+    example do
+      expect(provider).to receive(:log).with("Logging in with Access Key: #{access_key_id[-4..-1].rjust(20, '*')}")
+      provider.check_auth
+    end
+  end
+end

data/spec/provider/elastic_beanstalk_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'aws-sdk'
+require 'aws-sdk-v1'
 require 'dpl/provider'
 require 'dpl/provider/elastic_beanstalk'
 

data/spec/provider/ops_works_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'aws-sdk'
+require 'aws-sdk-v1'
 require 'dpl/provider'
 require 'dpl/provider/ops_works'
 

data/spec/provider/s3_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'aws-sdk'
+require 'aws-sdk-v1'
 require 'dpl/provider/s3'
 
 describe DPL::Provider::S3 do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.7.travis.626.1
+  version: 1.7.7.travis.633.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -145,6 +145,7 @@ files:
 - spec/provider/cloud_files_spec.rb
 - spec/provider/cloudcontrol_spec.rb
 - spec/provider/cloudfoundry_spec.rb
+- spec/provider/code_deploy_spec.rb
 - spec/provider/deis_spec.rb
 - spec/provider/divshot_spec.rb
 - spec/provider/dotcloud_spec.rb