cloudster 2.18.0 → 2.19.0

data/README.md

@@ -93,6 +93,10 @@ Cloudster can also interact with the provisioned AWS Cloud :
 
         cloud.delete(:stack_name => 'TestStack')
 
+- Get the output attributes of each resource in the stack :
+
+        cloud.outputs(:stack_name => 'TestStack')
+
 - Describe the events of a stack :
 
         cloud.events(:stack_name => 'TestStack')

data/VERSION

@@ -1 +1 @@
-2.18.0
+2.19.0

data/cloudster.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudster"
-  s.version = "2.18.0"
+  s.version = "2.19.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Soman"]
-  s.date = "2013-01-08"
+  s.date = "2013-01-10"
   s.description = "Cloudster is a Ruby gem that was born to cut the learning curve involved \n    in writing your own CloudFormation templates. If you don't know what a CloudFormation template is, \n    but know about the AWS Cloud offerings, you can still use cloudster to provision your stack. \n    Still in infancy , cloudster can create a very basic stack like a breeze. All kinds of contribution welcome !"
   s.email = "emil.soman@gmail.com"
   s.extra_rdoc_files = [

data/lib/cloudster/cloud.rb

@@ -1,6 +1,7 @@
 module Cloudster
   #Cloud objects have many resources. This class can generate the cloudformation template and provision the stack.
   class Cloud
+    include Output
 
     # Initialize a Cloud instance
     #
@@ -334,6 +335,33 @@ module Cloudster
       return @cloud_formation.describe_stacks('StackName' => options[:stack_name]).body["Stacks"][0] rescue nil
     end
 
+    # Returns a hash containing the output values of each resource in the Stack
+    #
+    # ==== Examples
+    #   cloud = Cloudster::Cloud.new(
+    #    :access_key_id => 'aws_access_key_id',
+    #    :secret_access_key => 'aws_secret_access_key',
+    #    :region => 'us-east-1'
+    #   )
+    #   cloud.outputs(:stack_name => 'RDSStack')
+    #
+    # ==== Parameters
+    # * options<~Hash>
+    #   * :stack_name : A string which will contain the name of the stack
+    #
+    # ==== Returns
+    # * Hash containing outputs of the stack
+    def outputs(options = {})
+      require_options(options, [:stack_name])
+      stack_description = describe(:stack_name => options[:stack_name])
+      outputs = stack_description["Outputs"] rescue nil
+      outputs_hash = {}
+      outputs.each do |output|
+        outputs_hash[output["OutputKey"]] = parse_outputs(output["OutputValue"])
+      end
+      return outputs_hash
+    end
+
     # Returns the status of the stack
     #
     # ==== Examples

data/lib/cloudster/output.rb

@@ -7,11 +7,20 @@ module Cloudster
     def output_template(outputs)
       resource_name = outputs.keys[0]
       outputs_array = outputs.values[0].collect
-      each_output_join = outputs_array.collect {|output| {"Fn::Join" => [":", output]}}
+      each_output_join = outputs_array.collect {|output| {"Fn::Join" => ["|", output]}}
       return resource_name => {
         'Value' => { "Fn::Join" => [ ",", each_output_join] }
       }
     end
 
+    def parse_outputs(output)
+      output_hash = {}
+      output.split(',').each do |attribute|
+        key_value = attribute.split('|')
+        output_hash[key_value[0]] = key_value[1]
+      end
+      return output_hash
+    end
+
   end
 end

data/spec/cloud_front_spec.rb

@@ -40,9 +40,9 @@ describe Cloudster::ChefClient do
               "Value"=>{
                 "Fn::Join"=>[",",
                   [
-                    {"Fn::Join"=>[":", ["bucket_name", {"Ref"=>"S3ResourceName"}]]},
-                    {"Fn::Join"=>[":", ["dns_name", {"Fn::GetAtt"=>["S3ResourceName", "DomainName"]}]]},
-                    {"Fn::Join"=>[":", ["website_url", {"Fn::GetAtt"=>["S3ResourceName", "WebsiteURL"]}]]}
+                    {"Fn::Join"=>["|", ["bucket_name", {"Ref"=>"S3ResourceName"}]]},
+                    {"Fn::Join"=>["|", ["dns_name", {"Fn::GetAtt"=>["S3ResourceName", "DomainName"]}]]},
+                    {"Fn::Join"=>["|", ["website_url", {"Fn::GetAtt"=>["S3ResourceName", "WebsiteURL"]}]]}
                   ]
                 ]
               }

data/spec/cloud_spec.rb

@@ -127,6 +127,40 @@ describe Cloudster::Cloud do
     end
   end
 
+  describe '#outputs' do
+    it "should raise argument error if resources not provided" do
+      cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
+      expect { cloud.outputs() }.to raise_error(ArgumentError, 'Missing required argument: stack_name')
+    end
+    it "should trigger 'describe stack' request" do
+      cloud_formation = double('CloudFormation')
+      Fog::AWS::CloudFormation.should_receive(:new).with(:aws_access_key_id => 'test', :aws_secret_access_key => 'test', :region => nil).and_return cloud_formation
+      cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
+      cloud.should_receive(:describe).with(:stack_name => 'stack_name').and_return ({
+        "Outputs"=>[{
+          "OutputValue"=>"bucket_name|teststack3-testbucket1,dns_name|teststack3-testbucket1.s3.amazonaws.com,website_url|http://teststack3-testbucket1.s3-website-us-east-1.amazonaws.com",
+          "OutputKey"=>"TestBucket1"
+        },{
+          "OutputValue"=>"bucket_name|teststack3-testbucket2,dns_name|teststack3-testbucket2.s3.amazonaws.com,website_url|http://teststack3-testbucket2.s3-website-us-east-1.amazonaws.com",
+          "OutputKey"=>"TestBucket2"
+        }]
+      })
+      output_hash = cloud.outputs(:stack_name => 'stack_name')
+      output_hash.should == ({
+        "TestBucket1" => {
+            "bucket_name" => "teststack3-testbucket1",
+            "dns_name" => "teststack3-testbucket1.s3.amazonaws.com",
+            "website_url" => "http://teststack3-testbucket1.s3-website-us-east-1.amazonaws.com"
+        },
+        "TestBucket2" => {
+            "bucket_name" => "teststack3-testbucket2",
+            "dns_name" => "teststack3-testbucket2.s3.amazonaws.com",
+            "website_url" => "http://teststack3-testbucket2.s3-website-us-east-1.amazonaws.com"
+        }
+      })
+    end
+  end
+
   describe "#is_s3_bucket_name_available?" do
     it "should return true if bucket is available" do
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')

data/spec/output_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Cloudster::Output do
+  class Resource;end
+  Resource.extend(Cloudster::Output)
+
   describe "output_template" do
     it "should return the cloudformation template for the Outputs" do
       resource_name = "S3ResourceName"
@@ -16,12 +19,26 @@ describe Cloudster::Output do
         resource_name => {
           "Value" => {
             "Fn::Join" => [ ",",[
-              {"Fn::Join" => [":", ['bucket_name', {"Ref" => resource_name } ] ]},
-              {"Fn::Join" => [":", ['dns_name', {'Fn::GetAtt' => [resource_name, 'DomainName']} ] ]}
+              {"Fn::Join" => ["|", ['bucket_name', {"Ref" => resource_name } ] ]},
+              {"Fn::Join" => ["|", ['dns_name', {'Fn::GetAtt' => [resource_name, 'DomainName']} ] ]}
             ]]
           }
         }
       }
     end
   end
