elastic-beanstalk 0.3.0 → 0.3.1

data/README.md

@@ -78,10 +78,10 @@ This will take a while.  We intend to provide an example in the wiki and/or samp
     rake eb:package                 # Package zip source bundle for Elastic Beanstalk
     rake eb:show_config[version]    # Show resolved configuration without doing anything
 
-## RDS Rake Tasks
+## EB:RDS Rake Tasks
 
-RDS tasks are intended to make integration of RDS task into the deployment process simple.
-i.e. create a snapshot before or after an `eb:deploy`, the following `rake` tasks exist:
+The EB:RDS tasks are intended to make integration of RDS tasks into the deployment process simple.
+i.e. create a snapshot before or after an `eb:deploy`.  The following rake tasks exist:
 
     rake eb:rds:create_snapshot[instance_id,snapshot_id]   # Creates an RDS snapshot
     rake eb:rds:instances                                  # List RDS instances

data/elastic-beanstalk.gemspec

@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'time_diff'
   spec.add_runtime_dependency 'zipruby'
   spec.add_runtime_dependency 'table_print'
+  spec.add_runtime_dependency 'nokogiri'
 end

data/lib/elastic/beanstalk/smoke_tester.rb

@@ -1,6 +1,7 @@
 require 'timeout'
 require 'net/http'
 require 'elastic/beanstalk/spinner'
+require 'nokogiri'
 
 module Elastic
   module Beanstalk
@@ -31,8 +32,14 @@ module Elastic
                   response = ResponseStub.new({code: e.message, body: ''})
                 end
 
-                #puts "\t\t[#{response.code}]"
+                puts "\t\t[#{response.code}]"
                 #puts "\t#{response.body}"
+
+                #
+                # Let's try to get out quickly when the deploy has gone wrong.
+                #
+                break if received_fatal_error?(response)
+
               end until (!response.nil? && response.code.to_i == 200 && response.body.include?(expected_text))
             }
           end
@@ -44,6 +51,36 @@ module Elastic
 
       private
 
+      def received_fatal_error?(response)
+        fatal_error = false
+        ['Bundler::PathError'].each do |code|
+          # fail right away on known terminal cases.
+          if (!response.nil? && response.code.to_i == 500 && response.body.include?(code))
+
+            doc = Nokogiri::HTML(response.body)
+
+            $stderr.puts "\t\t[#{response.code}] #{code}"
+            $stderr.puts "\t\t\t#{get_content(doc, '//h1')}"
+            $stderr.puts "\t\t\t#{get_content(doc, '//dl/dd')}"
+            fatal_error = true
+            break
+          end
+        end
+
+        fatal_error
+      end
+
+      def get_content(doc, xpath)
+        value = ''
+        begin
+          element = doc.xpath(xpath)
+          element = element.first unless element.nil?
+          value = element.content unless element.nil?
+        rescue
+        end
+        value
+      end
+
       class ResponseStub
 
         attr_reader :code, :body

data/lib/elastic/beanstalk/tasks/eb.rake

@@ -11,7 +11,7 @@ require 'timeout'
 namespace :eb do
 
   namespace :rds do
-
+    # http://docs.aws.amazon.com/AWSRubySDK/latest/frames.html
     desc 'List RDS snapshots'
     task :snapshots => [:config] do |t, args|
       # absolutely do not run this without specifying columns, otherwise it will call all defined methods including :delete
@@ -106,7 +106,6 @@ namespace :eb do
          {engine: lambda { |i| "#{i.engine} #{i.engine_version}" }},
          {zone: {display_method: :availability_zone_name}},
          :multi_az,
-         #{endpoint_address: {max_width: 120}},
          {:endpoint_address => {:width => 120}},
          {port: {display_method: :endpoint_port}},
          #:latest_restorable_time,

data/lib/elastic/beanstalk/version.rb

@@ -1,5 +1,5 @@
 module Elastic
   module Beanstalk
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/spec/lib/elastic/beanstalk/eb_smoke_tester_spec.rb

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe EbExtensions do
 
-  ##this is a driver only, perhaps make this a reasonable test someday...
+
+  ###this is a driver only, perhaps make this a reasonable test someday...
   #it "#test_url" do
   #  #url = 'http://acme-development-inactive.elasticbeanstalk.com/ping'
-  #  url = 'http://google.com'
+  #  #url = 'http://google.com'
   #  expected_text = 'You came to this page by mistake, go back where you came from'
   #  EbSmokeTester.test_url(url, 10, 2, expected_text)
   #end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-beanstalk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  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: ! '    The simplest way to configure and deploy an Elastic Beanstalk
   application via rake.