cloudster 2.19.2 → 2.19.3

data/VERSION

@@ -1 +1 @@
-2.19.2
+2.19.3

data/cloudster.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudster"
-  s.version = "2.19.2"
+  s.version = "2.19.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Soman"]
-  s.date = "2013-01-18"
+  s.date = "2013-01-21"
   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_front.rb

@@ -1,6 +1,8 @@
 module Cloudster
   #==CloudFront resource
+  #Output values : domain_name
   class CloudFront
+    include Cloudster::Output
 
     # Initialize CloudFront
     #
@@ -41,19 +43,27 @@ module Cloudster
 
     private
       def template
-        return "Resources" => {
-          @name => {
-              "Type" => "AWS::CloudFront::Distribution",
-              "Properties" => {
-                "DistributionConfig" => {
-                  "S3Origin" => {
-                    "DNSName"=> {"Fn::GetAtt" => [@instance_name, "DomainName"]},
-                  },
-                  "Enabled" => "true"
+        template = { "Resources" => {
+            @name => {
+                "Type" => "AWS::CloudFront::Distribution",
+                "Properties" => {
+                  "DistributionConfig" => {
+                    "S3Origin" => {
+                      "DNSName"=> {"Fn::GetAtt" => [@instance_name, "DomainName"]},
+                    },
+                    "Enabled" => "true"
+                  }
                 }
-              }
+            }
+          }
+        }
+        outputs = {
+          @name => {
+            'domain_name' => {'Fn::GetAtt' => [@name, 'DomainName']}
           }
         }
+        template['Outputs'] = output_template(outputs)
+        return template
 
       end
 

data/lib/cloudster/elastic_ip.rb

@@ -1,6 +1,8 @@
 module Cloudster
   #==ElasticIp resource
+  #Output values : public_ip
   class ElasticIp
+    include Cloudster::Output
 
     # Initialize an ElasticIp
     #
@@ -43,7 +45,7 @@ module Cloudster
 
     private
       def template
-        return "Resources" => {
+        template = { "Resources" => {
           @name => {
             "Type" => "AWS::EC2::EIP",
               "Properties" => {
@@ -51,8 +53,16 @@ module Cloudster
                   "Ref" => @instance_name
                 }
               }
+            }
           }
         }
+        outputs = {
+          @name => {
+            'public_ip' => {'Ref' => @name}
+          }
+        }
+        template['Outputs'] = output_template(outputs)
+        return template
       end
 
   end

data/lib/cloudster/elb.rb

@@ -1,6 +1,8 @@
 module Cloudster
   #==Elb resource
+  #Output values : canonical_hosted_zone_name, canonical_hosted_zone_name_id, dns_name, source_security_group_name, source_security_group_owner
   class Elb
+    extend Cloudster::Output
 
     # Initialize an Elb instance
     #
@@ -71,14 +73,24 @@ module Cloudster
         }
       }
       properties.merge!({"Instances" => get_instance_name_list_for_template(options[:instance_names])})
-      template = {'Resources' => { 
-                        options[:name] => { 
+      template = {'Resources' => {
+                        options[:name] => {
                           'Type' => 'AWS::ElasticLoadBalancing::LoadBalancer',
                           'Properties' => properties
                        }
                   }
       }
-      return template 
+      outputs = {
+        options[:name] => {
+          'canonical_hosted_zone_name' => {'Fn::GetAtt' => [options[:name], 'CanonicalHostedZoneName']},
+          'canonical_hosted_zone_name_id' => {'Fn::GetAtt' => [options[:name], 'CanonicalHostedZoneNameID']},
+          'dns_name' => {'Fn::GetAtt' => [options[:name], 'DNSName']},
+          'source_security_group_name' => {'Fn::GetAtt' => [options[:name], 'SourceSecurityGroup.GroupName']},
+          'source_security_group_owner' => {'Fn::GetAtt' => [options[:name], 'SourceSecurityGroup.OwnerAlias']}
+        }
+      }
+      template['Outputs'] = output_template(outputs)
+      return template
     end
 
     private

data/lib/cloudster/rds.rb

@@ -1,6 +1,8 @@
 module Cloudster
   #==Rds resource
+  #Output values : endpoint_address, endpoint_port
   class Rds
+    extend Cloudster::Output
 
     # Initialize an Rds instance
     #
@@ -101,7 +103,7 @@ module Cloudster
       options[:engine] ||= 'MySQL'
       options[:instance_class] ||= 'db.t1.micro'
       options[:multi_az] ||= false
-      template = {'Resources' => { 
+      template = {'Resources' => {
                     options[:name] => {
                       "Type" => "AWS::RDS::DBInstance",
                       "Properties" => {
@@ -115,7 +117,14 @@ module Cloudster
                     }
                   }
       }
-      return template 
+      outputs = {
+        options[:name] => {
+          'endpoint_address' => {'Fn::GetAtt' => [options[:name], 'Endpoint.Address']},
+          'endpoint_port' => {'Fn::GetAtt' => [options[:name], 'Endpoint.Port']}
+        }
+      }
+      template['Outputs'] = output_template(outputs)
+      return template
     end
 
   end

data/spec/cloud_front_spec.rb

@@ -46,6 +46,15 @@ describe Cloudster::ChefClient do
                   ]
                 ]
               }
+            },
+            "CloudFront"=>{
+              "Value"=>{
+                "Fn::Join"=>[",",
+                  [
+                    {"Fn::Join"=>["|", ["domain_name", {"Fn::GetAtt"=>["CloudFront", "DomainName"]}]]}
+                  ]
+                ]
+              }
             }
           }
         }

data/spec/cloud_spec.rb

@@ -91,6 +91,29 @@ describe Cloudster::Cloud do
                   ]
                 ]
               }
+            },
+            "MySqlDB"=> {
+              "Value" => {
+                "Fn::Join" => ["," ,
+                  [
+                    {"Fn::Join" => ["|", ["endpoint_address", {'Fn::GetAtt' => ['MySqlDB', 'Endpoint.Address']}]]},
+                    {"Fn::Join" => ["|", ["endpoint_port", {'Fn::GetAtt' => ['MySqlDB', 'Endpoint.Port']}]]}
+                  ]
+                ]
+              }
+            },
+            "ELB"=> {
+              "Value" => {
+                "Fn::Join" => ["," ,
+                  [
+                    {"Fn::Join" => ["|", ["canonical_hosted_zone_name", {'Fn::GetAtt' => ['ELB', 'CanonicalHostedZoneName']}]]},
+                    {"Fn::Join" => ["|", ["canonical_hosted_zone_name_id", {'Fn::GetAtt' => ['ELB', 'CanonicalHostedZoneNameID']}]]},
+                    {"Fn::Join" => ["|", ["dns_name", {'Fn::GetAtt' => ['ELB', 'DNSName']}]]},
+                    {"Fn::Join" => ["|", ["source_security_group_name", {'Fn::GetAtt' => ['ELB', 'SourceSecurityGroup.GroupName']}]]},
+                    {"Fn::Join" => ["|", ["source_security_group_owner", {'Fn::GetAtt' => ['ELB', 'SourceSecurityGroup.OwnerAlias']}]]}
+                  ]
+                ]
+              }
             }
           }
       }.to_json

data/spec/elastic_ip_spec.rb

@@ -37,7 +37,7 @@ describe Cloudster::ChefClient do
           "Outputs" => {
             "AppServer"=>{
               "Value"=>{
-                "Fn::Join"=>[",", 
+                "Fn::Join"=>[",",
                   [
                     {"Fn::Join"=>["|", ["availablity_zone", {"Fn::GetAtt"=>["AppServer", "AvailabilityZone"]}]]},
                     {"Fn::Join"=>["|", ["private_dns_name", {"Fn::GetAtt"=>["AppServer", "PrivateDnsName"]}]]},
@@ -47,6 +47,15 @@ describe Cloudster::ChefClient do
                   ]
                 ]
               }
+            },
+            "ElasticIp"=>{
+              "Value"=>{
+                "Fn::Join"=>[",",
+                  [
+                    {"Fn::Join"=>["|", ["public_ip", {"Ref"=> "ElasticIp"}]]}
+                  ]
+                ]
+              }
             }
           }
         }

