dpl 1.6.6.travis.500.1 → 1.6.6.travis.507.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODE2ZDFjNTMwOGZjODFiNzAyZTU3NDNiODU4MTRlZmQ0ZjZhNWM2Yw==
+    NDNhZmZlMWU4NzBiOTJiODg4YjM0NGVhY2M3NjQ3OGU1YjhlZTVhZQ==
   data.tar.gz: !binary |-
-    Mjk2OTI4YjQzM2E5NDI2ZTA5ZWZkYWYwM2I4ZDYzOGNiODhlMzQ3Mg==
+    MTc4NGMzNWNlNDZlYzUwMjdkMTUzZDAxYjM3YmU2MmE1ZWUzMDRjMg==
 SHA512:
   metadata.gz: !binary |-
-    ODkxZTU4YjU4NGM3NjQxZmZiYTU4MGM3MWRhNDdjN2Y0MDllMzljOGY1NWU2
-    ZWM3YWI2MGZhNzYyMzU2NTVjNTNlNzNmMDJlNTU5ODk4ZTQxNGZkYTIyZGE4
-    MGE2Y2ViNmE3Y2VkMzFkZmM1MWRkNTgyOWNiYWY1YmI2ZDlhNTA=
+    ODhjYTZkOWM5M2VlODBhZTRmYzE5MmJiNTMwOWY3ZGRmOWM1NWNiNjA0ZjA5
+    NTMxYTgyMTk0MWEwNzMzODRlY2QyODAwZTcwZGM1NjFlMGJkZWYxZmFhOWQ5
+    NzA4ZjJlNjhjNTEyZWJlMDNmOGVhYmEzNTAyZmU1NzAyNjZkNTM=
   data.tar.gz: !binary |-
-    YzkwMmJkMmVjMGRkZjg1N2I3MmMzYTkxYmQ1ZTFiNzIwZjJlNzUwZjZiMjA4
-    OWVjZjc5MjE0OTgwYmQyODVmZjlhZGU2MTE1YThjNTUzZTlkMWU0ZWE0ZDU1
-    M2Q1NzAxZWY5OWQzNzcwYzY5ZDA4YWNlZGQxMGFhZjVmNjVmYTg=
+    ODUzOTVlYzU0NWU4ZTY5Y2ExZmQ3MzIyODc0M2MwN2Y1NTNmYWQ1N2MwNTVm
+    ZjFhZGNjNGNjMmIyMzE2N2NiNTNiYmE4MThiZTZmMzNiYmI0YmRjZDhkZjZk
+    MGM2NDljZjI3NDJlNjUzYWFjYWIwMDRlNzE5YTk4NzkxMDYxZDA=

data/Gemfile

@@ -45,3 +45,8 @@ end
 group :gae do
   gem 'rubyzip'
 end
+
+group :elastic_beanstalk do
+  gem 'rubyzip'
+  gem 'aws-sdk'
+end

data/README.md

@@ -26,6 +26,7 @@ Dpl supports the following providers:
 * [Hackage](#hackage)
 * [Deis](#deis)
 * [Google Cloud Storage](#google-cloud-storage)
+* [Elastic Beanstalk](#elastic-beanstalk)
 
 ## Installation:
 
@@ -358,3 +359,17 @@ For accounts using two factor authentication, you have to use an oauth token as
     dpl --provider=gcs --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --acl=public-read
     dpl --provider=gcs --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --detect-encoding --cache_control=max-age=99999
     dpl --provider=gcs --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --local-dir=BUILD --upload-dir=BUILDS
+
+### Elastic Beanstalk:
+
+#### Options:
+
+ * **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).
+ * **region**: AWS Region the Elastic Beanstalk app is running in. Defaults to 'us-east-1'. Please be aware that this must match the region of the elastic beanstalk app.
+ * **app**: Elastic Beanstalk application name.
+ * **env**: Elastic Beanstalk environment name which will be updated.
+
+#### Examples:
+
+    dpl --provider=elasticbeanstalk --access-key-id=<access-key-id> --secret-access-key="<secret-access-key>" --app="example-app-name" --env="example-app-environment" --region="us-west-2"

data/lib/dpl/provider.rb

@@ -28,6 +28,7 @@ module DPL
     autoload :Deis,         'dpl/provider/deis'
     autoload :GCS,          'dpl/provider/gcs'
     autoload :GAE,          'dpl/provider/gae'
+    autoload :ElasticBeanstalk, 'dpl/provider/elastic_beanstalk'
 
     def self.new(context, options)
       return super if self < Provider
@@ -124,6 +125,10 @@ module DPL
       @sha ||= ENV['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
     end
 
+    def commit_msg
+      @commit_msg ||= %x{git log #{sha} -n 1 --pretty=%B}.strip
+    end
+
     def cleanup
       return if options[:skip_cleanup]
       context.shell "mv .dpl ~/dpl"

data/lib/dpl/provider/elastic_beanstalk.rb

@@ -0,0 +1,115 @@
+require 'aws-sdk'
+require 'zip'
+
+module DPL
+  class Provider
+    class ElasticBeanstalk < Provider
+      experimental 'AWS Elastic Beanstalk'
+
+      DEFAULT_REGION = 'us-east-1'
+
+      def needs_key?
+        false
+      end
+
+      def check_auth
+        AWS.config(access_key_id: option(:access_key_id), secret_access_key: option(:secret_access_key), region: region)
+      end
+
+      def check_app
+      end
+
+      def push_app
+        create_bucket unless bucket_exists?
+        zip_file = create_zip
+        s3_object = upload(archive_name, zip_file)
+        sleep 5 #s3 eventual consistency
+        version = create_app_version(s3_object)
+        update_app(version)
+      end
+
+      private
+
+      def app_name
+        option(:app)
+      end
+
+      def env_name
+        option(:env)
+      end
+
+      def version_label
+        "travis-#{sha}-#{Time.now.to_i}"
+      end
+
+      def archive_name
+        "#{version_label}.zip"
+      end
+
+      def region
+        option(:region) || DEFAULT_REGION
+      end
+
+      def bucket_name
+        "travis-elasticbeanstalk-builds-#{region}"
+      end
+
+      def s3
+        @s3 ||= AWS::S3.new
+      end
+
+      def eb
+        @eb ||= AWS::ElasticBeanstalk.new.client
+      end
+
+      def bucket_exists?
+        s3.buckets.map(&:name).include? bucket_name
+      end
+
+      def create_bucket
+        s3.buckets.create(bucket_name)
+      end
+
+      def create_zip
+        directory = Dir.pwd
+        zipfile_name = File.join(directory, archive_name)
+
+        Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
+          Dir[File.join(directory, '**', '**')].each do |file|
+            relative_archive_path = File.join(directory, '/')
+            zipfile.add(file.sub(relative_archive_path, ''), file)
+          end
+        end
+        zipfile_name
+      end
+
+      def upload(key, file)
+        obj = s3.buckets[bucket_name].objects[key]
+        obj.write(Pathname.new(file))
+        obj
+      end
+
+      def create_app_version(s3_object)
+        options = {
+          :application_name  => app_name,
+          :version_label     => version_label,
+          :description       => commit_msg,
+          :source_bundle     => {
+            :s3_bucket => bucket_name,
+            :s3_key    => s3_object.key
+          },
+          :auto_create_application => false
+        }
+        eb.create_application_version(options)
+      end
+
+      def update_app(version)
+        options = {
+          :environment_name  => env_name,
+          :version_label     => version[:application_version][:version_label]
+        }
+        eb.update_environment(options)
+      end
+    end
+  end
+end

data/spec/provider/elastic_beanstalk_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+require 'aws-sdk'
+require 'dpl/provider'
+require 'dpl/provider/elastic_beanstalk'
+
+describe DPL::Provider::ElasticBeanstalk do
+
+  before (:each) do
+    AWS.stub!
+  end
+
+  let(:access_key_id) { 'qwertyuiopasdfghjklz' }
+  let(:secret_access_key) { 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz' }
+  let(:region) { 'us-west-2' }
+  let(:app) { 'example-app' }
+  let(:env) { 'live' }
+
+  subject :provider do
+    described_class.new(DummyContext.new, :access_key_id => access_key_id, :secret_access_key => secret_access_key, :region => region, :app => app, :env => env)
+  end
+
+  describe "#check_auth" do
+    example do
+      expect(AWS).to receive(:config).with(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region)
+      provider.check_auth
+    end
+  end
+
+  describe "#push_app" do
+
+    let(:bucket_name) { "travis-elasticbeanstalk-builds-#{region}" }
+    let(:s3_object) { Object.new }
+    let(:app_version) { Object.new }
+
+    let(:bucket) { Struct.new(:name) }
+    let(:s3) { Struct.new(:buckets) }
+
+    example 'bucket exists already' do
+      s3_mock = s3.new([bucket.new(bucket_name)])
+      expect(provider).to receive(:s3).and_return(s3_mock)
+      expect(provider).not_to receive(:create_bucket)
+      expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
+      expect(provider).to receive(:archive_name).and_return('file.zip')
+      expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_return(s3_object)
+      expect(provider).to receive(:sleep).with(5)
+      expect(provider).to receive(:create_app_version).with(s3_object).and_return(app_version)
+      expect(provider).to receive(:update_app).with(app_version)
+
+      provider.push_app
+    end
+
+    example 'bucket doesnt exist yet' do
+      s3_mock = s3.new([])
+      expect(provider).to receive(:s3).and_return(s3_mock)
+      expect(provider).to receive(:create_bucket)
+      expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
+      expect(provider).to receive(:archive_name).and_return('file.zip')
+      expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_return(s3_object)
+      expect(provider).to receive(:sleep).with(5)
+      expect(provider).to receive(:create_app_version).with(s3_object).and_return(app_version)
+      expect(provider).to receive(:update_app).with(app_version)
+
+      provider.push_app
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.6.6.travis.500.1
+  version: 1.6.6.travis.507.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -107,6 +107,7 @@ files:
 - lib/dpl/provider/deis.rb
 - lib/dpl/provider/divshot.rb
 - lib/dpl/provider/dot_cloud.rb
+- lib/dpl/provider/elastic_beanstalk.rb
 - lib/dpl/provider/engine_yard.rb
 - lib/dpl/provider/gae.rb
 - lib/dpl/provider/gcs.rb
@@ -138,6 +139,7 @@ files:
 - spec/provider/deis_spec.rb
 - spec/provider/divshot_spec.rb
 - spec/provider/dotcloud_spec.rb
+- spec/provider/elastic_beanstalk_spec.rb
 - spec/provider/gae_spec.rb
 - spec/provider/gcs_spec.rb
 - spec/provider/hackage_spec.rb