stackster 0.2.4 → 0.2.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+## v0.2.5
+
+* Bug fix with stack lister on non existent domain
+
 ## v0.2.3
 
 * Added addition log messages

data/lib/stackster/aws/cloud_formation.rb

@@ -16,57 +16,45 @@ module Stackster
         parameters = { 'Parameters' => args[:parameters] }
         data = { 'Capabilities' => ['CAPABILITY_IAM'],
                  'TemplateBody' => args[:template] }.merge parameters
-        begin
-          @connect.create_stack(args[:name], data)
-        rescue Exception => e  
-          Error.new(:config => @config, :exception => e).process
-        end
+        @connect.create_stack(args[:name], data)
         @logger.info "Cloud Formation stack creation completed."
+      rescue Exception => e  
+        Error.new(:config => @config, :exception => e).process
       end
 
       def update(args)
         parameters = { 'Parameters' => args[:parameters] }
         data = { 'Capabilities' => ['CAPABILITY_IAM'],
                  'TemplateBody' => args[:template] }.merge parameters
-        begin
-          @connect.update_stack(args[:name], data)
-        rescue Exception => e  
-          Error.new(:config => @config, :exception => e).process
-        end
+        @connect.update_stack(args[:name], data)
         @logger.info "Cloud Formation stack update completed."
+      rescue Exception => e  
+        Error.new(:config => @config, :exception => e).process
       end
 
       def destroy(name)
-        begin
-          @connect.delete_stack name
-        rescue Exception => e  
-          Error.new(:config => @config, :exception => e).process
-        end
+        @connect.delete_stack name
         @logger.info "Cloud Formation stack destroy completed."
+      rescue Exception => e  
+        Error.new(:config => @config, :exception => e).process
       end
 
       def describe_stack(name)
-        begin
-          @connect.describe_stacks('StackName' => name).body['Stacks']
-        rescue Exception => e  
-          Error.new(:config => @config, :exception => e).process
-        end
+        @connect.describe_stacks('StackName' => name).body['Stacks']
+      rescue Exception => e  
+        Error.new(:config => @config, :exception => e).process
       end
 
       def stack_resources(name)
-        begin
-          @connect.describe_stack_resources('StackName' => name).body['StackResources']
-        rescue Exception => e  
-          Error.new(:config => @config, :exception => e).process
-        end
+        @connect.describe_stack_resources('StackName' => name).body['StackResources']
+      rescue Exception => e  
+        Error.new(:config => @config, :exception => e).process
       end
 
       def stack_events(name, limit)
-        begin
-          @connect.describe_stack_events(name).body['StackEvents'] [0..limit-1]
-        rescue Exception => e  
-          Error.new(:config => @config, :exception => e).process
-        end
+        @connect.describe_stack_events(name).body['StackEvents'] [0..limit-1]
+      rescue Exception => e  
+        Error.new(:config => @config, :exception => e).process
       end
 
       def stack_status(name)
@@ -78,11 +66,9 @@ module Stackster
       end
 
       def template(name)
-        begin
-          @connect.get_template(name).body['TemplateBody']
-        rescue Exception => e  
-          Error.new(:config => @config, :exception => e).process
-        end
+        @connect.get_template(name).body['TemplateBody']
+      rescue Exception => e  
+        Error.new(:config => @config, :exception => e).process
       end
 
     end

data/lib/stackster/aws/cloud_formation/error.rb

@@ -12,7 +12,7 @@ module Stackster
         end
 
         def process
-          message = XmlSimple.xml_in(@exception.response.body)
+          message = XmlSimple.xml_in @exception.response.body
           message['Error'].first['Message'].each do |msg|
             case msg
             when 'No updates are to be performed.'

data/lib/stackster/aws/simpledb.rb

@@ -15,8 +15,12 @@ module Stackster
         @connect.list_domains.body['Domains']
       end
 
+      def domain_exists?(domain)
+        domains.include? domain
+      end
+
       def create_domain(domain)
-        @connect.create_domain(domain) unless domains.include? domain
+        @connect.create_domain(domain) unless domains.exists?
       end
 
       def put_attributes(domain, key, attributes, options)

data/lib/stackster/entry/entry_lister.rb

@@ -7,10 +7,13 @@ module Stackster
     end
 
     def all
-      entries = sdb_connect.select "select * from #{@domain}"
-      entries.keys.map do |name|
-        remove_region_from_entry(name)
+      if sdb_connect.domain_exists? @domain
+        e = sdb_connect.select "select * from #{@domain}"
+        entries = e.keys.map do |name|
+          remove_region_from_entry(name)
+        end
       end
+      entries ? entries : []
     end
 
     private

data/lib/stackster/version.rb

@@ -1,3 +1,3 @@
 module Stackster
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/entry/entry_lister_spec.rb

@@ -6,6 +6,9 @@ describe Stackster do
     @simple_db_mock = mock 'simple db'
     config = mock 'config mock'
     Stackster::AWS::SimpleDB.should_receive(:new).and_return @simple_db_mock
+    @simple_db_mock.should_receive(:domain_exists?).
+                    with("stacks").
+                    and_return true
     @simple_db_mock.should_receive(:select).
                     with("select * from stacks").
                     and_return('stack-to-find-us-west-1' => { 'attr1' => 'value1' })
@@ -13,4 +16,17 @@ describe Stackster do
     entry_lister.all.should == ['stack-to-find']
   end
 
+  it "should return a blank array if the domain does not exist" do
+    @simple_db_mock = mock 'simple db'
+    config = mock 'config mock'
+    Stackster::AWS::SimpleDB.should_receive(:new).and_return @simple_db_mock
+    @simple_db_mock.should_receive(:domain_exists?).
+                    with("stacks").
+                    and_return false
+    @simple_db_mock.should_receive(:select).
+                    with("select * from stacks").exactly(0).times
+    entry_lister = Stackster::EntryLister.new :config => config
+    entry_lister.all.should == []
+  end
+
 end

data/spec/entry_spec.rb

@@ -61,7 +61,10 @@ describe Stackster do
 
     it "should set the attributes in simple db" do
       @simple_db_mock.should_receive(:put_attributes).
-                      with("stacks", "test-stack-us-west-1", {"key"=>"value", "Name"=>"test-stack-us-west-1"}, {:replace=>["key", "Name"]})
+                      with("stacks", 
+                           "test-stack-us-west-1", 
+                           { "key" => "value", "Name" => "test-stack-us-west-1" }, 
+                           { :replace => ["key", "Name"] } )
       @entry.attributes = {"key"=>"value"}
       
       @entry.save

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackster
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70297430198300 !ruby/object:Gem::Requirement
+  requirement: &70305096775860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297430198300
+  version_requirements: *70305096775860
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70297430197820 !ruby/object:Gem::Requirement
+  requirement: &70305096775400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297430197820
+  version_requirements: *70305096775400
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70297430197380 !ruby/object:Gem::Requirement
+  requirement: &70305096774920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297430197380
+  version_requirements: *70305096774920
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70297430196960 !ruby/object:Gem::Requirement
+  requirement: &70305096774500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297430196960
+  version_requirements: *70305096774500
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &70297430196520 !ruby/object:Gem::Requirement
+  requirement: &70305096774040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297430196520
+  version_requirements: *70305096774040
 description: Thats what I do
 email:
 - brett@weav.net
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1300407250190885825
+      hash: -4091889771990582798
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1300407250190885825
+      hash: -4091889771990582798
 requirements: []
 rubyforge_project: stackster
 rubygems_version: 1.8.16