dpl 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af89a10a5a1d66462990934a93215af341bbbfcf
-  data.tar.gz: 5400021aba1ffcea9549d910773ad0c90afd2ad7
+  metadata.gz: b842f79343d961133954e00f0083315e5d99c8bf
+  data.tar.gz: f4a1be0a2e6a3a3f1c8cea71c5c9914ca421a94b
 SHA512:
-  metadata.gz: dfa28b8549431d85202aa2b5148bd8afdb1e1243c0454682484bf9e7df19ac701c1ddb98170bf964fbe5341d11ab1a3765b301ff0fb36ef7e2f632cc60501cc3
-  data.tar.gz: b109321326bec28b89d239a387f74008593161e887b96738bc1228ad03147d0b904cb2b910b16a9de109eef56c90a98c0350caa1911f0cde0f2f38d8fc5e17e5
+  metadata.gz: c86c355aaa1b52cbd8e1b303de16e29c1ee29c69ef994d5f9741c346b3aca8769fb4f0591dc74b0e83e5ee70ee0063f065069c5d51156161dd3c0a7930a7bf71
+  data.tar.gz: 8f9f27bac251d9a2e8b4cf1fa88ba58d2c5a224aba68af981d49acc26dfd369d7cae4b31e101ecf9194970d0046252da3d8754f289ec45034affc3c99fe6d699

data/README.md

@@ -3,12 +3,14 @@ Deploy tool made for Continuous Deployment.
 Usage:
 
     dpl --provider=heroku --api-key=`heroku auth:token`
+    dpl --provider=cloudControl --deployment='<application>/<deployment>' --email=<email> --password=<password>
 
 Supported providers:
 
 * Heroku
 * Nodejitsu
 * Openshift
-* Engine Yard (experimental)
+* cloudControl
+* RubyGems
+* Engine Yard
 * dotCloud (experimental)
-* RubyGems (experimental)

data/lib/dpl/provider.rb

@@ -5,12 +5,13 @@ module DPL
   class Provider
     include FileUtils
 
-    autoload :Heroku,     'dpl/provider/heroku'
-    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 :Heroku,       'dpl/provider/heroku'
+    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 :CloudControl, 'dpl/provider/cloudcontrol'
 
     def self.new(context, options)
       return super if self < Provider

data/lib/dpl/provider/cloudcontrol.rb

@@ -0,0 +1,96 @@
+require 'json'
+require 'net/http'
+require 'net/https'
+
+module DPL
+  class Provider
+    class CloudControl < Provider
+      attr_accessor :app_name
+      attr_accessor :dep_name
+
+      def initialize(context, options)
+        super
+        option(:email) && option(:password) && option(:deployment)
+        @app_name, @dep_name = options[:deployment].split('/')
+
+        @http = Net::HTTP.new('api.cloudcontrol.com', 443)
+        @http.use_ssl = true
+      end
+
+      def check_auth
+        headers_with_token
+      end
+
+      def check_app
+        response = api_call('GET', "/app/#{ app_name }/deployment/#{ dep_name }")
+        raise 'ERROR: application check failed' if response.code != '200'
+        @repository = JSON.parse(response.body)["branch"]
+      end
+
+      def setup_key(file)
+        data = { 'key' => File.read(file).chomp }
+        response = api_call('POST', "/user/#{ user['username'] }/key", JSON.dump(data))
+        raise 'ERROR: adding key failed' if response.code != '200'
+        key = JSON.parse response.body
+        @ssh_key_id = key['key_id']
+      end
+
+      def remove_key
+        response = api_call('DELETE', "/user/#{ user['username']}/key/#{ @ssh_key_id }")
+        raise 'ERROR: key removal failed' if response.code != '204'
+      end
+
+      def push_app
+        branch = (dep_name == 'default') ? 'master' : dep_name
+        context.shell "git push #{ @repository } #{ branch };"
+        deploy_app
+      end
+
+    private
+
+        def get_token
+          request = Net::HTTP::Post.new '/token/'
+          request.basic_auth options[:email], options[:password]
+          response = @http.request(request)
+          raise 'ERROR: authorization failed' if response.code != '200'
+          return JSON.parse response.body
+        end
+
+        def headers_with_token(options = {})
+          @token = get_token if options[:new_token] || @token.nil?
+          return {
+            'Authorization' => %Q|cc_auth_token="#{ @token['token'] }"|,
+            'Content-Type' => 'application/json'
+          }
+        end
+
+        def get_headers
+          headers = headers_with_token
+          response = api_call('GET', '/user/', nil, headers)
+          return headers if response.code == '200'
+
+          return headers_with_token :new_token => true
+        end
+
+        def api_call(method, path, data = nil, headers = nil)
+          return @http.send_request(method, path, data, headers || get_headers)
+        end
+
+        def deploy_app
+          data = {'version' => -1}
+          response = api_call('PUT', "/app/#{ app_name }/deployment/#{ dep_name }", JSON.dump(data))
+          raise 'ERROR: deployment failed' if response.code != '200'
+        end
+
+        def user
+          if @user.nil?
+            response = api_call('GET', '/user/')
+            raise 'ERROR: can not find the user' if response.code != '200'
+            users = JSON.parse response.body
+            @user = users[0]
+          end
+          return @user
+        end
+    end
+  end
+end