data/spec/elb_spec.rb

@@ -12,13 +12,99 @@ describe Cloudster::Elb do
   describe '#template with default listener' do
     it "should return a ruby hash for the resource cloudformation template with default listener" do
       elb = Cloudster::Elb.new(:name => 'LoadBalancer', :instance_names => ['AppServer', 'AppServer2']) 
-      elb.template.should == {"Resources" => {"LoadBalancer"=>{"Type"=>"AWS::ElasticLoadBalancing::LoadBalancer", "Properties"=>{"AvailabilityZones"=>{"Fn::GetAZs"=>""}, "Listeners"=>[{"LoadBalancerPort"=>"80", "InstancePort"=>"80", "Protocol"=>"HTTP"}], "HealthCheck"=>{"Target"=>{"Fn::Join"=>["", ["HTTP:", "80", "/"]]}, "HealthyThreshold"=>"3", "UnhealthyThreshold"=>"5", "Interval"=>"30", "Timeout"=>"5"}, "Instances"=>[{"Ref"=>"AppServer"}, {"Ref"=>"AppServer2"}]}}}}
+      elb.template.should == {
+        "Resources" => {
+          "LoadBalancer"=>{
+            "Type"=>"AWS::ElasticLoadBalancing::LoadBalancer",
+            "Properties"=>{
+              "AvailabilityZones"=>{
+                "Fn::GetAZs"=>""
+              },
+              "Listeners"=>[
+                {
+                  "LoadBalancerPort"=>"80",
+                  "InstancePort"=>"80",
+                  "Protocol"=>"HTTP"
+                }
+              ],
+              "HealthCheck"=>{
+                "Target"=>{
+                  "Fn::Join"=>["", ["HTTP:", "80", "/"]]
+                },
+                "HealthyThreshold"=>"3",
+                "UnhealthyThreshold"=>"5",
+                "Interval"=>"30",
+                "Timeout"=>"5"
+              },
+              "Instances"=>[{"Ref"=>"AppServer"}, {"Ref"=>"AppServer2"}]
+            }
+          }
+        },
+        "Outputs" => {
+          "LoadBalancer"=>{
+            "Value"=>{
+              "Fn::Join"=>[",",
+                [
+                    {"Fn::Join" => ["|", ["canonical_hosted_zone_name", {'Fn::GetAtt' => ['LoadBalancer', 'CanonicalHostedZoneName']}]]},
+                    {"Fn::Join" => ["|", ["canonical_hosted_zone_name_id", {'Fn::GetAtt' => ['LoadBalancer', 'CanonicalHostedZoneNameID']}]]},
+                    {"Fn::Join" => ["|", ["dns_name", {'Fn::GetAtt' => ['LoadBalancer', 'DNSName']}]]},
+                    {"Fn::Join" => ["|", ["source_security_group_name", {'Fn::GetAtt' => ['LoadBalancer', 'SourceSecurityGroup.GroupName']}]]},
+                    {"Fn::Join" => ["|", ["source_security_group_owner", {'Fn::GetAtt' => ['LoadBalancer', 'SourceSecurityGroup.OwnerAlias']}]]}
+                ]
+              ]
+            }
+          }
+        }
+      }
     end
   end
   describe '#template with custom listener' do
     it "should return a ruby hash for the resource cloudformation template with the custom listener" do
