eb_deployer 0.3.0 → 0.3.1

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p429
+1.9.3-p429

data/lib/eb_deployer.rb

@@ -231,12 +231,7 @@ module EbDeployer
     action = options.delete(:action)
 
     if File.exists?(options[:config_file])
-      if !options[:package]
-        puts "Found configuration at #{options[:config_file]}."
-        puts "Now execute 'eb_deploy -p <package name>' to deploy"
-        puts "'eb_deploy --help') for more options"
-        exit(2)
-      end
+      puts "Found configuration at #{options[:config_file]}."
     else
       puts "Generated default configuration at #{options[:config_file]}."
       DefaultConfig.new(File.basename(Dir.pwd)).write_to(options[:config_file])
@@ -245,11 +240,11 @@ module EbDeployer
 
     if !options[:package] && action == :deploy
       puts "Missing options: -p (--package)"
+      puts "'eb_deploy --help' for details"
       puts parser
       exit(-1)
     end
 
-
     self.send(action, ConfigLoader.new.load(options))
   end
 
@@ -258,7 +253,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") do |v|
+      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|
         options[:package] = v
       end
 
@@ -283,6 +278,13 @@ module EbDeployer
         exit(0)
       end
 
+      opts.on("-h", "--help", "help")  do
+        puts opts
+        puts ""
+        puts "YAML package file format:"
+        puts "s3_bucket: <bucket_name>"
+        puts "s3_key: <object_path>"
+      end
     end
   end
 

data/lib/eb_deployer/application.rb

@@ -11,12 +11,17 @@ module EbDeployer
     def create_version(version_label, package)
       create_application_if_not_exists
 
-      package = Package.new(package, @bucket + ".packages", @s3_driver)
-      package.upload
+      source_bundle = if package =~ /\.yml$/
+                        YAML.load(File.read(package))
+                      else
+                        package = Package.new(package, @bucket + ".packages", @s3_driver)
+                        package.upload
+                        package.source_bundle
+                      end
 
       unless @eb_driver.application_version_labels(@name).include?(version_label)
         log("Create application version with label #{version_label}")
-        @eb_driver.create_application_version(@name, version_label, package.source_bundle)
+        @eb_driver.create_application_version(@name, version_label, source_bundle)
       end
     end
 

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/deploy_test.rb

@@ -8,7 +8,22 @@ class DeployTest < MiniTest::Unit::TestCase
     @sample_package = sample_file('app-package.war')
   end
 
-  def test_first_deplyment_create_eb_application
+  def test_deployment_with_s3_package_specification
+    File.open('mingle_package.yml', 'w') do |f|
+      f.write("s3_bucket: test-bucket\n")
+      f.write("s3_key: test-mingle.war")
+    end
+
+    deploy(:application => 'simple', :environment => "production",
+           :package => 'mingle_package.yml', :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])
+  ensure
+    FileUtils.rm_rf('mingle_package.yml')
+  end
+
+  def test_first_deployment_create_eb_application
     assert !@eb_driver.application_exists?('simple')
     deploy(:application => 'simple', :environment => "production")
     assert @eb_driver.application_exists?('simple')

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
+  prerelease: 
 platform: ruby
 authors:
 - wpc
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-02-05 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
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -68,26 +71,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.0
+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 box.

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2M0YzZlNzgzYzJkODBlNzhmYWEzNjNhZDA5MWVjYTlhMWRmYzkyMg==
-  data.tar.gz: !binary |-
-    MTc3YTc2ODk4YjAzYjEyNzEwYmI3ODE2MTkyNDgzM2FlYjA3MTM1Yw==
-SHA512:
-  metadata.gz: !binary |-
-    MmQwNGE5ZTViNzlmNGE4MDhhMDBjNDg0M2NiNmM3YjIzZWFiZjYyMmQ1NGE5
-    MTE1MDNjYzMwZGMzMjI5NmFmMGQ3OTdkODY1M2E1NGIzOTkyYjZkNGFkNGQw
-    MWY5Mjc1ZTVlOTA0NjU0YmM3NzI1ZWUwODY1YmY3ZDQxMGVhN2I=
-  data.tar.gz: !binary |-
-    Y2UwZTliNTE1ZWI1OTRkMWM0Mzk3NmIxNTJmZDYzNGU4ZGMzOGRiNjIwYTYw
-    ZWM5ZDgyMjkzZmRiNWRkZTQwZDU0ODYyZDM3ZTJkMGQ1M2Q1ZjA0YTk5MWI1
-    OWY5Y2EyOTgzODA4MmM1NzU4MTA5NThkMTU4ODA2ODgxZjQxZWU=