data/lib/dpl/provider/engine_yard.rb

@@ -1,9 +1,8 @@
+require 'time'
+
 module DPL
   class Provider
     class EngineYard < Provider
-      experimental "Engine Yard"
-
-      requires 'engineyard'
       requires 'engineyard-cloud-client'
 
       def token
@@ -15,7 +14,7 @@ module DPL
       end
 
       def api
-        @api ||= EY::CloudClient.new(token, EY::CLI::UI.new)
+        @api ||= EY::CloudClient.new(:token => token)
       end
 
       def check_auth
@@ -23,47 +22,67 @@ module DPL
       end
 
       def check_app
-        @app = EY::CloudClient::App.all(api).detect do |app|
-          app.name == option(:app)
+        remotes = `git remote -v`.scan(/\t[^\s]+\s/).map { |c| c.strip }.uniq
+        @current_sha = `git rev-parse HEAD`.chomp
+        resolver = api.resolve_app_environments(
+          :app_name => options[:app],
+          :account_name => options[:account],
+          :environment_name => options[:environment],
+          :remotes => remotes)
+        resolver.one_match { @app_env = resolver.matches.first }
+        resolver.no_matches { error resolver.errors.join("\n").inspect }
+        resolver.many_matches do |matches|
+          message = "Multiple matches possible, please be more specific:\n\n"
+          matches.each do |appenv|
+            message << "environment: '#{appenv.environment.name}' account: '#{appenv.environment.account.name}'\n"
+          end
+          error message
         end
+        @app_env
       end
 
-      def setup_key(file)
-        @key = EY::CloudClient::Keypair.create(api, {
-          "name"       => option(:key_name),
-          "public_key" => File.read(file)
-        })
+      def needs_key?
+        false
       end
 
-      def remove_key
-        @key.destroy if @key
+      def cleanup
+        #DONT
       end
 
       def push_app
-        fail
-        EY::CloudClient::Deployment.deploy(api, option(:environment), deploy_args)
-      end
-
-      def deploy_args
-        deploy_args = { :ref => `git log --format="%H" -1`.chop }
-        if options[:run]
-          deploy_args[:migrate]         = true
-          deploy_args[:migrate_command] = Array(options[:run]).map { |c| "(#{c})" }.join(" && ")
-        elsif options.include? :migrate
-          deploy_args[:migrate]         = options[:migrate]
+        deploy_opts = {:ref => @current_sha}
+        if command = options[:migrate]
+          if command === true || command === "true"
+            error("\"true\" doesn't look like a migration command, try --migrate=\"rake db:migrate\"")
+          end
+          deploy_opts[:migrate] = true
+          deploy_opts[:migration_command] = command
+        end
+        print "deploying "
+        deployment = EY::CloudClient::Deployment.deploy(api, @app_env, deploy_opts)
+        result = poll_for_result(deployment)
+        unless result.successful
+          error "Deployment failed (see logs on Engine Yard)"
         end
-        deploy_args
       end
 
-      def run(command)
-        # commands run by deployment
+      def poll_for_result(deployment)
+        until deployment.finished?
+          sleep 5
+          #TODO: configurable timeout?
+          print "."
+          deployment = EY::CloudClient::Deployment.get(api, deployment.app_environment, deployment.id)
+        end
+        puts "DONE: https://cloud.engineyard.com/apps/#{deployment.app.id}/environments/#{deployment.environment.id}/deployments/#{deployment.id}/pretty"
+        deployment
       end
 
       def deploy
         super
-      rescue EY::Error => error
-        raise Error, error.message, error.backtrace
+      rescue EY::CloudClient::Error => e
+        error(e.message)
       end
+
     end
   end
 end

data/lib/dpl/provider/rubygems.rb

@@ -1,8 +1,6 @@
 module DPL
   class Provider
     class RubyGems < Provider
-      experimental "RubyGems"
-
       requires 'gems'
 
       def setup_auth

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 end

data/spec/provider/cloudcontrol_spec.rb

@@ -0,0 +1,192 @@
+require 'spec_helper'
+require 'dpl/provider/cloudcontrol'
+
+describe DPL::Provider::CloudControl 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 {
+        $stdout.should receive(:write).at_least(3).times
+        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
+    provider.should receive(:headers_with_token)
+    provider.check_auth.should
+  end
+
+  describe '#check_app' do
+    it 'on deployment found' do
+      provider.should receive(:api_call).and_return double(
+        :code => '200',
+        :body => '{"branch":"foo_repo.git"}'
+      )
+      provider.instance_variable_get(:@repository).should be_nil
+      provider.check_app
+      provider.instance_variable_get(:@repository).should == 'foo_repo.git'
+    end
+
+    it 'on deployment not found' do
+      provider.should receive(:api_call).and_return double(:code => '410')
+      expect { provider.check_app }.to raise_error 'ERROR: application check failed'
+    end
+  end
+
+  describe '#setup_key' do
+    before do
+      File.should receive(:read).with('file').and_return('foo_key')
+      provider.should receive(:user).and_return({ 'username' => 'foo_user' })
+    end
+
+    it 'on api success' do
+      provider.should 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"}'
+        )
+
+      provider.instance_variable_get(:@ssh_key_id).should be_nil
+      provider.setup_key 'file'
+      provider.instance_variable_get(:@ssh_key_id).should == 'foo_key_id'
+    end
+
+    it 'on api failure' do
+      provider.should 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 'ERROR: adding key failed'
+    end
+  end
+
+  describe '#remove_key' do
+    before do
+      provider.instance_variable_set(:@ssh_key_id, 'foo_key_id')
+      provider.should receive(:user).and_return({ 'username' => 'foo_user' })
+    end
+
+    it 'on api success' do
+      provider.should 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
+      provider.should receive(:api_call).with('DELETE', '/user/foo_user/key/foo_key_id').and_return double(:code => '410')
+      expect { provider.remove_key }.to raise_error 'ERROR: key removal failed'
+    end
+  end
+
+  it '#push_app shuld deploy the app' do
+    provider.instance_variable_set(:@repository, 'foo_repo.git')
+    context = double(:shell)
+    context.should receive(:shell).with("git push foo_repo.git master;")
+    provider.should receive(:context).and_return context
+    provider.should receive(:deploy_app)
+
+    provider.push_app
+  end
+
+  describe 'private method' do
+    describe '#get_token' do
+      it 'on api success' do
+        request = double()
+        request.should receive(:basic_auth).with('foo@test.com', 'password')
+        Net::HTTP::Post.should receive(:new).with('/token/').and_return request
+
+        provider.instance_variable_get(:@http).should receive(:request).and_return double(
+          :code => '200',
+          :body => '{ "token": "foo_token"}'
+        )
+
+        provider.instance_eval { get_token }.should == { 'token' => 'foo_token' }
+      end
+
+      it 'on api failure' do
+        provider.instance_variable_get(:@http).should receive(:request).and_return double(:code => '401')
+
+        expect do
+          provider.instance_eval { get_token }
+        end.to raise_error 'ERROR: authorization failed'
+      end
+    end
+
+    it '#headers_with_token should return headers' do
+      provider.should receive(:get_token).and_return({ 'token' => 'foo_token' })
+      expected_return = {
+        'Authorization' => 'cc_auth_token="foo_token"',
+        'Content-Type' => 'application/json'
+      }
+
+      provider.instance_eval { headers_with_token }.should == expected_return
+    end
+
+    describe '#get_headers' do
+      let(:expected_args) { [ 'GET', '/user/', nil, {'foo' => 'headers'} ] }
+
+      before do
+        provider.should receive(:headers_with_token).and_return({ 'foo' => 'headers' })
+      end
+
+      it 'on token valid' do
+        provider.should receive(:api_call).with(*expected_args).and_return double(:code => '200')
+        provider.instance_eval { get_headers }.should == { 'foo' => 'headers' }
+      end
+
+      it 'on token expired' do
+        provider.should receive(:api_call).with(*expected_args).and_return double(:code => '401')
+        provider.should 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"} ]
+      provider.instance_variable_get(:@http).should 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
+        provider.should 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
+        provider.should 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 'ERROR: deployment failed'
+      end
+    end
+
+    describe '#user' do
+      it 'on api success' do
+        provider.should receive(:api_call).with('GET', '/user/').and_return double(
+          :code => '200',
+          :body => '["foo_user"]'
+        )
+
+        provider.instance_eval { user }.should == 'foo_user'
+      end
+
+      it 'on api failure' do
+        provider.should receive(:api_call).with('GET', '/user/').and_return double(:code => '410')
+
+        expect do
+          provider.instance_eval { user }
+        end.to raise_error 'ERROR: can not find the user'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -85,6 +85,7 @@ files:
 - lib/dpl/cli.rb
 - lib/dpl/error.rb
 - lib/dpl/provider.rb
+- lib/dpl/provider/cloudcontrol.rb
 - lib/dpl/provider/dot_cloud.rb
 - lib/dpl/provider/engine_yard.rb
 - lib/dpl/provider/heroku.rb
@@ -98,6 +99,7 @@ files:
 - notes/engine_yard.md
 - notes/heroku.md
 - spec/cli_spec.rb
+- spec/provider/cloudcontrol_spec.rb
 - spec/provider/dotcloud_spec.rb
 - spec/provider/heroku_anvil_spec.rb
 - spec/provider/heroku_git_spec.rb
@@ -131,6 +133,7 @@ specification_version: 4
 summary: deploy tool
 test_files:
 - spec/cli_spec.rb
+- spec/provider/cloudcontrol_spec.rb
 - spec/provider/dotcloud_spec.rb
 - spec/provider/heroku_anvil_spec.rb
 - spec/provider/heroku_git_spec.rb