-      elb = Cloudster::Elb.new(:name => 'LoadBalancer', :instance_names => ['AppServer', 'AppServer2'], :listeners => [{:port => 80, :instance_port => 3333, :protocol => 'HTTP'}]) 
-      elb.template.should == {"Resources" => {"LoadBalancer"=>{"Type"=>"AWS::ElasticLoadBalancing::LoadBalancer", "Properties"=>{"AvailabilityZones"=>{"Fn::GetAZs"=>""}, "Listeners"=>[{"LoadBalancerPort"=>"80", "InstancePort"=>"3333", "Protocol"=>"HTTP"}], "HealthCheck"=>{"Target"=>{"Fn::Join"=>["", ["HTTP:", "80", "/"]]}, "HealthyThreshold"=>"3", "UnhealthyThreshold"=>"5", "Interval"=>"30", "Timeout"=>"5"}, "Instances"=>[{"Ref"=>"AppServer"}, {"Ref"=>"AppServer2"}]}}}}
+      elb = Cloudster::Elb.new(:name => 'LoadBalancer', :instance_names => ['AppServer', 'AppServer2'], :listeners => [{:port => 80, :instance_port => 3333, :protocol => 'HTTP'}])
+      elb.template.should == {
+        "Resources" => {
+          "LoadBalancer"=>{
+            "Type"=>"AWS::ElasticLoadBalancing::LoadBalancer",
+            "Properties"=>{
+              "AvailabilityZones"=>{
+                "Fn::GetAZs"=>""
+              },
+              "Listeners"=>[
+                {
+                  "LoadBalancerPort"=>"80",
+                  "InstancePort"=>"3333",
+                  "Protocol"=>"HTTP"
+                }
+              ],
+              "HealthCheck"=>{
+                "Target"=>{
+                  "Fn::Join"=>["", ["HTTP:", "80", "/"]]
+                },
+                "HealthyThreshold"=>"3",
+                "UnhealthyThreshold"=>"5",
+                "Interval"=>"30",
+                "Timeout"=>"5"
+              },
+              "Instances"=>[{"Ref"=>"AppServer"}, {"Ref"=>"AppServer2"}]
+            }
+          }
+        },
+        "Outputs" => {
+          "LoadBalancer"=>{
+            "Value"=>{
+              "Fn::Join"=>[",",
+                [
+                    {"Fn::Join" => ["|", ["canonical_hosted_zone_name", {'Fn::GetAtt' => ['LoadBalancer', 'CanonicalHostedZoneName']}]]},
+                    {"Fn::Join" => ["|", ["canonical_hosted_zone_name_id", {'Fn::GetAtt' => ['LoadBalancer', 'CanonicalHostedZoneNameID']}]]},
+                    {"Fn::Join" => ["|", ["dns_name", {'Fn::GetAtt' => ['LoadBalancer', 'DNSName']}]]},
+                    {"Fn::Join" => ["|", ["source_security_group_name", {'Fn::GetAtt' => ['LoadBalancer', 'SourceSecurityGroup.GroupName']}]]},
+                    {"Fn::Join" => ["|", ["source_security_group_owner", {'Fn::GetAtt' => ['LoadBalancer', 'SourceSecurityGroup.OwnerAlias']}]]}
+                ]
+              ]
+            }
+          }
+        }
+      }
     end
   end
   describe '.template' do
@@ -27,7 +113,50 @@ describe Cloudster::Elb do
     end
     it "should return a ruby hash for the resource cloudformation template" do
       hash = Cloudster::Elb.template(:name => 'LoadBalancer', :instance_names => ['AppServer', 'AppServer2'])
