eb_deployer 0.4.4.beta2 → 0.4.4.beta3

data/lib/eb_deployer/aws_driver/beanstalk.rb

@@ -95,13 +95,15 @@ module EbDeployer
       end
 
       def environment_cname(app_name, env_name)
-        env = alive_envs(app_name, [env_name]).first
-        env && env[:cname]
+        get_environment_attribute(app_name, env_name, :cname)
       end
 
       def environment_health_state(app_name, env_name)
-        env = alive_envs(app_name, [env_name]).first
-        env && env[:health]
+        get_environment_attribute(app_name, env_name, :health)
+      end
+
+      def environment_verion_label(app_name, env_name)
+        get_environment_attribute(app_name, env_name, :version_label)
       end
 
       def environment_swap_cname(app_name, env1, env2)
@@ -117,6 +119,11 @@ module EbDeployer
                {:name=>"WebServer", :type=>"Standard", :version=>"1.0"}
               ]
 
+      def get_environment_attribute(app_name, env_name, attribute)
+        env = alive_envs(app_name, [env_name]).first
+        env && env[:attribute]
+      end
+
       def environment_tier(name)
         TIERS.find {|t| t[:name].downcase == name.downcase} || raise("No tier found with name #{name.inspect}")
       end

data/lib/eb_deployer/eb_environment.rb

@@ -31,7 +31,8 @@ module EbDeployer
 
     def apply_settings(settings)
       raise "Env #{self.name} not exists for applying settings" unless @bs.environment_exists?(@app, @name)
-      update_eb_env(settings)
+      version_label = @bs.environment_verion_label(@app, @name)
+      update_eb_env(settings, version_label)
     end
 
     def cname_prefix
@@ -63,7 +64,7 @@ module EbDeployer
       end
     end
 
-    def update_eb_env(settings, version_label=nil)
+    def update_eb_env(settings, version_label)
       with_polling_events(/Environment update completed successfully/i) do
         @bs.update_environment(@app, @name, version_label, @creation_opts[:tier], settings)
       end

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.4.4.beta2"
+  VERSION = "0.4.4.beta3"
 end

data/test/aws_driver_stubs.rb

@@ -111,11 +111,12 @@ class EBStub
     'Green'
   end
 
-  #test only
   def environment_verion_label(app_name, env_name)
     @envs[env_key(app_name, env_name)][:version]
   end
 
+  #test only
+
   def environment_tier(app_name, env_name)
     @envs[env_key(app_name, env_name)][:tier]
   end

data/test/blue_green_deploy_test.rb

@@ -76,14 +76,23 @@ class BlueGreenDeployTest < DeployTest
 
     do_deploy(42, settings)
     assert_equal 10, @eb.environment_settings('simple', t('production-a', 'simple')).last[:value]
+    assert_equal '42', @eb.environment_verion_label('simple', t('production-a', 'simple'))
 
     do_deploy(43, settings)
     assert_equal 1, @eb.environment_settings('simple', t('production-a', 'simple')).last[:value]
+    assert_equal '42', @eb.environment_verion_label('simple', t('production-a', 'simple'))
+
     assert_equal 10, @eb.environment_settings('simple', t('production-b', 'simple')).last[:value]
+    assert_equal '43', @eb.environment_verion_label('simple', t('production-b', 'simple'))
+
 
     do_deploy(44, settings)
     assert_equal 10, @eb.environment_settings('simple', t('production-a', 'simple')).last[:value]
+    assert_equal '44', @eb.environment_verion_label('simple', t('production-a', 'simple'))
+
     assert_equal 1, @eb.environment_settings('simple', t('production-b', 'simple')).last[:value]
+    assert_equal '43', @eb.environment_verion_label('simple', t('production-b', 'simple'))
+
   end
 
   private

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.4.4.beta2
+  version: 0.4.4.beta3
+  prerelease: 6
 platform: ruby
 authors:
 - wpc
@@ -14,6 +15,7 @@ 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
@@ -85,26 +88,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: 1.3.1
 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 the box.

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGZjMmMyZmZjOTQwMDA3ZGMzNWViZGZmY2I0ZWRlMTlhODFmY2VlYw==
-  data.tar.gz: !binary |-
-    ZWNmNmQyMWViYWQ4MmZkNGEyZjgyZThkNDAzNDBiYmJlYjRhYzIwMw==
-SHA512:
-  metadata.gz: !binary |-
-    ZWYxMzg3ZDgxZWIyOTZkZTg2MTlhZjUyMmRmMDExYTRlZDllYmExN2FjNDZl
-    YWY5M2FmYjExYTUwMWQ2ZTg4YmI5ZmQ2ZDNmMTVlNWZmODhlZmNhNDU4NzZj
-    NmUyZmFjODE4YmI2MzQ4NTQyZjg0ODU5YmE4YTQ1Y2NiNGQ1OWQ=
-  data.tar.gz: !binary |-
-    YzU2NmQ2MjJjODhiNzk2Y2ZkNDZhZTBhOTU5NDg4OTg3YWFiZjJmMGJjMjcz
-    NTFmNjI1N2JlNzljYWU2NjkxNjFkMmJiNzE1YjI0Y2FhN2NhYzk3OWJhMzEz
-    MTNlNDVjNDE5YWViMWQ1ZmNkY2E1MjczYTI1MzUzYTk2ODAwMTQ=