eb_deployer 0.0.3 → 0.0.4

data/lib/eb_deployer/cloud_formation_provisioner.rb

@@ -17,10 +17,6 @@ module EbDeployer
       transform_output_to_settings(transforms)
     end
 
-    def output(key)
-      stack.outputs.find { |o| o.key == key }.try(:value)
-    end
-
     private
 
     def update_stack(template, params)
@@ -59,6 +55,10 @@ module EbDeployer
       end while !SUCCESS_STATS.include?(stats)
     end
 
+    def output(key)
+      stack.outputs.find { |o| o.key == key }.try(:value)
+    end
+
     def extract_params
       Hash[ENV.map {|k, v| k =~ /^AWSRESOURCES_(.*)/ ? [$1, v] : nil }.compact]
     end

data/lib/eb_deployer/environment.rb

@@ -3,7 +3,7 @@ module EbDeployer
     attr_reader :app, :name
     def initialize(app, env_name, eb_driver, creation_opts={})
       @app = app
-      @name = env_name
+      @name = @app + '-' + env_name
       @bs = eb_driver
       @creation_opts = creation_opts
       @poller = EventPoller.new(@app, @name, @bs)

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/deploy_test.rb

@@ -19,9 +19,9 @@ class DeployTest < Minitest::Test
 
 
   def test_first_deployment_create_environment
-    assert !@eb_driver.environment_exists?('simple', 'production')
+    assert !@eb_driver.environment_exists?('simple', 'simple-production')
     deploy(:application => 'simple', :environment => "production")
-    assert @eb_driver.environment_exists?('simple', 'production')
+    assert @eb_driver.environment_exists?('simple', 'simple-production')
   end
 
 
@@ -29,20 +29,20 @@ class DeployTest < Minitest::Test
     deploy(:application => 'simple',
            :environment => "production",
            :version_label => 1)
-    assert_equal '1', @eb_driver.environment_verion_label('simple', 'production')
+    assert_equal '1', @eb_driver.environment_verion_label('simple', 'simple-production')
 
     deploy(:application => 'simple',
            :environment => "production",
            :version_label => 2)
 
-    assert_equal '2', @eb_driver.environment_verion_label('simple', 'production')
+    assert_equal '2', @eb_driver.environment_verion_label('simple', 'simple-production')
   end
 
   def test_default_cname_that_deployed_should_app_env_name
     deploy(:application => 'simple',
            :environment => "production",
            :version_label => 42)
-    assert_equal "simple-production", @eb_driver.environment_cname_prefix('simple', 'production')
+    assert_equal "simple-production", @eb_driver.environment_cname_prefix('simple', 'simple-production')
   end
 
   def test_cname_prefix_can_be_override
@@ -50,7 +50,7 @@ class DeployTest < Minitest::Test
            :environment => "production",
            :cname_prefix => 'sports123',
            :version_label => 42)
-    assert_equal "sports123", @eb_driver.environment_cname_prefix('simple', 'production')
+    assert_equal "sports123", @eb_driver.environment_cname_prefix('simple', 'simple-production')
   end
 
 
@@ -81,8 +81,8 @@ class DeployTest < Minitest::Test
            :strategy => 'blue_green',
            :version_label => 42)
 
-    assert @eb_driver.environment_exists?('simple', 'production-blue')
-    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'production-blue')
+    assert @eb_driver.environment_exists?('simple', 'simple-production-blue')
+    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'simple-production-blue')
   end
 
 
@@ -97,8 +97,8 @@ class DeployTest < Minitest::Test
            :strategy => 'blue_green',
            :version_label => 43)
 
-    assert @eb_driver.environment_exists?('simple', 'production-blue')
-    assert @eb_driver.environment_exists?('simple', 'production-green')
+    assert @eb_driver.environment_exists?('simple', 'simple-production-blue')
+    assert @eb_driver.environment_exists?('simple', 'simple-production-green')
   end
 
 
@@ -113,9 +113,9 @@ class DeployTest < Minitest::Test
            :strategy => 'blue_green',
            :version_label => 43)
 
-    assert_match(/simple-production-inactive/,  @eb_driver.environment_cname_prefix('simple', 'production-blue'))
+    assert_match(/simple-production-inactive/,  @eb_driver.environment_cname_prefix('simple', 'simple-production-blue'))
 
-    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'production-green')
+    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'simple-production-green')
 
 
     deploy(:application => 'simple',
@@ -123,9 +123,9 @@ class DeployTest < Minitest::Test
            :strategy => 'blue_green',
            :version_label => 44)
 
-    assert_match(/simple-production-inactive/,  @eb_driver.environment_cname_prefix('simple', 'production-green'))
+    assert_match(/simple-production-inactive/,  @eb_driver.environment_cname_prefix('simple', 'simple-production-green'))
 
-    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'production-blue')
+    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'simple-production-blue')
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk