dpl 1.8.18.travis.1472.4 → 1.8.21

data/spec/provider/ops_works_spec.rb

@@ -1,91 +1,127 @@
 require 'spec_helper'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 require 'dpl/provider'
 require 'dpl/provider/ops_works'
 
 describe DPL::Provider::OpsWorks do
 
-  before (:each) do
-    AWS.stub!
+  subject :provider do
+    described_class.new(DummyContext.new, :access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz')
   end
 
-  subject :provider do
-    described_class.new(DummyContext.new, :access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz', :bucket => 'my-bucket')
+  describe '#opsworks_options' do
+    context 'without region' do
+      example do
+        options = provider.opsworks_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.opsworks_options
+        expect(options[:region]).to eq(region)
+      end
+    end
   end
 
   describe "#check_auth" do
     example do
-      expect(provider).to receive(:setup_auth)
       expect(provider).to receive(:log).with('Logging in with Access Key: ****************jklz')
       provider.check_auth
     end
   end
 
-  describe "#setup_auth" do
-    example do
-      expect(AWS).to receive(:config).with(:access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz').once.and_call_original
-      provider.setup_auth
-    end
-  end
-
   describe "#needs_key?" do
     example do
       expect(provider.needs_key?).to eq(false)
     end
   end
 
-  describe "#push_app" do
-    let(:client) { double(:ops_works_client) }
-    let(:ops_works_app) { {shortname: 'app', stack_id: 'stack-id'} }
-    before do
-      expect(provider).to receive(:current_sha).and_return('sha')
-      expect(provider.api).to receive(:client).and_return(client)
-      expect(provider.context.env).to receive(:[]).with('TRAVIS_BUILD_NUMBER').and_return('123')
-    end
+  describe DPL::Provider::OpsWorks do
+    access_key_id = 'someaccesskey'
+    secret_access_key = 'somesecretaccesskey'
+    region = 'us-east-1'
 
-    let(:custom_json) { "{\"deploy\":{\"app\":{\"migrate\":false,\"scm\":{\"revision\":\"sha\"}}}}" }
-    example 'without :migrate option' do
-      provider.options.update(app_id: 'app-id')
-      expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]}
-      )
-      expect(client).to receive(:create_deployment).with(
-        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
+    client_options = {
+      stub_responses: true,
+      region: region,
+      credentials: Aws::Credentials.new(access_key_id, secret_access_key)
+    }
 
-    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)
-      expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
-      expect(client).to receive(:create_deployment).with(
-        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
+    subject :provider do
+      described_class.new(DummyContext.new, {
+        access_key_id: access_key_id,
+        secret_access_key: secret_access_key
+      })
     end
 
-    example 'with :wait_until_deployed' do
-      provider.options.update(app_id: 'app-id', wait_until_deployed: true)
-      expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
-      expect(client).to receive(:create_deployment).and_return({deployment_id: 'deployment_id'})
-      expect(client).to receive(:describe_deployments).with({deployment_ids: ['deployment_id']}).and_return({deployments: [status: 'running']}, {deployments: [status: 'successful']})
-      provider.push_app
+    before :each do
+      expect(provider).to receive(:opsworks_options).and_return(client_options)
     end
 
-    example 'with :instance-ids' do
-      provider.options.update(app_id: 'app-id', instance_ids: ['instance-id'])
-      expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
-      expect(client).to receive(:create_deployment).with(
-        stack_id: 'stack-id', app_id: 'app-id', instance_ids:['instance-id'], command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json
-      ).and_return({})
-      provider.push_app
+    describe '#opsworks' do
+      example do
+        expect(Aws::OpsWorks::Client).to receive(:new).with(client_options).once
+        provider.opsworks
+      end
     end
-  end
 
-  describe "#api" do
-    example do
-      expect(AWS::OpsWorks).to receive(:new)
-      provider.api
+    describe "#push_app" do
+      let(:client) { provider.opsworks }
+      let(:ops_works_app) { {shortname: 'app', stack_id: 'stack-id'} }
+      before do
+        expect(provider).to receive(:current_sha).and_return('sha')
+        expect(provider.context.env).to receive(:[]).with('TRAVIS_BUILD_NUMBER').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')
+        expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+        expect(client).to receive(:create_deployment).with(
+          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
+
+      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)
+        expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+        expect(client).to receive(:create_deployment).with(
+          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)
+        expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+        expect(client).to receive(:create_deployment).and_return({deployment_id: 'deployment_id'})
+        expect(client).to receive(:describe_deployments).with({deployment_ids: ['deployment_id']}).and_return({deployments: [status: 'running']}, {deployments: [status: 'successful']})
+        provider.push_app
+      end
+
+      example 'with :instance-ids' do
+        provider.options.update(app_id: 'app-id', instance_ids: ['instance-id'])
+        expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+        expect(client).to receive(:create_deployment).with(
+          stack_id: 'stack-id', app_id: 'app-id', instance_ids:['instance-id'], command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json
+        ).and_return({})
+        provider.push_app
+      end
+
+      example 'with :layer-ids' do
+        provider.options.update(app_id: 'app-id', layer_ids: ['layer-id'])
+        expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+        expect(client).to receive(:create_deployment).with(
+          stack_id: 'stack-id', app_id: 'app-id', layer_ids:['layer-id'], command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json
+        ).and_return({})
+        provider.push_app
+      end
     end
   end
 end

data/spec/provider/s3_spec.rb

@@ -127,6 +127,13 @@ describe DPL::Provider::S3 do
       provider.push_app
     end
 
+    example "Sets Storage Class" do
+      provider.options.update(:storage_class => "STANDARD_AI")
+      expect(Dir).to receive(:glob).and_yield(__FILE__)
+      expect_any_instance_of(Aws::S3::Object).to receive(:upload_file).with(anything(), hash_including(:storage_class => "STANDARD_AI"))
+      provider.push_app
+    end
+
     example "Sets Website Index Document" do
       provider.options.update(:index_document_suffix => "test/index.html")
       expect(Dir).to receive(:glob).and_yield(__FILE__)

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'json/pure'
 require 'dpl/error'
 require 'dpl/provider'
 require 'rspec/its'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.18.travis.1472.4
+  version: 1.8.21
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,6 +66,26 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +128,7 @@ files:
 - lib/dpl/provider/bintray.rb
 - lib/dpl/provider/bitballoon.rb
 - lib/dpl/provider/boxfuse.rb
+- lib/dpl/provider/catalyze.rb
 - lib/dpl/provider/chef_supermarket.rb
 - lib/dpl/provider/cloud66.rb
 - lib/dpl/provider/cloud_files.rb
@@ -117,6 +138,7 @@ files:
 - lib/dpl/provider/divshot.rb
 - lib/dpl/provider/elastic_beanstalk.rb
 - lib/dpl/provider/engine_yard.rb
+- lib/dpl/provider/exoscale.rb
 - lib/dpl/provider/firebase.rb
 - lib/dpl/provider/gae.rb
 - lib/dpl/provider/gcs.rb
@@ -153,9 +175,11 @@ files:
 - spec/provider/anynines_spec.rb
 - spec/provider/appfog_spec.rb
 - spec/provider/atlas_spec.rb
+- spec/provider/azure_webapps_spec.rb
 - spec/provider/bintray_spec.rb
 - spec/provider/bitballoon_spec.rb
 - spec/provider/boxfuse_spec.rb
+- spec/provider/catalyze_spec.rb
 - spec/provider/chef_supermarket_spec.rb
 - spec/provider/cloud66_spec.rb
 - spec/provider/cloud_files_spec.rb
@@ -164,6 +188,7 @@ files:
 - spec/provider/deis_spec.rb
 - spec/provider/divshot_spec.rb
 - spec/provider/elastic_beanstalk_spec.rb
+- spec/provider/exoscale_spec.rb
 - spec/provider/firebase_spec.rb
 - spec/provider/gae_spec.rb
 - spec/provider/gcs_spec.rb
@@ -206,13 +231,58 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: deploy tool
-test_files: []
+test_files:
+- spec/cli_spec.rb
+- spec/provider/anynines_spec.rb
+- spec/provider/appfog_spec.rb
+- spec/provider/atlas_spec.rb
+- spec/provider/azure_webapps_spec.rb
+- spec/provider/bintray_spec.rb
+- spec/provider/bitballoon_spec.rb
+- spec/provider/boxfuse_spec.rb
+- spec/provider/catalyze_spec.rb
+- spec/provider/chef_supermarket_spec.rb
+- spec/provider/cloud66_spec.rb
+- spec/provider/cloud_files_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/elastic_beanstalk_spec.rb
+- spec/provider/exoscale_spec.rb
+- spec/provider/firebase_spec.rb
+- spec/provider/gae_spec.rb
+- spec/provider/gcs_spec.rb
+- spec/provider/hackage_spec.rb
+- spec/provider/heroku_anvil_spec.rb
+- spec/provider/heroku_api_spec.rb
+- spec/provider/heroku_git_deploy_key_spec.rb
+- spec/provider/heroku_git_spec.rb
+- spec/provider/lambda_spec.rb
+- spec/provider/launchpad_spec.rb
+- spec/provider/modulus_spec.rb
+- spec/provider/npm_spec.rb
+- spec/provider/openshift_spec.rb
+- spec/provider/ops_works_spec.rb
+- spec/provider/packagecloud_spec.rb
+- spec/provider/puppet_forge_spec.rb
+- spec/provider/pypi_spec.rb
+- spec/provider/releases_spec.rb
+- spec/provider/rubygems_spec.rb
+- spec/provider/s3_spec.rb
+- spec/provider/scalingo_spec.rb
+- spec/provider/script_spec.rb
+- spec/provider/surge_spec.rb
+- spec/provider/testfairy_spec.rb
+- spec/provider/transifex_spec.rb
+- spec/provider_spec.rb
+- spec/spec_helper.rb