dpl 1.7.12.travis.762.4 → 1.7.12.travis.763.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDFmMjVlNDNlOTFjOGQxYzdhOWMxYzIyYTc0ODExY2ZkN2IwMmEzZQ==
+    Mjk3OTgwNDg1YmFiNWFmOThkMWFhNmUzZTAwY2U3ZTFkNTA4MjRmYg==
   data.tar.gz: !binary |-
-    MGYyMGFmZDRhNjI1M2Y3ZjU0OGE4YTNmZTA2OWJiYmEyNjFjNWIyNg==
+    MjJlMzI2N2EyOTM4MjRmMzM1MGQxZWMxZjhkMDdkODJlMDlmNzg5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MzlhZDZlMWNkMWIxN2UyNzFjMGM4ZWJkNzZjMGE1YTgxMTlhYTMwNWRiZTZm
-    ZTJkMDBmY2U2NjEwNGRhZGE1Nzc4ZTQ4MzNhMzIxMGFjOTVjMjJhNDQ0MGNm
-    N2UzZDNmYTc3MDM5NDhhNjRjZDRjMjljZDUwMDIyOWQ5ODc4MmQ=
+    ZmMzMWQ3NTY3ZTUyYzkwZGI4NmRiZDdjMTVlY2YxYmVmM2NjYzA0ZWJlMDI2
+    MGJkYzE5NGViN2VlYjdkZjgyMWM1ZDI5YjY5ODliY2Y5ZWM5NmY4YTkwMjIy
+    ZDkxNzYzYWJjNzZkZTNmNmM2NzgwOGE4ZDI1OTg5ZGZlNmVkMjM=
   data.tar.gz: !binary |-
-    NTQxYzhkYTlmY2ZhMzZhNmMyYmVhYTgzNzQ5ZjRiNmI0OTU5YmMwNDBlYmVj
-    M2VkNzEzZDJhNTZkZDBlNjkyMzM4NGIxMzFhNDIyMDAzMmY2ZDJjY2UzYzhj
-    ODVlN2IyMTE0ZTg3ZTkzMjFhNmU4YmY3NjViZTRkNWUwMjRjNzI=
+    MjlhNjI5ZWJkMGE2OTA0M2MyNGZkNjdlZjk1ZDFlNjU4MTA1ZDIyNTJlZDJh
+    ZTgyMmI0ZjViOWM3Y2MxODQ3MmI5NTg4YzdhMmY4ZTgxNzA4N2Y1MTQ4NzY2
+    YjQxMjIwZWI4YTUyNTE3N2U5NjUwN2JlMTFhZjk4N2EyN2M2MzE=

data/README.md

@@ -34,6 +34,7 @@ Dpl supports the following providers:
 * [Chef Supermarket](#chef-supermarket)
 * [Lambda](#lambda)
 * [TestFairy](#testfairy)
+* [ExoScale](#exoscale)
 
 ## Installation:
 
@@ -458,7 +459,7 @@ For accounts using two factor authentication, you have to use an oauth token as
 
 ### Lambda:
 
-#### Options: 
+#### Options:
 
  * **function_name**: Required. The name of the Lambda being created / updated.
  * **role**: Required. The ARN of the IAM role to assign to this Lambda function.
@@ -521,3 +522,14 @@ and your testers can start testing your app.
 
     dpl --provider=testfairy --api-key=<api-key> --app-file="out/Sample.apk" --keystore-file="out/keystore" --storepass=<storepass> --alias=<alias>
 
+### ExoScale:
+
+#### Options:
+
+* **email**: ExoScale email or Organization ID.
+* **password**: ExoScale password.
+* **deployment**: ExoScale Deployment. Follows the format "APP_NAME/DEP_NAME".
+
+#### Examples:
+
+    dpl --provider=exoscale --email=<email> --password<password> --deployment=`APP_NAME/DEP_NAME`

data/lib/dpl/provider.rb

@@ -6,38 +6,39 @@ module DPL
   class Provider
     include FileUtils
 
-    autoload :Heroku,       'dpl/provider/heroku'
-    autoload :Appfog,       'dpl/provider/appfog'
-    autoload :EngineYard,   'dpl/provider/engine_yard'
-    autoload :DotCloud,     'dpl/provider/dot_cloud'
-    autoload :Nodejitsu,    'dpl/provider/nodejitsu'
-    autoload :Openshift,    'dpl/provider/openshift'
-    autoload :RubyGems,     'dpl/provider/rubygems'
-    autoload :NPM,          'dpl/provider/npm'
-    autoload :S3,           'dpl/provider/s3'
-    autoload :CloudControl, 'dpl/provider/cloudcontrol'
-    autoload :CloudFoundry, 'dpl/provider/cloud_foundry'
-    autoload :CodeDeploy,   'dpl/provider/code_deploy'
-    autoload :Lambda,       'dpl/provider/lambda'
-    autoload :PyPI,         'dpl/provider/pypi'
-    autoload :Divshot,      'dpl/provider/divshot'
-    autoload :CloudFiles,   'dpl/provider/cloud_files'
-    autoload :OpsWorks,     'dpl/provider/ops_works'
-    autoload :Modulus,      'dpl/provider/modulus'
-    autoload :Releases,     'dpl/provider/releases'
-    autoload :Cloud66,      'dpl/provider/cloud66'
-    autoload :Ninefold,     'dpl/provider/ninefold'
-    autoload :Hackage,      'dpl/provider/hackage'
-    autoload :Deis,         'dpl/provider/deis'
-    autoload :GCS,          'dpl/provider/gcs'
-    autoload :GAE,          'dpl/provider/gae'
-    autoload :BitBalloon,   'dpl/provider/bitballoon'
-    autoload :Biicode,      'dpl/provider/biicode'
+    autoload :Heroku,           'dpl/provider/heroku'
+    autoload :Appfog,           'dpl/provider/appfog'
+    autoload :EngineYard,       'dpl/provider/engine_yard'
+    autoload :DotCloud,         'dpl/provider/dot_cloud'
+    autoload :Nodejitsu,        'dpl/provider/nodejitsu'
+    autoload :Openshift,        'dpl/provider/openshift'
+    autoload :RubyGems,         'dpl/provider/rubygems'
+    autoload :NPM,              'dpl/provider/npm'
+    autoload :S3,               'dpl/provider/s3'
+    autoload :CloudControl,     'dpl/provider/cloudcontrol'
+    autoload :CloudFoundry,     'dpl/provider/cloud_foundry'
+    autoload :CodeDeploy,       'dpl/provider/code_deploy'
+    autoload :Lambda,           'dpl/provider/lambda'
+    autoload :PyPI,             'dpl/provider/pypi'
+    autoload :Divshot,          'dpl/provider/divshot'
+    autoload :CloudFiles,       'dpl/provider/cloud_files'
+    autoload :OpsWorks,         'dpl/provider/ops_works'
+    autoload :Modulus,          'dpl/provider/modulus'
+    autoload :Releases,         'dpl/provider/releases'
+    autoload :Cloud66,          'dpl/provider/cloud66'
+    autoload :Ninefold,         'dpl/provider/ninefold'
+    autoload :Hackage,          'dpl/provider/hackage'
+    autoload :Deis,             'dpl/provider/deis'
+    autoload :GCS,              'dpl/provider/gcs'
+    autoload :GAE,              'dpl/provider/gae'
+    autoload :BitBalloon,       'dpl/provider/bitballoon'
+    autoload :Biicode,          'dpl/provider/biicode'
     autoload :ElasticBeanstalk, 'dpl/provider/elastic_beanstalk'
-    autoload :PuppetForge,  'dpl/provider/puppet_forge'
-    autoload :Packagecloud, 'dpl/provider/packagecloud'
+    autoload :PuppetForge,      'dpl/provider/puppet_forge'
+    autoload :Packagecloud,     'dpl/provider/packagecloud'
     autoload :ChefSupermarket,  'dpl/provider/chef_supermarket'
-    autoload :TestFairy,  'dpl/provider/testfairy'
+    autoload :TestFairy,        'dpl/provider/testfairy'
+    autoload :ExoScale,         'dpl/provider/exoscale'
 
 
     def self.new(context, options)

data/lib/dpl/provider/exoscale.rb

@@ -0,0 +1,26 @@
+require 'json'
+require 'net/http'
+require 'net/https'
+
+module DPL
+  class Provider
+    class ExoScale < CloudControl
+      def initialize(context, options)
+        super
+        @http = Net::HTTP.new('api.app.exo.io', 443)
+        @http.use_ssl = true
+
+        @tokenHttp = Net::HTTP.new('portal.exoscale.ch', 443)
+        @tokenHttp.use_ssl = true
+      end
+    private
+      def get_token
+        request = Net::HTTP::Post.new '/api/apps/token'
+        request.basic_auth options[:email], options[:password]
+        response = @tokenHttp.request(request)
+        error('authorization failed') if response.code != '200'
+        return JSON.parse response.body
+      end
+    end
+  end
+end

data/spec/provider/exoscale_spec.rb

@@ -0,0 +1,191 @@
+require 'spec_helper'
+require 'dpl/provider/exoscale'
+
+describe DPL::Provider::ExoScale do
+  subject :provider do
+    described_class.new(DummyContext.new, :deployment => 'foo_app/default', :email => 'foo@test.com', :password => 'password')
+  end
+
+  its(:app_name) { should == 'foo_app' }
+  its(:dep_name) { should == 'default' }
+
+  its(:needs_key?) { should be true }
+
+  describe 'constructor' do
+    it 'with wrong arguments' do
+      expect {
+        described_class.new(DummyContext.new, :foo_dep => 'foo_app/default', :email => 'foo@test.com', :password => 'password')
+      }.to raise_error(DPL::Error)
+    end
+  end
+
+  it '#check_auth should call #headers_with_token' do
+    expect(provider).to receive(:headers_with_token)
+    provider.check_auth
+  end
+
+  describe '#check_app' do
+    it 'on deployment found' do
+      expect(provider).to receive(:api_call).and_return double(
+        :code => '200',
+        :body => '{"branch":"foo_repo.git"}'
+      )
+      expect(provider.instance_variable_get(:@repository)).to be_nil
+      provider.check_app
+      expect(provider.instance_variable_get(:@repository)).to eq('foo_repo.git')
+    end
+
+    it 'on deployment not found' do
+      expect(provider).to receive(:api_call).and_return double(:code => '410')
+      expect { provider.check_app }.to raise_error(DPL::Error)
+    end
+  end
+
+  describe '#setup_key' do
+    before do
+      expect(File).to receive(:read).with('file').and_return('foo_key')
+      expect(provider).to receive(:user).and_return({ 'username' => 'foo_user' })
+    end
+
+    it 'on api success' do
+      expect(provider).to receive(:api_call).with('POST', '/user/foo_user/key', '{"key":"foo_key"}').and_return double(
+          :code => '200',
+          :body => '{ "key": "foo_key", "key_id": "foo_key_id"}'
+        )
+
+      expect(provider.instance_variable_get(:@ssh_key_id)).to be_nil
+      provider.setup_key 'file'
+      expect(provider.instance_variable_get(:@ssh_key_id)).to eq('foo_key_id')
+    end
+
+    it 'on api failure' do
+      expect(provider).to receive(:api_call).with('POST', '/user/foo_user/key', '{"key":"foo_key"}').and_return double(:code => '401')
+
+      expect { provider.setup_key 'file' }.to raise_error(DPL::Error)
+    end
+  end
+
+  describe '#remove_key' do
+    before do
+      provider.instance_variable_set(:@ssh_key_id, 'foo_key_id')
+      expect(provider).to receive(:user).and_return({ 'username' => 'foo_user' })
+    end
+
+    it 'on api success' do
+      expect(provider).to receive(:api_call).with('DELETE', '/user/foo_user/key/foo_key_id').and_return double(:code => '204')
+      provider.remove_key
+    end
+
+    it 'on api failure' do
+      expect(provider).to receive(:api_call).with('DELETE', '/user/foo_user/key/foo_key_id').and_return double(:code => '410')
+      expect { provider.remove_key }.to raise_error(DPL::Error)
+    end
+  end
+
+  it '#push_app shuld deploy the app' do
+    provider.instance_variable_set(:@repository, 'foo_repo.git')
+    context = double(:shell)
+    expect(context).to receive(:shell).with("git push foo_repo.git HEAD:master -f")
+    expect(provider).to receive(:context).and_return context
+    expect(provider).to receive(:deploy_app)
+
+    provider.push_app
+  end
+
+  describe 'private method' do
+    describe '#get_token' do
+      it 'on api success' do
+        request = double()
+        expect(request).to receive(:basic_auth).with('foo@test.com', 'password')
+        expect(Net::HTTP::Post).to receive(:new).with('/api/apps/token').and_return request
+
+        expect(provider.instance_variable_get(:@tokenHttp)).to receive(:request).and_return double(
+          :code => '200',
+          :body => '{ "token": "foo_token"}'
+        )
+
+        expect(provider.instance_eval { get_token }).to eq({ 'token' => 'foo_token' })
+      end
+
+      it 'on api failure' do
+        expect(provider.instance_variable_get(:@tokenHttp)).to receive(:request).and_return double(:code => '401')
+
+        expect do
+          provider.instance_eval { get_token }
+        end.to raise_error(DPL::Error)
+      end
+    end
+
+    it '#headers_with_token should return headers' do
+      expect(provider).to receive(:get_token).and_return({ 'token' => 'foo_token' })
+      expected_return = {
+        'Authorization' => 'cc_auth_token="foo_token"',
+        'Content-Type' => 'application/json'
+      }
+
+      expect(provider.instance_eval { headers_with_token }).to eq(expected_return)
+    end
+
+    describe '#get_headers' do
+      let(:expected_args) { [ 'GET', '/user/', nil, {'foo' => 'headers'} ] }
+
+      before do
+        expect(provider).to receive(:headers_with_token).and_return({ 'foo' => 'headers' })
+      end
+
+      it 'on token valid' do
+        expect(provider).to receive(:api_call).with(*expected_args).and_return double(:code => '200')
+        expect(provider.instance_eval { get_headers }).to eq({ 'foo' => 'headers' })
+      end
+
+      it 'on token expired' do
+        expect(provider).to receive(:api_call).with(*expected_args).and_return double(:code => '401')
+        expect(provider).to receive(:headers_with_token).with({ :new_token => true})
+
+        provider.instance_eval { get_headers }
+      end
+    end
+
+    it '#api_call should send request' do
+      expected_args = [ "foo_method", "foo_path", "\"foo\":\"data\"", {"foo"=>"headers"} ]
+      expect(provider.instance_variable_get(:@http)).to receive(:send_request).with(*expected_args)
+
+      provider.instance_eval do
+        api_call('foo_method', 'foo_path', '"foo":"data"', { 'foo' => 'headers'})
+      end
+    end
+
+    describe '#deploy_app' do
+      it 'on api success' do
+        expect(provider).to receive(:api_call).with('PUT', '/app/foo_app/deployment/default', '{"version":-1}').and_return double(:code => '200')
+        provider.instance_eval { deploy_app }
+      end
+
+      it 'on api failure' do
+        expect(provider).to receive(:api_call).with('PUT', '/app/foo_app/deployment/default', '{"version":-1}').and_return double(:code => '410')
+        expect do
+          provider.instance_eval { deploy_app }
+        end.to raise_error(DPL::Error)
+      end
+    end
+
+    describe '#user' do
+      it 'on api success' do
+        expect(provider).to receive(:api_call).with('GET', '/user/').and_return double(
+          :code => '200',
+          :body => '["foo_user"]'
+        )
+
+        expect(provider.instance_eval { user }).to eq('foo_user')
+      end
+
+      it 'on api failure' do
+        expect(provider).to receive(:api_call).with('GET', '/user/').and_return double(:code => '410')
+
+        expect do
+          provider.instance_eval { user }
+        end.to raise_error(DPL::Error)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.12.travis.762.4
+  version: 1.7.12.travis.763.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -113,6 +113,7 @@ files:
 - lib/dpl/provider/dot_cloud.rb
 - lib/dpl/provider/elastic_beanstalk.rb
 - lib/dpl/provider/engine_yard.rb
+- lib/dpl/provider/exoscale.rb
 - lib/dpl/provider/gae.rb
 - lib/dpl/provider/gcs.rb
 - lib/dpl/provider/hackage.rb
@@ -154,6 +155,7 @@ files:
 - spec/provider/divshot_spec.rb
 - spec/provider/dotcloud_spec.rb
 - spec/provider/elastic_beanstalk_spec.rb
+- spec/provider/exoscale_spec.rb
 - spec/provider/gae_spec.rb
 - spec/provider/gcs_spec.rb
 - spec/provider/hackage_spec.rb