+
+  describe "parse_outputs" do
+    it "should return a hash of outputs" do
+      outputs = "bucket_name|teststack3-testbucket1,dns_name|teststack3-testbucket1.s3.amazonaws.com,website_url|http://teststack3-testbucket1.s3-website-us-east-1.amazonaws.com"
+      class Resource;end
+      Resource.extend(Cloudster::Output)
+      Resource.parse_outputs(outputs).should == {
+        "bucket_name" => "teststack3-testbucket1",
+        "dns_name" => "teststack3-testbucket1.s3.amazonaws.com",
+        "website_url" => "http://teststack3-testbucket1.s3-website-us-east-1.amazonaws.com"
+      }
+    end
+  end
+
 end

data/spec/s3_spec.rb

@@ -15,14 +15,14 @@ describe Cloudster::S3 do
       s3 = Cloudster::S3.new(:name => 'bucket_name')
       s3.template.should == {
         'Resources' => {'bucket_name' => {'Type' => 'AWS::S3::Bucket', 'Properties' => {}}},
-        "Outputs" => {"bucket_name"=>{"Value"=>{"Fn::Join"=>[",", [{"Fn::Join"=>[":", ["bucket_name", {"Ref"=>"bucket_name"}]]}, {"Fn::Join"=>[":", ["dns_name", {"Fn::GetAtt"=>["bucket_name", "DomainName"]}]]}, {"Fn::Join"=>[":", ["website_url", {"Fn::GetAtt"=>["bucket_name", "WebsiteURL"]}]]}]]}}}
+        "Outputs" => {"bucket_name"=>{"Value"=>{"Fn::Join"=>[",", [{"Fn::Join"=>["|", ["bucket_name", {"Ref"=>"bucket_name"}]]}, {"Fn::Join"=>["|", ["dns_name", {"Fn::GetAtt"=>["bucket_name", "DomainName"]}]]}, {"Fn::Join"=>["|", ["website_url", {"Fn::GetAtt"=>["bucket_name", "WebsiteURL"]}]]}]]}}}
       }
     end
     it "should return a ruby hash for the resource cloudformation template" do
       s3 = Cloudster::S3.new(:name => 'bucket_name', :access_control => "PublicRead", :website_configuration => {"index_document" => "index.html", "error_document" => "error.html"} )
       s3.template.should == {
         'Resources' => {'bucket_name' => {'Type' => 'AWS::S3::Bucket', 'Properties' => {"AccessControl" => "PublicRead", "WebsiteConfiguration" => { "IndexDocument" => "index.html", "ErrorDocument" => "error.html" } }}},
-        "Outputs" => {"bucket_name"=>{"Value"=>{"Fn::Join"=>[",", [{"Fn::Join"=>[":", ["bucket_name", {"Ref"=>"bucket_name"}]]}, {"Fn::Join"=>[":", ["dns_name", {"Fn::GetAtt"=>["bucket_name", "DomainName"]}]]}, {"Fn::Join"=>[":", ["website_url", {"Fn::GetAtt"=>["bucket_name", "WebsiteURL"]}]]}]]}}}
+        "Outputs" => {"bucket_name"=>{"Value"=>{"Fn::Join"=>[",", [{"Fn::Join"=>["|", ["bucket_name", {"Ref"=>"bucket_name"}]]}, {"Fn::Join"=>["|", ["dns_name", {"Fn::GetAtt"=>["bucket_name", "DomainName"]}]]}, {"Fn::Join"=>["|", ["website_url", {"Fn::GetAtt"=>["bucket_name", "WebsiteURL"]}]]}]]}}}
       }
     end
   end
@@ -35,7 +35,7 @@ describe Cloudster::S3 do
       hash = Cloudster::S3.template(:name => 'bucket_name', :access_control => "PublicRead", :website_configuration => {"index_document" => "index.html", "error_document" => "error.html"} )
       hash.should == {
         'Resources' => {'bucket_name' => {'Type' => 'AWS::S3::Bucket', 'Properties' => {"AccessControl" => "PublicRead", "WebsiteConfiguration" => { "IndexDocument" => "index.html", "ErrorDocument" => "error.html" } }}},
-        "Outputs" => {"bucket_name"=>{"Value"=>{"Fn::Join"=>[",", [{"Fn::Join"=>[":", ["bucket_name", {"Ref"=>"bucket_name"}]]}, {"Fn::Join"=>[":", ["dns_name", {"Fn::GetAtt"=>["bucket_name", "DomainName"]}]]}, {"Fn::Join"=>[":", ["website_url", {"Fn::GetAtt"=>["bucket_name", "WebsiteURL"]}]]}]]}}}
+        "Outputs" => {"bucket_name"=>{"Value"=>{"Fn::Join"=>[",", [{"Fn::Join"=>["|", ["bucket_name", {"Ref"=>"bucket_name"}]]}, {"Fn::Join"=>["|", ["dns_name", {"Fn::GetAtt"=>["bucket_name", "DomainName"]}]]}, {"Fn::Join"=>["|", ["website_url", {"Fn::GetAtt"=>["bucket_name", "WebsiteURL"]}]]}]]}}}
       }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudster
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.19.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -169,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 571049873
+      hash: 136420239
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: