elastic-beanstalk 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40a2e39a971bfd3c7c3de3c571af41a762dadbe6
-  data.tar.gz: 5656483a2442d9c46754e9e2a43d6970dab9e6b4
+  metadata.gz: 78b136f50127269176467ba6b9acc6f6e66ecd68
+  data.tar.gz: 5f2ee1c26fadeccb7e900ba5f3113382532e05a4
 SHA512:
-  metadata.gz: b2a52b39ea276ac7cdbe221063a92d0d95d323a362d2bc9a29ccad9f2a3327ca6d9efdd66a122bdf36dc02d51158d2a949bd442390c04b047d0422a47358d1e5
-  data.tar.gz: f894dcbfb2890d9dd20618f4ac05e533bc50789fe95f47ca6d0f64fa4e08f65528e3e00a7063b6ab7c5c91d68b479a4c8f496e9eaa93ca7498dd2f76eb819f80
+  metadata.gz: 83d030e7f06d67f9fea40967532393e09782d759fbce5fbf30b1edddae842fb8200a2383f2739032f421921cf5c9bff44767ba1c4872c7c17c05860f44b47ace
+  data.tar.gz: 02409b252a1f8dd08f103f189144744ef67376cb738acd75ac389f3e263e3a19a3f08c33e3c3ee043fe155b7d3a37a1f21e9ea768bedf3cc9ebbcdb0486787e8

data/README.md

@@ -46,21 +46,23 @@ This should contain the access and secret keys generated from the selected IAM u
 ### Step 2.  Add a config/eb.yml to your rails project
 Something like this should get you started
 
-    app: acme
-    region: us-east-1
-    # http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/concepts.platforms.html
-    solution_stack_name: 64bit Amazon Linux 2013.09 running Ruby 1.9.3
-
-    development:
-      strategy: inplace_update
-      options:
-        aws:autoscaling:launchconfiguration:
-          InstanceType: t1.micro
-
-    production:
-      options:
-        aws:autoscaling:launchconfiguration:
-          InstanceType: t1.small
+```ruby
+app: acme
+region: us-east-1
+# http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/concepts.platforms.html
+solution_stack_name: 64bit Amazon Linux 2013.09 running Ruby 1.9.3
+
+development:
+  strategy: inplace_update
+  options:
+    aws:autoscaling:launchconfiguration:
+      InstanceType: t1.micro
+
+production:
+  options:
+    aws:autoscaling:launchconfiguration:
+      InstanceType: t1.small
+```
 
 ### Step 3. Package and deploy
 The default is the 'development' environment, change this via command line arguments
@@ -131,129 +133,133 @@ Deploy an MD5 hashed version of acme to development
 
 config/eb.yml
 
-    # This is a sample that has not been executed so it may not be exactly 100%, but is intended to show
-    #   that access to full options_settings and .ebextensions is intended.
-    #---
-    app: acme
-    region: us-east-1
-    solution_stack_name: 64bit Amazon Linux running Ruby 1.9.3
-    package:
-      verbose: true
-      exclude_dirs: [solr, features] # additional dirs that merge with default excludes
-      exclude_files: [rspec.xml, README*, db/*.sqlite3]
-    smoke_test: |
-        lambda { |host|
-
-          EbSmokeTester.test_url("http://#{host}/ping", 600, 5, 'All good! Everything is up and checks out.')
-        }
-    #--
-    ebextensions:
-      01settings.config:
-        # Run rake tasks before an application deployment
-        container_commands:
-          01seed:
-            command: rake db:seed
-            leader_only: true
-      # run any necessary commands
-      02commands.config:
-        container_commands:
-          01timezone:
-            command: "ln -sf /usr/share/zoneinfo/America/Chicago /etc/localtime"
-
-      # These are things that make sense for any Ruby application see:
-      #     https://github.com/gkop/elastic-beanstalk-ruby/blob/master/.ebextensions/ruby.config
-      03-ruby.config:
-
-        # Install git in order to be able to bundle gems from git
-        packages:
-          yum:
-            git: []
-        commands:
-          # Run rake with bundle exec to be sure you get the right version
-          add_bundle_exec:
-            test: test ! -f /opt/elasticbeanstalk/support/.post-provisioning-complete
-            cwd: /opt/elasticbeanstalk/hooks/appdeploy/pre
-            command: perl -pi -e 's/(rake)/bundle exec $1/' 11_asset_compilation.sh 12_db_migration.sh
-          # Bundle with --deployment as recommended by bundler docs
-          #   cf. http://gembundler.com/v1.2/rationale.html under Deploying Your Application
-          add_deployment_flag:
-            test: test ! -f /opt/elasticbeanstalk/support/.post-provisioning-complete
-            cwd: /opt/elasticbeanstalk/hooks/appdeploy/pre
-            command: perl -pi -e 's/(bundle install)/$1 --deployment/' 10_bundle_install.sh
-          # Vendor gems to a persistent directory for speedy subsequent bundling
-          make_vendor_bundle_dir:
-            test: test ! -f /opt/elasticbeanstalk/support/.post-provisioning-complete
-            command: mkdir /var/app/support/vendor_bundle
-          # Store the location of vendored gems in a handy env var
-          set_vendor_bundle_var:
-            test: test ! -f /opt/elasticbeanstalk/support/.post-provisioning-complete
-            cwd: /opt/elasticbeanstalk/support
-            command: sed -i '12iexport EB_CONFIG_APP_VENDOR_BUNDLE=$EB_CONFIG_APP_SUPPORT/vendor_bundle' envvars
-          # The --deployment flag tells bundler to install gems to vendor/bundle/, so
-          # symlink that to the persistent directory
-          symlink_vendor_bundle:
-            test: test ! -f /opt/elasticbeanstalk/support/.post-provisioning-complete
-            cwd: /opt/elasticbeanstalk/hooks/appdeploy/pre
-            command: sed -i '6iln -s $EB_CONFIG_APP_VENDOR_BUNDLE ./vendor/bundle' 10_bundle_install.sh
-          # Don't run the above commands again on this instance
-          #   cf. http://stackoverflow.com/a/16846429/283398
-          z_write_post_provisioning_complete_file:
-            cwd: /opt/elasticbeanstalk/support
-            command: touch .post-provisioning-complete
-    #---
-    options:
-      aws:autoscaling:launchconfiguration:
-        EC2KeyName: eb-ssh
-        SecurityGroups: 'acme-production-control'
-
-      aws:autoscaling:asg:
-        MinSize: 1
-        MaxSize: 5
-
-      aws:elb:loadbalancer:
-        SSLCertificateId: 'arn:aws:iam::XXXXXXX:server-certificate/acme'
-        LoadBalancerHTTPSPort: 443
-
-      aws:elb:policies:
-        Stickiness Policy: true
-
-      aws:elasticbeanstalk:sns:topics:
-        Notification Endpoint: 'alerts@acme.com'
-
-      aws:elasticbeanstalk:application:
-        Application Healthcheck URL: '/'
-    #---
-    development:
-      strategy: inplace_update
-      options:
-        aws:autoscaling:launchconfiguration:
-          InstanceType: t1.micro
-        aws:elasticbeanstalk:application:environment:
-          RAILS_SKIP_ASSET_COMPILATION: true
-    #---
-    production:
-      options:
-        aws:autoscaling:launchconfiguration:
-          InstanceType: t1.small
-
+```ruby
+# This is a sample that has not been executed so it may not be exactly 100%, but is intended to show
+#   that access to full options_settings and .ebextensions is intended.
+#---
+app: acme
+region: us-east-1
+solution_stack_name: 64bit Amazon Linux running Ruby 1.9.3
+package:
+  verbose: true
+  exclude_dirs: [solr, features] # additional dirs that merge with default excludes
+  exclude_files: [rspec.xml, README*, db/*.sqlite3]
+smoke_test: |
+    lambda { |host|
+      EbSmokeTester.test_url("http://#{host}/ping", 600, 5, 'All good! Everything is up and checks out.')
+    }
+#--
+ebextensions:
+  01settings.config:
+    # Run rake tasks before an application deployment
+    container_commands:
+      01seed:
+        command: rake db:seed
+        leader_only: true
+  # run any necessary commands
+  02commands.config:
+    container_commands:
+      01timezone:
+        command: "ln -sf /usr/share/zoneinfo/America/Chicago /etc/localtime"
+
+  # These are things that make sense for any Ruby application see:
+  #     https://github.com/gkop/elastic-beanstalk-ruby/blob/master/.ebextensions/ruby.config
+  03-ruby.config:
+
+    # Install git in order to be able to bundle gems from git
+    packages:
+      yum:
+        git: []
+    commands:
+      # Run rake with bundle exec to be sure you get the right version
+      add_bundle_exec:
+        test: test ! -f /opt/elasticbeanstalk/support/.post-provisioning-complete
+        cwd: /opt/elasticbeanstalk/hooks/appdeploy/pre
+        command: perl -pi -e 's/(rake)/bundle exec $1/' 11_asset_compilation.sh 12_db_migration.sh
+      # Bundle with --deployment as recommended by bundler docs
+      #   cf. http://gembundler.com/v1.2/rationale.html under Deploying Your Application
+      add_deployment_flag:
+        test: test ! -f /opt/elasticbeanstalk/support/.post-provisioning-complete
+        cwd: /opt/elasticbeanstalk/hooks/appdeploy/pre
+        command: perl -pi -e 's/(bundle install)/$1 --deployment/' 10_bundle_install.sh
+      # Vendor gems to a persistent directory for speedy subsequent bundling
+      make_vendor_bundle_dir:
+        test: test ! -f /opt/elasticbeanstalk/support/.post-provisioning-complete
+        command: mkdir /var/app/support/vendor_bundle
+      # Store the location of vendored gems in a handy env var
+      set_vendor_bundle_var:
+        test: test ! -f /opt/elasticbeanstalk/support/.post-provisioning-complete
+        cwd: /opt/elasticbeanstalk/support
+        command: sed -i '12iexport EB_CONFIG_APP_VENDOR_BUNDLE=$EB_CONFIG_APP_SUPPORT/vendor_bundle' envvars
+      # The --deployment flag tells bundler to install gems to vendor/bundle/, so
+      # symlink that to the persistent directory
+      symlink_vendor_bundle:
+        test: test ! -f /opt/elasticbeanstalk/support/.post-provisioning-complete
+        cwd: /opt/elasticbeanstalk/hooks/appdeploy/pre
+        command: sed -i '6iln -s $EB_CONFIG_APP_VENDOR_BUNDLE ./vendor/bundle' 10_bundle_install.sh
+      # Don't run the above commands again on this instance
+      #   cf. http://stackoverflow.com/a/16846429/283398
+      z_write_post_provisioning_complete_file:
+        cwd: /opt/elasticbeanstalk/support
+        command: touch .post-provisioning-complete
+#---
+options:
+  aws:autoscaling:launchconfiguration:
+    EC2KeyName: eb-ssh
+    SecurityGroups: 'acme-production-control'
+
+  aws:autoscaling:asg:
+    MinSize: 1
+    MaxSize: 5
+
+  aws:elb:loadbalancer:
+    SSLCertificateId: 'arn:aws:iam::XXXXXXX:server-certificate/acme'
+    LoadBalancerHTTPSPort: 443
+
+  aws:elb:policies:
+    Stickiness Policy: true
+
+  aws:elasticbeanstalk:sns:topics:
+    Notification Endpoint: 'alerts@acme.com'
+
+  aws:elasticbeanstalk:application:
+    Application Healthcheck URL: '/'
+#---
+development:
+  strategy: inplace_update
+  options:
+    aws:autoscaling:launchconfiguration:
+      InstanceType: t1.micro
+    aws:elasticbeanstalk:application:environment:
+      RAILS_SKIP_ASSET_COMPILATION: true
+#---
+production:
+  options:
+    aws:autoscaling:launchconfiguration:
+      InstanceType: t1.small
+```
 
 ## Additional options
 Most of the configurations are defaulted.  The following are less obvious but may be useful:
 
-    secrets_dir: (default: '~/.aws')
-    package:
-      verbose: (default: false)
-      dir: (default: 'pkg')
+```ruby
+secrets_dir: (default: '~/.aws')
+package:
+  verbose: (default: false)
+  dir: (default: 'pkg')
+```
 
 ### eb_deployer additional options
 The following are passed if not nil, otherwise eb_deployer assigns an appropriate default.
 
-    package_bucket:
-    keep_latest:
-    version_prefix:
+```ruby
+package_bucket:
+keep_latest:
+version_prefix:
+```
 
 ## Still to come
-1. Caching sample config
+1. Caching sample config?
 2. More thorough access to the Elastic Beanstalk api as-needed.
 
 ## Contributing

data/elastic-beanstalk.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
 
   # runtime
   s.add_runtime_dependency 'railties', '>= 3.2'
-  s.add_runtime_dependency 'eb_deployer', '>= 0.4.4'
+  s.add_runtime_dependency 'eb_deployer', '>= 0.6.1'
   s.add_runtime_dependency 'awesome_print'
   s.add_runtime_dependency 'time_diff'
   s.add_runtime_dependency 'rubyzip'

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

@@ -68,11 +68,11 @@ namespace :eb do
     end
 
     def snapshot(snapshot_id)
-      AWS::RDS::DBSnapshot.new(snapshot_id)
+      Aws::RDS::DBSnapshot.new(snapshot_id)
     end
 
     def db(instance_id)
-      db_instance = AWS::RDS::DBInstance.new(instance_id)
+      db_instance = Aws::RDS::DBInstance.new(instance_id)
       raise "DB Instance[#{instance_id}] does not exist." unless db_instance.exists?
       db_instance
     end
@@ -181,11 +181,16 @@ namespace :eb do
 
     #-------------------------------------------------------------------------------
     # configure aws credentials.  Depending on the called task, this may not be necessary parent task should call #credentials! for validation.
-    AWS.config(credentials) unless credentials.nil?
+    Aws.config.update({
+      credentials: Aws::Credentials.new(credentials['access_key_id'], credentials['secret_access_key']),
+    }) unless credentials.nil?
 
     #-------------------------------------------------------------------------------
     # configure aws region if specified in the eb.yml
-    AWS.config(region: EbConfig.region) unless EbConfig.region.nil?
+    Aws.config.update({
+      region: EbConfig.region,
+    }) unless EbConfig.region.nil?
+
   end
 
   ###########################################

data/lib/elastic/beanstalk/version.rb

@@ -1,5 +1,5 @@
 module Elastic
   module Beanstalk
-    VERSION = '1.1.3'
+    VERSION = '1.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-beanstalk
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Kevin Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement