elasticity 3.0.1 → 3.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2FiZjA3NzNkODIzZjk1NGMwYjU2NGFhYmFkNzI1YTAzYzBkY2E1ZA==
+    NzBhNjA2ZjIxMDRkYmM1ZDU3MTllZjNlYzcxZTViODE4YjNhMzU0ZQ==
   data.tar.gz: !binary |-
-    OWY3ZWUzMDQ4M2M4Y2RhY2EzZGI3YjRmMDAzNzkwODhmM2YzNWVmZg==
+    NmM4Zjc2YzhkYjEwOTkyZTkwZTMxYjU5ODdlYTA4OTY4YWRhZDVlZQ==
 SHA512:
   metadata.gz: !binary |-
-    OTBhN2E2MzNmN2U5NDhkYWZjNTk1M2MyZDY0YzQ4YTRkNzExNzU1NDliZmE2
-    ZTY0NmJiZGRiNzY4Y2JkMTFjMjA4YjllZjg4NWQ5OGY1MTU4YzkxN2Y5NTY3
-    MmMzYWMwYzU5ZDY1ZDljYjBlMzE2YjBhNjEzYmRkMWIxNzc3NzM=
+    YWIxMzk4OWZjMTZkYTE3M2RjY2E3NmY1NTRjMGQ4OWUzNzBlOTQ2ZGFlYzVh
+    OGY3ZDljOGEwODE0OTZjN2JjYjlkZDdhYjEwMmRhNzUxNzE4YTg5YjdkZjg0
+    MDQ5YzVkZDQ3NzQzZjRlMWQ0MTJiYTM1MDkxN2Y3NzE0MzJhYjI=
   data.tar.gz: !binary |-
-    NzQ2ODI0YTNiZjg0OGM0YzA5MjZlZDg4MDBlNjFkNmRjZGMyZTQ2YmY1ZmI0
-    ZmI3YjAzZmRkMDc5MDM2NjU5OGJhM2JkZmEwM2MxYWVjMjk2OWE0YTIxYmZl
-    NjhiZGNjNWVlOGZmZDhjOWM5M2Y0NjU2ZDk4NDhkMTI1YThiOTc=
+    ZTZmYmMxOGRiMzA1MGQwMjRhNTgxYzIxMTE0YjgxOWM4NjQ4NDhjMjlhOTU2
+    N2E5ZmNjMmM1OTIyNGYzOTI5M2RkNzYxMWI1ODk0MDk5MzEwM2FhNDIxODFm
+    N2Q2NjgzMzcwNmFkZDJkOWEyY2ZjMzc3MmM1M2M2NTM1MjdmYjk=

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 3.0.2 - March 26, 2014
+
+- Second go at a fix for [Issue #60](https://github.com/rslifka/elasticity/issues/60), "Specifying a VPC subnet does not work" as placement and subnet cannot both be specified.
+
 ## 3.0.1 - March 26, 2014
 
 - Fix for [Issue #60](https://github.com/rslifka/elasticity/issues/60), "Specifying a VPC subnet does not work".

data/lib/elasticity/job_flow.rb

@@ -185,7 +185,10 @@ module Elasticity
           }
         }
       }
-      preamble[:instances].merge!(:ec2_subnet_id => @ec2_subnet_id) if @ec2_subnet_id
+      if @ec2_subnet_id
+        preamble[:instances].merge!(:ec2_subnet_id => @ec2_subnet_id)
+        preamble[:instances].delete(:placement)
+      end
       preamble[:instances].merge!(:ec2_key_name => @ec2_key_name) if @ec2_key_name
       preamble
     end

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/spec/lib/elasticity/job_flow_spec.rb

@@ -417,10 +417,15 @@ describe Elasticity::JobFlow do
     end
 
     context 'when a VPC subnet ID is specified' do
-      it 'should include it in the preamble' do
+      before do
         subject.ec2_subnet_id = 'subnet-118b9d79'
+      end
+      it 'should include it in the preamble' do
         subject.send(:jobflow_preamble)[:instances].should be_a_hash_including({:ec2_subnet_id => 'subnet-118b9d79'})
       end
+      it 'should not include the placement since a subnet implies a placement' do
+        subject.send(:jobflow_preamble)[:instances].should_not include(:placement)
+      end
     end
 
     context 'when jobflow visibility is modified' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Robert Slifka