-      hash.should == {"Resources" => {"LoadBalancer"=>{"Type"=>"AWS::ElasticLoadBalancing::LoadBalancer", "Properties"=>{"AvailabilityZones"=>{"Fn::GetAZs"=>""}, "Listeners"=>[{"LoadBalancerPort"=>"80", "InstancePort"=>"80", "Protocol"=>"HTTP"}], "HealthCheck"=>{"Target"=>{"Fn::Join"=>["", ["HTTP:", "80", "/"]]}, "HealthyThreshold"=>"3", "UnhealthyThreshold"=>"5", "Interval"=>"30", "Timeout"=>"5"}, "Instances"=>[{"Ref"=>"AppServer"}, {"Ref"=>"AppServer2"}]}}}}
+      hash.should == {
+        "Resources" => {
+          "LoadBalancer"=>{
+            "Type"=>"AWS::ElasticLoadBalancing::LoadBalancer",
+            "Properties"=>{
+              "AvailabilityZones"=>{
+                "Fn::GetAZs"=>""
+              },
+              "Listeners"=>[
+                {
+                  "LoadBalancerPort"=>"80",
+                  "InstancePort"=>"80",
+                  "Protocol"=>"HTTP"
+                }
+              ],
+              "HealthCheck"=>{
+                "Target"=>{
+                  "Fn::Join"=>["", ["HTTP:", "80", "/"]]
+                },
+                "HealthyThreshold"=>"3",
+                "UnhealthyThreshold"=>"5",
+                "Interval"=>"30",
+                "Timeout"=>"5"
+              },
+              "Instances"=>[{"Ref"=>"AppServer"}, {"Ref"=>"AppServer2"}]
+            }
+          }
+        },
+        "Outputs" => {
+          "LoadBalancer"=>{
+            "Value"=>{
+              "Fn::Join"=>[",",
+                [
+                    {"Fn::Join" => ["|", ["canonical_hosted_zone_name", {'Fn::GetAtt' => ['LoadBalancer', 'CanonicalHostedZoneName']}]]},
+                    {"Fn::Join" => ["|", ["canonical_hosted_zone_name_id", {'Fn::GetAtt' => ['LoadBalancer', 'CanonicalHostedZoneNameID']}]]},
+                    {"Fn::Join" => ["|", ["dns_name", {'Fn::GetAtt' => ['LoadBalancer', 'DNSName']}]]},
+                    {"Fn::Join" => ["|", ["source_security_group_name", {'Fn::GetAtt' => ['LoadBalancer', 'SourceSecurityGroup.GroupName']}]]},
+                    {"Fn::Join" => ["|", ["source_security_group_owner", {'Fn::GetAtt' => ['LoadBalancer', 'SourceSecurityGroup.OwnerAlias']}]]}
+                ]
+              ]
+            }
+          }
+        }
+      }
     end
   end
 end

data/spec/rds_spec.rb

@@ -12,7 +12,7 @@ describe Cloudster::Rds do
   describe '#template' do
     it "should return a ruby hash for the resource cloudformation template" do
       rds = Cloudster::Rds.new(:name => 'MySqlDB', :storage_size => '10', :multi_az => true) 
-      template = {'Resources' => { 
+      template = {'Resources' => {
                     'MySqlDB' => {
                       "Type" => "AWS::RDS::DBInstance",
                       "Properties" => {
@@ -24,6 +24,18 @@ describe Cloudster::Rds do
                         "MultiAZ" => true
                       }
                     }
+                  },
+                  "Outputs" => {
+                    "MySqlDB"=>{
+                      "Value"=>{
+                        "Fn::Join"=>[",", 
+                          [
+                            {"Fn::Join" => ["|", ["endpoint_address", {'Fn::GetAtt' => ['MySqlDB', 'Endpoint.Address']}]]},
+                            {"Fn::Join" => ["|", ["endpoint_port", {'Fn::GetAtt' => ['MySqlDB', 'Endpoint.Port']}]]}
+                          ]
+                        ]
+                      }
+                    }
                   }
       }
       rds.template.should == template 
@@ -35,7 +47,7 @@ describe Cloudster::Rds do
     end
     it "should return a ruby hash for the resource cloudformation template" do
       hash = Cloudster::Rds.template(:name => 'MySqlDB', :storage_size => '10')
-      template = {'Resources' => { 
+      template = {'Resources' => {
                     'MySqlDB' => {
                       "Type" => "AWS::RDS::DBInstance",
                       "Properties" => {
@@ -47,6 +59,18 @@ describe Cloudster::Rds do
                         "MultiAZ" => false
                       }
                     }
+                  },
+                  "Outputs" => {
+                    "MySqlDB"=>{
+                      "Value"=>{
+                        "Fn::Join"=>[",", 
+                          [
+                            {"Fn::Join" => ["|", ["endpoint_address", {'Fn::GetAtt' => ['MySqlDB', 'Endpoint.Address']}]]},
+                            {"Fn::Join" => ["|", ["endpoint_port", {'Fn::GetAtt' => ['MySqlDB', 'Endpoint.Port']}]]}
+                          ]
+                        ]
+                      }
+                    }
                   }
       }
       hash.should == template 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudster
 version: !ruby/object:Gem::Version
-  version: 2.19.2
+  version: 2.19.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-21 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: 773599183
+      hash: -732779757
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: