eb_deployer 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef615dab849a7606f603bd42350de60ac0a3f14f
-  data.tar.gz: 4a00f6d08956d9cabf4fb5ce8771a82ac5e9f616
+  metadata.gz: a339b19fefcb73b8a72dc75be71acdd5c687e51d
+  data.tar.gz: 20ab402493ce588c41f77193d65ff54bad160f05
 SHA512:
-  metadata.gz: f881ddebf33bd167315214a9cd940e0a531d4fa17f28aa5c096f67eda764392ce36cb53f8555e9957e74312953e7ffd43fe4db15f31f8996ae220b8c39a37c4c
-  data.tar.gz: f79a4f4d394d8f0f81e72c0b5b245047abd1226417135268b0353cf4349a310c1e21ef90490df7935135fcc9b1bb76e5ce018c8528e73a2a97644ab3a87018c1
+  metadata.gz: 029d124d285bcf266aa87313399ad9eb6badcf08a4f305b89ae0811dbbe7ec9dc29c8896f8965108fca94aea22b028cba32f175c80f93f9b276f86a0fee38a50
+  data.tar.gz: 75e13ca3c1f39f06a81b0db7be58b1d2da79852aeceb4d06af9ad5d5379d90696534c0168e6382cf2ecdd320ce00a210c7d5bd26876492a5ae27ea19b5bd941d

data/README.md

@@ -1,4 +1,4 @@
-# EbDeployer [![Build Status](https://snap-ci.com/ThoughtWorksStudios/eb_deployer/branch/master/build_image)](https://snap-ci.com/ThoughtWorksStudios/eb_deployer/branch/master) [![Build Status](https://travis-ci.org/ThoughtWorksStudios/eb_deployer.png?branch=master)](https://travis-ci.org/ThoughtWorksStudios/eb_deployer)
+# EbDeployer [![Build Status](https://snap-ci.com/ThoughtWorksStudios/eb_deployer/branch/master/build_image)](https://snap-ci.com/ThoughtWorksStudios/eb_deployer/branch/master) [![Build Status](https://travis-ci.org/ThoughtWorksStudios/eb_deployer.png?branch=master)](https://travis-ci.org/ThoughtWorksStudios/eb_deployer) [![Gem Version](https://badge.fury.io/rb/eb_deployer.svg)](http://badge.fury.io/rb/eb_deployer)
 
 [Built with :yellow_heart: and :coffee: in San Francisco](http://www.thoughtworks.com/mingle/team/)
 
@@ -91,6 +91,16 @@ Later tutorials coming soon will cover
 
 Take a look at code if you can not wait for the documentation.
 
+### eb_deploy.yml configuration file
+
+Like Rails database.yml file, EbDeployer will read eb_deploy.yml file as ERB template file. So you can trade it as standard ERB template file, and substitute Ruby script.
+
+By default, EbDeployer provides the following methods:
+
+1. random_hash: it basically is `SecureRandom.hex[0..9]`
+2. package_digest: it is your eb package file digest
+3. environment: environment name you passed in when executing eb_deploy script.
+
 ## More
 
 [Automated zero downtime deployment to AWS Elastic Beanstalk for Rails with EbDeployer](http://helabs.com/blog/2015/05/19/automated-zero-downtime-deployment-to-aws-elastic-beanstalk-for-rails-with-eb-deployer/?utm_content=buffer12098&utm_medium=social&utm_source=twitter.com&utm_campaign=buffer)
@@ -117,4 +127,3 @@ AWS re:Invent 2013: [slideshare](http://www.slideshare.net/AmazonWebServices/aws
 
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ThoughtWorksStudios/eb_deployer/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/lib/eb_deployer/config_loader.rb

@@ -7,24 +7,24 @@ module EbDeployer
     include Utils
 
     class EvalBinding
-      def initialize(package_digest)
+      attr_reader :environment, :package_digest
+      def initialize(package_digest, env)
         @package_digest = package_digest
+        @environment = env
       end
 
       def random_hash
         SecureRandom.hex[0..9]
       end
-
-      def package_digest
-        @package_digest
-      end
     end
 
     def load(options)
       options = options.dup
       package_digest = package_digest(options[:package])
       config_file = options.delete(:config_file)
-      config_settings = load_config_settings(config_file, package_digest)
+
+      env = options[:environment]
+      config_settings = load_config_settings(config_file, package_digest, env)
 
       app_name = config_settings[:application]
 
@@ -32,7 +32,6 @@ module EbDeployer
       common_settings[:version_label] ||= package_digest
 
       envs = config_settings[:environments]
-      env = options[:environment]
       raise "Environment #{env} is not defined in #{config_file}" unless envs.has_key?(env)
       env_settings = symbolize_keys(envs[env] || {})
       env_option_settings = env_settings.delete(:option_settings) || []
@@ -46,13 +45,14 @@ module EbDeployer
 
     private
 
-    def load_config_settings(config_file, package_digest)
-      yaml = ERB.new(File.read(config_file)).result(eval_binding(package_digest))
+    def load_config_settings(config_file, package_digest, env)
+      yaml = ERB.new(File.read(config_file)).
+             result(eval_binding(package_digest, env))
       symbolize_keys(YAML.load(yaml))
     end
 
-    def eval_binding(package_digest)
-      EvalBinding.new(package_digest).instance_eval { binding }
+    def eval_binding(package_digest, env)
+      EvalBinding.new(package_digest, env).instance_eval { binding }
     end
 
     def package_digest(package)

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/test/config_loader_test.rb

@@ -173,6 +173,19 @@ YAML
                     'value' => '0'}], config[:inactive_settings])
   end
 
+  def test_access_environment_name_in_config_yml_file
+    config = @loader.load(generate_input(<<-YAML, :environment => 'dev'))
+application: myapp
+common:
+  resources:
+    inputs:
+      env: <%= environment %>
+environments:
+  dev:
+  production:
+YAML
+    assert_equal('dev', config[:resources]['inputs']['env'])
+  end
 
   private
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - wpc
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk