stackster 0.4.3 → 0.4.4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## head:
 
+## 0.4.4 (03/18/2013)
+
+* Refactor instance_reader logic and specs
+
 ## 0.4.3 (03/14/2013)
 
 * Properly return instances in an auto scaling group

data/lib/stackster/instance/instance_reader.rb

@@ -7,8 +7,13 @@ module Stackster
 
     def list_stack_instances(stack_name)
       @asg_id = auto_scaling_group_id(stack_name)
-      asg_instances = auto_scaling.list_instances if @asg_id
-      return [] unless asg_instances
+
+      return [] unless @asg_id
+
+      asg_instances = auto_scaling.list_instances
+
+      return [] unless asg_instances.any?
+
       ec2.describe_instance asg_instances
     end
 

data/lib/stackster/version.rb

@@ -1,3 +1,3 @@
 module Stackster
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/instance/instance_reader_spec.rb

@@ -5,61 +5,71 @@ describe Stackster::InstanceReader do
   describe "list_stack_instances" do
 
     before do
-      @config_mock = mock 'config'
-      @cloud_formation_mock = mock 'cloud formation'
-      @auto_scaling_groups_mock = mock 'auto scaling'
-      @ec2_mock = mock 'ec2'
+      @config_mock                   = mock 'config'
+      @cloud_formation_mock          = mock 'cloud formation'
+      @auto_scaling_groups_mock      = mock 'auto scaling'
+      @ec2_mock                      = mock 'ec2'
       @instance_reservation_set_mock = mock 'reservation'
-      @instance_data_mock = mock 'instance data mock'
+      @instance_data_mock            = mock 'instance data mock'
 
       Stackster::AWS::CloudFormation.should_receive(:new).
                                      with(:config => @config_mock).
                                      and_return @cloud_formation_mock
+    end
 
-      stack_resource_results = [{'StackName' => 'stack',
-                                 'ResourceType' => 'AWS::AutoScaling::AutoScalingGroup',
-                                 'PhysicalResourceId' => 'asg1'}]
+    context "with no ASGs" do
+      before do
+        @cloud_formation_mock.should_receive(:stack_resources).
+                              with('stack').
+                              and_return []
+      end
 
-      @cloud_formation_mock.should_receive(:stack_resources).
-                            with('stack').
-                            and_return stack_resource_results
+      it "should return an empty array" do
+        instance_reader = Stackster::InstanceReader.new :config => @config_mock
+        instance_reader.list_stack_instances('stack').should == []
+      end
+    end
 
-      Stackster::AWS::AutoScalingGroups.should_receive(:new).
-                                        with(:config => @config_mock, :asg_id => "asg1").
-                                        and_return @auto_scaling_groups_mock
+    context "with an ASG" do
+      before do
+        stack_resource_results = [{'StackName' => 'stack',
+                                   'ResourceType' => 'AWS::AutoScaling::AutoScalingGroup',
+                                   'PhysicalResourceId' => 'asg1'}]
 
-      Stackster::AWS::EC2.should_receive(:new).
-                          with(:config => @config_mock).
-                          and_return @ec2_mock
-    end
+        @cloud_formation_mock.should_receive(:stack_resources).
+                              with('stack').
+                              and_return stack_resource_results
 
-    context "with no running instances" do
-      it "should return empty array" do
-        @auto_scaling_groups_mock.should_receive(:list_instances).
-                                  and_return []
+        Stackster::AWS::AutoScalingGroups.should_receive(:new).
+                                          with(:config => @config_mock, :asg_id => "asg1").
+                                          and_return @auto_scaling_groups_mock
+      end
 
-        @ec2_mock.should_receive(:describe_instance).
-                  with([]).
-                  and_return @instance_reservation_set_mock
+      context "with no running instances" do
+        it "should return empty array" do
+          @auto_scaling_groups_mock.should_receive(:list_instances).
+                                    and_return []
 
-        @instance_reservation_set_mock.stub :any? => true
-        instance_reader = Stackster::InstanceReader.new :config => @config_mock
-        instance_reader.list_stack_instances('stack').should == @instance_reservation_set_mock
+          instance_reader = Stackster::InstanceReader.new :config => @config_mock
+          instance_reader.list_stack_instances('stack').should == []
+        end
       end
-    end
 
-    context "with running instances" do
-      it "should return the reservation set for each running instance" do
-        @auto_scaling_groups_mock.should_receive(:list_instances).
-                                  and_return ['instance1']
+      context "with running instances" do
+        it "should return the reservation set for each running instance" do
+          @auto_scaling_groups_mock.should_receive(:list_instances).
+                                    and_return ['instance1', 'instance2']
 
-        @ec2_mock.should_receive(:describe_instance).
-                  with(['instance1']).
-                  and_return @instance_reservation_set_mock
+          @ec2_mock.should_receive(:describe_instance).
+                    with(['instance1', 'instance2']).
+                    and_return @instance_reservation_set_mock
 
-        @instance_reservation_set_mock.stub :any? => true
-        instance_reader = Stackster::InstanceReader.new :config => @config_mock
-        instance_reader.list_stack_instances('stack').should == @instance_reservation_set_mock
+          Stackster::AWS::EC2.should_receive(:new).
+                              with(:config => @config_mock).
+                              and_return @ec2_mock
+          instance_reader = Stackster::InstanceReader.new :config => @config_mock
+          instance_reader.list_stack_instances('stack').should == @instance_reservation_set_mock
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackster
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70158035968220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70158035968220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70158035966920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
+  version_requirements: *70158035966920
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70158035965200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.4
+  version_requirements: *70158035965200
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70158035964000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,60 +54,40 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.3
+  version_requirements: *70158035964000
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70158035979700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.10.0
+  version_requirements: *70158035979700
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70158035979180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *70158035979180
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70158035978340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
+  version_requirements: *70158035978340
 description: Thats what I do
 email:
 - brett@weav.net
@@ -198,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3513599222543714350
+      hash: 3945755026545543091
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -207,10 +172,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3513599222543714350
+      hash: 3945755026545543091
 requirements: []
 rubyforge_project: stackster
-rubygems_version: 1.8.24
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: I make deployments easier