simple_deploy 0.8.0 → 0.8.1.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 832792b12e68e17d1db4be736d39c9336e98bd99
-  data.tar.gz: 910b11938e36f43f7a6ced19dfd7a561ceee0d8a
+  metadata.gz: ef642027dcd39feaf45207dd2ed7df8cf5d26616
+  data.tar.gz: 4bd38248f760e1ef7b5feea6a3ccd479182864ed
 SHA512:
-  metadata.gz: 13bf1dd9a2954146bdbe181b5b064a7fcf028786fbe2e8be79f3cf1397bca87e7e7cd84ab4319846d03a5ef4835bdc8080346dd13dd124159fc8d2fdba5811a2
-  data.tar.gz: 4716579fc9991b71496aac673f36dab70f082361e30220ca1d654c39da945f9a71abdb17c9b934d4912ce16d8cf0151cd6b7f78da8f9481f88819475b106e46d
+  metadata.gz: a7bb87ccf61a0650a40b6669b0abd9a920f9c30b587fd0cbb185787fb28d75d6a84de30e0c3ebcf0ecf3e003d8454e08b9267b4627f55a972f4c6bbda5600f50
+  data.tar.gz: 2ba87b2d56034443a4ba4e39d8e986bc03660a336f37a834a770b685ef0d458477744a28f8b526142c40e776a804cd31bd20536c9c6cb0ac25e1165c7325546f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## HEAD:
+
+## v0.8.1 (03/25/14):
+
+* Update fog to 1.21
+* Instances and Deploy support for multi ASGs in stack
+
 ## v0.8.0 (12/13/13):
 
 * Added flag to specify external ips

data/lib/simple_deploy/aws/instance_reader.rb

@@ -6,10 +6,13 @@ module SimpleDeploy
       end
 
       def list_stack_instances(stack_name)
-        asg_id = auto_scaling_group_id(stack_name)
-        return [] unless asg_id
 
-        asg_instances = list_instances asg_id
+        asg_ids = auto_scaling_group_id(stack_name)
+
+        return [] unless asg_ids
+
+        asg_instances = asg_ids.map { |asg_id| list_instances asg_id }.flatten
+
         return [] unless asg_instances.any?
 
         describe_instances asg_instances
@@ -18,9 +21,9 @@ module SimpleDeploy
       private
 
       def list_instances(asg_id)
-        @asg ||= Fog::AWS::AutoScaling.new :aws_access_key_id => @config.access_key,
+        @asg ||= Fog::AWS::AutoScaling.new :aws_access_key_id     => @config.access_key,
                                            :aws_secret_access_key => @config.secret_key,
-                                           :region => @config.region
+                                           :region                => @config.region
 
         body = @asg.describe_auto_scaling_groups('AutoScalingGroupNames' => [asg_id]).body
         result = body['DescribeAutoScalingGroupsResult']['AutoScalingGroups'].last
@@ -30,9 +33,9 @@ module SimpleDeploy
       end
 
       def describe_instances(instances)
-        @ec2 ||= Fog::Compute::AWS.new :aws_access_key_id => @config.access_key,
+        @ec2 ||= Fog::Compute::AWS.new :aws_access_key_id     => @config.access_key,
                                        :aws_secret_access_key => @config.secret_key,
-                                       :region => @config.region
+                                       :region                => @config.region
 
         @ec2.describe_instances('instance-state-name' => 'running',
                                 'instance-id' => instances).body['reservationSet']
@@ -51,7 +54,7 @@ module SimpleDeploy
         asgs = cf_stack_resources.select do |r|
           r['ResourceType'] == 'AWS::AutoScaling::AutoScalingGroup'
         end
-        asgs.any? ? asgs.first['PhysicalResourceId'] : false
+        asgs.any? ? asgs.map {|asg| asg['PhysicalResourceId'] } : false
       end
 
     end

data/lib/simple_deploy/stack.rb

@@ -123,7 +123,7 @@ module SimpleDeploy
     def instances
       stack_reader.instances.map do |instance|
         instance['instancesSet'].map do |info|
-          determine_ip_address(info)
+          determine_ip_address(info)  
         end
       end.flatten.compact
     end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.8.0"
+  VERSION = "0.8.1.beta1"
 end

data/simple_deploy.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "capistrano", "= 2.13.5"
   s.add_runtime_dependency "esbit", "~> 0.0.4"
   s.add_runtime_dependency "trollop", "= 2.0"
-  s.add_runtime_dependency "fog", "= 1.18.0"
-  s.add_runtime_dependency "excon", "= 0.28.0"
+  s.add_runtime_dependency "fog", "= 1.21.0"
+  s.add_runtime_dependency "excon", "= 0.32.0"
   s.add_runtime_dependency "unf", "= 0.1.3"
   s.add_runtime_dependency "unf_ext", "= 0.0.6"
 end

data/spec/aws/instance_reader_spec.rb

@@ -45,11 +45,14 @@ describe SimpleDeploy::AWS::InstanceReader do
       end
     end
 
-    context "with an ASG" do
+    context "with an ASGs" do
       before do
-        stack_resource_results = [{'StackName' => 'stack',
-                                   'ResourceType' => 'AWS::AutoScaling::AutoScalingGroup',
-                                   'PhysicalResourceId' => 'asg1'}]
+        stack_resource_results = []
+        @asgs = ['asg1', 'asg2'].each do |asg|
+          stack_resource_results << { 'StackName'          => 'stack',
+                                      'ResourceType'       => 'AWS::AutoScaling::AutoScalingGroup',
+                                      'PhysicalResourceId' => asg }
+        end
 
         @cloud_formation_mock.should_receive(:stack_resources).
                               with('stack').
@@ -61,9 +64,11 @@ describe SimpleDeploy::AWS::InstanceReader do
 
       context "with no running instances" do
         it "should return empty array" do
-          @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
-                                    with('AutoScalingGroupNames' => ['asg1']).
-                                    and_return(@empty_response)
+          @asgs.each do |asg|
+            @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
+                                      with('AutoScalingGroupNames' => [asg]).
+                                      and_return(@empty_response)
+          end
 
           instance_reader = SimpleDeploy::AWS::InstanceReader.new
           instance_reader.list_stack_instances('stack').should == []
@@ -75,6 +80,9 @@ describe SimpleDeploy::AWS::InstanceReader do
           @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
                                     with('AutoScalingGroupNames' => ['asg1']).
                                     and_return(@list_response)
+          @auto_scaling_groups_mock.should_receive(:describe_auto_scaling_groups).
+                                    with('AutoScalingGroupNames' => ['asg2']).
+                                    and_return(@empty_response)
 
           Fog::Compute::AWS.stub(:new).
                             and_return @ec2_mock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1.beta1
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
@@ -307,12 +307,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: simple_deploy
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Opinionated gem for AWS resource management.