eb_deployer 0.3.4 → 0.3.5

data/lib/eb_deployer/application.rb

@@ -11,12 +11,19 @@ module EbDeployer
     def create_version(version_label, package)
       create_application_if_not_exists
 
-      source_bundle = if File.extname(package) == '.yml'
-                        YAML.load(File.read(package))
+      source_bundle = if File.exists?(package)
+                        if File.extname(package) == '.yml'
+                          YAML.load(File.read(package))
+                        else
+                          package = Package.new(package, @bucket + ".packages", @s3_driver)
+                          package.upload
+                          package.source_bundle
+                        end
+                      elsif package =~ /:/
+                        bucket, obj_key = package.split(':')
+                        {'s3_bucket' => bucket, 's3_key' => obj_key}
                       else
-                        package = Package.new(package, @bucket + ".packages", @s3_driver)
-                        package.upload
-                        package.source_bundle
+                        raise "Unknown package file/format: #{package.inspect}"
                       end
 
       unless @eb_driver.application_version_labels(@name).include?(version_label)

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/eb_deployer.rb

@@ -270,7 +270,7 @@ module EbDeployer
   def self.cli_parser(options)
     OptionParser.new do |opts|
       opts.banner = "Usage: eb_deployer [options]"
-      opts.on("-p", "--package [FILE]", "Package to deploy, for example a war file for java application or yaml specification for package location on s3, see -h for format") do |v|
+      opts.on("-p", "--package [FILE/S3_OBJECT]", "Package to deploy, can be a war file for java application, or yaml specification for package location on S3, or a S3 object with bucket name saperated by colon, e.g. bucket_name:key_name") do |v|
         options[:package] = v
       end
 
@@ -309,6 +309,7 @@ module EbDeployer
       opts.on("-h", "--help", "help")  do
         puts opts
         puts ""
+        puts "S3 object package format: s3_bucket_name:s3_object_key"
         puts "YAML package file format:"
         puts "s3_bucket: <bucket_name>"
         puts "s3_key: <object_path>"

data/test/deploy_test.rb

@@ -419,6 +419,18 @@ class DeployTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_pass_s3_object_name_as_package_file
+    package_name = 'test-bucket:test-mingle.war'
+
+    deploy(:package => package_name,
+           :application => 'simple',
+           :environment => "production",
+           :version_label => 1)
+
+    assert @eb_driver.application_exists?('simple')
+    last_version = @eb_driver.application_versions('simple').last
+    assert_equal({'s3_bucket' => 'test-bucket', 's3_key' => 'test-mingle.war'}, last_version[:source_bundle])
+  end
 
   private
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
+  prerelease: 
 platform: ruby
 authors:
 - wpc
@@ -9,20 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: For automating Blue-Green deployment flows on Elastic Beanstalk.
@@ -34,9 +37,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
+- .gitignore
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - LICENSE
 - README.md
@@ -69,26 +72,27 @@ files:
 homepage: https://github.com/ThoughtWorksStudios/eb_deployer
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Low friction deployments should be a breeze. Elastic Beanstalk provides a
   great foundation for performing Blue-Green deployments, and EbDeployer add a missing
   top to automate the whole flow out of the box.
@@ -100,3 +104,4 @@ test_files:
 - test/environment_test.rb
 - test/smoke_test_test.rb
 - test/test_helper.rb
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: db0cf300a1d06c7b6ed063eef7ef69c7cab8d025
-  data.tar.gz: 5acf245e16a6c1ce4b4d35ad1d1544d5185b2329
-SHA512:
-  metadata.gz: 35071cab562e78eae3485b15b2d81d328c5ae5618ea5fdc56dd7b8d7335bca0aa5c8937547b3474fe9194175ab093f75b2bca139b58740bb737da23ad7ae37f9
-  data.tar.gz: 9a4f03e8d7a4a0a769e749d4d191b9feeec7def2ad598ffa41b36e72191dad9b46964efc8b9e5d8b37670678d322eaec57f46e640813dcafe5ad07065808e8e6